minor fixes in policy cmdlets

sudhakar4171 · sudhakar4171 · commit b7d55207086b · 2016-04-01T15:23:30.000+05:30
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmBackupManagementServer.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmBackupManagementServer.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// <summary>
     /// Get list of containers
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesContainer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmBackupManagementServer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]
     public class GetAzureRmBackupManagementServer : RecoveryServicesBackupCmdletBase
     {
         [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.Name)]
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs
@@ -78,8 +78,7 @@ public override void ExecuteCmdlet()
                PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
                {  
                    {PolicyParams.PolicyName, Name},
-                   {PolicyParams.WorkloadType, WorkloadType},
-                   {PolicyParams.BackupManagementType, BackupManagementType},
+                   {PolicyParams.WorkloadType, WorkloadType},                   
                    {PolicyParams.RetentionPolicy, RetentionPolicy},
                    {PolicyParams.SchedulePolicy, SchedulePolicy},                
                }, HydraAdapter);
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Validations/PolicyValidations.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Validations/PolicyValidations.cs
@@ -24,13 +24,13 @@
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
 {
     public partial class PolicyHelpers
-    {        
+    {
         public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
             AzureRmRecoveryServicesLongTermRetentionPolicy ltrPolicy,
             AzureRmRecoveryServicesSimpleSchedulePolicy schPolicy)
         {
             // for daily schedule, daily retention policy is required
-            if(schPolicy.ScheduleRunFrequency == ScheduleRunType.Daily && 
+            if (schPolicy.ScheduleRunFrequency == ScheduleRunType.Daily &&
                ltrPolicy.DailySchedule == null)
             {
                 throw new ArgumentException(Resources.DailyRetentionScheduleNullException);
@@ -45,24 +45,27 @@ public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
             }
 
             // validate daily retention schedule with schPolicy
-            if(ltrPolicy.DailySchedule != null)
+            if (ltrPolicy.DailySchedule != null)
             {
-                ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.DailySchedule.RetentionTimes);               
+                ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.DailySchedule.RetentionTimes);
             }
 
             // validate weekly retention schedule with schPolicy
             if (ltrPolicy.WeeklySchedule != null)
             {
                 ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.WeeklySchedule.RetentionTimes);
 
-                // count of daysOfWeek should match for weekly schedule
-                if(ltrPolicy.WeeklySchedule.DaysOfTheWeek.Count != schPolicy.ScheduleRunDays.Count)
+                if (schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly)
                 {
-                    throw new ArgumentException(Resources.DaysofTheWeekInWeeklyRetentionException);                        
+                    // count of daysOfWeek should match for weekly schedule
+                    if (ltrPolicy.WeeklySchedule.DaysOfTheWeek.Count != schPolicy.ScheduleRunDays.Count)
+                    {
+                        throw new ArgumentException(Resources.DaysofTheWeekInWeeklyRetentionException);
+                    }
+
+                    // validate days of week
+                    ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays, ltrPolicy.WeeklySchedule.DaysOfTheWeek);
                 }
-
-                // validate days of week
-                ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays, ltrPolicy.WeeklySchedule.DaysOfTheWeek);
             }
 
             // validate monthly retention schedule with schPolicy
@@ -71,16 +74,17 @@ public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
                 ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.MonthlySchedule.RetentionTimes);
 
                 // if backupSchedule is weekly, then user cannot choose 'Daily Retention format' 
-                if(schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly &&
+                if (schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly &&
                     ltrPolicy.MonthlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Daily)
                 {
                     throw new ArgumentException(Resources.MonthlyYearlyInvalidDailyRetentionFormatTypeException);
                 }
 
                 // for monthly and weeklyFormat, validate days of week
-                if(ltrPolicy.MonthlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Weekly)
+                if (ltrPolicy.MonthlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Weekly &&
+                   schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly)
                 {
-                    ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays, 
+                    ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays,
                                                            ltrPolicy.MonthlySchedule.RetentionScheduleWeekly.DaysOfTheWeek);
                 }
             }
@@ -98,7 +102,8 @@ public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
                 }
 
                 // for yearly and weeklyFormat, validate days of week                 
-                if (ltrPolicy.YearlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Weekly)
+                if (ltrPolicy.YearlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Weekly &&
+                    schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly)
                 {
                     ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays,
                                                            ltrPolicy.YearlySchedule.RetentionScheduleWeekly.DaysOfTheWeek);
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj
@@ -84,6 +84,10 @@
       <Project>{b758fec1-35c1-4f93-a954-66dd33f6e0ec}</Project>
       <Name>Commands.RecoveryServices.Backup.HydraAdapter</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Commands.RecoveryServices.Backup.Logger\Commands.RecoveryServices.Backup.Logger.csproj">
+      <Project>{5e675749-6139-464a-904c-59c0ffdfec82}</Project>
+      <Name>Commands.RecoveryServices.Backup.Logger</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Commands.RecoveryServices.Backup.Models\Commands.RecoveryServices.Backup.Models.csproj">
       <Project>{30b92759-50b3-494e-b9f0-ec9a2ce9d57b}</Project>
       <Name>Commands.RecoveryServices.Backup.Models</Name>
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
@@ -193,9 +193,7 @@ 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];
-            BackupManagementType backupManagementType = (BackupManagementType)ProviderData.ProviderParameters[
-                                                                              PolicyParams.BackupManagementType];
+                (Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType)ProviderData.ProviderParameters[PolicyParams.WorkloadType];            
             AzureRmRecoveryServicesRetentionPolicyBase retentionPolicy = (AzureRmRecoveryServicesRetentionPolicyBase)
                                                  ProviderData.ProviderParameters[PolicyParams.RetentionPolicy];
             AzureRmRecoveryServicesSchedulePolicyBase schedulePolicy = (AzureRmRecoveryServicesSchedulePolicyBase)
@@ -204,18 +202,21 @@ public ProtectionPolicyResponse CreatePolicy()
             // 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);            
+            ValidateAzureVMRetentionPolicy(retentionPolicy);
+            Logger.Instance.WriteDebug("Validation of Retention policy is successful");
 
             // Now validate both RetentionPolicy and SchedulePolicy together
             PolicyHelpers.ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(
                                 (AzureRmRecoveryServicesLongTermRetentionPolicy)retentionPolicy,
                                 (AzureRmRecoveryServicesSimpleSchedulePolicy)schedulePolicy);
+            Logger.Instance.WriteDebug("Validation of Retention policy with Schedule policy is successful");
 
             // construct Hydra policy request            
             ProtectionPolicyRequest hydraRequest = new ProtectionPolicyRequest()

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`27`	`27`	`/// <summary>`
`28`	`28`	`/// Get list of containers`
`29`	`29`	`/// </summary>`
`30`		`- [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesContainer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]`
	`30`	`+ [Cmdlet(VerbsCommon.Get, "AzureRmBackupManagementServer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]`
`31`	`31`	`public class GetAzureRmBackupManagementServer : RecoveryServicesBackupCmdletBase`
`32`	`32`	`{`
`33`	`33`	`[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.Name)]`
Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,13 @@`
`24`	`24`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers`
`25`	`25`	`{`
`26`	`26`	`public partial class PolicyHelpers`
`27`		`- {`
	`27`	`+ {`
`28`	`28`	`public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(`
`29`	`29`	`AzureRmRecoveryServicesLongTermRetentionPolicy ltrPolicy,`
`30`	`30`	`AzureRmRecoveryServicesSimpleSchedulePolicy schPolicy)`
`31`	`31`	`{`
`32`	`32`	`// for daily schedule, daily retention policy is required`
`33`		`- if(schPolicy.ScheduleRunFrequency == ScheduleRunType.Daily &&`
	`33`	`+ if (schPolicy.ScheduleRunFrequency == ScheduleRunType.Daily &&`
`34`	`34`	`ltrPolicy.DailySchedule == null)`
`35`	`35`	`{`
`36`	`36`	`throw new ArgumentException(Resources.DailyRetentionScheduleNullException);`
`@@ -45,24 +45,27 @@ public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// validate daily retention schedule with schPolicy`
`48`		`- if(ltrPolicy.DailySchedule != null)`
	`48`	`+ if (ltrPolicy.DailySchedule != null)`
`49`	`49`	`{`
`50`		`- ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.DailySchedule.RetentionTimes);`
	`50`	`+ ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.DailySchedule.RetentionTimes);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// validate weekly retention schedule with schPolicy`
`54`	`54`	`if (ltrPolicy.WeeklySchedule != null)`
`55`	`55`	`{`
`56`	`56`	`ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.WeeklySchedule.RetentionTimes);`
`57`	`57`
`58`		`- // count of daysOfWeek should match for weekly schedule`
`59`		`- if(ltrPolicy.WeeklySchedule.DaysOfTheWeek.Count != schPolicy.ScheduleRunDays.Count)`
	`58`	`+ if (schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly)`
`60`	`59`	`{`
`61`		`- throw new ArgumentException(Resources.DaysofTheWeekInWeeklyRetentionException);`
	`60`	`+ // count of daysOfWeek should match for weekly schedule`
	`61`	`+ if (ltrPolicy.WeeklySchedule.DaysOfTheWeek.Count != schPolicy.ScheduleRunDays.Count)`
	`62`	`+ {`
	`63`	`+ throw new ArgumentException(Resources.DaysofTheWeekInWeeklyRetentionException);`
	`64`	`+ }`
	`65`	`+`
	`66`	`+ // validate days of week`
	`67`	`+ ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays, ltrPolicy.WeeklySchedule.DaysOfTheWeek);`
`62`	`68`	`}`
`63`		`-`
`64`		`- // validate days of week`
`65`		`- ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays, ltrPolicy.WeeklySchedule.DaysOfTheWeek);`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`// validate monthly retention schedule with schPolicy`
`@@ -71,16 +74,17 @@ public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(`
`71`	`74`	`ValidateRetentionAndBackupTimes(schPolicy.ScheduleRunTimes, ltrPolicy.MonthlySchedule.RetentionTimes);`
`72`	`75`
`73`	`76`	`// if backupSchedule is weekly, then user cannot choose 'Daily Retention format'`
`74`		`- if(schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly &&`
	`77`	`+ if (schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly &&`
`75`	`78`	`ltrPolicy.MonthlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Daily)`
`76`	`79`	`{`
`77`	`80`	`throw new ArgumentException(Resources.MonthlyYearlyInvalidDailyRetentionFormatTypeException);`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`// for monthly and weeklyFormat, validate days of week`
`81`		`- if(ltrPolicy.MonthlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Weekly)`
	`84`	`+ if (ltrPolicy.MonthlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Weekly &&`
	`85`	`+ schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly)`
`82`	`86`	`{`
`83`		`- ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays,`
	`87`	`+ ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays,`
`84`	`88`	`ltrPolicy.MonthlySchedule.RetentionScheduleWeekly.DaysOfTheWeek);`
`85`	`89`	`}`
`86`	`90`	`}`
`@@ -98,7 +102,8 @@ public static void ValidateLongTermRetentionPolicyWithSimpleRetentionPolicy(`
`98`	`102`	`}`
`99`	`103`
`100`	`104`	`// for yearly and weeklyFormat, validate days of week`
`101`		`- if (ltrPolicy.YearlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Weekly)`
	`105`	`+ if (ltrPolicy.YearlySchedule.RetentionScheduleFormatType == Cmdlets.Models.RetentionScheduleFormat.Weekly &&`
	`106`	`+ schPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly)`
`102`	`107`	`{`
`103`	`108`	`ValidateRetentionAndScheduleDaysOfWeek(schPolicy.ScheduleRunDays,`
`104`	`109`	`ltrPolicy.YearlySchedule.RetentionScheduleWeekly.DaysOfTheWeek);`