minor fixes in policy

Author: sudhakar4171

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs

@@ -93,7 +93,7 @@ public static AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyR
                 iaasPolicyModel.BackupManagementType = BackupManagementType.AzureVM;
                 iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((LongTermRetentionPolicy)
                                                   ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).RetentionPolicy);
-                iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicyPolicy((SimpleSchedulePolicy)
+                iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicy((SimpleSchedulePolicy)
                                                  ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).SchedulePolicy);
             }
             else

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs

@@ -208,7 +208,7 @@ private static DailyRetentionSchedule GetPSLTRDailySchedule(HydraModels.DailyRet
             DailyRetentionSchedule psDaily = new DailyRetentionSchedule();
 
             psDaily.DurationCountInDays = GetRetentionDurationInDays(hydraDaily.RetentionDuration);
-            psDaily.RetentionTimes = (List<DateTime>)hydraDaily.RetentionTimes;
+            psDaily.RetentionTimes = ParseDateTimesToUTC(hydraDaily.RetentionTimes);
 
             return psDaily;
         }
@@ -223,7 +223,7 @@ private static WeeklyRetentionSchedule GetPSLTRWeeklySchedule(HydraModels.Weekly
             WeeklyRetentionSchedule psWeekly = new WeeklyRetentionSchedule();
 
             psWeekly.DurationCountInWeeks = GetRetentionDurationInWeeks(hydraWeekly.RetentionDuration);
-            psWeekly.RetentionTimes = (List<DateTime>)hydraWeekly.RetentionTimes;
+            psWeekly.RetentionTimes = ParseDateTimesToUTC(hydraWeekly.RetentionTimes);
             psWeekly.DaysOfTheWeek = HelperUtils.GetEnumListFromStringList<DayOfWeek>(hydraWeekly.DaysOfTheWeek);
 
             return psWeekly;
@@ -239,7 +239,7 @@ private static MonthlyRetentionSchedule GetPSLTRMonthlySchedule(HydraModels.Mont
             MonthlyRetentionSchedule psMonthly = new MonthlyRetentionSchedule();
 
             psMonthly.DurationCountInMonths = GetRetentionDurationInMonths(hydraMonthly.RetentionDuration);
-            psMonthly.RetentionTimes = (List<DateTime>)hydraMonthly.RetentionTimes;
+            psMonthly.RetentionTimes = ParseDateTimesToUTC(hydraMonthly.RetentionTimes);
             psMonthly.RetentionScheduleFormatType = (RetentionScheduleFormat)Enum.Parse(typeof(RetentionScheduleFormat),
                                                                                    hydraMonthly.RetentionScheduleFormatType);
             psMonthly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(hydraMonthly.RetentionScheduleDaily);
@@ -258,7 +258,7 @@ private static YearlyRetentionSchedule GetPSLTRYearlySchedule(HydraModels.Yearly
             YearlyRetentionSchedule psYearly = new YearlyRetentionSchedule();
 
             psYearly.DurationCountInYears = GetRetentionDurationInYears(hydraYearly.RetentionDuration);
-            psYearly.RetentionTimes = (List<DateTime>)hydraYearly.RetentionTimes;
+            psYearly.RetentionTimes = ParseDateTimesToUTC(hydraYearly.RetentionTimes);
             psYearly.RetentionScheduleFormatType = (RetentionScheduleFormat)Enum.Parse(typeof(RetentionScheduleFormat),
                                                                                    hydraYearly.RetentionScheduleFormatType);
             psYearly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(hydraYearly.RetentionScheduleDaily);

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/SchedulePolicyConversions.cs

@@ -26,7 +26,7 @@ public partial class PolicyHelpers
     {
         #region HydraToPSObject conversions
 
-        public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePolicyPolicy(
+        public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePolicy(
             SimpleSchedulePolicy hydraPolicy)
         {
             if (hydraPolicy == null)
@@ -39,7 +39,7 @@ public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePol
             psPolicy.ScheduleRunDays = HelperUtils.GetEnumListFromStringList<DayOfWeek>(hydraPolicy.ScheduleRunDays);
             psPolicy.ScheduleRunFrequency = (ScheduleRunType)Enum.Parse(typeof(ScheduleRunType),
                                                                         hydraPolicy.ScheduleRunFrequency);
-            psPolicy.ScheduleRunTimes = (List<DateTime>)hydraPolicy.ScheduleRunTimes;
+            psPolicy.ScheduleRunTimes = ParseDateTimesToUTC(hydraPolicy.ScheduleRunTimes);
 
             // safe side validation
             psPolicy.Validate();
@@ -51,7 +51,7 @@ public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePol
 
         #region PStoHydraObject conversions
 
-        public static List<DateTime> ParseScheduleRunTimesToUTC(List<DateTime> localTimes)
+        public static List<DateTime> ParseDateTimesToUTC(IList<DateTime> localTimes)
         {
             if (localTimes == null || localTimes.Count == 0)
             {
@@ -64,11 +64,9 @@ public static List<DateTime> ParseScheduleRunTimesToUTC(List<DateTime> localTime
             foreach (DateTime localTime in localTimes)
             {
                 temp = localTime;
-                if (localTime.Kind == DateTimeKind.Local)
+                if (localTime.Kind != DateTimeKind.Utc)
                 {
-                    temp = localTime.ToUniversalTime();
-                    temp = new DateTime(temp.Year, temp.Month,
-                                        temp.Day, temp.Hour, temp.Minute - (temp.Minute % 30), 0);
+                    temp = localTime.ToUniversalTime();                    
                 }                
                 utcTimes.Add(temp);
             }

src/ResourceManager/RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml

@@ -10,19 +10,19 @@
         <TableHeaders>
           <TableColumnHeader>
             <Label>Name</Label>
-            <Width>25</Width>
+            <Width>20</Width>
           </TableColumnHeader>
           <TableColumnHeader>
             <Label>WorkloadType</Label>
             <Width>18</Width>
           </TableColumnHeader>
           <TableColumnHeader>
             <Label>BackupManagementType</Label>
-            <Width>18</Width>
+            <Width>20</Width>
           </TableColumnHeader>
           <TableColumnHeader>
             <Label>BackupTime</Label>
-            <Width>30</Width>
+            <Width>25</Width>
           </TableColumnHeader>
           <TableColumnHeader>
             <Label>DaysOfWeek</Label>