Merge pull request #6819 from MabOneSdk/users/sisi/managed-disk

Added TargetResourceGroupName parameter to Restore-AzureRmRecoveryServicesBackupItem

Author: markcowl

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Helpers/Conversions/RecoveryPointConversions.cs

@@ -83,6 +83,8 @@ public static List<RecoveryPointBase> GetPSAzureRecoveryPoints(
                         EncryptionEnabled = recPoint.IsSourceVMEncrypted.HasValue ?
                             recPoint.IsSourceVMEncrypted.Value : false,
                         IlrSessionActive = isInstantILRSessionActive,
+                        IsManagedVirtualMachine = recPoint.IsManagedVirtualMachine.HasValue ?
+                            recPoint.IsManagedVirtualMachine.Value : false,
                         OriginalSAEnabled = recPoint.OriginalStorageAccountOption.HasValue ?
                             recPoint.OriginalStorageAccountOption.Value : false,
                     };

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureVmRecoveryPoint.cs

@@ -58,6 +58,11 @@ public class AzureVmRecoveryPoint : RecoveryPointBase
         /// </summary>
         public bool IlrSessionActive { get; set; }
 
+        /// <summary>
+        /// Identifies if the virtual machine has a managed disks.
+        /// </summary>
+        public bool IsManagedVirtualMachine { get; set; }
+
         /// <summary>
         /// Required details for recovering an encrypted VM. 
         /// Applicable only when the EncryptionEnabled flag is true.

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/CmdletParamEnums.cs

@@ -53,6 +53,7 @@ public enum RestoreBackupItemParams
         StorageAccountId,
         StorageAccountLocation,
         StorageAccountType,
+        TargetResourceGroupName,
         OsaOption
     }
 

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

@@ -262,13 +262,17 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 ProviderData[RestoreBackupItemParams.StorageAccountLocation].ToString();
             string storageAccountType =
                 ProviderData[RestoreBackupItemParams.StorageAccountType].ToString();
+            string targetResourceGroupName =
+                ProviderData.ContainsKey(RestoreBackupItemParams.TargetResourceGroupName) ?
+                ProviderData[RestoreBackupItemParams.TargetResourceGroupName].ToString() : null;
             bool osaOption = (bool)ProviderData[RestoreBackupItemParams.OsaOption];
 
             var response = ServiceClientAdapter.RestoreDisk(
                 rp,
                 storageAccountId,
                 storageAccountLocation,
                 storageAccountType,
+                targetResourceGroupName,
                 osaOption,
                 vaultName: vaultName,
                 resourceGroupName: resourceGroupName,

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

@@ -37,6 +37,7 @@ public RestAzureNS.AzureOperationResponse RestoreDisk(
             string storageAccountId,
             string storageAccountLocation,
             string storageAccountType,
+            string targetResourceGroupName,
             bool osaOption,
             string vaultName = null,
             string resourceGroupName = null,
@@ -64,6 +65,11 @@ public RestAzureNS.AzureOperationResponse RestoreDisk(
                 throw new Exception(string.Format(Resources.RestoreDiskStorageTypeError, vmType));
             }
 
+            if (targetResourceGroupName != null && rp.IsManagedVirtualMachine == false)
+            {
+                Logger.Instance.WriteWarning(Resources.UnManagedBackupVmWarning);
+            }
+
             IaasVMRestoreRequest restoreRequest = new IaasVMRestoreRequest()
             {
                 CreateNewCloudService = false,
@@ -72,6 +78,8 @@ public RestAzureNS.AzureOperationResponse RestoreDisk(
                 Region = vaultLocation,
                 StorageAccountId = storageAccountId,
                 SourceResourceId = rp.SourceResourceId,
+                TargetResourceGroupId = targetResourceGroupName ??
+                    "/subscriptions/" + BmsAdapter.Client.SubscriptionId + "/resourceGroups/" + targetResourceGroupName,
                 OriginalStorageAccountOption = useOsa,
             };
 

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RestoreDiskAPIs.cs

@@ -48,9 +48,14 @@ function Get-RandomSuffix(
 }
 
 function Create-ResourceGroup(
-	[string] $location)
+	[string] $location,
+	[int] $nick = -1)
 {
 	$name = "PSTestRG" + @(Get-RandomSuffix)
+	if($nick -gt -1)
+	{
+		$name += $nick
+	}
 
 	$resourceGroup = Get-AzureRmResourceGroup -Name $name -ErrorAction Ignore
 

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/Common.ps1

@@ -235,6 +235,7 @@ function Test-AzureVMFullRestore
 {
 	$location = Get-ResourceGroupLocation
 	$resourceGroupName = Create-ResourceGroup $location
+	$targetResourceGroupName = Create-ResourceGroup $location 1
 
 	try
 	{
@@ -245,7 +246,7 @@ function Test-AzureVMFullRestore
 		$item = Enable-Protection $vault $vm
 		$backupJob = Backup-Item $vault $item
 		$rp = Get-RecoveryPoint $vault $item $backupJob
-		
+
 		Assert-ThrowsContains { Restore-AzureRmRecoveryServicesBackupItem `
 			-VaultId $vault.ID `
 			-VaultLocation $vault.Location `
@@ -255,20 +256,32 @@ function Test-AzureVMFullRestore
 			-UseOriginalStorageAccount } `
 			"This recovery point doesn’t have the capability to restore disks to their original storage account. Re-run the restore command without the UseOriginalStorageAccountForDisks parameter.";
 
-		$restoreJob = Restore-AzureRmRecoveryServicesBackupItem `
+		$restoreJob1 = Restore-AzureRmRecoveryServicesBackupItem `
 			-VaultId $vault.ID `
 			-VaultLocation $vault.Location `
 			-RecoveryPoint $rp `
 			-StorageAccountName $saName `
 			-StorageAccountResourceGroupName $resourceGroupName | `
 				Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID
 
-		Assert-True { $restoreJob.Status -eq "Completed" }
+		Assert-True { $restoreJob1.Status -eq "Completed" }   
+
+		$restoreJob2 = Restore-AzureRmRecoveryServicesBackupItem `
+			-VaultId $vault.ID `
+			-VaultLocation $vault.Location `
+			-RecoveryPoint $rp `
+			-StorageAccountName $saName `
+			-StorageAccountResourceGroupName $resourceGroupName `
+			-TargetResourceGroupName $targetResourceGroupName | `
+				Wait-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID
+
+		Assert-True { $restoreJob2.Status -eq "Completed" }
 	}
 	finally
 	{
 		# Cleanup
 		Cleanup-ResourceGroup $resourceGroupName
+		Cleanup-ResourceGroup $targetResourceGroupName
 	}
 }