Merge branch 'dev1' into anudeeb-dev1

dragonfly91 · dragonfly91 · commit 2943f574c686 · 2016-04-01T18:36:03.000+05:30
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs
@@ -37,6 +37,10 @@ public static AzureRmRecoveryServicesContainerBase GetContainerModel(ProtectionC
                 {
                     containerModel = new AzureRmRecoveryServicesIaasVmContainer(protectionContainer);
                 }
+                if (protectionContainer.Properties.GetType().IsSubclassOf(typeof(MabProtectionContainer)))
+                {
+                    containerModel = new AzureRmRecoveryServicesMabContainer(protectionContainer);
+                }
             }
 
             return containerModel;
@@ -93,7 +97,7 @@ public static AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyR
                 iaasPolicyModel.BackupManagementType = BackupManagementType.AzureVM;
                 iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((LongTermRetentionPolicy)
                                                   ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).RetentionPolicy);
-                iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicyPolicy((SimpleSchedulePolicy)
+                iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicy((SimpleSchedulePolicy)
                                                  ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).SchedulePolicy);
             }
             else
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RecoveryPointConversions.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RecoveryPointConversions.cs
@@ -35,11 +35,12 @@ public static List<AzureRmRecoveryServicesRecoveryPointBase> GetPSAzureRecoveryP
                 AzureRmRecoveryServicesIaasVmRecoveryPoint rpBase = new AzureRmRecoveryServicesIaasVmRecoveryPoint()
                 {
                     BackupManagementType = item.BackupManagementType,
-                    ContainerName = item.ContainerName,
                     ItemName = item.Name,
+                    ContainerName = item.ContainerName,
                     ContainerType = item.ContainerType,
                     RecoveryPointTime = Convert.ToDateTime(recPoint.RecoveryPointTime).ToLocalTime(),
                     RecoveryPointType = recPoint.RecoveryPointType,
+                    RecoveryPointId = rp.Id,
                     WorkloadType = item.WorkloadType,
                     RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,                    
                 };
@@ -67,7 +68,6 @@ public static AzureRmRecoveryServicesRecoveryPointBase GetPSAzureRecoveryPoints(
                     RecoveryPointTime = Convert.ToDateTime(recPoint.RecoveryPointTime).ToLocalTime(),
                     RecoveryPointType = recPoint.RecoveryPointType,
                     RecoveryPointId = rpResponse.RecPoint.Id,
-                    Region = rpResponse.Location,
                     WorkloadType = item.WorkloadType,
                     RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,
                 };
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs
@@ -208,7 +208,7 @@ private static DailyRetentionSchedule GetPSLTRDailySchedule(HydraModels.DailyRet
             DailyRetentionSchedule psDaily = new DailyRetentionSchedule();
 
             psDaily.DurationCountInDays = GetRetentionDurationInDays(hydraDaily.RetentionDuration);
-            psDaily.RetentionTimes = (List<DateTime>)hydraDaily.RetentionTimes;
+            psDaily.RetentionTimes = ParseDateTimesToUTC(hydraDaily.RetentionTimes);
 
             return psDaily;
         }
@@ -223,7 +223,7 @@ private static WeeklyRetentionSchedule GetPSLTRWeeklySchedule(HydraModels.Weekly
             WeeklyRetentionSchedule psWeekly = new WeeklyRetentionSchedule();
 
             psWeekly.DurationCountInWeeks = GetRetentionDurationInWeeks(hydraWeekly.RetentionDuration);
-            psWeekly.RetentionTimes = (List<DateTime>)hydraWeekly.RetentionTimes;
+            psWeekly.RetentionTimes = ParseDateTimesToUTC(hydraWeekly.RetentionTimes);
             psWeekly.DaysOfTheWeek = HelperUtils.GetEnumListFromStringList<DayOfWeek>(hydraWeekly.DaysOfTheWeek);
 
             return psWeekly;
@@ -239,7 +239,7 @@ private static MonthlyRetentionSchedule GetPSLTRMonthlySchedule(HydraModels.Mont
             MonthlyRetentionSchedule psMonthly = new MonthlyRetentionSchedule();
 
             psMonthly.DurationCountInMonths = GetRetentionDurationInMonths(hydraMonthly.RetentionDuration);
-            psMonthly.RetentionTimes = (List<DateTime>)hydraMonthly.RetentionTimes;
+            psMonthly.RetentionTimes = ParseDateTimesToUTC(hydraMonthly.RetentionTimes);
             psMonthly.RetentionScheduleFormatType = (RetentionScheduleFormat)Enum.Parse(typeof(RetentionScheduleFormat),
                                                                                    hydraMonthly.RetentionScheduleFormatType);
             psMonthly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(hydraMonthly.RetentionScheduleDaily);
@@ -258,7 +258,7 @@ private static YearlyRetentionSchedule GetPSLTRYearlySchedule(HydraModels.Yearly
             YearlyRetentionSchedule psYearly = new YearlyRetentionSchedule();
 
             psYearly.DurationCountInYears = GetRetentionDurationInYears(hydraYearly.RetentionDuration);
-            psYearly.RetentionTimes = (List<DateTime>)hydraYearly.RetentionTimes;
+            psYearly.RetentionTimes = ParseDateTimesToUTC(hydraYearly.RetentionTimes);
             psYearly.RetentionScheduleFormatType = (RetentionScheduleFormat)Enum.Parse(typeof(RetentionScheduleFormat),
                                                                                    hydraYearly.RetentionScheduleFormatType);
             psYearly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(hydraYearly.RetentionScheduleDaily);
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/SchedulePolicyConversions.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/SchedulePolicyConversions.cs
@@ -26,7 +26,7 @@ public partial class PolicyHelpers
     {
         #region HydraToPSObject conversions
 
-        public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePolicyPolicy(
+        public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePolicy(
             SimpleSchedulePolicy hydraPolicy)
         {
             if (hydraPolicy == null)
@@ -39,7 +39,7 @@ public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePol
             psPolicy.ScheduleRunDays = HelperUtils.GetEnumListFromStringList<DayOfWeek>(hydraPolicy.ScheduleRunDays);
             psPolicy.ScheduleRunFrequency = (ScheduleRunType)Enum.Parse(typeof(ScheduleRunType),
                                                                         hydraPolicy.ScheduleRunFrequency);
-            psPolicy.ScheduleRunTimes = (List<DateTime>)hydraPolicy.ScheduleRunTimes;
+            psPolicy.ScheduleRunTimes = ParseDateTimesToUTC(hydraPolicy.ScheduleRunTimes);
 
             // safe side validation
             psPolicy.Validate();
@@ -51,7 +51,7 @@ public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePol
 
         #region PStoHydraObject conversions
 
-        public static List<DateTime> ParseScheduleRunTimesToUTC(List<DateTime> localTimes)
+        public static List<DateTime> ParseDateTimesToUTC(IList<DateTime> localTimes)
         {
             if (localTimes == null || localTimes.Count == 0)
             {
@@ -64,11 +64,9 @@ public static List<DateTime> ParseScheduleRunTimesToUTC(List<DateTime> localTime
             foreach (DateTime localTime in localTimes)
             {
                 temp = localTime;
-                if (localTime.Kind == DateTimeKind.Local)
+                if (localTime.Kind != DateTimeKind.Utc)
                 {
-                    temp = localTime.ToUniversalTime();
-                    temp = new DateTime(temp.Year, temp.Month,
-                                        temp.Day, temp.Hour, temp.Minute - (temp.Minute % 30), 0);
+                    temp = localTime.ToUniversalTime();                    
                 }                
                 utcTimes.Add(temp);
             }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RestoreDiskAPIs.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RestoreDiskAPIs.cs
@@ -23,6 +23,7 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureRmRecoveryServicesIaasVm
         {
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
             string resourceName = BmsAdapter.GetResourceName();
+            string location = BmsAdapter.GetResourceLocation();            
 
             string containerName = rp.ContainerName;
             string protectedItemName = rp.ItemName;
@@ -35,7 +36,7 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureRmRecoveryServicesIaasVm
                 CreateNewCloudService = false,
                 RecoveryPointId = recoveryPointId,
                 RecoveryType = RecoveryType.RestoreDisks,
-                Region = rp.Region,
+                Region = location,
                 StorageAccountName = storageAccountId,
                 SubnetName = string.Empty,
                 VirtualMachineName = string.Empty,
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxyBase.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxyBase.cs
@@ -67,5 +67,10 @@ public string GetResourceGroupName()
         {
             return PSRecoveryServicesClient.arsVault.ResouceGroupName;
         }
+
+        public string GetResourceLocation()
+        {
+            return PSRecoveryServicesClient.arsVault.Location;
+        }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureRmRecoveryServicesAzureVmRecoveryPoint.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureRmRecoveryServicesAzureVmRecoveryPoint.cs
@@ -28,8 +28,6 @@ public class AzureRmRecoveryServicesIaasVmRecoveryPoint : AzureRmRecoveryService
         /// 
         public string RecoveryPointAdditionalInfo { get; set; }
 
-        public string Region { get; set; }
-
         public AzureRmRecoveryServicesIaasVmRecoveryPoint()
         {
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml b/src/ResourceManager/RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml
@@ -10,19 +10,19 @@
         <TableHeaders>
           <TableColumnHeader>
             <Label>Name</Label>
-            <Width>25</Width>
+            <Width>20</Width>
           </TableColumnHeader>
           <TableColumnHeader>
             <Label>WorkloadType</Label>
             <Width>18</Width>
           </TableColumnHeader>
           <TableColumnHeader>
             <Label>BackupManagementType</Label>
-            <Width>18</Width>
+            <Width>20</Width>
           </TableColumnHeader>
           <TableColumnHeader>
             <Label>BackupTime</Label>
-            <Width>30</Width>
+            <Width>25</Width>
           </TableColumnHeader>
           <TableColumnHeader>
             <Label>DaysOfWeek</Label>

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ public static AzureRmRecoveryServicesContainerBase GetContainerModel(ProtectionC`
`37`	`37`	`{`
`38`	`38`	`containerModel = new AzureRmRecoveryServicesIaasVmContainer(protectionContainer);`
`39`	`39`	`}`
	`40`	`+ if (protectionContainer.Properties.GetType().IsSubclassOf(typeof(MabProtectionContainer)))`
	`41`	`+ {`
	`42`	`+ containerModel = new AzureRmRecoveryServicesMabContainer(protectionContainer);`
	`43`	`+ }`
`40`	`44`	`}`
`41`	`45`
`42`	`46`	`return containerModel;`
`@@ -93,7 +97,7 @@ public static AzureRmRecoveryServicesPolicyBase GetPolicyModel(ProtectionPolicyR`
`93`	`97`	`iaasPolicyModel.BackupManagementType = BackupManagementType.AzureVM;`
`94`	`98`	`iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((LongTermRetentionPolicy)`
`95`	`99`	`((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).RetentionPolicy);`
`96`		`- iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicyPolicy((SimpleSchedulePolicy)`
	`100`	`+ iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicy((SimpleSchedulePolicy)`
`97`	`101`	`((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).SchedulePolicy);`
`98`	`102`	`}`
`99`	`103`	`else`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public partial class PolicyHelpers`
`26`	`26`	`{`
`27`	`27`	`#region HydraToPSObject conversions`
`28`	`28`
`29`		`- public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePolicyPolicy(`
	`29`	`+ public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePolicy(`
`30`	`30`	`SimpleSchedulePolicy hydraPolicy)`
`31`	`31`	`{`
`32`	`32`	`if (hydraPolicy == null)`
`@@ -39,7 +39,7 @@ public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePol`
`39`	`39`	`psPolicy.ScheduleRunDays = HelperUtils.GetEnumListFromStringList<DayOfWeek>(hydraPolicy.ScheduleRunDays);`
`40`	`40`	`psPolicy.ScheduleRunFrequency = (ScheduleRunType)Enum.Parse(typeof(ScheduleRunType),`
`41`	`41`	`hydraPolicy.ScheduleRunFrequency);`
`42`		`- psPolicy.ScheduleRunTimes = (List<DateTime>)hydraPolicy.ScheduleRunTimes;`
	`42`	`+ psPolicy.ScheduleRunTimes = ParseDateTimesToUTC(hydraPolicy.ScheduleRunTimes);`
`43`	`43`
`44`	`44`	`// safe side validation`
`45`	`45`	`psPolicy.Validate();`
`@@ -51,7 +51,7 @@ public static AzureRmRecoveryServicesSimpleSchedulePolicy GetPSSimpleSchedulePol`
`51`	`51`
`52`	`52`	`#region PStoHydraObject conversions`
`53`	`53`
`54`		`- public static List<DateTime> ParseScheduleRunTimesToUTC(List<DateTime> localTimes)`
	`54`	`+ public static List<DateTime> ParseDateTimesToUTC(IList<DateTime> localTimes)`
`55`	`55`	`{`
`56`	`56`	`if (localTimes == null \|\| localTimes.Count == 0)`
`57`	`57`	`{`
`@@ -64,11 +64,9 @@ public static List<DateTime> ParseScheduleRunTimesToUTC(List<DateTime> localTime`
`64`	`64`	`foreach (DateTime localTime in localTimes)`
`65`	`65`	`{`
`66`	`66`	`temp = localTime;`
`67`		`- if (localTime.Kind == DateTimeKind.Local)`
	`67`	`+ if (localTime.Kind != DateTimeKind.Utc)`
`68`	`68`	`{`
`69`		`- temp = localTime.ToUniversalTime();`
`70`		`- temp = new DateTime(temp.Year, temp.Month,`
`71`		`- temp.Day, temp.Hour, temp.Minute - (temp.Minute % 30), 0);`
	`69`	`+ temp = localTime.ToUniversalTime();`
`72`	`70`	`}`
`73`	`71`	`utcTimes.Add(temp);`
`74`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,10 @@ public string GetResourceGroupName()`
`67`	`67`	`{`
`68`	`68`	`return PSRecoveryServicesClient.arsVault.ResouceGroupName;`
`69`	`69`	`}`
	`70`	`+`
	`71`	`+ public string GetResourceLocation()`
	`72`	`+ {`
	`73`	`+ return PSRecoveryServicesClient.arsVault.Location;`
	`74`	`+ }`
`70`	`75`	`}`
`71`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ public class AzureRmRecoveryServicesIaasVmRecoveryPoint : AzureRmRecoveryService`
`28`	`28`	`///`
`29`	`29`	`public string RecoveryPointAdditionalInfo { get; set; }`
`30`	`30`
`31`		`- public string Region { get; set; }`
`32`		`-`
`33`	`31`	`public AzureRmRecoveryServicesIaasVmRecoveryPoint()`
`34`	`32`	`{`
`35`	`33`