Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1

mkherani · mkherani · commit 62c3d3e099dc · 2016-04-20T15:25:59.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
@@ -122,7 +122,7 @@ public static AzureRmRecoveryServicesBackupPolicyBase GetPolicyModel(ProtectionP
                 policyModel = new AzureRmRecoveryServicesIaasVmPolicy();
                 AzureRmRecoveryServicesIaasVmPolicy iaasPolicyModel = policyModel as AzureRmRecoveryServicesIaasVmPolicy;
                 iaasPolicyModel.WorkloadType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureVM;
-                iaasPolicyModel.BackupManagementType = BackupManagementType.AzureVM;
+                iaasPolicyModel.BackupManagementType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureVM;
                 iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((LongTermRetentionPolicy)
                                                   ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).RetentionPolicy);
                 iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicy((SimpleSchedulePolicy)
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs
@@ -94,7 +94,7 @@ private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hyd
             response.VmVersion = vmJob.VirtualMachineVersion;
             response.WorkloadName = vmJob.EntityFriendlyName;
             response.ActivityId = vmJob.ActivityId;
-            response.BackupManagementType = EnumUtils.GetEnum<BackupManagementType>(GetPSBackupManagementType(vmJob.BackupManagementType));
+            response.BackupManagementType = EnumUtils.GetEnum<Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType>(GetPSBackupManagementType(vmJob.BackupManagementType));
             response.Operation = vmJob.Operation;
 
             if (vmJob.ErrorDetails != null)
@@ -165,22 +165,22 @@ public static string GetLastIdFromFullId(string fullId)
 
         #region Enum translators
 
-        public static string GetJobTypeForService(BackupManagementType mgmtType)
+        public static string GetJobTypeForService(Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType mgmtType)
         {
             switch (mgmtType)
             {
-                case BackupManagementType.AzureVM:
-                    return ProviderType.AzureIaasVM.ToString();
+                case Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureVM:
+                    return Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString();
                 default:
                     throw new Exception("Invalid BackupManagementType provided: " + mgmtType);
             }
         }
 
         public static string GetPSBackupManagementType(string jobType)
         {
-            if (jobType == ProviderType.AzureIaasVM.ToString())
+            if (jobType == Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString())
             {
-                return BackupManagementType.AzureVM.ToString();
+                return Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureVM.ToString();
             }
             else
             {
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs
@@ -34,7 +34,7 @@ public static string GetHydraProviderType(CmdletModel.ContainerType containerTyp
             switch (containerType)
             {
                 case CmdletModel.ContainerType.AzureVM:
-                    providerType = ProviderType.AzureIaasVM.ToString();
+                    providerType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString();
                     break;
                 default:
                     break;
@@ -50,7 +50,7 @@ public static string GetHydraProviderType(CmdletModel.WorkloadType workloadType)
             switch (workloadType)
             {
                 case CmdletModel.WorkloadType.AzureVM:
-                    providerType = ProviderType.AzureIaasVM.ToString();
+                    providerType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString();
                     break;
                 default:
                     break;
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Resources/Microsoft.Azure.Management.RecoveryServices.Backup.dll b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Resources/Microsoft.Azure.Management.RecoveryServices.Backup.dll
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Utils.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Utils.cs
@@ -128,15 +128,16 @@ public class ConversionUtils
     {
         public static BackupManagementType GetPsBackupManagementType(string backupManagementType)
         {
-            ProviderType providerType = EnumUtils.GetEnum<ProviderType>(backupManagementType);
+            Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType providerType
+                = EnumUtils.GetEnum<Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType>(backupManagementType);
 
             switch (providerType)
             {
-                case ProviderType.AzureIaasVM:
+                case Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM:
                     return BackupManagementType.AzureVM;
-                case ProviderType.MAB:
+                case Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.MAB:
                     return BackupManagementType.MARS;
-                case ProviderType.DPM:
+                case Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.DPM:
                     return BackupManagementType.SCDPM;
                 default:
                     throw new Exception("Unsupported BackupManagmentType: " + backupManagementType);
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/DpmModels/AzureRmRecoveryServicesDpmBackupEngine.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/DpmModels/AzureRmRecoveryServicesDpmBackupEngine.cs
@@ -36,7 +36,7 @@ public class AzureRmRecoveryServicesDpmBackupEngine : AzureRmRecoveryServicesBac
         public AzureRmRecoveryServicesDpmBackupEngine(BackupEngineResource backupEngine)
             : base(backupEngine)
         {
-            DpmBackupEngine dpmBackupEngine = (DpmBackupEngine)backupEngine.Properties;
+            BackupEngineBase dpmBackupEngine = (BackupEngineBase)backupEngine.Properties;
             FriendlyName = dpmBackupEngine.FriendlyName;
             Status = dpmBackupEngine.RegistrationStatus;
         }
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
@@ -384,7 +384,7 @@ public List<AzureRmRecoveryServicesBackupContainerBase> ListProtectionContainers
             queryParams.FriendlyName = name;
 
             // 2. Filter by ContainerType
-            queryParams.ProviderType = ProviderType.AzureIaasVM.ToString();
+            queryParams.BackupManagementType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString();
 
             // 3. Filter by Status
             queryParams.RegistrationStatus = status.ToString();
@@ -421,7 +421,7 @@ public List<AzureRmRecoveryServicesBackupItemBase> ListProtectedItems()
 
             ProtectedItemListQueryParam queryParams = new ProtectedItemListQueryParam();
             queryParams.DatasourceType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.WorkloadType.VM;
-            queryParams.ProviderType = ProviderType.AzureIaasVM.ToString();
+            queryParams.BackupManagementType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString();
 
             List<ProtectedItemResource> protectedItems = new List<ProtectedItemResource>();
             string skipToken = null;
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs
@@ -90,7 +90,7 @@ public ProtectionPolicyResponse ModifyPolicy()
             queryParams.FriendlyName = name;
 
             // 2. Filter by ContainerType
-            queryParams.ProviderType = ProviderType.MAB.ToString();
+            queryParams.BackupManagementType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.MAB.ToString();
 
             var listResponse = HydraAdapter.ListContainers(queryParams);
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/JobTests.ps1 b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/JobTests.ps1
@@ -146,8 +146,12 @@ function Test-WaitJobPipeScenario
 
 function Test-CancelJobScenario
 {
+	$1fixedStartDate = Get-Date -Date "2016-04-19 17:00:00"
+	$1fixedStartDate = $1fixedStartDate.ToUniversalTime()
+	$1fixedEndDate = Get-Date -Date "2016-04-20 17:00:00"
+	$1fixedEndDate = $1fixedEndDate.ToUniversalTime()
 	SetVaultContext;
-	$runningJobs = Get-AzureRmRecoveryServicesBackupJob -From $fixedStartDate -To $fixedEndDate -Status "InProgress" -Operation "Backup"
+	$runningJobs = Get-AzureRmRecoveryServicesBackupJob -From $1fixedStartDate -To $1fixedEndDate -Status "InProgress" -Operation "Backup"
 	foreach ($runningJob in $runningJobs)
 	{
 		$cancelledJob = Stop-AzureRmRecoveryServicesBackupJob -Job $runningJob
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestCancelJobScenario.json b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestCancelJobScenario.json
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/StopAzureRmRecoveryServicesJob.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/StopAzureRmRecoveryServicesJob.cs

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hyd`
`94`	`94`	`response.VmVersion = vmJob.VirtualMachineVersion;`
`95`	`95`	`response.WorkloadName = vmJob.EntityFriendlyName;`
`96`	`96`	`response.ActivityId = vmJob.ActivityId;`
`97`		`- response.BackupManagementType = EnumUtils.GetEnum<BackupManagementType>(GetPSBackupManagementType(vmJob.BackupManagementType));`
	`97`	`+ response.BackupManagementType = EnumUtils.GetEnum<Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType>(GetPSBackupManagementType(vmJob.BackupManagementType));`
`98`	`98`	`response.Operation = vmJob.Operation;`
`99`	`99`
`100`	`100`	`if (vmJob.ErrorDetails != null)`
`@@ -165,22 +165,22 @@ public static string GetLastIdFromFullId(string fullId)`
`165`	`165`
`166`	`166`	`#region Enum translators`
`167`	`167`
`168`		`- public static string GetJobTypeForService(BackupManagementType mgmtType)`
	`168`	`+ public static string GetJobTypeForService(Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType mgmtType)`
`169`	`169`	`{`
`170`	`170`	`switch (mgmtType)`
`171`	`171`	`{`
`172`		`- case BackupManagementType.AzureVM:`
`173`		`- return ProviderType.AzureIaasVM.ToString();`
	`172`	`+ case Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureVM:`
	`173`	`+ return Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString();`
`174`	`174`	`default:`
`175`	`175`	`throw new Exception("Invalid BackupManagementType provided: " + mgmtType);`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`public static string GetPSBackupManagementType(string jobType)`
`180`	`180`	`{`
`181`		`- if (jobType == ProviderType.AzureIaasVM.ToString())`
	`181`	`+ if (jobType == Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString())`
`182`	`182`	`{`
`183`		`- return BackupManagementType.AzureVM.ToString();`
	`183`	`+ return Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureVM.ToString();`
`184`	`184`	`}`
`185`	`185`	`else`
`186`	`186`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public class AzureRmRecoveryServicesDpmBackupEngine : AzureRmRecoveryServicesBac`
`36`	`36`	`public AzureRmRecoveryServicesDpmBackupEngine(BackupEngineResource backupEngine)`
`37`	`37`	`: base(backupEngine)`
`38`	`38`	`{`
`39`		`- DpmBackupEngine dpmBackupEngine = (DpmBackupEngine)backupEngine.Properties;`
	`39`	`+ BackupEngineBase dpmBackupEngine = (BackupEngineBase)backupEngine.Properties;`
`40`	`40`	`FriendlyName = dpmBackupEngine.FriendlyName;`
`41`	`41`	`Status = dpmBackupEngine.RegistrationStatus;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,12 @@ function Test-WaitJobPipeScenario`
`146`	`146`
`147`	`147`	`function Test-CancelJobScenario`
`148`	`148`	`{`
	`149`	`+ $1fixedStartDate = Get-Date -Date "2016-04-19 17:00:00"`
	`150`	`+ $1fixedStartDate = $1fixedStartDate.ToUniversalTime()`
	`151`	`+ $1fixedEndDate = Get-Date -Date "2016-04-20 17:00:00"`
	`152`	`+ $1fixedEndDate = $1fixedEndDate.ToUniversalTime()`
`149`	`153`	`SetVaultContext;`
`150`		`- $runningJobs = Get-AzureRmRecoveryServicesBackupJob -From $fixedStartDate -To $fixedEndDate -Status "InProgress" -Operation "Backup"`
	`154`	`+ $runningJobs = Get-AzureRmRecoveryServicesBackupJob -From $1fixedStartDate -To $1fixedEndDate -Status "InProgress" -Operation "Backup"`
`151`	`155`	`foreach ($runningJob in $runningJobs)`
`152`	`156`	`{`
`153`	`157`	`$cancelledJob = Stop-AzureRmRecoveryServicesBackupJob -Job $runningJob`