Minor bug fixes in policy, added testcase of policy

Author: sudhakar4171

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

@@ -51,6 +51,31 @@ public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePol
 
         #region PStoHydraObject conversions
 
+        public static List<DateTime> ParseScheduleRunTimesToUTC(List<DateTime> localTimes)
+        {
+            if (localTimes == null || localTimes.Count == 0)
+            {
+                return null;
+            }
+
+            List<DateTime> utcTimes = new List<DateTime>();
+            DateTime temp;
+
+            foreach (DateTime localTime in localTimes)
+            {
+                temp = localTime;
+                if (localTime.Kind == DateTimeKind.Local)
+                {
+                    temp = localTime.ToUniversalTime();
+                    temp = new DateTime(temp.Year, temp.Month,
+                                        temp.Day, temp.Hour, temp.Minute - (temp.Minute % 30), 0);
+                }                
+                utcTimes.Add(temp);
+            }
+
+            return utcTimes;
+        }       
+
         public static SimpleSchedulePolicy GetHydraSimpleSchedulePolicy(
             AzureRmRecoveryServicesSimpleSchedulePolicy psPolicy)
         {
@@ -65,6 +90,7 @@ public static SimpleSchedulePolicy GetHydraSimpleSchedulePolicy(
             {
                 hydraPolicy.ScheduleRunDays = HelperUtils.GetStringListFromEnumList<DayOfWeek>(psPolicy.ScheduleRunDays);
             }
+            hydraPolicy.ScheduleRunTimes = psPolicy.ScheduleRunTimes;
 
             return hydraPolicy;
         }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

@@ -250,7 +250,7 @@
     <value>In Schedule, if ScheduleRunFrequency is Weekly then ScheduleRunDays should not be empty and not contain duplicate entries</value>
   </data>
   <data name="InvalidScheduleTimeInScheduleException" xml:space="preserve">
-    <value>ScheduleTimes in Schedule should have ONE time and must be of multiples of 30 Mins with seconds and milliseconds set to 0</value>
+    <value>ScheduleTimes in Schedule should be in UTC Timezone, have ONE time and must be of multiples of 30 Mins with seconds and milliseconds set to 0</value>
   </data>
   <data name="InvalidWeeksOfMonthInMonthlyYearlyRetentionPolicyException" xml:space="preserve">
     <value>In Monthly/Yearly retention schedule, WeeksOfMonth is NULL or empty or contains duplicate entires</value>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx

@@ -203,6 +203,11 @@ public ProtectionPolicyResponse CreatePolicy()
 
             // do validations
             ValidateAzureVMWorkloadType(workloadType);
+            ValidateAzureVMSchedulePolicy(schedulePolicy);
+
+            // update the retention times from backupSchedule to retentionPolicy after converting to UTC           
+            CopyScheduleTimeToRetentionTimes((AzureRmRecoveryServicesLongTermRetentionPolicy)retentionPolicy,
+                                             (AzureRmRecoveryServicesSimpleSchedulePolicy)schedulePolicy);
 
             // validate both RetentionPolicy and SchedulePolicy
             ValidateAzureVMRetentionPolicy(retentionPolicy);
@@ -263,6 +268,11 @@ public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()
                 ((AzureRmRecoveryServicesIaasVmPolicy)policy).RetentionPolicy = retentionPolicy;
             }
 
+            // copy the backupSchedule time to retentionPolicy after converting to UTC
+            CopyScheduleTimeToRetentionTimes(
+                (AzureRmRecoveryServicesLongTermRetentionPolicy)((AzureRmRecoveryServicesIaasVmPolicy)policy).RetentionPolicy,
+                (AzureRmRecoveryServicesSimpleSchedulePolicy)((AzureRmRecoveryServicesIaasVmPolicy)policy).SchedulePolicy);
+
             // Now validate both RetentionPolicy and SchedulePolicy matches or not
             PolicyHelpers.ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
                 (AzureRmRecoveryServicesLongTermRetentionPolicy)((AzureRmRecoveryServicesIaasVmPolicy)policy).RetentionPolicy,
@@ -437,7 +447,7 @@ private static DateTime GenerateRandomTime()
             Random rand = new Random();
             int hour = rand.Next(0, 24);
             int minute = (rand.Next(0, 2) == 0) ? 0 : 30;
-            return new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, hour, minute, 00);
+            return new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, hour, minute, 00, DateTimeKind.Utc);
         }
 
 
@@ -519,6 +529,7 @@ private AzureIaaSVMProtectableItem GetAzureVMProtectableObject(string azureVMNam
             return protectableObject;
 
         }
+
         private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzureVM,
             out AzureIaaSVMProtectableItem protectableObject)
         {
@@ -641,6 +652,34 @@ private HttpStatusCode TrackRefreshContainerOperation(string operationResultLink
             return status;
         }
 
+        private void CopyScheduleTimeToRetentionTimes(AzureRmRecoveryServicesLongTermRetentionPolicy retPolicy,
+                                                      AzureRmRecoveryServicesSimpleSchedulePolicy schPolicy)
+        {
+            // first convert schedule run times to UTC
+            schPolicy.ScheduleRunTimes = PolicyHelpers.ParseScheduleRunTimesToUTC(schPolicy.ScheduleRunTimes);
+
+            // now copy times from schedule to retention policy
+            if(retPolicy.IsDailyScheduleEnabled && retPolicy.DailySchedule != null)
+            {
+                retPolicy.DailySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
+            }
+
+            if (retPolicy.IsWeeklyScheduleEnabled && retPolicy.WeeklySchedule != null)
+            {
+                retPolicy.DailySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
+            }
+
+            if (retPolicy.IsMonthlyScheduleEnabled && retPolicy.MonthlySchedule != null)
+            {
+                retPolicy.DailySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
+            }
+
+            if (retPolicy.IsYearlyScheduleEnabled && retPolicy.YearlySchedule != null)
+            {
+                retPolicy.DailySchedule.RetentionTimes = schPolicy.ScheduleRunTimes;
+            }
+        }
+
         #endregion
     }
 }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

@@ -12,17 +12,17 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
 {
-    public partial class ContainerTests : RecoveryServicesBackupTestsBase
+    public partial class PolicyTests : RecoveryServicesBackupTestsBase
     {
         [Fact]
         public void TestPolicyScenario()

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/PolicyTests.cs

@@ -15,16 +15,20 @@
 function Test-PolicyScenario
 {
 	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "phaniktRSV" -Name "phaniktRs1";
-	$containers = Get-AzureRmRecoveryServicesContainer -Vault $vault -ContainerType "AzureVM" -Status "Registered";
-	foreach ($container in $containers)
-	{
-		echo $container.Name $container.ResourceGroupName;
-	}
-	Assert-AreEqual $containers[0].Name "mylinux1";
+	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
 
-	$namedContainer = Get-AzureRmRecoveryServicesContainer -Vault $vault -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
-	Assert-AreEqual $namedContainer.Name "mylinux1";
+	# get default objects
+	$schedulePolicy = Get-AzureRmRecoveryServicesSchedulePolicyObject -WorkloadType "AzureVM"
+	$retPolicy = Get-AzureRmRecoveryServicesBackupRetentionPolicyObject -WorkloadType "AzureVM"
 
-	$rgFilteredContainer = Get-AzureRmRecoveryServicesContainer -Vault $vault -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1" -ResourceGroupName "00prjai12";
-	echo $rgFilteredContainer.Name $rgFilteredContainer.ResourceGroupName;
+	# now create new policy
+	$policy = New-AzureRmRecoveryServicesProtectionPolicy -Name "pwtest1" -WorkloadType "AzureVM" -RetentionPolicy $retPolicy -SchedulePolicy $schedulePolicy
+		
+	# now get policy and update it with new schedule/retention
+	$schedulePolicy = Get-AzureRmRecoveryServicesSchedulePolicyObject -WorkloadType "AzureVM"
+	$retPolicy = Get-AzureRmRecoveryServicesBackupRetentionPolicyObject -WorkloadType "AzureVM"
+
+    Get-AzureRmRecoveryServicesProtectionPolicy -Name "pwtest1"	| Set-AzureRmRecoveryServicesProtectionPolicy -RetentionPolicy $retPolicy -SchedulePolicy $schedulePolicy 
+
+	echo $schedulePolicy	
 }