Adding platform fault domain and avzone support

Author: abageria

src/RecoveryServices/RecoveryServices.SiteRecovery.Management.Sdk/README.md

@@ -23,9 +23,9 @@ payload-flattening-threshold: 2
 
 ###
 ``` yaml
-commit: 203d98d48deb3c3daead3101d106a1977eba2453
+commit: 511060cc81ed358bd4a8be701f7bdf4196a440e2
 input-file:
-  - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/recoveryservicessiterecovery/resource-manager/Microsoft.RecoveryServices/stable/2024-10-01/service.json
+  - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/recoveryservicessiterecovery/resource-manager/Microsoft.RecoveryServices/stable/2025-08-01/service.json
 
 output-folder: Generated
 

src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/A2A/A2ATestsHelper.ps1

@@ -183,6 +183,16 @@ function getClusterName{
     return "powershell-cluster";
 }
 
+function getPlatformFaultDomain
+{
+    return 0
+}
+
+function getPlatformUpdateDomain1
+{
+    return 1
+}
+
 function Get-RandomSuffix(
 	[int] $size = 8)
 {

src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/A2A/AsrA2ATests.ps1

@@ -1931,6 +1931,8 @@ function Test-VMSSReplication {
     $recMappingName = getRecoveryContainerMapping
     $primaryNetMapping = getPrimaryNetworkMapping
     $recoveryNetMapping = getRecoveryNetworkMapping
+    $platformFaultDomain = getPlatformDomain
+    $platformFaultDomain1 = getPlatformDomain1
 
     #create recovery side resources
     $recRgName = getRecoveryResourceGroupName
@@ -1941,7 +1943,7 @@ function Test-VMSSReplication {
     $recRg = $RecoveryAzureNetworkId.Substring(0, $index)
     #create virtual Machine scale set
     $stnd = "Standard"
-    $vmssConfig = New-AzVmssConfig -Location $recoveryLocation -PlatformFaultDomainCount 1 -SinglePlacementGroup 0 -SecurityType $stnd
+    $vmssConfig = New-AzVmssConfig -Location $recoveryLocation -PlatformFaultDomainCount 2 -SinglePlacementGroup 0 -SecurityType $stnd
     $recVmss = new-azvmss -resourcegroupname $recRgName -vmscalesetname 'vmss-asr' -virtualmachinescaleset $vmssConfig
     $recVmss1 = new-azvmss -resourcegroupname $recRgName -vmscalesetname 'vmss1-asr' -virtualmachinescaleset $vmssConfig
 
@@ -2017,7 +2019,7 @@ function Test-VMSSReplication {
     $v = New-AzRecoveryServicesAsrAzureToAzureDiskReplicationConfig -ManagedDisk -LogStorageAccountId $logStg `
         -DiskId $vhdid -RecoveryResourceGroupId  $recRg -RecoveryReplicaDiskAccountType  $RecoveryReplicaDiskAccountType `
         -RecoveryTargetDiskAccountType $RecoveryTargetDiskAccountType
-    $enableDRjob = New-AzRecoveryServicesAsrReplicationProtectedItem -AzureToAzure -AzureVmId $vm.Id -Name $vmName  -ProtectionContainerMapping $mapping -RecoveryResourceGroupId  $recRg -AzureToAzureDiskReplicationConfiguration $v -RecoveryVirtualMachineScaleSetId $recVmss.Id
+    $enableDRjob = New-AzRecoveryServicesAsrReplicationProtectedItem -AzureToAzure -AzureVmId $vm.Id -Name $vmName  -ProtectionContainerMapping $mapping -RecoveryResourceGroupId  $recRg -AzureToAzureDiskReplicationConfiguration $v -RecoveryVirtualMachineScaleSetId $recVmss.Id -PlatformFaultDomain $platformFaultDomain
     [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(20 * 1000)
     [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(20 * 1000)
     WaitForJobCompletion -JobId $enableDRjob.Name
@@ -2026,12 +2028,14 @@ function Test-VMSSReplication {
     #Validate vmss Set in replicated vm properties
     $pe = Get-AzRecoveryServicesAsrReplicationProtectedItem -ProtectionContainer $pc -Name  $vmName
     Assert-NotNull($pe.providerSpecificDetails.RecoveryVirtualMachineScaleSetId)
+    Assert-NotNull($pe.providerSpecificDetails.PlatformFaultDomain)
 
     #Update Vmpropertie
-    $updateDRjob = Set-AzRecoveryServicesAsrReplicationProtectedItem -InputObject $pe -RecoveryVirtualMachineScaleSetId $recVmss1.Id
+    $updateDRjob = Set-AzRecoveryServicesAsrReplicationProtectedItem -InputObject $pe -RecoveryVirtualMachineScaleSetId $recVmss1.Id -PlatformFaultDomain $platformFaultDomain1
     WaitForJobCompletion -JobId $updateDRjob.Name
     $pe = Get-AzRecoveryServicesAsrReplicationProtectedItem -ProtectionContainer $pc -Name  $vmName
     Assert-NotNull($pe.providerSpecificDetails.RecoveryVirtualMachineScaleSetId)
+    Assert-NotNull($pe.providerSpecificDetails.PlatformFaultDomain)
 
     #Failover
     $failoverjob = Start-AzRecoveryServicesAsrUnPlannedFailoverJob -ReplicationProtectedItem $pe -Direction PrimaryToRecovery -PerformSourceSideAction
@@ -2212,7 +2216,9 @@ $CacheStorageAccount = "/subscriptions/7c943c1b-5122-4097-90c8-861411bdd574/reso
 
 $rgId = "/subscriptions/7c943c1b-5122-4097-90c8-861411bdd574/resourceGroups/vijami-alertrg"
 
-$ReprotectJob = Update-AzRecoveryServicesAsrProtectionDirection -AzureToAzure -ReplicationProtectedItem $ReplicationProtectedItem -ProtectionContainerMapping $RecoveryMapping -LogStorageAccountId $CacheStorageAccount -RecoveryResourceGroupID $rgId
+$platformFaultDomain = 1
+
+$ReprotectJob = Update-AzRecoveryServicesAsrProtectionDirection -AzureToAzure -ReplicationProtectedItem $ReplicationProtectedItem -ProtectionContainerMapping $RecoveryMapping -LogStorageAccountId $CacheStorageAccount -RecoveryResourceGroupID $rgId -PlatformFaultDomain $platformFaultDomain
 
 [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(20 * 1000)
 WaitForJobCompletion -JobId $ReprotectJob.Name

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

@@ -577,6 +577,14 @@ public class NewAzureRmRecoveryServicesAsrReplicationProtectedItem : SiteRecover
         [ValidateNotNullOrEmpty]
         public ASRReplicationProtectionCluster ReplicationProtectionCluster { get; set; }
 
+        /// <summary>
+        /// Gets or sets the resource ID of virtual machine scale set to failover this virtual machine to.
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.AzureToAzure, HelpMessage = "Specify the platform fault domain to be used by the failover Vm in target recovery region.")]
+        [Parameter(ParameterSetName = ASRParameterSets.AzureToAzureWithoutDiskDetails, HelpMessage = "Specify the platform fault domain to be used by the failover Vm in target recovery region.")]
+        [ValidateNotNullOrEmpty]
+        public int? PlatformFaultDomain { get; set; }
+
         /// <summary>
         ///     ProcessRecord of the command.
         /// </summary>
@@ -994,7 +1002,8 @@ private void AzureToAzureReplication(EnableProtectionInput input)
                 RecoveryExtendedLocation = this.IsParameterBound(c => c.RecoveryExtendedLocation) ? new ExtendedLocation
                 {
                     Name = this.RecoveryExtendedLocation
-                } : null
+                } : null,
+                PlatformFaultDomain = this.PlatformFaultDomain,
             };
 
             if (!string.IsNullOrEmpty(this.ReplicationGroupName))

src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/SetAzureRmRecoveryServicesAsrReplicationProtectedItem.cs

@@ -307,6 +307,13 @@ public class SetAzureRmRecoveryServicesAsrReplicationProtectedItem : SiteRecover
         [ValidateNotNullOrEmpty]
         public string TestNetworkId { get; set; }
 
+        /// <summary>
+        ///     Gets or sets the platform fault domain for replication protected item after failover.
+        /// </summary>
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public int? PlatformFaultDomain { get; set; }
+
         /// <summary>
         ///     ProcessRecord of the command.
         /// </summary>
@@ -354,6 +361,7 @@ public override void ExecuteSiteRecoveryCmdlet()
                     this.IsParameterBound(c => c.RecoveryProximityPlacementGroupId) &&
                     this.IsParameterBound(c => c.RecoveryVirtualMachineScaleSetId) &&
                     this.IsParameterBound(c => c.RecoveryCapacityReservationGroupId) &&
+                    this.IsParameterBound(c => c.PlatformFaultDomain) &&
                     string.IsNullOrEmpty(this.RecoveryCloudServiceId) &&
                     string.IsNullOrEmpty(this.RecoveryResourceGroupId) &&
                     string.IsNullOrEmpty(this.LicenseType) &&
@@ -419,6 +427,7 @@ public override void ExecuteSiteRecoveryCmdlet()
                 var recoveryNicTag = this.RecoveryNicTag;
                 var diskTag = this.DiskTag;
                 var tfoNetworkId = string.Empty;
+                var platformFaultDomain = this.PlatformFaultDomain;
                 var vMNicInputDetailsList = new List<VMNicInputDetails>();
                 var providerSpecificInput = new UpdateReplicationProtectedItemProviderInput();
 
@@ -694,6 +703,10 @@ public override void ExecuteSiteRecoveryCmdlet()
                         ? this.RecoveryCapacityReservationGroupId
                         : providerSpecificDetails.RecoveryCapacityReservationGroupId;
 
+                    platformFaultDomain = this.IsParameterBound(c => c.PlatformFaultDomain)
+                        ? this.PlatformFaultDomain
+                        : providerSpecificDetails.PlatformFaultDomain;
+
                     if (!this.MyInvocation.BoundParameters.ContainsKey(
                             Utilities.GetMemberName(() => this.RecoveryCloudServiceId)))
                     {
@@ -756,7 +769,8 @@ public override void ExecuteSiteRecoveryCmdlet()
                             this.DiskEncryptionSecretUrl,
                             this.DiskEncryptionVaultId,
                             this.KeyEncryptionKeyUrl,
-                            this.KeyEncryptionVaultId)
+                            this.KeyEncryptionVaultId),
+                        PlatformFaultDomain = this.PlatformFaultDomain
                     };
 
                     if (this.ASRVMNicConfiguration != null &&

src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs

@@ -406,6 +406,22 @@ public class UpdateAzureRmRecoveryServicesAsrProtection : SiteRecoveryCmdletBase
             HelpMessage = "Specifies the disk encryption secret key vault ID(Azure disk encryption) to be used be recovery VM after failover.")]
         public string KeyEncryptionVaultId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the recovery availability zone for protected Vm.
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.AzureToAzure)]
+        [Parameter(ParameterSetName = ASRParameterSets.AzureToAzureWithMultipleStorageAccount)]
+        [ValidateNotNullOrEmpty]
+        public string RecoveryAvailabilityZone { get; set; }
+
+        /// <summary>
+        /// Gets or sets platform fault domain for protected Vm.
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.AzureToAzure)]
+        [Parameter(ParameterSetName = ASRParameterSets.AzureToAzureWithMultipleStorageAccount)]
+        [ValidateNotNullOrEmpty]
+        public int? PlatformFaultDomain { get; set; }
+
         /// <summary>
         ///     ProcessRecord of the command.
         /// </summary>
@@ -783,7 +799,9 @@ private void A2ARPIReprotect()
                     RecoveryBootDiagStorageAccountId = this.RecoveryBootDiagStorageAccountId,
                     RecoveryProximityPlacementGroupId = this.RecoveryProximityPlacementGroupId,
                     RecoveryVirtualMachineScaleSetId = this.RecoveryVirtualMachineScaleSetId,
-                    RecoveryCapacityReservationGroupId = this.RecoveryCapacityReservationGroupId
+                    RecoveryCapacityReservationGroupId = this.RecoveryCapacityReservationGroupId,
+                    RecoveryAvailabilityZone = this.RecoveryAvailabilityZone,
+                    PlatformFaultDomain = this.PlatformFaultDomain
                 };
 
                 // Fetch the latest Protected item objects

src/RecoveryServices/RecoveryServices/help/New-AzRecoveryServicesAsrReplicationProtectedItem.md

@@ -88,6 +88,7 @@ New-AzRecoveryServicesAsrReplicationProtectedItem [-AzureToAzure]
  [-RecoveryCapacityReservationGroupId <String>] [-RecoveryAvailabilitySetId <String>]
  [-RecoveryBootDiagStorageAccountId <String>] [-DiskEncryptionVaultId <String>]
  [-DiskEncryptionSecretUrl <String>] [-KeyEncryptionKeyUrl <String>] [-KeyEncryptionVaultId <String>]
+ [-PlatformFaultDomain <Integer>]
  [-WaitForCompletion] [-RecoveryExtendedLocation <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
  [-Confirm] [<CommonParameters>]
 ```
@@ -102,6 +103,7 @@ New-AzRecoveryServicesAsrReplicationProtectedItem [-AzureToAzure] -AzureVmId <St
  [-RecoveryCapacityReservationGroupId <String>] [-RecoveryAvailabilitySetId <String>]
  [-RecoveryBootDiagStorageAccountId <String>] [-DiskEncryptionVaultId <String>]
  [-DiskEncryptionSecretUrl <String>] [-KeyEncryptionKeyUrl <String>] [-KeyEncryptionVaultId <String>]
+ [-PlatformFaultDomain <Integer>]
  [-WaitForCompletion] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -607,6 +609,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PlatformFaultDomain
+Specify the platform fault domain to used by the failover Vm in target recovery region.
+
+```yaml
+Type: System.int32
+Parameter Sets: AzureToAzure, AzureToAzureWithoutDiskDetails
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ProcessServer
 The Process Server to use to replicate this machine. Use the list of process servers in the ASR fabric corresponding to the Configuration server to specify one.
 

src/RecoveryServices/RecoveryServices/help/Set-AzRecoveryServicesAsrReplicationProtectedItem.md

@@ -32,6 +32,7 @@ Set-AzRecoveryServicesAsrReplicationProtectedItem -InputObject <ASRReplicationPr
  [-RecoveryPublicIPAddressId <String>] [-RecoveryNetworkSecurityGroupId <String>]
  [-RecoveryLBBackendAddressPoolId <String[]>] [-TfoAzureVMName <String>]
  [-ASRVMNicConfiguration <ASRVMNicConfig[]>] [-TestNetworkId <String>]
+ [-PlatformFaultDomain <Integer>]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -317,6 +318,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PlatformFaultDomain
+Specify the platform fault domain to used by the failover Vm in target recovery region.
+
+```yaml
+Type: System.int32
+Parameter Sets: AzureToAzure, AzureToAzureWithoutDiskDetails
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -PrimaryNic
 Specifies the NIC which will be used as primary NIC for recovery VM after after failover.
 

src/RecoveryServices/RecoveryServices/help/Update-AzRecoveryServicesAsrProtectionDirection.md

@@ -77,6 +77,8 @@ Update-AzRecoveryServicesAsrProtectionDirection [-AzureToAzure]
  [-RecoveryCapacityReservationGroupId <String>] [-RecoveryBootDiagStorageAccountId <String>]
  [-DiskEncryptionVaultId <String>] [-DiskEncryptionSecretUrl <String>] [-KeyEncryptionKeyUrl <String>]
  [-KeyEncryptionVaultId <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
+ [-RecoveryAvailabilityZone <String>]
+ [-PlatformFaultDomain <Integer>]
  [<CommonParameters>]
 ```
 
@@ -91,6 +93,8 @@ Update-AzRecoveryServicesAsrProtectionDirection [-AzureToAzure]
  [-RecoveryCapacityReservationGroupId <String>] [-RecoveryBootDiagStorageAccountId <String>]
  [-DiskEncryptionVaultId <String>] [-DiskEncryptionSecretUrl <String>] [-KeyEncryptionKeyUrl <String>]
  [-KeyEncryptionVaultId <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
+ [-RecoveryAvailabilityZone <String>]
+ [-PlatformFaultDomain <Integer>]
  [<CommonParameters>]
 ```
 
@@ -463,6 +467,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PlatformFaultDomain
+Specify the platform fault domain to used by the failover Vm in target recovery region.
+
+```yaml
+Type: System.int32
+Parameter Sets: AzureToAzure, AzureToAzureWithoutDiskDetails
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ProcessServer
 Process Server to be used for replication.
 
@@ -508,6 +527,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -RecoveryAvailabilityZone
+Specify the availability zone to used by the failover Vm in target recovery region.
+
+```yaml
+Type: System.String
+Parameter Sets: AzureToAzure, AzureToAzureWithoutDiskDetails
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -RecoveryAzureStorageAccountId
 Specifies the ID of the Azure storage account to replicate to.