Merge pull request #55 from MabOneSdk/pragrawa

Policy changes

Author: pragrawa

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/NewAzureBackupProtectionPolicy.cs

@@ -55,7 +55,7 @@ public class NewAzureBackupProtectionPolicy : AzureBackupVaultCmdletBase
         public DateTime ScheduleRunTimes { get; set; }
 
         [Parameter(Position = 9, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.RetentionType, ValueFromPipelineByPropertyName = true)]
-        [ValidateSet("Days", IgnoreCase = true)]
+        [ValidateSet("Days", "Weeks", IgnoreCase = true)]
         public string RetentionType { get; set; }
 
         [Parameter(Position = 10, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.RententionDuration, ValueFromPipelineByPropertyName = true)]

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/SetAzureBackupProtectionPolicy.cs

@@ -52,7 +52,7 @@ public class SetAzureBackupProtectionPolicy : AzureBackupPolicyCmdletBase
         public DateTime ScheduleRunTimes { get; set; }
 
         [Parameter(Position = 6, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RetentionType)]
-        [ValidateSet("Days", IgnoreCase = true)]
+        [ValidateSet("Days", "Weeks", IgnoreCase = true)]
         public string RetentionType { get; set; }
 
         [Parameter(Position = 7, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RententionDuration)]

src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ProtectionPolicyHelpers.cs

@@ -107,18 +107,14 @@ private static void ValidateRetentionRange(string retentionType, int retentionDu
             if(retentionType == RetentionDurationType.Days.ToString() && (retentionDuration < MinRetentionInDays
                 || retentionDuration > MaxRetentionInDays))
             {
-                var exception = new Exception("For Retention in days , valid values of retention duration are 7 to 30.");
-                //var errorRecord = new ErrorRecord(exception, string.Empty, ErrorCategory.InvalidData, null);
-                //azureBackupCmdletBase.WriteError(errorRecord);
+                var exception = new ArgumentException("For Retention in days , valid values of retention duration are 7 to 30.");
                 throw exception;
             }
 
             if (retentionType == RetentionDurationType.Weeks.ToString() && (retentionDuration < MinRetentionInWeeks
                 || retentionDuration > MaxRetentionInWeeks))
             {
-                var exception = new Exception("For Retention in weeks , valid values of retention duration are 1 to 4.");
-                //var errorRecord = new ErrorRecord(exception, string.Empty, ErrorCategory.InvalidData, null);
-                //azureBackupCmdletBase.WriteError(errorRecord);
+                var exception = new ArgumentException("For Retention in weeks , valid values of retention duration are 1 to 4.");
                 throw exception;
             }
 
@@ -141,19 +137,15 @@ private static IList<DayOfWeek> ParseScheduleRunDays(string[] scheduleRunDays)
         {
             if (scheduleRunDays == null || scheduleRunDays.Length <= 0)
             {
-                var exception = new Exception("For weekly scheduletype , ScheduleRunDays should not be empty.");
-                //var errorRecord = new ErrorRecord(exception, string.Empty, ErrorCategory.InvalidData, null);
-                //azureBackupCmdletBase.WriteError(errorRecord);
+                var exception = new ArgumentException("For weekly scheduletype , ScheduleRunDays should not be empty.");
                 throw exception;
             }
 
             IList<DayOfWeek> ListofWeekDays = new List<DayOfWeek>();
 
             foreach (var dayOfWeek in scheduleRunDays)
             {
-                //azureBackupCmdletBase.WriteDebug("dayOfWeek" + dayOfWeek.ToString());
                 DayOfWeek item = (DayOfWeek)Enum.Parse(typeof(DayOfWeek), dayOfWeek, true);
-                //azureBackupCmdletBase.WriteDebug("Item" + item.ToString());
                 if (!ListofWeekDays.Contains(item))
                 {
                     ListofWeekDays.Add(item);
@@ -165,7 +157,10 @@ private static IList<DayOfWeek> ParseScheduleRunDays(string[] scheduleRunDays)
 
         private static DateTime ParseScheduleRunTime(DateTime scheduleStartTime)
         {
-            scheduleStartTime = scheduleStartTime.ToUniversalTime();
+            if (scheduleStartTime.Kind == DateTimeKind.Local)
+            {
+                scheduleStartTime = scheduleStartTime.ToUniversalTime();
+            }
             DateTime scheduleRunTime = new DateTime(scheduleStartTime.Year, scheduleStartTime.Month,
                 scheduleStartTime.Day, scheduleStartTime.Hour, scheduleStartTime.Minute - (scheduleStartTime.Minute % 30), 0);
             return scheduleRunTime;