[RecoveryServices.Backup]Added support for restoring unmanaged disks as managed disk

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

@@ -63,7 +63,8 @@ public enum RestoreVMBackupItemParams
         RestoreDiskList,
         RestoreOnlyOSDisk,
         RestoreAsUnmanagedDisks,
-        DiskEncryptionSetId
+        DiskEncryptionSetId,
+        RestoreAsManagedDisk
     }
 
     public enum RestoreFSBackupItemParams

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

@@ -394,6 +394,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
             String secondaryRegion = useSecondaryRegion ? (string)ProviderData[CRRParams.SecondaryRegion]: null;
             IList<string> targetZones = ProviderData.ContainsKey(RecoveryPointParams.TargetZone) ?
                 new List<string>(new string[]{(ProviderData[RecoveryPointParams.TargetZone].ToString())}) : null;
+            bool restoreWithManagedDisks = (bool)ProviderData[RestoreVMBackupItemParams.RestoreAsManagedDisk];
 
             Dictionary<UriEnums, string> uriDict = HelperUtils.ParseUri(rp.Id);
             string containerUri = HelperUtils.GetContainerUri(uriDict, rp.Id);
@@ -419,7 +420,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
             }
 
             // if the vm is unmanaged, target rg should not be provided
-            if(rp.IsManagedVirtualMachine == false && targetResourceGroupName != null)
+            if(rp.IsManagedVirtualMachine == false && targetResourceGroupName != null && !restoreWithManagedDisks)
             {
                 Logger.Instance.WriteWarning(Resources.TargetResourcegroupNotSupported);
             }
@@ -451,7 +452,8 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                     null,
                 OriginalStorageAccountOption = useOsa,
                 RestoreDiskLunList = restoreDiskLUNS,
-                DiskEncryptionSetId = DiskEncryptionSetId
+                DiskEncryptionSetId = DiskEncryptionSetId,
+                RestoreWithManagedDisks = restoreWithManagedDisks
             };
 
             if(targetZones != null)

src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.ps1

@@ -398,6 +398,11 @@ function Test-AzureUnmanagedVMFullRestore
 		$saName = Create-SA $resourceGroupName $location
 		$vm = Create-UnmanagedVM $resourceGroupName $location $saName
 		$vault = Create-RecoveryServicesVault $resourceGroupName $location
+
+		Set-AzRecoveryServicesVaultProperty -VaultId $vault.ID -SoftDeleteFeatureState "Disable"
+		$VaultProperty = Get-AzRecoveryServicesVaultProperty -VaultId $vault.ID
+		Assert-True { $VaultProperty.SoftDeleteFeatureState -eq "Disabled" }
+
 		$item = Enable-Protection $vault $vm $resourceGroupName
 		$backupJob = Backup-Item $vault $item
 		$rp = Get-RecoveryPoint $vault $item $backupJob
@@ -411,6 +416,14 @@ function Test-AzureUnmanagedVMFullRestore
 			-UseOriginalStorageAccount | Wait-AzRecoveryServicesBackupJob -VaultId $vault.ID
 
 		Assert-True { $restoreJob.Status -eq "Completed" }
+
+		$restoreJob2 = Restore-AzRecoveryServicesBackupItem `
+			-VaultId $vault.ID `
+			-VaultLocation $vault.Location `
+			-RecoveryPoint $rp `
+			-StorageAccountName $saName `
+			-StorageAccountResourceGroupName $resourceGroupName `
+			-RestoreAsManagedDisk -TargetResourceGroupName $resourceGroupName
 	}
 	finally
 	{

src/RecoveryServices/RecoveryServices.Backup/Cmdlets/Restore/RestoreAzureRMRecoveryServicesBackupItem.cs

@@ -38,6 +38,7 @@ public class RestoreAzureRmRecoveryServicesBackupItem : RSBackupVaultCmdletBase
         internal const string AzureVMParameterSet = "AzureVMParameterSet";
         internal const string AzureVMManagedDiskParameterSet = "AzureVMManagedDiskParameterSet";
         internal const string AzureVMRestoreManagedAsUnmanaged = "AzureVMRestoreManagedAsUnmanaged";
+        internal const string AzureVMRestoreUnmanagedAsManaged = "AzureVMRestoreUnmanagedAsManaged";
         internal const string AzureVMUnManagedDiskParameterSet = "AzureVMUnManagedDiskParameterSet";
         internal const string AzureFileShareParameterSet = "AzureFileShareParameterSet";
         internal const string AzureWorkloadParameterSet = "AzureWorkloadParameterSet";
@@ -64,6 +65,8 @@ public class RestoreAzureRmRecoveryServicesBackupItem : RSBackupVaultCmdletBase
             ParameterSetName = AzureVMManagedDiskParameterSet, HelpMessage = ParamHelpMsgs.RestoreDisk.RecoveryPoint)]
         [Parameter(Mandatory = true, ValueFromPipeline = true, Position = 0,
             ParameterSetName = AzureVMUnManagedDiskParameterSet, HelpMessage = ParamHelpMsgs.RestoreDisk.RecoveryPoint)]
+        [Parameter(Mandatory = true, ValueFromPipeline = true, Position = 0,
+            ParameterSetName = AzureVMRestoreUnmanagedAsManaged, HelpMessage = ParamHelpMsgs.RestoreDisk.RecoveryPoint)]
         [ValidateNotNullOrEmpty]
         public RecoveryPointBase RecoveryPoint { get; set; }
 
@@ -86,6 +89,8 @@ public class RestoreAzureRmRecoveryServicesBackupItem : RSBackupVaultCmdletBase
             HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountName)]
         [Parameter(Mandatory = true, Position = 1, ParameterSetName = AzureVMRestoreManagedAsUnmanaged,
             HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountName)]
+        [Parameter(Mandatory = true, Position = 1, ParameterSetName = AzureVMRestoreUnmanagedAsManaged,
+            HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountName)]
         [ValidateNotNullOrEmpty]
         public string StorageAccountName { get; set; }
 
@@ -100,6 +105,8 @@ public class RestoreAzureRmRecoveryServicesBackupItem : RSBackupVaultCmdletBase
             HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountResourceGroupName)]
         [Parameter(Mandatory = true, Position = 2, ParameterSetName = AzureVMRestoreManagedAsUnmanaged,
             HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountResourceGroupName)]
+        [Parameter(Mandatory = true, Position = 2, ParameterSetName = AzureVMRestoreUnmanagedAsManaged,
+            HelpMessage = ParamHelpMsgs.RestoreDisk.StorageAccountResourceGroupName)]
         [ValidateNotNullOrEmpty]
         public string StorageAccountResourceGroupName { get; set; }
 
@@ -108,6 +115,8 @@ public class RestoreAzureRmRecoveryServicesBackupItem : RSBackupVaultCmdletBase
         /// </summary>
         [Parameter(Mandatory = true, Position = 3, ParameterSetName = AzureVMManagedDiskParameterSet,
             HelpMessage = ParamHelpMsgs.RestoreVM.TargetResourceGroupName)]
+        [Parameter(Mandatory = true, Position = 3, ParameterSetName = AzureVMRestoreUnmanagedAsManaged,
+            HelpMessage = ParamHelpMsgs.RestoreVM.TargetResourceGroupName)]
         [ValidateNotNullOrEmpty]
         public string TargetResourceGroupName { get; set; }
 
@@ -171,6 +180,8 @@ public class RestoreAzureRmRecoveryServicesBackupItem : RSBackupVaultCmdletBase
         /// </summary>
         [Parameter(Mandatory = true, ParameterSetName = AzureVMUnManagedDiskParameterSet,
             HelpMessage = ParamHelpMsgs.RestoreVM.OsaOption)]
+        [Parameter(Mandatory = false, ParameterSetName = AzureVMRestoreUnmanagedAsManaged,
+            HelpMessage = ParamHelpMsgs.RestoreVM.OsaOption)]
         public SwitchParameter UseOriginalStorageAccount { get; set; }
 
         /// <summary>
@@ -184,6 +195,8 @@ public class RestoreAzureRmRecoveryServicesBackupItem : RSBackupVaultCmdletBase
             HelpMessage = ParamHelpMsgs.RestoreVM.RestoreOnlyOSDisk)]
         [Parameter(Mandatory = false, ParameterSetName = AzureVMUnManagedDiskParameterSet,
             HelpMessage = ParamHelpMsgs.RestoreVM.RestoreOnlyOSDisk)]
+        [Parameter(Mandatory = false, ParameterSetName = AzureVMRestoreUnmanagedAsManaged,
+            HelpMessage = ParamHelpMsgs.RestoreVM.RestoreOnlyOSDisk)]
         public SwitchParameter RestoreOnlyOSDisk { get; set; }
 
         /// <summary>
@@ -197,6 +210,8 @@ public class RestoreAzureRmRecoveryServicesBackupItem : RSBackupVaultCmdletBase
             HelpMessage = ParamHelpMsgs.RestoreVM.RestoreDiskList)]
         [Parameter(Mandatory = false, ParameterSetName = AzureVMRestoreManagedAsUnmanaged,
             HelpMessage = ParamHelpMsgs.RestoreVM.RestoreDiskList)]
+        [Parameter(Mandatory = false, ParameterSetName = AzureVMRestoreUnmanagedAsManaged,
+            HelpMessage = ParamHelpMsgs.RestoreVM.RestoreDiskList)]
         public string[] RestoreDiskList { get; set; }
 
         /// <summary>
@@ -231,6 +246,13 @@ public class RestoreAzureRmRecoveryServicesBackupItem : RSBackupVaultCmdletBase
             HelpMessage = ParamHelpMsgs.RestoreVM.TargetZone)]
         public int? TargetZoneNumber { get; set; }
 
+        /// <summary>
+        /// Switch param to restore a backed up unmanaged vm as managed disks.
+        /// </summary>
+        [Parameter(Mandatory = true, ParameterSetName = AzureVMRestoreUnmanagedAsManaged, HelpMessage = ParamHelpMsgs.RestoreVM.RestoreAsManagedDisk)]
+        [ValidateNotNullOrEmpty]
+        public SwitchParameter RestoreAsManagedDisk { get; set; }
+
         public override void ExecuteCmdlet()
         {
             ExecutionBlock(() =>
@@ -265,6 +287,7 @@ public override void ExecuteCmdlet()
                 providerParameters.Add(RestoreVMBackupItemParams.RestoreOnlyOSDisk, RestoreOnlyOSDisk);
                 providerParameters.Add(RestoreVMBackupItemParams.RestoreAsUnmanagedDisks, RestoreAsUnmanagedDisks);
                 providerParameters.Add(CRRParams.UseSecondaryRegion, RestoreToSecondaryRegion.IsPresent);
+                providerParameters.Add(RestoreVMBackupItemParams.RestoreAsManagedDisk, RestoreAsManagedDisk.IsPresent);
 
                 if (DiskEncryptionSetId != null)
                 {

src/RecoveryServices/RecoveryServices.Backup/ParamHelpMsgs.cs

@@ -155,6 +155,7 @@ internal static class RestoreVM
             public const string RestoreDiskList = "Specify which disks to recover of the backed up VM";
             public const string RestoreAsUnmanagedDisks = "Use this switch to specify to restore as unmanaged disks";
             public const string TargetZone = "Target zone to restore the disks";
+            public const string RestoreAsManagedDisk = "Use this switch to specify to restore as managed disks.";
         }
 
         internal static class RestoreFS

src/RecoveryServices/RecoveryServices/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added support for restoring unmanaged disks vm as managed disks.
 
 ## Version 3.5.0
 * Added Cross Zonal Restore for managed virtual machines.