Merge pull request #9 from kiranisaac/master

JobScheduleParameters and JobParameters should return Dictionary<string,...

Author: elvg

src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj

@@ -168,7 +168,7 @@
     <Compile Include="Common\AzureAutomationOperationException.cs" />
     <Compile Include="Common\Constants.cs" />
     <Compile Include="Common\IAutomationClient.cs" />
-    <Compile Include="Common\PowershellJsonConverter.cs" />
+    <Compile Include="Common\PowerShellJsonConverter.cs" />
     <Compile Include="Common\Requires.cs" />
     <Compile Include="Common\RequiresExtensions.cs" />
     <Compile Include="Common\ResourceCommonException.cs" />

src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs

@@ -1560,7 +1560,7 @@ private IDictionary<string, string> ProcessRunbookParameters(string automationAc
 
             if (!hasJobStartedBy)
             {
-                filteredParameters.Add(Constants.JobStartedByParameterName, Constants.ClientIdentity);
+                filteredParameters.Add(Constants.JobStartedByParameterName, PowerShellJsonConverter.Serialize(Constants.ClientIdentity));
             }
 
             return filteredParameters;

src/ServiceManagement/Automation/Commands.Automation/Model/Job.cs

@@ -11,9 +11,9 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Automation.Common;
-using Microsoft.Azure.Commands.Automation.Properties;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Microsoft.Azure.Commands.Automation.Model
 {
@@ -52,7 +52,7 @@ public Job(string accountName, Azure.Management.Automation.Models.Job job)
             this.Exception = job.Properties.Exception;
             this.EndTime = job.Properties.EndTime;
             this.LastStatusModifiedTime = job.Properties.LastStatusModifiedTime;
-            this.JobParameters = job.Properties.Parameters ?? new Dictionary<string, string>();
+            this.JobParameters = job.Properties.Parameters.ToDictionary(item => item.Key, item => (object)PowerShellJsonConverter.Deserialize(item.Value)) ?? new Dictionary<string, object>();
         }
 
         /// <summary>
@@ -115,7 +115,7 @@ public Job()
         /// <summary>
         /// Gets or sets the parameters of the job.
         /// </summary>
-        public IDictionary<string, string> JobParameters { get; set; }
+        public IDictionary<string, object> JobParameters { get; set; }
 
         /// <summary>
         /// Gets or sets the runbook.

src/ServiceManagement/Automation/Commands.Automation/Model/JobSchedule.cs

@@ -13,9 +13,8 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Automation.Common;
-using Microsoft.Azure.Commands.Automation.Properties;
-using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Microsoft.Azure.Commands.Automation.Model
 {
@@ -37,7 +36,7 @@ public JobSchedule(string automationAccountName, Azure.Management.Automation.Mod
             this.JobScheduleId = jobSchedule.Properties.Id;
             this.RunbookName = jobSchedule.Properties.Runbook.Name;
             this.ScheduleName = jobSchedule.Properties.Schedule.Name;
-            this.Parameters = jobSchedule.Properties.Parameters ?? new Dictionary<string, string>();
+            this.Parameters = jobSchedule.Properties.Parameters.ToDictionary(item => item.Key, item => (object)PowerShellJsonConverter.Deserialize(item.Value)) ?? new Dictionary<string, object>();
         }
 
         /// <summary>
@@ -70,6 +69,6 @@ public JobSchedule()
         /// <summary>
         /// Gets or sets the runbook parameters.
         /// </summary>
-        public IDictionary<string, string> Parameters { get; set; }
+        public IDictionary<string, object> Parameters { get; set; }
     }
 }