minor policy fixes and fixed merge conflicts

Author: sudhakar4171

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Validations/PolicyValidations.cs

@@ -31,27 +31,28 @@ public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
         {
             // for daily schedule, daily retention policy is required
             if (schPolicy.ScheduleRunFrequency == ScheduleRunType.Daily &&
-               ltrPolicy.DailySchedule == null)
+               (ltrPolicy.DailySchedule == null || ltrPolicy.IsDailyScheduleEnabled == false))
             {
                 throw new ArgumentException(Resources.DailyRetentionScheduleNullException);
             }
 
             // for weekly schedule, daily retention policy should be NULL
             // AND weekly retention policy is required
             if (schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly &&
-               (ltrPolicy.DailySchedule != null || ltrPolicy.WeeklySchedule == null))
+               (ltrPolicy.IsDailyScheduleEnabled != false || ltrPolicy.WeeklySchedule == null || 
+               (ltrPolicy.IsWeeklyScheduleEnabled == false)))
             {
                 throw new ArgumentException(Resources.WeeklyRetentionScheduleNullException);
             }
 
             // validate daily retention schedule with schPolicy
-            if (ltrPolicy.DailySchedule != null)
+            if (ltrPolicy.DailySchedule != null && ltrPolicy.IsDailyScheduleEnabled == true)
             {
                 ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.DailySchedule.RetentionTimes);
             }
 
             // validate weekly retention schedule with schPolicy
-            if (ltrPolicy.WeeklySchedule != null)
+            if (ltrPolicy.WeeklySchedule != null && ltrPolicy.IsWeeklyScheduleEnabled == true)
             {
                 ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.WeeklySchedule.RetentionTimes);
 
@@ -69,7 +70,7 @@ public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
             }
 
             // validate monthly retention schedule with schPolicy
-            if (ltrPolicy.MonthlySchedule != null)
+            if (ltrPolicy.MonthlySchedule != null && ltrPolicy.IsMonthlyScheduleEnabled == true)
             {
                 ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.MonthlySchedule.RetentionTimes);
 

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

@@ -205,7 +205,7 @@
     <value>RetentionTime in retention schedule should be same as backup time in SchedulePolicy</value>
   </data>
   <data name="DailyRetentionScheduleNullException" xml:space="preserve">
-    <value>Daily Retention Schedule can't be null if Daily Backup Schedule is enabled</value>
+    <value>Daily Retention Schedule can't be null (or) IsDailyScheduleEnabled should be 'true'  if Daily Backup Schedule is enabled</value>
   </data>
   <data name="DailyScheduleEnabledButScheduleIsNullException" xml:space="preserve">
     <value>RetentionPolicy: IsDailyScheduleEnabled=true but DailySchedule is NULL</value>
@@ -229,7 +229,7 @@
     <value>RetentionDuration in Days/Weeks/Months/Years should be from 1 - 9999</value>
   </data>
   <data name="WeeklyRetentionScheduleNullException" xml:space="preserve">
-    <value>If Weekly backup schedule is enabled, Daily retention schedule should be null and Weekly retention schedule should not be null</value>
+    <value>If Weekly backup schedule is enabled, then IsDailyScheduleEnabled should be false and Weekly retention schedule should not be null, IsWeeklyScheduleEnabled should be true</value>
   </data>
   <data name="WeeklyScheduleEnabledButScheduleIsNullException" xml:space="preserve">
     <value>RetentionPolicy: IsWeeklyScheduleEnabled=true but WeeklySchedule is NULL</value>

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

@@ -264,25 +264,30 @@ public ProtectionPolicyResponse CreatePolicy()
         {
             string policyName = (string)ProviderData.ProviderParameters[PolicyParams.PolicyName];
             Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType workloadType =
-                (Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType)ProviderData.ProviderParameters[PolicyParams.WorkloadType];            
-            AzureRmRecoveryServicesRetentionPolicyBase retentionPolicy = (AzureRmRecoveryServicesRetentionPolicyBase)
-                                                 ProviderData.ProviderParameters[PolicyParams.RetentionPolicy];
-            AzureRmRecoveryServicesSchedulePolicyBase schedulePolicy = (AzureRmRecoveryServicesSchedulePolicyBase)
-                                                 ProviderData.ProviderParameters[PolicyParams.SchedulePolicy];
+                (Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType)ProviderData.ProviderParameters[PolicyParams.WorkloadType];
+            AzureRmRecoveryServicesRetentionPolicyBase retentionPolicy =
+                ProviderData.ProviderParameters.ContainsKey(PolicyParams.RetentionPolicy) ?
+                (AzureRmRecoveryServicesRetentionPolicyBase)ProviderData.ProviderParameters[PolicyParams.RetentionPolicy] :
+                null;
+            AzureRmRecoveryServicesSchedulePolicyBase schedulePolicy =
+                ProviderData.ProviderParameters.ContainsKey(PolicyParams.SchedulePolicy) ?
+                (AzureRmRecoveryServicesSchedulePolicyBase)ProviderData.ProviderParameters[PolicyParams.SchedulePolicy] :
+                null;
 
             // do validations
             ValidateAzureVMWorkloadType(workloadType);
             ValidateAzureVMSchedulePolicy(schedulePolicy);
             Logger.Instance.WriteDebug("Validation of Schedule policy is successful");
 
-            // update the retention times from backupSchedule to retentionPolicy after converting to UTC           
-            CopyScheduleTimeToRetentionTimes((AzureRmRecoveryServicesLongTermRetentionPolicy)retentionPolicy,
-                                             (AzureRmRecoveryServicesSimpleSchedulePolicy)schedulePolicy);
-
             // validate RetentionPolicy
             ValidateAzureVMRetentionPolicy(retentionPolicy);
             Logger.Instance.WriteDebug("Validation of Retention policy is successful");
 
+            // update the retention times from backupSchedule to retentionPolicy after converting to UTC           
+            CopyScheduleTimeToRetentionTimes((AzureRmRecoveryServicesLongTermRetentionPolicy)retentionPolicy,
+                                             (AzureRmRecoveryServicesSimpleSchedulePolicy)schedulePolicy);
+            Logger.Instance.WriteDebug("Copy of RetentionTime from with SchedulePolicy to RetentionPolicy is successful");
+            
             // Now validate both RetentionPolicy and SchedulePolicy together
             PolicyHelpers.ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
                                 (AzureRmRecoveryServicesLongTermRetentionPolicy)retentionPolicy,
@@ -311,15 +316,23 @@ public ProtectionPolicyResponse CreatePolicy()
 
         public ProtectionPolicyResponse ModifyPolicy()
         {
-            AzureRmRecoveryServicesRetentionPolicyBase retentionPolicy = (AzureRmRecoveryServicesRetentionPolicyBase)
-                                                 ProviderData.ProviderParameters[PolicyParams.RetentionPolicy];
-            AzureRmRecoveryServicesSchedulePolicyBase schedulePolicy = (AzureRmRecoveryServicesSchedulePolicyBase)
-                                                 ProviderData.ProviderParameters[PolicyParams.SchedulePolicy];
-            AzureRmRecoveryServicesPolicyBase policy = (AzureRmRecoveryServicesPolicyBase)
-                                                 ProviderData.ProviderParameters[PolicyParams.ProtectionPolicy];
+            AzureRmRecoveryServicesRetentionPolicyBase retentionPolicy =
+               ProviderData.ProviderParameters.ContainsKey(PolicyParams.RetentionPolicy) ?
+               (AzureRmRecoveryServicesRetentionPolicyBase)ProviderData.ProviderParameters[PolicyParams.RetentionPolicy] :
+               null;
+            AzureRmRecoveryServicesSchedulePolicyBase schedulePolicy =
+                ProviderData.ProviderParameters.ContainsKey(PolicyParams.SchedulePolicy) ?
+                (AzureRmRecoveryServicesSchedulePolicyBase)ProviderData.ProviderParameters[PolicyParams.SchedulePolicy] :
+                null;
+
+            AzureRmRecoveryServicesPolicyBase policy =
+                ProviderData.ProviderParameters.ContainsKey(PolicyParams.ProtectionPolicy) ?
+                (AzureRmRecoveryServicesPolicyBase)ProviderData.ProviderParameters[PolicyParams.ProtectionPolicy] :
+                null;
 
             // do validations
             ValidateAzureVMProtectionPolicy(policy);
+            Logger.Instance.WriteDebug("Validation of Protection Policy is successful");
 
             // RetentionPolicy and SchedulePolicy both should not be empty
             if (retentionPolicy == null && schedulePolicy == null)
@@ -332,22 +345,26 @@ public ProtectionPolicyResponse ModifyPolicy()
             {
                 ValidateAzureVMSchedulePolicy(schedulePolicy);
                 ((AzureRmRecoveryServicesIaasVmPolicy)policy).SchedulePolicy = schedulePolicy;
+                Logger.Instance.WriteDebug("Validation of Schedule policy is successful");
             }
             if (retentionPolicy != null)
             {
                 ValidateAzureVMRetentionPolicy(retentionPolicy);
                 ((AzureRmRecoveryServicesIaasVmPolicy)policy).RetentionPolicy = retentionPolicy;
+                Logger.Instance.WriteDebug("Validation of Retention policy is successful");
             }
 
             // copy the backupSchedule time to retentionPolicy after converting to UTC
             CopyScheduleTimeToRetentionTimes(
                 (AzureRmRecoveryServicesLongTermRetentionPolicy)((AzureRmRecoveryServicesIaasVmPolicy)policy).RetentionPolicy,
                 (AzureRmRecoveryServicesSimpleSchedulePolicy)((AzureRmRecoveryServicesIaasVmPolicy)policy).SchedulePolicy);
+            Logger.Instance.WriteDebug("Copy of RetentionTime from with SchedulePolicy to RetentionPolicy is successful");
 
             // Now validate both RetentionPolicy and SchedulePolicy matches or not
             PolicyHelpers.ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
                 (AzureRmRecoveryServicesLongTermRetentionPolicy)((AzureRmRecoveryServicesIaasVmPolicy)policy).RetentionPolicy,
                 (AzureRmRecoveryServicesSimpleSchedulePolicy)((AzureRmRecoveryServicesIaasVmPolicy)policy).SchedulePolicy);
+            Logger.Instance.WriteDebug("Validation of Retention policy with Schedule policy is successful");
 
             // construct Hydra policy request            
             ProtectionPolicyRequest hydraRequest = new ProtectionPolicyRequest()

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

@@ -42,10 +42,10 @@
                 <PropertyName>BackupManagementType</PropertyName>
               </TableColumnItem>
               <TableColumnItem>
-                <PropertyName>SchedulePolicy.ScheduleRunTimes</PropertyName>
+                <ScriptBlock>$_.SchedulePolicy.ScheduleRunTimes</ScriptBlock>
               </TableColumnItem>
               <TableColumnItem>
-                <PropertyName>SchedulePolicy.ScheduleRunDays</PropertyName>
+                <ScriptBlock>$_.SchedulePolicy.ScheduleRunDays</ScriptBlock>
               </TableColumnItem>
             </TableColumnItems>
           </TableRowEntry>