Fixing bug for replication to Managed disk for HyperV to Azure scenario in Azure site recovery service (#26147)

* Bug fix for H2A replication to MD

* Updated change log

* Updated tests

* Updated help file

Author: vidyadharijami

src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/B2A/AsrB2ATests.ps1

@@ -927,10 +927,26 @@ function Test-CreateRPIWithMangedDisksForReplication
     param([string] $vaultSettingsFilePath)
 
     Import-AzRecoveryServicesAsrVaultSettingsFile -Path $vaultSettingsFilePath
+    $PrimaryFabricName = "ToPowershell"
     $fabric =  Get-AsrFabric -FriendlyName $PrimaryFabricName
     $pc =  Get-ASRProtectionContainer -Fabric $fabric
     $ProtectionContainerMapping = Get-ASRProtectionContainerMapping -ProtectionContainer $pc
     $policy = Get-AzRecoveryServicesAsrPolicy -Name $PolicyName
     $VM= Get-AsrProtectableItem -ProtectionContainer $pc -FriendlyName $VMName
-    $EnableDRjob = New-AzRecoveryServicesAsrReplicationProtectedItem -ProtectableItem $VM -Name $VM.Name -ProtectionContainerMapping $ProtectionContainerMapping[0] -RecoveryAzureStorageAccountId $StorageAccountID -OSDiskName $VMName -OS Windows -RecoveryResourceGroupId $RecoveryResourceGroupId -UseManagedDisksForReplication True
+
+    Assert-ThrowsContains { New-AzRecoveryServicesAsrReplicationProtectedItem `
+    -ProtectableItem $VM[0] `
+    -Name $VM[0].Name `
+    -ProtectionContainerMapping $ProtectionContainerMapping[0] `
+    -RecoveryAzureStorageAccountId $StorageAccountID `
+    -OSDiskName $VMName `
+    -OS Windows `
+    -RecoveryResourceGroupId $RecoveryResourceGroupId `
+    -UseManagedDisksForReplication True } `
+    "Only one of the input parameters are expected not both either RecoveryAzureStorageAccountId or UseManagedDisksForReplication"
+
+    $EnableDRjob = New-AzRecoveryServicesAsrReplicationProtectedItem -ProtectableItem $VM[0] -Name $VM[0].Name -ProtectionContainerMapping $ProtectionContainerMapping[0] -LogStorageAccountId $StorageAccountID -OSDiskName $VMName -OS Windows -RecoveryResourceGroupId $RecoveryResourceGroupId -UseManagedDisksForReplication True
+    WaitForJobCompletion -JobId $EnableDRjob.Name
+    $Job = Get-AzRecoveryServicesAsrJob -Name $EnableDRjob.Name
+    Assert-True { $Job.State -eq "Succeeded" }
 }

src/RecoveryServices/RecoveryServices.SiteRecovery.Test/SessionRecords/RecoveryServices.SiteRecovery.Test.AsrB2ATests/CreateRPIWithMangedDisksForReplication.json

@@ -546,4 +546,7 @@ Recommended Action: To cleanup the resources created by Test failover run the Te
   <data name="UnsupportedReplicationProviderOperation" xml:space="preserve">
     <value>Unsupported replication provider {0} for this {1} operation</value>
   </data>
+  <data name="IncorrectParameters" xml:space="preserve">
+    <value>Only one of the input parameters are expected not both either RecoveryAzureStorageAccountId or UseManagedDisksForReplication </value>
+  </data>
 </root>

src/RecoveryServices/RecoveryServices.SiteRecovery/Properties/Resources.Designer.cs

@@ -223,8 +223,8 @@ public class NewAzureRmRecoveryServicesAsrReplicationProtectedItem : SiteRecover
         /// <summary>
         ///     Gets or sets the ID of the Azure storage account to replicate to.
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.EnterpriseToAzure, Mandatory = true)]
-        [Parameter(ParameterSetName = ASRParameterSets.HyperVSiteToAzure, Mandatory = true)]
+        [Parameter(ParameterSetName = ASRParameterSets.EnterpriseToAzure)]
+        [Parameter(ParameterSetName = ASRParameterSets.HyperVSiteToAzure)]
         [Parameter(ParameterSetName = ASRParameterSets.AzureToAzureWithoutDiskDetails)]
         [ValidateNotNullOrEmpty]
         public string RecoveryAzureStorageAccountId { get; set; }
@@ -841,6 +841,13 @@ private void EnterpriseAndHyperVToAzure(EnableProtectionInput input)
                         this.UseManagedDisk));
             }
 
+            if(!string.IsNullOrEmpty(this.RecoveryAzureStorageAccountId)
+                && !string.IsNullOrEmpty(this.UseManagedDisksForReplication))
+            {
+                throw new PSArgumentException(
+                    string.Format(Resources.IncorrectParameters));
+            }
+
             if (!string.IsNullOrEmpty(this.RecoveryAzureNetworkId))
             {
                 providerSettings.TargetAzureNetworkId = this.RecoveryAzureNetworkId;
@@ -906,15 +913,25 @@ private void EnterpriseAndHyperVToAzure(EnableProtectionInput input)
                 }
             }
 
+            string deploymentType = string.Empty;
             if (this.RecoveryAzureStorageAccountId != null)
             {
                 providerSettings.TargetStorageAccountId =
                     this.RecoveryAzureStorageAccountId;
+                deploymentType = Utilities.GetValueFromArmId(
+                    this.RecoveryAzureStorageAccountId,
+                    ARMResourceTypeConstants.Providers);
             }
-
-            var deploymentType = Utilities.GetValueFromArmId(
-                this.RecoveryAzureStorageAccountId,
-                ARMResourceTypeConstants.Providers);
+            else
+            {
+                if(this.LogStorageAccountId != null)
+                {
+                    deploymentType = Utilities.GetValueFromArmId(
+                    this.LogStorageAccountId,
+                    ARMResourceTypeConstants.Providers);
+                }
+            }
+            
             if (deploymentType.ToLower()
                 .Contains(Constants.Classic.ToLower()))
             {

src/RecoveryServices/RecoveryServices.SiteRecovery/Properties/Resources.resx

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed bug for making RecoveryAzureStorageAccountId parameter optional in `New-ASRReplicationProtectedItem` cmdlet of H2A.
 
 ## Version 7.1.0
 * Added MUA support for CMK Encryption properties of Recovery Services Vault. Updated the  VaultProperty command to use underlying Vault APIs.

src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/NewAzureRmRecoveryServicesAsrReplicationProtectedItem.cs

@@ -15,7 +15,7 @@ Enables replication for an ASR protectable item by creating a replication protec
 ### EnterpriseToEnterprise (Default)
 ```
 New-AzRecoveryServicesAsrReplicationProtectedItem [-VmmToVmm] -ProtectableItem <ASRProtectableItem>
- -Name <String> -ProtectionContainerMapping <ASRProtectionContainerMapping> 
+ -Name <String> -ProtectionContainerMapping <ASRProtectionContainerMapping>
  [-WaitForCompletion] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -56,8 +56,9 @@ New-AzRecoveryServicesAsrReplicationProtectedItem [-VMwareToAzure] -ProtectableI
 ```
 New-AzRecoveryServicesAsrReplicationProtectedItem [-HyperVToAzure] -ProtectableItem <ASRProtectableItem>
  -Name <String> [-RecoveryVmName <String>] -ProtectionContainerMapping <ASRProtectionContainerMapping>
- -RecoveryAzureStorageAccountId <String> -RecoveryResourceGroupId <String> [-UseManagedDisk <String>] [-UseManagedDisksForReplication <String>]
- [-WaitForCompletion] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ -RecoveryAzureStorageAccountId <String> -RecoveryResourceGroupId <String> [-UseManagedDisk <String>]
+ [-UseManagedDisksForReplication <String>] [-WaitForCompletion] [-DefaultProfile <IAzureContextContainer>]
+ [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### HyperVSiteToAzure
@@ -72,36 +73,36 @@ New-AzRecoveryServicesAsrReplicationProtectedItem [-HyperVToAzure] -ProtectableI
  [-RecoveryVmTag <System.Collections.Generic.IDictionary`2[System.String,System.String]>]
  [-DiskTag <System.Collections.Generic.IDictionary`2[System.String,System.String]>]
  [-RecoveryNicTag <System.Collections.Generic.IDictionary`2[System.String,System.String]>]
- [-UseManagedDisk <String>] [-UseManagedDisksForReplication <String>] [-WaitForCompletion] [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+ [-UseManagedDisk <String>] [-UseManagedDisksForReplication <String>] [-WaitForCompletion]
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### AzureToAzure
 ```
 New-AzRecoveryServicesAsrReplicationProtectedItem [-AzureToAzure]
  -AzureToAzureDiskReplicationConfiguration <ASRAzuretoAzureDiskReplicationConfig[]> -AzureVmId <String>
- -Name <String> [-RecoveryVmName <String>] -ProtectionContainerMapping <ASRProtectionContainerMapping>
- [-RecoveryAzureNetworkId <String>] [-RecoveryAzureSubnetName <String>] -RecoveryResourceGroupId <String>
- [-ReplicationGroupName <String>] [-RecoveryCloudServiceId <String>] [-RecoveryAvailabilityZone <String>]
+ -Name <String> -ProtectionContainerMapping <ASRProtectionContainerMapping> [-RecoveryAzureNetworkId <String>]
+ [-RecoveryAzureSubnetName <String>] -RecoveryResourceGroupId <String> [-ReplicationGroupName <String>]
+ [-RecoveryCloudServiceId <String>] [-RecoveryAvailabilityZone <String>]
  [-RecoveryProximityPlacementGroupId <String>] [-RecoveryVirtualMachineScaleSetId <String>]
  [-RecoveryCapacityReservationGroupId <String>] [-RecoveryAvailabilitySetId <String>]
  [-RecoveryBootDiagStorageAccountId <String>] [-DiskEncryptionVaultId <String>]
  [-DiskEncryptionSecretUrl <String>] [-KeyEncryptionKeyUrl <String>] [-KeyEncryptionVaultId <String>]
- [-WaitForCompletion] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-WaitForCompletion] [-RecoveryExtendedLocation <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
+ [-Confirm] [<CommonParameters>]
 ```
 
 ### AzureToAzureWithoutDiskDetails
 ```
 New-AzRecoveryServicesAsrReplicationProtectedItem [-AzureToAzure] -AzureVmId <String> -Name <String>
- [-RecoveryVmName <String>] -ProtectionContainerMapping <ASRProtectionContainerMapping>
- [-RecoveryAzureStorageAccountId <String>] -LogStorageAccountId <String> [-RecoveryAzureNetworkId <String>]
- [-RecoveryAzureSubnetName <String>] -RecoveryResourceGroupId <String> [-ReplicationGroupName <String>]
- [-RecoveryAvailabilityZone <String>] [-RecoveryProximityPlacementGroupId <String>]
- [-RecoveryVirtualMachineScaleSetId <String>] [-RecoveryCapacityReservationGroupId <String>]
- [-RecoveryAvailabilitySetId <String>] [-RecoveryBootDiagStorageAccountId <String>]
- [-DiskEncryptionVaultId <String>] [-DiskEncryptionSecretUrl <String>] [-KeyEncryptionKeyUrl <String>]
- [-KeyEncryptionVaultId <String>] [-WaitForCompletion] [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
- [-Confirm] [<CommonParameters>]
+ -ProtectionContainerMapping <ASRProtectionContainerMapping> [-RecoveryAzureStorageAccountId <String>]
+ -LogStorageAccountId <String> [-RecoveryAzureNetworkId <String>] [-RecoveryAzureSubnetName <String>]
+ -RecoveryResourceGroupId <String> [-ReplicationGroupName <String>] [-RecoveryAvailabilityZone <String>]
+ [-RecoveryProximityPlacementGroupId <String>] [-RecoveryVirtualMachineScaleSetId <String>]
+ [-RecoveryCapacityReservationGroupId <String>] [-RecoveryAvailabilitySetId <String>]
+ [-RecoveryBootDiagStorageAccountId <String>] [-DiskEncryptionVaultId <String>]
+ [-DiskEncryptionSecretUrl <String>] [-KeyEncryptionKeyUrl <String>] [-KeyEncryptionVaultId <String>]
+ [-WaitForCompletion] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ReplicateVMwareToAzure
@@ -799,7 +800,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-
 ### -RecoveryNicTag
 Specify the tags for the target NICs of the VM.
 
@@ -865,7 +865,7 @@ Name of the recovery Vm created after failover.
 
 ```yaml
 Type: System.String
-Parameter Sets: VMwareToAzureWithDiskType, VMwareToAzure, EnterpriseToAzure, HyperVSiteToAzure, AzureToAzure, AzureToAzureWithoutDiskDetails, ReplicateVMwareToAzure, ReplicateVMwareToAzureWithDiskInput
+Parameter Sets: VMwareToAzureWithDiskType, VMwareToAzure, EnterpriseToAzure, HyperVSiteToAzure, ReplicateVMwareToAzure, ReplicateVMwareToAzureWithDiskInput
 Aliases:
 
 Required: False