diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/AzureModels/AzureItem.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/AzureModels/AzureItem.cs
index d14be9d0690e..4a3f12d41ce9 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Models/AzureModels/AzureItem.cs
+++ b/src/RecoveryServices/RecoveryServices.Backup.Models/AzureModels/AzureItem.cs
@@ -27,6 +27,11 @@ public class AzureItem : ItemBase
///
public ItemProtectionStatus ProtectionStatus { get; set; }
+ ///
+ /// Policy ID Associated with item
+ ///
+ public string PolicyId { get; set; }
+
///
/// Protection State of the item
///
@@ -67,6 +72,7 @@ public AzureItem(ProtectedItemResource protectedItemResource,
: base(protectedItemResource, containerName, containerType)
{
ProtectionPolicyName = policyName;
+ PolicyId = protectedItemResource.Properties.PolicyId;
}
}
public class AzureItemExtendedInfo : ItemExtendedInfoBase
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/CmdletParamEnums.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/CmdletParamEnums.cs
index 96e6a1ba64e7..ed549305517f 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Models/CmdletParamEnums.cs
+++ b/src/RecoveryServices/RecoveryServices.Backup.Models/CmdletParamEnums.cs
@@ -58,7 +58,10 @@ public enum RestoreBackupItemParams
public enum RestoreVMBackupItemParams
{
TargetResourceGroupName,
- OsaOption
+ OsaOption,
+ RestoreDiskList,
+ RestoreOnlyOSDisk,
+ RestoreAsUnmanagedDisks
}
public enum RestoreFSBackupItemParams
@@ -118,7 +121,11 @@ public enum ItemParams
BackupType,
EnableCompression,
DeleteState,
- FriendlyName
+ FriendlyName,
+ InclusionDisksList,
+ ExclusionDisksList,
+ ResetExclusionSettings,
+ ExcludeAllDataDisks
}
public enum ProtectionCheckParams
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs
index 6edc54f121ad..f2f0504e1a49 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs
+++ b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs
@@ -429,7 +429,29 @@ public static string DiscoveryFailureErrorMessage {
return ResourceManager.GetString("DiscoveryFailureErrorMessage", resourceCulture);
}
}
-
+
+ ///
+ /// Looks up a localized string similar to Multiple Parameters Provided. Please specify only one of the parameters from InclusionDisksList, ExclusionDisksList, ResetExclusionSetting and ExcludeAllDataDisks..
+ ///
+ public static string DiskExclusionParametersRedundant
+ {
+ get
+ {
+ return ResourceManager.GetString("DiskExclusionParametersRedundant", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Both Inclusion and Exclusion lists provided. Please provide only one of them.
+ ///
+ public static string InclusionListRedundantError
+ {
+ get
+ {
+ return ResourceManager.GetString("InclusionListRedundantError", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Empty response received from Service Client.
///
@@ -1379,7 +1401,29 @@ public static string URIValueNotFound {
return ResourceManager.GetString("URIValueNotFound", resourceCulture);
}
}
-
+
+ ///
+ /// Looks up a localized string similar to The disks of the managed VM will be restored as unmanaged since TargetResourceGroupName parameter is not provided. This will NOT leverage the instant restore functionality and hence can be significantly slow based on given storage account. To leverage instant restore, provide the TargetResourceGroupName parameter. Otherwise, provide the intent next time by passing the RestoreAsUnmanagedDisks parameter
+ ///
+ public static string UnmanagedVMRestoreWarning
+ {
+ get
+ {
+ return ResourceManager.GetString("UnmanagedVMRestoreWarning", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Both RestoreAsUnmanagedDisks and TargetResourceGroupName can't be spceified. Please give Only one parameter and retry.
+ ///
+ public static string TargetRGUnmanagedRestoreDuplicateParamsException
+ {
+ get
+ {
+ return ResourceManager.GetString("TargetRGUnmanagedRestoreDuplicateParamsException", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to VirtualMachineId is NULL or Empty. Please enter valid VirtualMachineId.
///
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx
index 4b4e42115ca3..7417765eede5 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx
+++ b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx
@@ -586,4 +586,16 @@ Please contact Microsoft for further assistance.
Target Container parameter is required for this operation.
+
+ Multiple Parameters Provided. Please specify only one of the parameters from InclusionDisksList, ExclusionDisksList, ResetExclusionSetting and ExcludeAllDataDisks.
+
+
+ Both Inclusion and Exclusion lists provided. Please provide only one of them.
+
+
+ Both RestoreAsUnmanagedDisks and TargetResourceGroupName can't be spceified. Please give Only one parameter and retry.
+
+
+ The disks of the managed VM will be restored as unmanaged since TargetResourceGroupName parameter is not provided. This will NOT leverage the instant restore functionality and hence can be significantly slow based on given storage account. To leverage instant restore, provide the TargetResourceGroupName parameter. Otherwise, provide the intent next time by passing the RestoreAsUnmanagedDisks parameter
+
\ No newline at end of file
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj b/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj
index f2da5a0387c0..b1fc6cc42e80 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj
+++ b/src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj
@@ -1,4 +1,4 @@
-
+
RecoveryServices
@@ -14,5 +14,5 @@
-
+
\ No newline at end of file
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs b/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
index 8be55aa3e2da..05f77b67899e 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
+++ b/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
@@ -19,6 +19,7 @@
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
using Microsoft.Azure.Management.Internal.Resources.Models;
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+using Microsoft.Rest;
using Microsoft.Rest.Azure.OData;
using System;
using System.Collections.Generic;
@@ -74,6 +75,10 @@ public RestAzureNS.AzureOperationResponse EnableProtectio
string azureVMCloudServiceName = (string)ProviderData[ItemParams.AzureVMCloudServiceName];
string azureVMResourceGroupName = (string)ProviderData[ItemParams.AzureVMResourceGroupName];
string parameterSetName = (string)ProviderData[ItemParams.ParameterSetName];
+ string[] inclusionDisksList = (string[])ProviderData[ItemParams.InclusionDisksList];
+ string[] exclusionDisksList = (string[])ProviderData[ItemParams.ExclusionDisksList];
+ SwitchParameter resetDiskExclusionSetting = (SwitchParameter)ProviderData[ItemParams.ResetExclusionSettings];
+ bool excludeAllDataDisks = (bool)ProviderData[ItemParams.ExcludeAllDataDisks];
PolicyBase policy = (PolicyBase)ProviderData[ItemParams.Policy];
@@ -81,6 +86,9 @@ public RestAzureNS.AzureOperationResponse EnableProtectio
AzureVmItem item = (AzureVmItem)ProviderData[ItemParams.Item];
+ bool isDiskExclusionParamPresent = ValidateDiskExclusionParameters(
+ inclusionDisksList, exclusionDisksList, resetDiskExclusionSetting, excludeAllDataDisks);
+
// do validations
string containerUri = "";
string protectedItemUri = "";
@@ -88,7 +96,10 @@ public RestAzureNS.AzureOperationResponse EnableProtectio
string sourceResourceId = null;
AzureVmPolicy azureVmPolicy = (AzureVmPolicy)ProviderData[ItemParams.Policy];
- ValidateProtectedItemCount(azureVmPolicy);
+ if (azureVmPolicy != null)
+ {
+ ValidateProtectedItemCount(azureVmPolicy);
+ }
if (itemBase == null)
{
@@ -126,6 +137,14 @@ public RestAzureNS.AzureOperationResponse EnableProtectio
sourceResourceId = iaasVmProtectableItem.VirtualMachineId;
}
}
+ else if(isDiskExclusionParamPresent && parameterSetName.Contains("Modify"))
+ {
+ isComputeAzureVM = IsComputeAzureVM(item.VirtualMachineId);
+ Dictionary keyValueDict = HelperUtils.ParseUri(item.Id);
+ containerUri = HelperUtils.GetContainerUri(keyValueDict, item.Id);
+ protectedItemUri = HelperUtils.GetProtectedItemUri(keyValueDict, item.Id);
+ sourceResourceId = item.SourceResourceId;
+ }
else
{
ValidateAzureVMWorkloadType(item.WorkloadType, policy.WorkloadType);
@@ -150,9 +169,49 @@ public RestAzureNS.AzureOperationResponse EnableProtectio
properties = new AzureIaaSComputeVMProtectedItem();
}
- properties.PolicyId = policy.Id;
+ if(policy != null)
+ {
+ properties.PolicyId = policy.Id;
+ }
+ else
+ {
+ properties.PolicyId = item.PolicyId;
+ }
properties.SourceResourceId = sourceResourceId;
+ ExtendedProperties extendedProperties = null;
+ if (resetDiskExclusionSetting.IsPresent)
+ {
+ extendedProperties = new ExtendedProperties();
+ extendedProperties.DiskExclusionProperties = null;
+ }
+ else
+ {
+ if(inclusionDisksList != null)
+ {
+ IList inclusionList = Array.ConvertAll(inclusionDisksList, s => int.Parse(s)).OfType().ToList();
+ DiskExclusionProperties diskExclusionProperties = new DiskExclusionProperties(inclusionList, true);
+ extendedProperties = new ExtendedProperties();
+ extendedProperties.DiskExclusionProperties = diskExclusionProperties;
+ }
+ else if(exclusionDisksList != null)
+ {
+ IList exclusionList = Array.ConvertAll(exclusionDisksList, s => int.Parse(s)).OfType().ToList();
+ DiskExclusionProperties diskExclusionProperties = new DiskExclusionProperties(exclusionList, false);
+ extendedProperties = new ExtendedProperties();
+ extendedProperties.DiskExclusionProperties = diskExclusionProperties;
+ }
+ else if(excludeAllDataDisks == true)
+ {
+ IList exclusionList = new List();
+ DiskExclusionProperties diskExclusionProperties = new DiskExclusionProperties(exclusionList, true);
+ extendedProperties = new ExtendedProperties();
+ extendedProperties.DiskExclusionProperties = diskExclusionProperties;
+ }
+ }
+
+ properties.ExtendedProperties = extendedProperties;
+
ProtectedItemResource serviceClientRequest = new ProtectedItemResource()
{
Properties = properties
@@ -327,6 +386,10 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
ProviderData.ContainsKey(RestoreVMBackupItemParams.TargetResourceGroupName) ?
ProviderData[RestoreVMBackupItemParams.TargetResourceGroupName].ToString() : null;
bool osaOption = (bool)ProviderData[RestoreVMBackupItemParams.OsaOption];
+ string[] restoreDiskList = (string[])ProviderData[RestoreVMBackupItemParams.RestoreDiskList];
+ SwitchParameter restoreOnlyOSDisk = (SwitchParameter)ProviderData[RestoreVMBackupItemParams.RestoreOnlyOSDisk];
+ SwitchParameter restoreAsUnmanagedDisks = (SwitchParameter)ProviderData[RestoreVMBackupItemParams.RestoreAsUnmanagedDisks];
+
Dictionary uriDict = HelperUtils.ParseUri(rp.Id);
string containerUri = HelperUtils.GetContainerUri(uriDict, rp.Id);
@@ -343,11 +406,36 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
throw new Exception(string.Format(Resources.RestoreDiskStorageTypeError, vmType));
}
+ if(targetResourceGroupName != null && restoreAsUnmanagedDisks.IsPresent)
+ {
+ throw new Exception(Resources.TargetRGUnmanagedRestoreDuplicateParamsException);
+ }
+
if (targetResourceGroupName != null && rp.IsManagedVirtualMachine == false)
{
Logger.Instance.WriteWarning(Resources.UnManagedBackupVmWarning);
}
+ if(rp.IsManagedVirtualMachine == true && targetResourceGroupName == null
+ && restoreAsUnmanagedDisks.IsPresent == false)
+ {
+ Logger.Instance.WriteWarning(Resources.UnmanagedVMRestoreWarning);
+ }
+
+ IList restoreDiskLUNS;
+ if(restoreOnlyOSDisk.IsPresent)
+ {
+ restoreDiskLUNS = new List();
+ }
+ else if(restoreDiskList != null)
+ {
+ restoreDiskLUNS = Array.ConvertAll(restoreDiskList, s => int.Parse(s)).OfType