Merge branch 'dev1' into anudeeb-dev1

dragonfly91 · dragonfly91 · commit bd69d7812492 · 2016-03-21T16:16:26.000+05:30
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs
@@ -207,7 +207,7 @@ public override void Validate()
             {
                 if (RetentionScheduleDaily == null)
                 {
-                    throw new ArgumentException("RetentionScheduleDaily is set to NULL");
+                    throw new ArgumentException(Resources.MonthlyYearlyRetentionDailySchedulePolicyNULLException);
                 }
 
                 RetentionScheduleDaily.Validate();
@@ -217,7 +217,7 @@ public override void Validate()
             {
                 if (RetentionScheduleWeekly == null)
                 {
-                    throw new ArgumentException("RetentionScheduleWeekly is set to NULL");
+                    throw new ArgumentException(Resources.MonthlyYearlyRetentionWeeklySchedulePolicyNULLException);                    
                 }
 
                 RetentionScheduleWeekly.Validate();
@@ -268,7 +268,7 @@ public override void Validate()
             {
                 if (RetentionScheduleDaily == null)
                 {
-                    throw new ArgumentException("RetentionScheduleDaily is set to NULL");
+                    throw new ArgumentException(Resources.MonthlyYearlyRetentionDailySchedulePolicyNULLException);
                 }
 
                 RetentionScheduleDaily.Validate();
@@ -278,7 +278,7 @@ public override void Validate()
             {
                 if (RetentionScheduleWeekly == null)
                 {
-                    throw new ArgumentException("RetentionScheduleWeekly is set to NULL");
+                    throw new ArgumentException(Resources.MonthlyYearlyRetentionWeeklySchedulePolicyNULLException);
                 }
 
                 RetentionScheduleWeekly.Validate();
@@ -305,14 +305,14 @@ public void Validate()
         {
             if (DaysOfTheMonth == null || DaysOfTheMonth.Count == 0)
             {
-                throw new ArgumentException("DaysOfTheMonth is set to NULL/Empty");
+                throw new ArgumentException(Resources.InvalidDaysOfMonthInMonthlyYearlyRetentionPolicyException);
             }
 
             // check if all the days are unique or not
             List<Day> distinctDays = DaysOfTheMonth.GroupBy(x => new { x.Date, x.IsLast }).Select(g => g.First()).ToList();
             if (DaysOfTheMonth.Count != distinctDays.Count)
             {
-                throw new ArgumentException("DaysOfTheMonth list in DailyRetentionFormat contains duplicate entries");
+                throw new ArgumentException(Resources.InvalidDaysOfMonthInMonthlyYearlyRetentionPolicyException);
             }
 
             // also check if there exists more than one 'IsLast=true'
@@ -328,7 +328,7 @@ public void Validate()
 
             if(countOfIsLast > 1)
             {
-                throw new ArgumentException("Only ONE day can have IsLast=true in DaysOfTheMonth list");
+                throw new ArgumentException(Resources.InvalidDayInDaysOfMonthOfMonthlyYearlyRetentionPolicyException);
             }
         }
 
@@ -346,25 +346,17 @@ public class WeeklyRetentionFormat
 
         public void Validate()
         {
-            if (DaysOfTheWeek == null || DaysOfTheWeek.Count == 0)
+            if (DaysOfTheWeek == null || DaysOfTheWeek.Count == 0 ||
+                DaysOfTheWeek.Count != DaysOfTheWeek.Distinct().Count())
             {
-                throw new ArgumentException("DaysOfTheWeek is set to NULL/Empty");
+                throw new ArgumentException(Resources.InvalidDaysOfWeekInMonthlyYearlyRetentionPolicyException);
             }            
 
-            if (WeeksOfTheMonth == null || WeeksOfTheMonth.Count == 0)
+            if (WeeksOfTheMonth == null || WeeksOfTheMonth.Count == 0 ||
+                WeeksOfTheMonth.Count != WeeksOfTheMonth.Distinct().Count())
             {
-                throw new ArgumentException("WeeksOfTheMonth is set to NULL/Empty");
-            }
-                        
-            if (DaysOfTheWeek.Count != DaysOfTheWeek.Distinct().Count())
-            {
-                throw new ArgumentException("DaysOfTheWeek list in WeeklyRetentionFormat contains duplicate entries");
-            }
-                        
-            if (WeeksOfTheMonth.Count != WeeksOfTheMonth.Distinct().Count())
-            {
-                throw new ArgumentException("WeeksOfTheMonth list in WeeklyRetentionFormat contains duplicate entries");
-            }
+                throw new ArgumentException(Resources.InvalidWeeksOfMonthInMonthlyYearlyRetentionPolicyException);
+            }           
         }
 
         public override string ToString()
@@ -390,8 +382,7 @@ public void Validate()
         {
             if (IsLast == false && (Date <= 0 || Date > PolicyConstants.MaxAllowedDateInMonth))
             {
-                throw new ArgumentException("Days in DaysOfTheMonth should have IsLast = true  or date should be 1-" +
-                                             PolicyConstants.MaxAllowedDateInMonth);
+                throw new ArgumentException(Resources.InvalidDayInDaysOfMonthOfMonthlyYearlyRetentionPolicyException);
             }
         }
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/PolicyScheduleObjects.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/PolicyScheduleObjects.cs
@@ -17,6 +17,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
 {
@@ -31,29 +32,22 @@ public class AzureRmRecoveryServicesSimpleSchedulePolicy : AzureRmRecoveryServic
         public override void Validate()
         {
             //Currently only one scheduled run time is allowed
-            if (ScheduleRunTimes == null || ScheduleRunTimes.Count != 1)
-            {
-                throw new ArgumentException("", "ScheduleRunTimes");
-            }
-
             //Validate that the schedule runtime is in multiples of 30 Mins
-            if (ScheduleRunTimes[0].Minute % 30 != 0 || ScheduleRunTimes[0].Second != 0 || ScheduleRunTimes[0].Millisecond != 0)
+            if (ScheduleRunTimes == null || ScheduleRunTimes.Count != 1 || 
+                ScheduleRunTimes[0].Minute % 30 != 0 || 
+                ScheduleRunTimes[0].Second != 0 || 
+                ScheduleRunTimes[0].Millisecond != 0)
             {
-                throw new ArgumentException("ScheduleTimes must be of multiples of 30 Mins with Seconds " +
-                                            "and milliseconds set to 0");
+                throw new ArgumentException(Resources.InvalidScheduleTimeInScheduleException);
             }
 
             if (ScheduleRunFrequency == ScheduleRunType.Weekly)
             {
-                if (ScheduleRunDays == null || ScheduleRunDays.Count == 0)
-                {
-                    throw new ArgumentException("", "scheduleRunDays");
-                }
-                                
-                if (ScheduleRunDays.Count != ScheduleRunDays.Distinct().Count())
+                if (ScheduleRunDays == null || ScheduleRunDays.Count == 0 || 
+                    ScheduleRunDays.Count != ScheduleRunDays.Distinct().Count())
                 {
-                    throw new ArgumentException("ScheduleRunDays list in BackupSchedule contains duplicate entries");
-                }
+                    throw new ArgumentException(Resources.InvalidScheduleRunDaysInScheduleException);
+                }                
             }
         }
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx
@@ -237,4 +237,28 @@
   <data name="YearlyScheduleMonthsOfYearException" xml:space="preserve">
     <value>MonthsOfYear list in YearlyRetentionSchedule should not be NULL and not contain duplicate entires</value>
   </data>
+  <data name="InvalidDayInDaysOfMonthOfMonthlyYearlyRetentionPolicyException" xml:space="preserve">
+    <value>In Monthly/Yearly retention schedule, Day in DaysOfMonth should be 1-28 (or) IsLast=true set for one day only</value>
+  </data>
+  <data name="InvalidDaysOfMonthInMonthlyYearlyRetentionPolicyException" xml:space="preserve">
+    <value>In Monthly/Yearly retention schedule, DaysOfMonth is NULL or empty or contains duplicate entires</value>
+  </data>
+  <data name="InvalidDaysOfWeekInMonthlyYearlyRetentionPolicyException" xml:space="preserve">
+    <value>In Monthly/Yearly retention schedule, DaysOfWeek is NULL or empty or contains duplicate entires</value>
+  </data>
+  <data name="InvalidScheduleRunDaysInScheduleException" xml:space="preserve">
+    <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>
+  </data>
+  <data name="InvalidWeeksOfMonthInMonthlyYearlyRetentionPolicyException" xml:space="preserve">
+    <value>In Monthly/Yearly retention schedule, WeeksOfMonth is NULL or empty or contains duplicate entires</value>
+  </data>
+  <data name="MonthlyYearlyRetentionDailySchedulePolicyNULLException" xml:space="preserve">
+    <value>In Monthly/Yearly retention schedule, if RetentionScheduleFormatType=Daily then RetentionScheduleDaily should NOT be null</value>
+  </data>
+  <data name="MonthlyYearlyRetentionWeeklySchedulePolicyNULLException" xml:space="preserve">
+    <value>In Monthly/Yearly retention schedule, if RetentionScheduleFormatType=Weekly then RetentionScheduleWeekly should NOT be null</value>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ public override void Validate()`
`207`	`207`	`{`
`208`	`208`	`if (RetentionScheduleDaily == null)`
`209`	`209`	`{`
`210`		`- throw new ArgumentException("RetentionScheduleDaily is set to NULL");`
	`210`	`+ throw new ArgumentException(Resources.MonthlyYearlyRetentionDailySchedulePolicyNULLException);`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`RetentionScheduleDaily.Validate();`
`@@ -217,7 +217,7 @@ public override void Validate()`
`217`	`217`	`{`
`218`	`218`	`if (RetentionScheduleWeekly == null)`
`219`	`219`	`{`
`220`		`- throw new ArgumentException("RetentionScheduleWeekly is set to NULL");`
	`220`	`+ throw new ArgumentException(Resources.MonthlyYearlyRetentionWeeklySchedulePolicyNULLException);`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`RetentionScheduleWeekly.Validate();`
`@@ -268,7 +268,7 @@ public override void Validate()`
`268`	`268`	`{`
`269`	`269`	`if (RetentionScheduleDaily == null)`
`270`	`270`	`{`
`271`		`- throw new ArgumentException("RetentionScheduleDaily is set to NULL");`
	`271`	`+ throw new ArgumentException(Resources.MonthlyYearlyRetentionDailySchedulePolicyNULLException);`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`RetentionScheduleDaily.Validate();`
`@@ -278,7 +278,7 @@ public override void Validate()`
`278`	`278`	`{`
`279`	`279`	`if (RetentionScheduleWeekly == null)`
`280`	`280`	`{`
`281`		`- throw new ArgumentException("RetentionScheduleWeekly is set to NULL");`
	`281`	`+ throw new ArgumentException(Resources.MonthlyYearlyRetentionWeeklySchedulePolicyNULLException);`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`RetentionScheduleWeekly.Validate();`
`@@ -305,14 +305,14 @@ public void Validate()`
`305`	`305`	`{`
`306`	`306`	`if (DaysOfTheMonth == null \|\| DaysOfTheMonth.Count == 0)`
`307`	`307`	`{`
`308`		`- throw new ArgumentException("DaysOfTheMonth is set to NULL/Empty");`
	`308`	`+ throw new ArgumentException(Resources.InvalidDaysOfMonthInMonthlyYearlyRetentionPolicyException);`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`// check if all the days are unique or not`
`312`	`312`	`List<Day> distinctDays = DaysOfTheMonth.GroupBy(x => new { x.Date, x.IsLast }).Select(g => g.First()).ToList();`
`313`	`313`	`if (DaysOfTheMonth.Count != distinctDays.Count)`
`314`	`314`	`{`
`315`		`- throw new ArgumentException("DaysOfTheMonth list in DailyRetentionFormat contains duplicate entries");`
	`315`	`+ throw new ArgumentException(Resources.InvalidDaysOfMonthInMonthlyYearlyRetentionPolicyException);`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`// also check if there exists more than one 'IsLast=true'`
`@@ -328,7 +328,7 @@ public void Validate()`
`328`	`328`
`329`	`329`	`if(countOfIsLast > 1)`
`330`	`330`	`{`
`331`		`- throw new ArgumentException("Only ONE day can have IsLast=true in DaysOfTheMonth list");`
	`331`	`+ throw new ArgumentException(Resources.InvalidDayInDaysOfMonthOfMonthlyYearlyRetentionPolicyException);`
`332`	`332`	`}`
`333`	`333`	`}`
`334`	`334`
`@@ -346,25 +346,17 @@ public class WeeklyRetentionFormat`
`346`	`346`
`347`	`347`	`public void Validate()`
`348`	`348`	`{`
`349`		`- if (DaysOfTheWeek == null \|\| DaysOfTheWeek.Count == 0)`
	`349`	`+ if (DaysOfTheWeek == null \|\| DaysOfTheWeek.Count == 0 \|\|`
	`350`	`+ DaysOfTheWeek.Count != DaysOfTheWeek.Distinct().Count())`
`350`	`351`	`{`
`351`		`- throw new ArgumentException("DaysOfTheWeek is set to NULL/Empty");`
	`352`	`+ throw new ArgumentException(Resources.InvalidDaysOfWeekInMonthlyYearlyRetentionPolicyException);`
`352`	`353`	`}`
`353`	`354`
`354`		`- if (WeeksOfTheMonth == null \|\| WeeksOfTheMonth.Count == 0)`
	`355`	`+ if (WeeksOfTheMonth == null \|\| WeeksOfTheMonth.Count == 0 \|\|`
	`356`	`+ WeeksOfTheMonth.Count != WeeksOfTheMonth.Distinct().Count())`
`355`	`357`	`{`
`356`		`- throw new ArgumentException("WeeksOfTheMonth is set to NULL/Empty");`
`357`		`- }`
`358`		`-`
`359`		`- if (DaysOfTheWeek.Count != DaysOfTheWeek.Distinct().Count())`
`360`		`- {`
`361`		`- throw new ArgumentException("DaysOfTheWeek list in WeeklyRetentionFormat contains duplicate entries");`
`362`		`- }`
`363`		`-`
`364`		`- if (WeeksOfTheMonth.Count != WeeksOfTheMonth.Distinct().Count())`
`365`		`- {`
`366`		`- throw new ArgumentException("WeeksOfTheMonth list in WeeklyRetentionFormat contains duplicate entries");`
`367`		`- }`
	`358`	`+ throw new ArgumentException(Resources.InvalidWeeksOfMonthInMonthlyYearlyRetentionPolicyException);`
	`359`	`+ }`
`368`	`360`	`}`
`369`	`361`
`370`	`362`	`public override string ToString()`
`@@ -390,8 +382,7 @@ public void Validate()`
`390`	`382`	`{`
`391`	`383`	`if (IsLast == false && (Date <= 0 \|\| Date > PolicyConstants.MaxAllowedDateInMonth))`
`392`	`384`	`{`
`393`		`- throw new ArgumentException("Days in DaysOfTheMonth should have IsLast = true or date should be 1-" +`
`394`		`- PolicyConstants.MaxAllowedDateInMonth);`
	`385`	`+ throw new ArgumentException(Resources.InvalidDayInDaysOfMonthOfMonthlyYearlyRetentionPolicyException);`
`395`	`386`	`}`
`396`	`387`	`}`
`397`	`388`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`using System.Text;`
`18`	`18`	`using System.Threading.Tasks;`
`19`	`19`	`using System.Collections.Generic;`
	`20`	`+using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;`
`20`	`21`
`21`	`22`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models`
`22`	`23`	`{`
`@@ -31,29 +32,22 @@ public class AzureRmRecoveryServicesSimpleSchedulePolicy : AzureRmRecoveryServic`
`31`	`32`	`public override void Validate()`
`32`	`33`	`{`
`33`	`34`	`//Currently only one scheduled run time is allowed`
`34`		`- if (ScheduleRunTimes == null \|\| ScheduleRunTimes.Count != 1)`
`35`		`- {`
`36`		`- throw new ArgumentException("", "ScheduleRunTimes");`
`37`		`- }`
`38`		`-`
`39`	`35`	`//Validate that the schedule runtime is in multiples of 30 Mins`
`40`		`- if (ScheduleRunTimes[0].Minute % 30 != 0 \|\| ScheduleRunTimes[0].Second != 0 \|\| ScheduleRunTimes[0].Millisecond != 0)`
	`36`	`+ if (ScheduleRunTimes == null \|\| ScheduleRunTimes.Count != 1 \|\|`
	`37`	`+ ScheduleRunTimes[0].Minute % 30 != 0 \|\|`
	`38`	`+ ScheduleRunTimes[0].Second != 0 \|\|`
	`39`	`+ ScheduleRunTimes[0].Millisecond != 0)`
`41`	`40`	`{`
`42`		`- throw new ArgumentException("ScheduleTimes must be of multiples of 30 Mins with Seconds " +`
`43`		`- "and milliseconds set to 0");`
	`41`	`+ throw new ArgumentException(Resources.InvalidScheduleTimeInScheduleException);`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`if (ScheduleRunFrequency == ScheduleRunType.Weekly)`
`47`	`45`	`{`
`48`		`- if (ScheduleRunDays == null \|\| ScheduleRunDays.Count == 0)`
`49`		`- {`
`50`		`- throw new ArgumentException("", "scheduleRunDays");`
`51`		`- }`
`52`		`-`
`53`		`- if (ScheduleRunDays.Count != ScheduleRunDays.Distinct().Count())`
	`46`	`+ if (ScheduleRunDays == null \|\| ScheduleRunDays.Count == 0 \|\|`
	`47`	`+ ScheduleRunDays.Count != ScheduleRunDays.Distinct().Count())`
`54`	`48`	`{`
`55`		`- throw new ArgumentException("ScheduleRunDays list in BackupSchedule contains duplicate entries");`
`56`		`- }`
	`49`	`+ throw new ArgumentException(Resources.InvalidScheduleRunDaysInScheduleException);`
	`50`	`+ }`
`57`	`51`	`}`
`58`	`52`	`}`
`59`	`53`