Merge pull request #191 from MabOneSdk/dev1-sudreddy

Minor build break fixes

Author: sudhakar4171

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

@@ -94,22 +94,25 @@ private static void ValidateRetentionAndBackupTimes(List<DateTime> schPolicyTime
             }
         }
 
-        private static void ValidateRetentionAndScheduleDaysOfWeek(List<DayOfWeek> backupDOWList)
+        private static void ValidateRetentionAndScheduleDaysOfWeek(List<DayOfWeek> schList, List<DayOfWeek> retList)
         {
             // TBD
 
            /* if (backupDOWList.Count != DaysOfTheWeek.Count)
             {
                 throw new ArgumentException("DaysOfTheWeek of retention schedule  must be same of backup schedule DaysOfTheWeek");
-            }
-            foreach (var day in DaysOfTheWeek)
+            } */
+
+            // each day in retList must be present in 
+
+         /*   foreach (var day in DaysOfTheWeek)
             {
                 if (!backupDOWList.Contains(day))
                 {
                     throw new ArgumentException("DaysOfTheWeek of retention schedule  must be same of backup schedule DaysOfTheWeek");
                 }
 
-            } */
+            }*/
         }
 
         #endregion

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs

@@ -196,7 +196,7 @@ public class MonthlyRetentionSchedule : RetentionScheduleBase
         public MonthlyRetentionSchedule()
             : base()
         {
-            this.RetentionScheduleFormatType = RetentionScheduleFormat.Invalid;
+            
         }
 
         public override void Validate()
@@ -208,12 +208,7 @@ public override void Validate()
                 throw new ArgumentException(string.Format("Allowed Count for DurationCountInMonths is 1 - {0}",
                                             PolicyConstants.MaxAllowedRetentionDurationCount));
             }
-
-            if (RetentionScheduleFormatType == RetentionScheduleFormat.Invalid)
-            {
-                throw new ArgumentException("RetentionScheduleType is set to Invalid");
-            }
-
+            
             if (RetentionScheduleFormatType == RetentionScheduleFormat.Daily)
             {
                 if (RetentionScheduleDaily == null)
@@ -258,7 +253,7 @@ public class YearlyRetentionSchedule : RetentionScheduleBase
         public YearlyRetentionSchedule()
             : base()
         {
-            this.RetentionScheduleFormatType = RetentionScheduleFormat.Invalid;
+            
         }
 
         public override void Validate()
@@ -270,26 +265,12 @@ public override void Validate()
                 throw new ArgumentException(string.Format("Allowed Count for DurationCountInYears is 1 - {0}",
                                             PolicyConstants.MaxAllowedRetentionDurationCount));
             }
-
-            if (RetentionScheduleFormatType == RetentionScheduleFormat.Invalid)
-            {
-                throw new ArgumentException("RetentionScheduleType is set to Invalid");
-            }
-
+                        
             if (MonthsOfYear == null || MonthsOfYear.Count == 0)
             {
                 throw new ArgumentException("MonthsOfYear is set to NULL/Empty");
             }
-
-            // validate if MonthsOfYear strings are correct
-            foreach (Month month in MonthsOfYear)
-            {               
-                if (month == Month.Invalid)
-                {
-                    throw new ArgumentException("MonthsOfYear content is Invalid");
-                }
-            }
-
+            
             if (RetentionScheduleFormatType == RetentionScheduleFormat.Daily)
             {
                 if (RetentionScheduleDaily == null)
@@ -357,16 +338,7 @@ public void Validate()
             if (WeeksOfTheMonth == null || WeeksOfTheMonth.Count == 0)
             {
                 throw new ArgumentException("WeeksOfTheMonth is set to NULL/Empty");
-            }
-
-            // validate if WeeksOfTheMonth are valid
-            foreach (WeekOfMonth week in WeeksOfTheMonth)
-            {
-                if (week == WeekOfMonth.Invalid)
-                {
-                    throw new ArgumentException("WeeksOfTheMonth content is Invalid");
-                }
-            }           
+            }                                
         }
 
         public override string ToString()

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/PolicyScheduleObjects.cs

@@ -30,11 +30,6 @@ public class AzureRmRecoveryServicesSimpleSchedulePolicy : AzureRmRecoveryServic
 
         public override void Validate()
         {
-            if (ScheduleRunFrequency == ScheduleRunType.Invalid)
-            {
-                throw new ArgumentException("ScheduleRunFrequency is set to Invalid");
-            }
-
             //Currently only one scheduled run time is allowed
             if (ScheduleRunTimes == null || ScheduleRunTimes.Count != 1)
             {