CalandarSchedule change - changing the response of the cmdlet

Author: jemex

src/ResourceManager/Automation/Commands.Automation/Cmdlet/NewAzureAutomationSchedule.cs

@@ -62,19 +62,19 @@ public NewAzureAutomationSchedule()
         /// <summary>
         /// Gets or sets the schedule days of the week.
         /// </summary>
-        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByWeekly, Mandatory = false, HelpMessage = "The list of days of the week for weekly schedule.")]
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByWeekly, Mandatory = false, HelpMessage = "The list of days of week for the weekly schedule.")]
         public DayOfWeek[] DaysOfWeek { get; set; }
 
         /// <summary>
         /// Gets or sets the schedule days of the month.
         /// </summary>
-        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByMonthlyDaysOfMonth, Mandatory = false, HelpMessage = "The list of days of the month for monthly schedule.")]
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByMonthlyDaysOfMonth, Mandatory = false, HelpMessage = "The list of days of month for the monthly schedule.")]
         public DaysOfMonth[] DaysOfMonth { get; set; }
 
         /// <summary>
         /// Gets or sets the schedule day of the week.
         /// </summary>
-        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByMonthlyDayOfWeek, Mandatory = false, HelpMessage = "The day of week for monthly occurrence.")]
+        [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByMonthlyDayOfWeek, Mandatory = false, HelpMessage = "The day of week for the monthly occurrence.")]
         public DayOfWeek? DayOfWeek { get; set; }
 
         /// <summary>
@@ -196,7 +196,7 @@ private Schedule CreateMonthlyScheduleModel()
                 Frequency = ScheduleFrequency.Month,
                 Interval = this.MonthInterval,
                 DaysOfMonth = this.DaysOfMonth,
-                DayOfWeek = dayOfWeek,
+                DayOfWeekMonthlySchedule = dayOfWeek,
                 DayOfWeekOccurrence = this.DayOfWeekOccurrence == 0 ? null : this.DayOfWeekOccurrence.ToString()
             };
 
@@ -219,7 +219,7 @@ private Schedule CreateWeeklyScheduleModel()
                 ExpiryTime = this.ExpiryTime,
                 Frequency = ScheduleFrequency.Week,
                 Interval = this.WeekInterval,
-                DaysOfWeek = this.DaysOfWeek == null
+                DaysOfWeekWeeklySchedule = this.DaysOfWeek == null
                     ? null
                     : this.DaysOfWeek.Select(day => day.ToString()).ToList()
             };

src/ResourceManager/Automation/Commands.Automation/Model/Schedule.cs

@@ -58,13 +58,13 @@ public Schedule(string resourceGroupName, string automationAccountName, Azure.Ma
                                : this.NextRun;
             this.Interval = schedule.Properties.Interval.HasValue ? schedule.Properties.Interval.Value : this.Interval;
             this.Frequency = (ScheduleFrequency)Enum.Parse(typeof(ScheduleFrequency), schedule.Properties.Frequency, true);
-            this.DaysOfWeek = schedule.Properties.AdvancedSchedule == null
+            this.DaysOfWeekWeeklySchedule = schedule.Properties.AdvancedSchedule == null
                 ? null
                 : schedule.Properties.AdvancedSchedule.WeekDays;
             this.DaysOfMonth = schedule.Properties.AdvancedSchedule == null
                 ? null
                 : this.GetDaysOfMonth(schedule.Properties.AdvancedSchedule.MonthDays);
-            this.DayOfWeek = this.IsMonthlyOccurrenceNull(schedule.Properties.AdvancedSchedule)
+            this.DayOfWeekMonthlySchedule = this.IsMonthlyOccurrenceNull(schedule.Properties.AdvancedSchedule)
                 ? null
                 : schedule.Properties.AdvancedSchedule.MonthlyOccurrences.First().Day;
             this.DayOfWeekOccurrence = this.IsMonthlyOccurrenceNull(schedule.Properties.AdvancedSchedule)
@@ -112,7 +112,7 @@ public Schedule()
         /// <summary>
         /// Gets or sets the schedule days of the week.
         /// </summary>
-        public IList<string> DaysOfWeek { get; set; }
+        public IList<string> DaysOfWeekWeeklySchedule { get; set; }
 
         /// <summary>
         /// Gets or sets the schedule days of the month.
@@ -122,7 +122,7 @@ public Schedule()
         /// <summary>
         /// Gets or sets the schedule day of the week.
         /// </summary>
-        public string DayOfWeek { get; set; }
+        public string DayOfWeekMonthlySchedule { get; set; }
 
         /// <summary>
         /// Gets or sets the schedule day of the week occurrence.
@@ -144,15 +144,15 @@ public AdvancedSchedule GetAdvancedSchedule()
 
             var advancedSchedule = new AdvancedSchedule()
             {
-                WeekDays = this.DaysOfWeek,
+                WeekDays = this.DaysOfWeekWeeklySchedule,
                 MonthDays = this.DaysOfMonth == null ? null : this.DaysOfMonth.Select(v => Convert.ToInt32(v)).ToList(),
-                MonthlyOccurrences = string.IsNullOrWhiteSpace(this.DayOfWeek) && this.DayOfWeekOccurrence == null
+                MonthlyOccurrences = string.IsNullOrWhiteSpace(this.DayOfWeekMonthlySchedule) && this.DayOfWeekOccurrence == null
                     ? null
                     : new AdvancedScheduleMonthlyOccurrence[]
                     {
                         new AdvancedScheduleMonthlyOccurrence()
                         {
-                            Day = this.DayOfWeek,
+                            Day = this.DayOfWeekMonthlySchedule,
                             Occurrence = this.GetDayOfWeekOccurrence(this.DayOfWeekOccurrence)
                         }
                     }
@@ -202,9 +202,9 @@ private bool IsMonthlyOccurrenceNull(Azure.Management.Automation.Models.Advanced
         /// </returns>
         private bool AdvancedScheduleIsNull(Schedule schedule)
         {
-            return (schedule.DaysOfWeek == null
+            return (schedule.DaysOfWeekWeeklySchedule == null
                 && schedule.DaysOfMonth == null
-                && string.IsNullOrWhiteSpace(schedule.DayOfWeek)
+                && string.IsNullOrWhiteSpace(schedule.DayOfWeekMonthlySchedule)
                 && schedule.DayOfWeekOccurrence == null);
         }