Adding Time Zone support for Get and New schedule cmdlets

Author: Bpoe

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

@@ -84,6 +84,12 @@ public NewAzureAutomationSchedule()
         [ValidateRange(1, byte.MaxValue)]
         public byte HourInterval { get; set; }
 
+        /// <summary>
+        /// Gets or sets the schedule time zone.
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The schedule time zone.")]
+        public string TimeZone { get; set; }
+
         /// <summary>
         /// Execute this cmdlet.
         /// </summary>
@@ -95,25 +101,26 @@ protected override void AutomationProcessRecord()
                 Name = this.Name,
                 StartTime = this.StartTime,
                 Description = this.Description,
-                ExpiryTime = this.ExpiryTime
+                ExpiryTime = this.ExpiryTime,
+                TimeZone = this.TimeZone,
             };
 
-            if (this.ParameterSetName == AutomationCmdletParameterSets.ByOneTime)
-            {
-                schedule.Frequency = ScheduleFrequency.Onetime;
-            }
-            else if (this.ParameterSetName == AutomationCmdletParameterSets.ByDaily)
-            {
-                schedule.Frequency = ScheduleFrequency.Day;
-                schedule.Interval = this.DayInterval;
-            }
-            else if (this.ParameterSetName == AutomationCmdletParameterSets.ByHourly)
+            switch (this.ParameterSetName)
             {
-                schedule.Frequency = ScheduleFrequency.Hour;
-                schedule.Interval = this.HourInterval;
+                case AutomationCmdletParameterSets.ByOneTime:
+                    schedule.Frequency = ScheduleFrequency.Onetime;
+                    break;
+                case AutomationCmdletParameterSets.ByDaily:
+                    schedule.Frequency = ScheduleFrequency.Day;
+                    schedule.Interval = this.DayInterval;
+                    break;
+                case AutomationCmdletParameterSets.ByHourly:
+                    schedule.Frequency = ScheduleFrequency.Hour;
+                    schedule.Interval = this.HourInterval;
+                    break;
             }
 
-            Schedule createdSchedule = this.AutomationClient.CreateSchedule(this.ResourceGroupName, this.AutomationAccountName, schedule);
+            var createdSchedule = this.AutomationClient.CreateSchedule(this.ResourceGroupName, this.AutomationAccountName, schedule);
             this.WriteObject(createdSchedule);
         }
     }

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

@@ -335,7 +335,8 @@ public Schedule CreateSchedule(string resourceGroupName, string automationAccoun
                     ExpiryTime = schedule.ExpiryTime,
                     Description = schedule.Description,
                     Interval = schedule.Interval,
-                    Frequency = schedule.Frequency.ToString()
+                    Frequency = schedule.Frequency.ToString(),
+                    TimeZone = schedule.TimeZone,
                 }
             };
 

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

@@ -38,24 +38,26 @@ public class Schedule : BaseProperties
         public Schedule(string resourceGroupName, string automationAccountName, Azure.Management.Automation.Models.Schedule schedule)
         {
             Requires.Argument("schedule", schedule).NotNull();
+
             this.ResourceGroupName = resourceGroupName;
             this.AutomationAccountName = automationAccountName;
             this.Name = schedule.Name;
             this.Description = schedule.Properties.Description;
-            this.StartTime = schedule.Properties.StartTime.ToLocalTime();
-            this.ExpiryTime = schedule.Properties.ExpiryTime.ToLocalTime();
+            this.StartTime = AdjustOffset(schedule.Properties.StartTime, schedule.Properties.StartTimeOffsetMinutes);
+            this.ExpiryTime = AdjustOffset(schedule.Properties.ExpiryTime, schedule.Properties.ExpiryTimeOffsetMinutes);
             this.CreationTime = schedule.Properties.CreationTime.ToLocalTime();
             this.LastModifiedTime = schedule.Properties.LastModifiedTime.ToLocalTime();
             this.IsEnabled = schedule.Properties.IsEnabled;
-            this.NextRun = schedule.Properties.NextRun.HasValue
-                               ? schedule.Properties.NextRun.Value.ToLocalTime()
-                               : this.NextRun;
-            this.Interval = schedule.Properties.Interval.HasValue ? schedule.Properties.Interval.Value : this.Interval;
+            this.NextRun = AdjustOffset(schedule.Properties.NextRun, schedule.Properties.NextRunOffsetMinutes);
+            this.Interval = schedule.Properties.Interval ?? this.Interval;
             this.Frequency = (ScheduleFrequency)Enum.Parse(typeof(ScheduleFrequency), schedule.Properties.Frequency, true);
+            this.TimeZone = schedule.Properties.TimeZone;
         }
 
+        #region Public Properties
+
         /// <summary>
-        /// Initializes a new instance of the <see cref="HourlySchedule"/> class.
+        /// Initializes a new instance of the <see cref="Schedule"/> class.
         /// </summary>
         public Schedule()
         {
@@ -90,5 +92,32 @@ public Schedule()
         /// Gets or sets the schedule frequency.
         /// </summary>
         public ScheduleFrequency Frequency { get; set; }
+
+        /// <summary>
+        /// Gets or sets the schedule time zone.
+        /// </summary>
+        public string TimeZone { get; set; }
+
+        #endregion Public Properties
+
+        #region Private Methods
+
+        private static DateTimeOffset? AdjustOffset(DateTimeOffset? dateTimeOffset, double offsetMinutes)
+        {
+            if (dateTimeOffset.HasValue)
+            {
+                return AdjustOffset(dateTimeOffset.Value, offsetMinutes);
+            }
+
+            return null;
+        }
+
+        private static DateTimeOffset AdjustOffset(DateTimeOffset dateTimeOffset, double offsetMinutes)
+        {
+            var timeSpan = TimeSpan.FromMinutes(offsetMinutes);
+            return dateTimeOffset.ToOffset(timeSpan);
+        }
+
+        #endregion Private Methods
     }
 }

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

@@ -10,6 +10,8 @@ public enum ScheduleFrequency
     {
         Onetime,
         Day,
-        Hour
+        Hour,
+        Week,
+        Month,
     }
 }

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

@@ -45,10 +45,11 @@ public Schedule(string automationAccountName, WindowsAzure.Management.Automation
                                : 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.TimeZone = schedule.Properties.TimeZone;
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="HourlySchedule"/> class.
+        /// Initializes a new instance of the <see cref="Schedule"/> class.
         /// </summary>
         public Schedule()
         {
@@ -108,5 +109,10 @@ public Schedule()
         /// Gets or sets the schedule frequency.
         /// </summary>
         public ScheduleFrequency Frequency { get; set; }
+
+        /// <summary>
+        /// Gets or sets the schedule time zone.
+        /// </summary>
+        public string TimeZone { get; set; }
     }
 }