Policy Changes

pragrawa · pragrawa · commit 14339b3286ad · 2015-08-17T21:47:36.000+05:30
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/NewAzureRMBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/NewAzureRMBackupProtectionPolicy.cs
@@ -77,8 +77,6 @@ public override void ExecuteCmdlet()
 
                 ProtectionPolicyHelpers.ValidateRetentionPolicy(RetentionPolicy, backupSchedule);
                 
-                AzureRMBackupProtectionPolicy protectionPolicy = new AzureRMBackupProtectionPolicy();
-
                 var addCSMProtectionPolicyRequest = new CSMAddProtectionPolicyRequest();
                 addCSMProtectionPolicyRequest.PolicyName = this.Name;
                 addCSMProtectionPolicyRequest.Properties = new CSMAddProtectionPolicyRequestProperties();
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/NewAzureRMBackupRetentionPolicyObject.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/NewAzureRMBackupRetentionPolicyObject.cs
@@ -86,22 +86,22 @@ public override void ExecuteCmdlet()
                 base.ExecuteCmdlet();
                 if (DailyRetention != false)
                 {
-                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupDailyRetentionPolicy("Daily", Retention);
+                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupDailyRetentionPolicy(RetentionType.Daily.ToString(), Retention);
                     ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
                     WriteObject(retentionPolicy);
                 }
 
                 if (WeeklyRetention != false)
                 {
                     List<DayOfWeek> daysofWeekList = ConvertDaysOfWeek(DaysOfWeek);
-                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupWeeklyRetentionPolicy("Weekly", Retention, daysofWeekList);
+                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupWeeklyRetentionPolicy(RetentionType.Weekly.ToString(), Retention, daysofWeekList);
                     ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
                     WriteObject(retentionPolicy);
                 }
 
                 if (MonthlyRetentionInDailyFormat != false)
                 {
-                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy("Monthly", Retention, RetentionFormat.Daily, DaysOfMonth,
+                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy(RetentionType.Monthly.ToString(), Retention, RetentionFormat.Daily, DaysOfMonth,
                         null, null);
                     ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
                     WriteObject(retentionPolicy);
@@ -111,7 +111,7 @@ public override void ExecuteCmdlet()
                 {
                     List<DayOfWeek> daysofWeekList = ConvertDaysOfWeek(DaysOfWeek);
                     List<WeekNumber> weekNumbers = ConvertWeekNumbers(WeekNumber);
-                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy("Monthly", Retention, RetentionFormat.Weekly, DaysOfMonth,
+                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy(RetentionType.Monthly.ToString(), Retention, RetentionFormat.Weekly, DaysOfMonth,
                         weekNumbers, daysofWeekList);
 
                     ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
@@ -122,7 +122,7 @@ public override void ExecuteCmdlet()
                 if (YearlyRetentionInDailyFormat != false)
                 {
                     List<Month> monthsOfYear = ConvertMonthsOfYear(MonthsOfYear);
-                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy("Yearly", Retention, monthsOfYear, RetentionFormat.Daily,
+                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy(RetentionType.Yearly.ToString(), Retention, monthsOfYear, RetentionFormat.Daily,
                         DaysOfMonth, null, null);
 
                     ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
@@ -135,7 +135,7 @@ public override void ExecuteCmdlet()
                     List<DayOfWeek> daysofWeekList = ConvertDaysOfWeek(DaysOfWeek);
                     List<WeekNumber> weekNumbers = ConvertWeekNumbers(WeekNumber);
                     List<Month> monthsOfYear = ConvertMonthsOfYear(MonthsOfYear);
-                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy("Yearly", Retention, monthsOfYear,
+                    AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy(RetentionType.Yearly.ToString(), Retention, monthsOfYear,
                         RetentionFormat.Weekly, DaysOfMonth, weekNumbers, daysofWeekList);
 
                     ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
@@ -145,7 +145,7 @@ public override void ExecuteCmdlet()
             });
         }
 
-        public List<DayOfWeek> ConvertDaysOfWeek(string[] daysOfWeek)
+        private List<DayOfWeek> ConvertDaysOfWeek(string[] daysOfWeek)
         {
             List<DayOfWeek> ListofWeekDays = new List<DayOfWeek>();
 
@@ -161,7 +161,7 @@ public List<DayOfWeek> ConvertDaysOfWeek(string[] daysOfWeek)
             return ListofWeekDays;
         }
 
-        public List<WeekNumber> ConvertWeekNumbers(string[] weekNumbers)
+        private List<WeekNumber> ConvertWeekNumbers(string[] weekNumbers)
         {
             List<WeekNumber> ListofWeekNumbers = new List<WeekNumber>();
 
@@ -177,7 +177,7 @@ public List<WeekNumber> ConvertWeekNumbers(string[] weekNumbers)
             return ListofWeekNumbers;
         }
 
-        public List<Month> ConvertMonthsOfYear(string[] monthsOfYear)
+        private List<Month> ConvertMonthsOfYear(string[] monthsOfYear)
         {
             List<Month> ListofMonthsOfYear = new List<Month>();
 
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/RemoveAzureRMBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/RemoveAzureRMBackupProtectionPolicy.cs
@@ -44,7 +44,7 @@ public override void ExecuteCmdlet()
                 }
                 else
                 {
-                    var exception = new ArgumentException(string.Format("ProtectionPolicy with name {0} does not exist.", policyInfo.Name));
+                    var exception = new ArgumentException(string.Format("Protection Policy {0} not found.", policyInfo.Name));
                     throw exception;                    
                 }
             });
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/SetAzureRMBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/SetAzureRMBackupProtectionPolicy.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
     /// <summary>
     /// Update existing protection policy
     /// </summary>
-    [Cmdlet(VerbsCommon.Set, "AzureRMBackupProtectionPolicy", DefaultParameterSetName = NoScheduleParamSet), OutputType(typeof(AzureRMBackupProtectionPolicy))]
+    [Cmdlet(VerbsCommon.Set, "AzureRMBackupProtectionPolicy", DefaultParameterSetName = NoScheduleParamSet), OutputType(typeof(AzureRMBackupJob), typeof(IList<AzureRMBackupJob>))]
     public class SetAzureRMBackupProtectionPolicy : AzureBackupPolicyCmdletBase
     {
         protected const string WeeklyScheduleParamSet = "WeeklyScheduleParamSet";
@@ -71,7 +71,6 @@ public override void ExecuteCmdlet()
                     throw new ArgumentException(String.Format("Protection policy {0} not found", ProtectionPolicy.Name));
                 }
 
-                // TODO: Make the below function work with AzureBackupProtectionPolicy
                 FillRemainingValuesForSetPolicyRequest(policyInfo, this.NewName);
 
                 var backupSchedule = ProtectionPolicyHelpers.FillCSMBackupSchedule(policyInfo.ScheduleType, BackupTime,
@@ -83,7 +82,6 @@ public override void ExecuteCmdlet()
                 updateProtectionPolicyRequest.Properties.PolicyName = this.NewName;
                 updateProtectionPolicyRequest.Properties.BackupSchedule = backupSchedule;
 
-                AzureRMBackupProtectionPolicy protectionPolicy = new AzureRMBackupProtectionPolicy();
                 if (RetentionPolicy != null && RetentionPolicy.Length > 0)
                 {
                     updateProtectionPolicyRequest.Properties.LtrRetentionPolicy =
@@ -101,9 +99,12 @@ public override void ExecuteCmdlet()
 
                 if (operationId != Guid.Empty)
                 {
-                    var operationStatus = GetOperationStatus(ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, operationId);
+                    string resourceGroupName = ProtectionPolicy.ResourceGroupName;
+                    string resourceName = ProtectionPolicy.ResourceName;
+                    var operationStatus = GetOperationStatus(resourceGroupName, resourceName, operationId);
                     WriteDebug("Protection Policy successfully updated and created job(s) to re-configure protection on associated items");
-                    WriteObject(operationStatus.JobList);
+
+                    WriteObject(GetCreatedJobs(resourceGroupName, resourceName, vault, operationStatus.JobList));
                 }
 
                 else
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ProtectionPolicyHelpers.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ProtectionPolicyHelpers.cs
@@ -155,13 +155,13 @@ public static void ValidateRetentionPolicy(IList<AzureRMBackupRetentionPolicy> r
 
             foreach (AzureRMBackupRetentionPolicy retentionPolicy in retentionPolicyList)
             {
-                if(retentionPolicy.RetentionType == "Daily")
+                if(retentionPolicy.RetentionType == RetentionType.Daily.ToString())
                 {
                     ValidateDailyRetention((AzureBackupDailyRetentionPolicy)retentionPolicy);
                     validateDailyRetention = true;
                     dailyRetentionPolicyCount = dailyRetentionPolicyCount + 1;
                 }
-                else if (retentionPolicy.RetentionType == "Weekly")
+                else if (retentionPolicy.RetentionType == RetentionType.Weekly.ToString())
                 {
                     ValidateWeeklyRetention((AzureBackupWeeklyRetentionPolicy)retentionPolicy);
                     validateWeeklyRetention = true;
@@ -172,7 +172,7 @@ public static void ValidateRetentionPolicy(IList<AzureRMBackupRetentionPolicy> r
                     }
                     weeklyRetentionPolicyCount = weeklyRetentionPolicyCount + 1;
                 }
-                else if (retentionPolicy.RetentionType == "Monthly")
+                else if (retentionPolicy.RetentionType == RetentionType.Monthly.ToString())
                 {
                     ValidateMonthlyRetention((AzureBackupMonthlyRetentionPolicy)retentionPolicy);
                     if (backupSchedule != null)
@@ -182,7 +182,7 @@ public static void ValidateRetentionPolicy(IList<AzureRMBackupRetentionPolicy> r
                     }
                     monthlyRetentionPolicyCount = monthlyRetentionPolicyCount + 1;
                 }
-                else if (retentionPolicy.RetentionType == "Yearly")
+                else if (retentionPolicy.RetentionType == RetentionType.Yearly.ToString())
                 {
                     ValidateYearlyRetention((AzureBackupYearlyRetentionPolicy)retentionPolicy);
                     if (backupSchedule != null)

Original file line number	Diff line number	Diff line change
`@@ -86,22 +86,22 @@ public override void ExecuteCmdlet()`
`86`	`86`	`base.ExecuteCmdlet();`
`87`	`87`	`if (DailyRetention != false)`
`88`	`88`	`{`
`89`		`- AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupDailyRetentionPolicy("Daily", Retention);`
	`89`	`+ AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupDailyRetentionPolicy(RetentionType.Daily.ToString(), Retention);`
`90`	`90`	`ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });`
`91`	`91`	`WriteObject(retentionPolicy);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`if (WeeklyRetention != false)`
`95`	`95`	`{`
`96`	`96`	`List<DayOfWeek> daysofWeekList = ConvertDaysOfWeek(DaysOfWeek);`
`97`		`- AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupWeeklyRetentionPolicy("Weekly", Retention, daysofWeekList);`
	`97`	`+ AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupWeeklyRetentionPolicy(RetentionType.Weekly.ToString(), Retention, daysofWeekList);`
`98`	`98`	`ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });`
`99`	`99`	`WriteObject(retentionPolicy);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if (MonthlyRetentionInDailyFormat != false)`
`103`	`103`	`{`
`104`		`- AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy("Monthly", Retention, RetentionFormat.Daily, DaysOfMonth,`
	`104`	`+ AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy(RetentionType.Monthly.ToString(), Retention, RetentionFormat.Daily, DaysOfMonth,`
`105`	`105`	`null, null);`
`106`	`106`	`ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });`
`107`	`107`	`WriteObject(retentionPolicy);`
`@@ -111,7 +111,7 @@ public override void ExecuteCmdlet()`
`111`	`111`	`{`
`112`	`112`	`List<DayOfWeek> daysofWeekList = ConvertDaysOfWeek(DaysOfWeek);`
`113`	`113`	`List<WeekNumber> weekNumbers = ConvertWeekNumbers(WeekNumber);`
`114`		`- AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy("Monthly", Retention, RetentionFormat.Weekly, DaysOfMonth,`
	`114`	`+ AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy(RetentionType.Monthly.ToString(), Retention, RetentionFormat.Weekly, DaysOfMonth,`
`115`	`115`	`weekNumbers, daysofWeekList);`
`116`	`116`
`117`	`117`	`ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });`
`@@ -122,7 +122,7 @@ public override void ExecuteCmdlet()`
`122`	`122`	`if (YearlyRetentionInDailyFormat != false)`
`123`	`123`	`{`
`124`	`124`	`List<Month> monthsOfYear = ConvertMonthsOfYear(MonthsOfYear);`
`125`		`- AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy("Yearly", Retention, monthsOfYear, RetentionFormat.Daily,`
	`125`	`+ AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy(RetentionType.Yearly.ToString(), Retention, monthsOfYear, RetentionFormat.Daily,`
`126`	`126`	`DaysOfMonth, null, null);`
`127`	`127`
`128`	`128`	`ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });`
`@@ -135,7 +135,7 @@ public override void ExecuteCmdlet()`
`135`	`135`	`List<DayOfWeek> daysofWeekList = ConvertDaysOfWeek(DaysOfWeek);`
`136`	`136`	`List<WeekNumber> weekNumbers = ConvertWeekNumbers(WeekNumber);`
`137`	`137`	`List<Month> monthsOfYear = ConvertMonthsOfYear(MonthsOfYear);`
`138`		`- AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy("Yearly", Retention, monthsOfYear,`
	`138`	`+ AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy(RetentionType.Yearly.ToString(), Retention, monthsOfYear,`
`139`	`139`	`RetentionFormat.Weekly, DaysOfMonth, weekNumbers, daysofWeekList);`
`140`	`140`
`141`	`141`	`ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });`
`@@ -145,7 +145,7 @@ public override void ExecuteCmdlet()`
`145`	`145`	`});`
`146`	`146`	`}`
`147`	`147`
`148`		`- public List<DayOfWeek> ConvertDaysOfWeek(string[] daysOfWeek)`
	`148`	`+ private List<DayOfWeek> ConvertDaysOfWeek(string[] daysOfWeek)`
`149`	`149`	`{`
`150`	`150`	`List<DayOfWeek> ListofWeekDays = new List<DayOfWeek>();`
`151`	`151`
`@@ -161,7 +161,7 @@ public List<DayOfWeek> ConvertDaysOfWeek(string[] daysOfWeek)`
`161`	`161`	`return ListofWeekDays;`
`162`	`162`	`}`
`163`	`163`
`164`		`- public List<WeekNumber> ConvertWeekNumbers(string[] weekNumbers)`
	`164`	`+ private List<WeekNumber> ConvertWeekNumbers(string[] weekNumbers)`
`165`	`165`	`{`
`166`	`166`	`List<WeekNumber> ListofWeekNumbers = new List<WeekNumber>();`
`167`	`167`
`@@ -177,7 +177,7 @@ public List<WeekNumber> ConvertWeekNumbers(string[] weekNumbers)`
`177`	`177`	`return ListofWeekNumbers;`
`178`	`178`	`}`
`179`	`179`
`180`		`- public List<Month> ConvertMonthsOfYear(string[] monthsOfYear)`
	`180`	`+ private List<Month> ConvertMonthsOfYear(string[] monthsOfYear)`
`181`	`181`	`{`
`182`	`182`	`List<Month> ListofMonthsOfYear = new List<Month>();`
`183`	`183`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public override void ExecuteCmdlet()`
`44`	`44`	`}`
`45`	`45`	`else`
`46`	`46`	`{`
`47`		`- var exception = new ArgumentException(string.Format("ProtectionPolicy with name {0} does not exist.", policyInfo.Name));`
	`47`	`+ var exception = new ArgumentException(string.Format("Protection Policy {0} not found.", policyInfo.Name));`
`48`	`48`	`throw exception;`
`49`	`49`	`}`
`50`	`50`	`});`
Original file line number	Diff line number	Diff line change
`@@ -155,13 +155,13 @@ public static void ValidateRetentionPolicy(IList<AzureRMBackupRetentionPolicy> r`
`155`	`155`
`156`	`156`	`foreach (AzureRMBackupRetentionPolicy retentionPolicy in retentionPolicyList)`
`157`	`157`	`{`
`158`		`- if(retentionPolicy.RetentionType == "Daily")`
	`158`	`+ if(retentionPolicy.RetentionType == RetentionType.Daily.ToString())`
`159`	`159`	`{`
`160`	`160`	`ValidateDailyRetention((AzureBackupDailyRetentionPolicy)retentionPolicy);`
`161`	`161`	`validateDailyRetention = true;`
`162`	`162`	`dailyRetentionPolicyCount = dailyRetentionPolicyCount + 1;`
`163`	`163`	`}`
`164`		`- else if (retentionPolicy.RetentionType == "Weekly")`
	`164`	`+ else if (retentionPolicy.RetentionType == RetentionType.Weekly.ToString())`
`165`	`165`	`{`
`166`	`166`	`ValidateWeeklyRetention((AzureBackupWeeklyRetentionPolicy)retentionPolicy);`
`167`	`167`	`validateWeeklyRetention = true;`
`@@ -172,7 +172,7 @@ public static void ValidateRetentionPolicy(IList<AzureRMBackupRetentionPolicy> r`
`172`	`172`	`}`
`173`	`173`	`weeklyRetentionPolicyCount = weeklyRetentionPolicyCount + 1;`
`174`	`174`	`}`
`175`		`- else if (retentionPolicy.RetentionType == "Monthly")`
	`175`	`+ else if (retentionPolicy.RetentionType == RetentionType.Monthly.ToString())`
`176`	`176`	`{`
`177`	`177`	`ValidateMonthlyRetention((AzureBackupMonthlyRetentionPolicy)retentionPolicy);`
`178`	`178`	`if (backupSchedule != null)`
`@@ -182,7 +182,7 @@ public static void ValidateRetentionPolicy(IList<AzureRMBackupRetentionPolicy> r`
`182`	`182`	`}`
`183`	`183`	`monthlyRetentionPolicyCount = monthlyRetentionPolicyCount + 1;`
`184`	`184`	`}`
`185`		`- else if (retentionPolicy.RetentionType == "Yearly")`
	`185`	`+ else if (retentionPolicy.RetentionType == RetentionType.Yearly.ToString())`
`186`	`186`	`{`
`187`	`187`	`ValidateYearlyRetention((AzureBackupYearlyRetentionPolicy)retentionPolicy);`
`188`	`188`	`if (backupSchedule != null)`