Merge pull request Azure#7925 from MabOneSdk/users/sisi/vm-restore-fix

[RecoveryServices.Backup] VM restore fix for Azure#7823
lilinvictorms · Nov 29, 2018 · f0f8269 · f0f8269
2 parents 328e7f4 + bb2c3dc
commit f0f8269
Show file tree

Hide file tree

Showing 6 changed files with 793,444 additions and 17,502 deletions.
diff --git a/...ryServices/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs b/...ryServices/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
@@ -297,7 +297,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 CreateNewCloudService = false,
                 RecoveryPointId = rp.RecoveryPointId,
                 RecoveryType = RecoveryType.RestoreDisks,
-                Region = vaultLocation,
+                Region = vaultLocation ?? ServiceClientAdapter.BmsAdapter.GetResourceLocation(),
                 StorageAccountId = storageAccountResource.Id,
                 SourceResourceId = rp.SourceResourceId,
                 TargetResourceGroupId = targetResourceGroupName != null ?
@@ -315,7 +315,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 triggerRestoreRequest,
                 vaultName: vaultName,
                 resourceGroupName: resourceGroupName,
-                vaultLocation: vaultLocation);
+                vaultLocation: vaultLocation ?? ServiceClientAdapter.BmsAdapter.GetResourceLocation());
             return response;
         }
 

diff --git a/...Services/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RestoreDiskAPIs.cs b/...Services/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RestoreDiskAPIs.cs
@@ -40,7 +40,6 @@ public RestAzureNS.AzureOperationResponse RestoreDisk(
             string resourceGroupName = null,
             string vaultLocation = null)
         {
-            vaultLocation = vaultLocation ?? BmsAdapter.GetResourceLocation();
             Dictionary<UriEnums, string> uriDict = HelperUtils.ParseUri(rp.Id);
             string containerUri = HelperUtils.GetContainerUri(uriDict, rp.Id);
             string protectedItemUri = HelperUtils.GetProtectedItemUri(uriDict, rp.Id);

diff --git a/...eryServices/Commands.RecoveryServices.Backup.ServiceClientAdapter/ServiceClientAdapter.cs b/...eryServices/Commands.RecoveryServices.Backup.ServiceClientAdapter/ServiceClientAdapter.cs
@@ -31,7 +31,7 @@ public partial class ServiceClientAdapter
         const string AzureFabricName = "Azure";
         public const string ResourceProviderProductionNamespace = "Microsoft.RecoveryServices";
 
-        ClientProxy<RecoveryServicesBackupNS.RecoveryServicesBackupClient> BmsAdapter;
+        public ClientProxy<RecoveryServicesBackupNS.RecoveryServicesBackupClient> BmsAdapter;
 
         ClientProxy<RecoveryServicesNS.RecoveryServicesClient> RSAdapter;
 

diff --git a/...RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.ps1 b/...RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.ps1
@@ -360,9 +360,10 @@ function Test-AzureVMSetVaultContext
 		# Setup
 		$vm = Create-VM $resourceGroupName $location
 		$vault = Create-RecoveryServicesVault $resourceGroupName $location
+		$saName = Create-SA $resourceGroupName $location
 
 		# Sleep to give the service time to add the default policy to the vault
-        Start-TestSleep 5000
+		Start-TestSleep 5000
 
 		Set-AzureRmRecoveryServicesVaultContext -Vault $vault
 
@@ -384,6 +385,29 @@ function Test-AzureVMSetVaultContext
 			-Container $container `
 			-WorkloadType AzureVM
 
+		$job = Backup-AzureRmRecoveryServicesBackupItem `
+			-Item $item
+
+		Wait-AzureRmRecoveryServicesBackupJob -Job $job
+
+		$backupJob = Get-AzureRmRecoveryServicesBackupJobDetails -Job $job
+
+		# Get Recovery Point
+		$backupStartTime = $backupJob.StartTime.AddMinutes(-1);
+		$backupEndTime = $backupJob.EndTime.AddMinutes(1);
+		$rps = Get-AzureRmRecoveryServicesBackupRecoveryPoint `
+			-Item $item `
+			-StartDate $backupStartTime `
+			-EndDate $backupEndTime
+
+		# Restore item
+		$restoreJob1 = Restore-AzureRmRecoveryServicesBackupItem `
+			-RecoveryPoint $rps[0] `
+			-StorageAccountName $saName `
+			-StorageAccountResourceGroupName $resourceGroupName
+
+		Wait-AzureRmRecoveryServicesBackupJob -Job $restoreJob1
+
 		# Disable protection
 		Disable-AzureRmRecoveryServicesBackupProtection `
 			-Item $item `