Merge pull request #10875 from AsrOneSdk/pubhatt/tfoSettingsAndRename

Azure Site Recovery - Adding optional parameters to enable resource renaming and Test failover networking configuration.

Author: isra-fel

src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.0.4-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.0.5-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/RecoveryServices/RecoveryServices.SiteRecovery/DiskReplicationConfiguration/AzureRmAsrAzureToAzureDiskReplicationConfig.cs

@@ -133,6 +133,20 @@ public class AzureRmAsrAzureToAzureDiskReplicationConfig : SiteRecoveryCmdletBas
         [ValidateNotNullOrEmpty]
         public string KeyEncryptionVaultId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the failover disk name.
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.AzureToAzureManagedDisk, Mandatory = false)]
+        [ValidateNotNullOrEmpty]
+        public string FailoverDiskName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the test failover disk name.
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.AzureToAzureManagedDisk, Mandatory = false)]
+        [ValidateNotNullOrEmpty]
+        public string TfoDiskName { get; set; }
+
         #endregion Parameters
 
         /// <summary>
@@ -172,7 +186,9 @@ public override void ExecuteSiteRecoveryCmdlet()
                             DiskEncryptionVaultId = this.DiskEncryptionVaultId,
                             KeyEncryptionKeyUrl = this.KeyEncryptionKeyUrl,
                             KeyEncryptionVaultId = this.KeyEncryptionVaultId,
-                            RecoveryDiskEncryptionSetId = this.RecoveryDiskEncryptionSetId
+                            RecoveryDiskEncryptionSetId = this.RecoveryDiskEncryptionSetId,
+                            FailoverDiskName = this.FailoverDiskName,
+                            TfoDiskName = this.TfoDiskName
                         };
                         break;
                 }

src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSObjects.cs

@@ -947,6 +947,11 @@ public ASRVMNicDetails(
             this.RecoveryNetworkSecurityGroupId = vMNicDetails.RecoveryNetworkSecurityGroupId;
             this.RecoveryLBBackendAddressPoolId =
                 vMNicDetails.RecoveryLBBackendAddressPoolIds?.ToList() ?? new List<string>();
+            this.TfoVMNetworkId = vMNicDetails.TfoVMNetworkId;
+            this.TfoVMSubnetName = vMNicDetails.TfoVMSubnetName;
+            this.TfoNetworkSecurityGroupId = vMNicDetails.TfoNetworkSecurityGroupId;
+            this.TfoIPConfigs = vMNicDetails.TfoIPConfigs?.ToList() ?? new List<IPConfig>();
+            this.EnableAcceleratedNetworkingOnTfo = vMNicDetails.EnableAcceleratedNetworkingOnTfo;
         }
 
         //
@@ -1028,6 +1033,31 @@ public ASRVMNicDetails(
         ///     Gets or sets the target backend address pools for the NIC.
         /// </summary>
         public List<string> RecoveryLBBackendAddressPoolId { get; set; }
+
+        /// <summary>
+        ///     Gets or sets test failover network Id.
+        /// </summary>
+        public string TfoVMNetworkId { get; set; }
+
+        /// <summary>
+        ///     Gets or sets test failover subnet name.
+        /// </summary>
+        public string TfoVMSubnetName { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the id of the NSG associated with the test failover NIC.
+        /// </summary>
+        public string TfoNetworkSecurityGroupId { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the IP configuration details for test failover NIC.
+        /// </summary>
+        public List<IPConfig> TfoIPConfigs { get; set; }
+
+        //
+        // Summary:
+        //     Gets or sets whether accelerated networking is enabled on test failover NIC.
+        public bool? EnableAcceleratedNetworkingOnTfo { get; set; }
     }
 
     /// <summary>
@@ -1422,8 +1452,10 @@ public ASRReplicationProtectedItem(
                 var a2aProviderSpecificDetails = (A2AReplicationDetails)rpi.Properties.ProviderSpecificDetails;
 
                 this.RecoveryAzureVMName = a2aProviderSpecificDetails.RecoveryAzureVMName;
+                this.TfoAzureVMName = a2aProviderSpecificDetails.TfoAzureVMName;
                 this.RecoveryAzureVMSize = a2aProviderSpecificDetails.RecoveryAzureVMSize;
                 this.SelectedRecoveryAzureNetworkId = a2aProviderSpecificDetails.SelectedRecoveryAzureNetworkId;
+                this.SelectedTfoAzureNetworkId = a2aProviderSpecificDetails.SelectedTfoAzureNetworkId;
                 this.ProtectionState = a2aProviderSpecificDetails.VmProtectionState;
                 this.ProtectionStateDescription = a2aProviderSpecificDetails.VmProtectionStateDescription;
                 this.ProviderSpecificDetails = new ASRAzureToAzureSpecificRPIDetails(a2aProviderSpecificDetails);
@@ -1610,6 +1642,16 @@ public ASRReplicationProtectedItem(
         ///     Gets or sets type of the Protection entity.
         /// </summary>
         public string Type { get; set; }
+
+        /// <summary>
+        ///     Gets or sets name of the test failover virtual machine.
+        /// </summary>
+        public string TfoAzureVMName { get; set; }
+
+        /// <summary>
+        ///     Gets or sets Id of the test failover virtual network.
+        /// </summary>
+        public string SelectedTfoAzureNetworkId { get; set; }
     }
 
     /// <summary>
@@ -2281,23 +2323,17 @@ public class AsrVolume
     }
 
     /// <summary>
-    ///     Partial details of a NIC of a VM.
+    ///     Partial ASR details of a NIC.
     /// </summary>
     [DataContract(Namespace = "http://schemas.microsoft.com/windowsazure")]
-    public class VMNic
+    public class ASRVMNicConfig
     {
         /// <summary>
         ///     Gets or sets ID of the NIC.
         /// </summary>
         [DataMember]
         public string NicId { get; set; }
 
-        /// <summary>
-        ///     Gets or sets the static IP address of the replica NIC.
-        /// </summary>
-        [DataMember]
-        public string RecoveryNicStaticIPAddress { get; set; }
-
         /// <summary>
         ///     Gets or sets Id of the recovery VM Network.
         /// </summary>
@@ -2311,16 +2347,52 @@ public class VMNic
         public string RecoveryVMSubnetName { get; set; }
 
         /// <summary>
-        ///     Gets or sets Name of the VM network.
+        ///     Gets or sets the id of the NSG associated with the recovery NIC.
         /// </summary>
         [DataMember]
-        public string VMNetworkName { get; set; }
+        public string RecoveryNetworkSecurityGroupId { get; set; }
 
         /// <summary>
-        ///     Gets or sets Name of the VM subnet.
+        ///     Gets or sets the IP configuration details for the recovery NIC.
         /// </summary>
         [DataMember]
-        public string VMSubnetName { get; set; }
+        public List<IPConfig> RecoveryIPConfigs { get; set; }
+
+        /// <summary>
+        ///     Gets or sets whether the recovery NIC has accelerated networking enabled.
+        /// </summary>
+        [DataMember]
+        public bool EnableAcceleratedNetworkingOnRecovery { get; set; }
+
+        /// <summary>
+        ///     Gets or sets Id of the test failover VM Network.
+        /// </summary>
+        [DataMember]
+        public string TfoVMNetworkId { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the name of the test failover VM subnet.
+        /// </summary>
+        [DataMember]
+        public string TfoVMSubnetName { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the id of the NSG associated with the test failover NIC.
+        /// </summary>
+        [DataMember]
+        public string TfoNetworkSecurityGroupId { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the IP configuration details for the test failover NIC.
+        /// </summary>
+        [DataMember]
+        public List<IPConfig> TfoIPConfigs { get; set; }
+
+        /// <summary>
+        ///     Gets or sets whether the test failover NIC has accelerated networking enabled.
+        /// </summary>
+        [DataMember]
+        public bool EnableAcceleratedNetworkingOnTfo { get; set; }
     }
 
     /// <summary>
@@ -2450,6 +2522,16 @@ public ASRAzuretoAzureDiskReplicationConfig()
         /// Gets or sets KeyEncryptionVaultId.
         /// </summary>
         public string KeyEncryptionVaultId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the failover disk name.
+        /// </summary>
+        public string FailoverDiskName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the test failover disk name.
+        /// </summary>
+        public string TfoDiskName { get; set; }
     }
 
     /// <summary>
@@ -2522,6 +2604,8 @@ public ASRAzureToAzureProtectedDiskDetails(A2AProtectedManagedDiskDetails disk)
             this.KekKeyVaultArmId = disk.KekKeyVaultArmId;
             this.KeyIdentifier = disk.KeyIdentifier;
             this.RecoveryDiskEncryptionSetId = disk.RecoveryDiskEncryptionSetId;
+            this.FailoverDiskName = disk.FailoverDiskName;
+            this.TfoDiskName = disk.TfoDiskName;
         }
 
         /// <summary>
@@ -2657,6 +2741,16 @@ public ASRAzureToAzureProtectedDiskDetails(A2AProtectedManagedDiskDetails disk)
         /// Gets or sets the data pending at source virtual machine in MB.
         /// </summary>
         public double? DataPendingAtSourceAgentInMB { get; set; }
+
+        /// <summary>
+        /// Gets or sets the failover disk name. 
+        /// </summary>
+        public string FailoverDiskName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the test failover disk name. 
+        /// </summary>
+        public string TfoDiskName { get; set; }
     }
 
     /// <summary>