Merge branch 'dev' of https://github.com/elvg/azure-powershell

Author: kiranisaac

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/GetAzureAutomationSchedule.cs

@@ -33,6 +33,8 @@ public class GetAzureAutomationSchedule : AzureAutomationBaseCmdlet
         /// </summary>
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByName, Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The schedule name.")]
+        [Alias("ScheduleName")]
+        [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
         /// <summary>

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/GetAzureAutomationScheduledRunbook.cs

@@ -37,16 +37,16 @@ public class GetAzureAutomationScheduledRunbook : AzureAutomationBaseCmdlet
         /// <summary>
         /// Gets or sets the runbook name of the job.
         /// </summary>
-        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookName, Mandatory = true, HelpMessage = "The runbook name of the job schedule.")]
-        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = true, HelpMessage = "The runbook name of the job schedule.")]
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookName, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The runbook name of the job schedule.")]
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The runbook name of the job schedule.")]
         [Alias("Name")]
         public string RunbookName { get; set; }
 
         /// <summary>
         /// Gets or sets the runbook name of the job.
         /// </summary>
-        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByScheduleName, Mandatory = true, HelpMessage = "The schedule name of the job schedule.")]
-        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = true, HelpMessage = "The schedule name of the job schedule.")]
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByScheduleName, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The schedule name of the job schedule.")]
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The schedule name of the job schedule.")]
         public string ScheduleName { get; set; }
 
         /// <summary>

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

@@ -145,8 +145,8 @@ public Schedule UpdateSchedule(string automationAccountName, string scheduleName
             AutomationManagement.Models.Schedule scheduleModel = this.GetScheduleModel(automationAccountName,
                 scheduleName);
             isEnabled = (isEnabled.HasValue) ? isEnabled : scheduleModel.Properties.IsEnabled;
-            description = description ?? scheduleModel.Properties.Description; ;
-            return this.UpdateScheduleHelper(automationAccountName, scheduleModel, isEnabled, description);
+            description = description ?? scheduleModel.Properties.Description;
+            return this.UpdateScheduleHelper(automationAccountName, scheduleName, isEnabled, description);
         }
 
         #endregion
@@ -1529,34 +1529,23 @@ private string FormatDateTime(DateTimeOffset dateTime)
         }
 
         private Schedule UpdateScheduleHelper(string automationAccountName,
-            AutomationManagement.Models.Schedule schedule, bool? isEnabled, string description)
+            string scheduleName, bool? isEnabled, string description)
         {
-
-            if (isEnabled.HasValue)
-            {
-                schedule.Properties.IsEnabled = isEnabled.Value;
-            }
-
-            if (description != null)
-            {
-                schedule.Properties.Description = description;
-            }
-
             var scheduleUpdateParameters = new AutomationManagement.Models.ScheduleUpdateParameters
             {
-                Name = schedule.Name,
+                Name = scheduleName,
                 Properties = new AutomationManagement.Models.ScheduleUpdateProperties
                 {
-                    Description = schedule.Properties.Description,
-                    IsEnabled = schedule.Properties.IsEnabled
+                    Description = description,
+                    IsEnabled = isEnabled
                 }
             };
 
             this.automationManagementClient.Schedules.Update(
                 automationAccountName,
                 scheduleUpdateParameters);
 
-            return this.GetSchedule(automationAccountName, schedule.Name);
+            return this.GetSchedule(automationAccountName, scheduleName);
         }
 
         private Certificate CreateCertificateInternal(string automationAccountName, string name, string path,

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

@@ -32,7 +32,7 @@ public class Constants
 
         public const string AutomationServicePrefix = "OaasCS";
 
-        public const string JobStartedByParameterName = "JobStartedBy";
+        public const string JobStartedByParameterName = "MicrosoftApplicationManagementStartedBy";
 
         // default schedule expiry time for daily schedule, consistent with UX
         // 12/31/9999 12:00:00 AM

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

@@ -33,7 +33,6 @@ public Module(string automationAccountName, Azure.Management.Automation.Models.M
             this.AutomationAccountName = automationAccountName;
             this.Name = module.Name;
             this.Location = module.Location;
-            this.Type = module.Type;
             this.Tags = module.Tags ?? new Dictionary<string, string>();
 
             if (module.Properties == null) return;
@@ -69,11 +68,6 @@ public Module()
         /// </summary>
         public string Location { get; set; }
 
-        /// <summary>
-        /// Gets or sets the type.
-        /// </summary>
-        public string Type { get; set; }
-
         /// <summary>
         /// Gets or sets the tags.
         /// </summary>

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

@@ -45,7 +45,6 @@ public Runbook(string accountName, AutomationManagement.Models.Runbook runbook)
             this.AutomationAccountName = accountName;
             this.Name = runbook.Name;
             this.Location = runbook.Location;
-            this.Type = runbook.Type;
             this.Tags = runbook.Tags ?? new Dictionary<string, string>();
 
             if (runbook.Properties == null) return;
@@ -85,11 +84,6 @@ public Runbook()
         /// </summary>
         public string Location { get; set; }
 
-        /// <summary>
-        /// Gets or sets the type.
-        /// </summary>
-        public string Type { get; set; }
-
         /// <summary>
         /// Gets or sets the tags.
         /// </summary>