VM restore fix for #7823

Azure · Nov 28, 2018 · a7c2805 · a7c2805
1 parent 821f8f2
commit a7c2805
Show file tree

Hide file tree

Showing 7 changed files with 756,212 additions and 16,545 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,24 @@ function Test-AzureVMSetVaultContext
 			-Container $container `
 			-WorkloadType AzureVM
 
+		$backupJob = Backup-AzureRmRecoveryServicesBackupItem `
+			-Item $item | Wait-AzureRmRecoveryServicesBackupJob;
+
+		# 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
+
 		# Disable protection
 		Disable-AzureRmRecoveryServicesBackupProtection `
 			-Item $item `

diff --git a/...ands.RecoveryServices.Backup.Test.ScenarioTests.ItemTests/TestAzureVMSetVaultContext.json b/...ands.RecoveryServices.Backup.Test.ScenarioTests.ItemTests/TestAzureVMSetVaultContext.json
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/ChangeLog.md b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/ChangeLog.md
@@ -20,6 +20,7 @@
 ## Current Release
 * Added client side validations for Azure File Share restore operations.
 * Made storageAccountName and storageAccountResourceGroupName optional for afs restore.
+* Fixed restore cmdlet while using Set-vaultContext.
 
 ## Version 4.5.1
 * Fix for modifying policy for a protected file share.

diff --git a/...ourceManager/RecoveryServices/Commands.RecoveryServices.Backup/RSBackupVaultCmdletBase.cs b/...ourceManager/RecoveryServices/Commands.RecoveryServices.Backup/RSBackupVaultCmdletBase.cs
@@ -15,8 +15,7 @@ public abstract class RSBackupVaultCmdletBase : RecoveryServicesBackupCmdletBase
         /// <summary>
         /// ARM ID of the Recovery Services Vault.
         /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "ARM ID of the Recovery Services Vault.",
-            ValueFromPipeline = true)]
+        [Parameter(Mandatory = false, HelpMessage = "ARM ID of the Recovery Services Vault.")]
         [ValidateNotNullOrEmpty]
         public string VaultId { get; set; }