diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IRecoveryPointsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IRecoveryPointsOperations.cs
index be42896c0d22..0a7be56ab715 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IRecoveryPointsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IRecoveryPointsOperations.cs
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
     public partial interface IRecoveryPointsOperations
     {
         /// <summary>
-        /// Gets the list of recovery points for a replication protected item.
+        /// Get recovery points for a replication protected item.
         /// </summary>
         /// <remarks>
         /// Lists the available recovery points for a replication protected
@@ -37,7 +37,7 @@ public partial interface IRecoveryPointsOperations
         /// The protection container name.
         /// </param>
         /// <param name='replicatedProtectedItemName'>
-        /// The replication protected item name.
+        /// The replication protected item's name.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -56,7 +56,7 @@ public partial interface IRecoveryPointsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<RecoveryPoint>>> ListByReplicationProtectedItemsWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets a recovery point.
+        /// Get a recovery point.
         /// </summary>
         /// <remarks>
         /// Get the details of specified recovery point.
@@ -68,7 +68,7 @@ public partial interface IRecoveryPointsOperations
         /// The protection container name.
         /// </param>
         /// <param name='replicatedProtectedItemName'>
-        /// The replication protected item name.
+        /// The replication protected item's name.
         /// </param>
         /// <param name='recoveryPointName'>
         /// The recovery point name.
@@ -90,7 +90,7 @@ public partial interface IRecoveryPointsOperations
         /// </exception>
         Task<AzureOperationResponse<RecoveryPoint>> GetWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, string recoveryPointName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets the list of recovery points for a replication protected item.
+        /// Get recovery points for a replication protected item.
         /// </summary>
         /// <remarks>
         /// Lists the available recovery points for a replication protected
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationFabricsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationFabricsOperations.cs
index 93e7890c23c0..3e2da5975552 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationFabricsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationFabricsOperations.cs
@@ -12,7 +12,6 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
-    using Microsoft.Rest.Azure.OData;
     using Models;
     using System.Collections;
     using System.Collections.Generic;
@@ -25,7 +24,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
     public partial interface IReplicationFabricsOperations
     {
         /// <summary>
-        /// Gets the list of ASR fabrics.
+        /// Gets the list of ASR fabrics
         /// </summary>
         /// <remarks>
         /// Gets a list of the Azure Site Recovery fabrics in the vault.
@@ -55,9 +54,6 @@ public partial interface IReplicationFabricsOperations
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='odataQuery'>
-        /// OData parameters to apply to the operation.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -73,13 +69,13 @@ public partial interface IReplicationFabricsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<Fabric>> GetWithHttpMessagesAsync(string fabricName, ODataQuery<FabricQueryParameter> odataQuery = default(ODataQuery<FabricQueryParameter>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Fabric>> GetWithHttpMessagesAsync(string fabricName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Creates an Azure Site Recovery fabric.
         /// </summary>
         /// <remarks>
         /// The operation to create an Azure Site Recovery fabric (for e.g.
-        /// Hyper-V site).
+        /// Hyper-V site)
         /// </remarks>
         /// <param name='fabricName'>
         /// Name of the ASR fabric.
@@ -208,7 +204,7 @@ public partial interface IReplicationFabricsOperations
         /// The operation to delete or remove an Azure Site Recovery fabric.
         /// </remarks>
         /// <param name='fabricName'>
-        /// ASR fabric to delete.
+        /// ASR fabric to delete
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -256,7 +252,7 @@ public partial interface IReplicationFabricsOperations
         /// </summary>
         /// <remarks>
         /// The operation to create an Azure Site Recovery fabric (for e.g.
-        /// Hyper-V site).
+        /// Hyper-V site)
         /// </remarks>
         /// <param name='fabricName'>
         /// Name of the ASR fabric.
@@ -385,7 +381,7 @@ public partial interface IReplicationFabricsOperations
         /// The operation to delete or remove an Azure Site Recovery fabric.
         /// </remarks>
         /// <param name='fabricName'>
-        /// ASR fabric to delete.
+        /// ASR fabric to delete
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -429,7 +425,7 @@ public partial interface IReplicationFabricsOperations
         /// </exception>
         Task<AzureOperationResponse<Fabric>> BeginRenewCertificateWithHttpMessagesAsync(string fabricName, RenewCertificateInput renewCertificate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets the list of ASR fabrics.
+        /// Gets the list of ASR fabrics
         /// </summary>
         /// <remarks>
         /// Gets a list of the Azure Site Recovery fabrics in the vault.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationJobsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationJobsOperations.cs
index ba0c3ad02473..cf37e77d059e 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationJobsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationJobsOperations.cs
@@ -56,7 +56,7 @@ public partial interface IReplicationJobsOperations
         /// Get the details of an Azure Site Recovery job.
         /// </remarks>
         /// <param name='jobName'>
-        /// Job identifier.
+        /// Job identifier
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -128,7 +128,7 @@ public partial interface IReplicationJobsOperations
         /// Resumes the specified job.
         /// </summary>
         /// <remarks>
-        /// The operation to resume an Azure Site Recovery job.
+        /// The operation to resume an Azure Site Recovery job
         /// </remarks>
         /// <param name='jobName'>
         /// Job identifier.
@@ -232,7 +232,7 @@ public partial interface IReplicationJobsOperations
         /// Resumes the specified job.
         /// </summary>
         /// <remarks>
-        /// The operation to resume an Azure Site Recovery job.
+        /// The operation to resume an Azure Site Recovery job
         /// </remarks>
         /// <param name='jobName'>
         /// Job identifier.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationLogicalNetworksOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationLogicalNetworksOperations.cs
index b3e43325a496..66550876136b 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationLogicalNetworksOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationLogicalNetworksOperations.cs
@@ -27,7 +27,7 @@ public partial interface IReplicationLogicalNetworksOperations
         /// Gets the list of logical networks under a fabric.
         /// </summary>
         /// <remarks>
-        /// Lists all the logical networks of the Azure Site Recovery fabric.
+        /// Lists all the logical networks of the Azure Site Recovery fabric
         /// </remarks>
         /// <param name='fabricName'>
         /// Server Id.
@@ -81,7 +81,7 @@ public partial interface IReplicationLogicalNetworksOperations
         /// Gets the list of logical networks under a fabric.
         /// </summary>
         /// <remarks>
-        /// Lists all the logical networks of the Azure Site Recovery fabric.
+        /// Lists all the logical networks of the Azure Site Recovery fabric
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationMigrationItemsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationMigrationItemsOperations.cs
index 5a6bb86e7d90..f4378a19f71b 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationMigrationItemsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationMigrationItemsOperations.cs
@@ -36,15 +36,6 @@ public partial interface IReplicationMigrationItemsOperations
         /// <param name='protectionContainerName'>
         /// Protection container name.
         /// </param>
-        /// <param name='odataQuery'>
-        /// OData parameters to apply to the operation.
-        /// </param>
-        /// <param name='skipToken'>
-        /// The pagination token.
-        /// </param>
-        /// <param name='takeToken'>
-        /// The page size.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -60,7 +51,7 @@ public partial interface IReplicationMigrationItemsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<MigrationItem>>> ListByReplicationProtectionContainersWithHttpMessagesAsync(string fabricName, string protectionContainerName, ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), string takeToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<MigrationItem>>> ListByReplicationProtectionContainersWithHttpMessagesAsync(string fabricName, string protectionContainerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets the details of a migration item.
         /// </summary>
@@ -224,41 +215,6 @@ public partial interface IReplicationMigrationItemsOperations
         /// </exception>
         Task<AzureOperationResponse<MigrationItem>> MigrateWithHttpMessagesAsync(string fabricName, string protectionContainerName, string migrationItemName, MigrateInput migrateInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Resynchronizes replication.
-        /// </summary>
-        /// <remarks>
-        /// The operation to resynchronize replication of an ASR migration
-        /// item.
-        /// </remarks>
-        /// <param name='fabricName'>
-        /// Fabric name.
-        /// </param>
-        /// <param name='protectionContainerName'>
-        /// Protection container name.
-        /// </param>
-        /// <param name='migrationItemName'>
-        /// Migration item name.
-        /// </param>
-        /// <param name='input'>
-        /// Resync input.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<MigrationItem>> ResyncWithHttpMessagesAsync(string fabricName, string protectionContainerName, string migrationItemName, ResyncInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Test migrate item.
         /// </summary>
         /// <remarks>
@@ -335,9 +291,6 @@ public partial interface IReplicationMigrationItemsOperations
         /// <param name='skipToken'>
         /// The pagination token.
         /// </param>
-        /// <param name='takeToken'>
-        /// The page size.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -353,7 +306,7 @@ public partial interface IReplicationMigrationItemsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<MigrationItem>>> ListWithHttpMessagesAsync(ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), string takeToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<MigrationItem>>> ListWithHttpMessagesAsync(ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Enables migration.
         /// </summary>
@@ -489,41 +442,6 @@ public partial interface IReplicationMigrationItemsOperations
         /// </exception>
         Task<AzureOperationResponse<MigrationItem>> BeginMigrateWithHttpMessagesAsync(string fabricName, string protectionContainerName, string migrationItemName, MigrateInput migrateInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Resynchronizes replication.
-        /// </summary>
-        /// <remarks>
-        /// The operation to resynchronize replication of an ASR migration
-        /// item.
-        /// </remarks>
-        /// <param name='fabricName'>
-        /// Fabric name.
-        /// </param>
-        /// <param name='protectionContainerName'>
-        /// Protection container name.
-        /// </param>
-        /// <param name='migrationItemName'>
-        /// Migration item name.
-        /// </param>
-        /// <param name='input'>
-        /// Resync input.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<MigrationItem>> BeginResyncWithHttpMessagesAsync(string fabricName, string protectionContainerName, string migrationItemName, ResyncInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Test migrate item.
         /// </summary>
         /// <remarks>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationNetworkMappingsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationNetworkMappingsOperations.cs
index a3fbae4e2caa..47f696e21ce9 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationNetworkMappingsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationNetworkMappingsOperations.cs
@@ -55,7 +55,7 @@ public partial interface IReplicationNetworkMappingsOperations
         /// Gets network mapping by name.
         /// </summary>
         /// <remarks>
-        /// Gets the details of an ASR network mapping.
+        /// Gets the details of an ASR network mapping
         /// </remarks>
         /// <param name='fabricName'>
         /// Primary fabric name.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationNetworksOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationNetworksOperations.cs
index 4d3b1d05978d..fbe4773a1bbe 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationNetworksOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationNetworksOperations.cs
@@ -30,7 +30,7 @@ public partial interface IReplicationNetworksOperations
         /// Lists the networks available for a fabric.
         /// </remarks>
         /// <param name='fabricName'>
-        /// Fabric name.
+        /// Fabric name
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -80,7 +80,7 @@ public partial interface IReplicationNetworksOperations
         /// Gets the list of networks. View-only API.
         /// </summary>
         /// <remarks>
-        /// Lists the networks available in a vault.
+        /// Lists the networks available in a vault
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -127,7 +127,7 @@ public partial interface IReplicationNetworksOperations
         /// Gets the list of networks. View-only API.
         /// </summary>
         /// <remarks>
-        /// Lists the networks available in a vault.
+        /// Lists the networks available in a vault
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationPoliciesOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationPoliciesOperations.cs
index a434a03034da..7433ff25f6f2 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationPoliciesOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationPoliciesOperations.cs
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
     public partial interface IReplicationPoliciesOperations
     {
         /// <summary>
-        /// Gets the list of replication policies.
+        /// Gets the list of replication policies
         /// </summary>
         /// <remarks>
         /// Lists the replication policies for a vault.
@@ -74,13 +74,13 @@ public partial interface IReplicationPoliciesOperations
         /// Creates the policy.
         /// </summary>
         /// <remarks>
-        /// The operation to create a replication policy.
+        /// The operation to create a replication policy
         /// </remarks>
         /// <param name='policyName'>
-        /// Replication policy name.
+        /// Replication policy name
         /// </param>
         /// <param name='input'>
-        /// Create policy input.
+        /// Create policy input
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -130,7 +130,7 @@ public partial interface IReplicationPoliciesOperations
         /// Policy Id.
         /// </param>
         /// <param name='input'>
-        /// Update Policy Input.
+        /// Update Policy Input
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -152,13 +152,13 @@ public partial interface IReplicationPoliciesOperations
         /// Creates the policy.
         /// </summary>
         /// <remarks>
-        /// The operation to create a replication policy.
+        /// The operation to create a replication policy
         /// </remarks>
         /// <param name='policyName'>
-        /// Replication policy name.
+        /// Replication policy name
         /// </param>
         /// <param name='input'>
-        /// Create policy input.
+        /// Create policy input
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -208,7 +208,7 @@ public partial interface IReplicationPoliciesOperations
         /// Policy Id.
         /// </param>
         /// <param name='input'>
-        /// Update Policy Input.
+        /// Update Policy Input
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -227,7 +227,7 @@ public partial interface IReplicationPoliciesOperations
         /// </exception>
         Task<AzureOperationResponse<Policy>> BeginUpdateWithHttpMessagesAsync(string policyName, UpdatePolicyInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets the list of replication policies.
+        /// Gets the list of replication policies
         /// </summary>
         /// <remarks>
         /// Lists the replication policies for a vault.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectableItemsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectableItemsOperations.cs
index c3d1f02a9257..6afea5879b22 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectableItemsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectableItemsOperations.cs
@@ -39,12 +39,6 @@ public partial interface IReplicationProtectableItemsOperations
         /// <param name='odataQuery'>
         /// OData parameters to apply to the operation.
         /// </param>
-        /// <param name='take'>
-        /// take OData query parameter.
-        /// </param>
-        /// <param name='skipToken'>
-        /// skipToken OData query parameter.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -60,7 +54,7 @@ public partial interface IReplicationProtectableItemsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ProtectableItem>>> ListByReplicationProtectionContainersWithHttpMessagesAsync(string fabricName, string protectionContainerName, ODataQuery<ProtectableItemQueryParameter> odataQuery = default(ODataQuery<ProtectableItemQueryParameter>), string take = default(string), string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProtectableItem>>> ListByReplicationProtectionContainersWithHttpMessagesAsync(string fabricName, string protectionContainerName, ODataQuery<ProtectableItemQueryParameter> odataQuery = default(ODataQuery<ProtectableItemQueryParameter>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets the details of a protectable item.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectedItemsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectedItemsOperations.cs
index 40238e79fe92..cae8f52a553e 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectedItemsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectedItemsOperations.cs
@@ -151,7 +151,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse> PurgeWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Updates the replication protected item settings.
+        /// Updates protection.
         /// </summary>
         /// <remarks>
         /// The operation to update the recovery settings of an ASR replication
@@ -233,7 +233,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// The protection container name.
         /// </param>
         /// <param name='replicatedProtectedItemName'>
-        /// The replicated protected item name.
+        /// The replicated protected item's name.
         /// </param>
         /// <param name='applyRecoveryPointInput'>
         /// The ApplyRecoveryPointInput.
@@ -255,38 +255,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> ApplyRecoveryPointWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ApplyRecoveryPointInput applyRecoveryPointInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute cancel failover.
-        /// </summary>
-        /// <remarks>
-        /// Operation to cancel the failover of the replication protected item.
-        /// </remarks>
-        /// <param name='fabricName'>
-        /// Unique fabric name.
-        /// </param>
-        /// <param name='protectionContainerName'>
-        /// Protection container name.
-        /// </param>
-        /// <param name='replicatedProtectedItemName'>
-        /// Replication protected item name.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<ReplicationProtectedItem>> FailoverCancelWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Execute commit failover.
+        /// Execute commit failover
         /// </summary>
         /// <remarks>
         /// Operation to commit the failover of the replication protected item.
@@ -317,7 +286,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> FailoverCommitWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute planned failover.
+        /// Execute planned failover
         /// </summary>
         /// <remarks>
         /// Operation to initiate a planned failover of the replication
@@ -333,7 +302,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// Replication protected item name.
         /// </param>
         /// <param name='failoverInput'>
-        /// Planned failover input.
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -450,7 +419,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> RepairReplicationWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute Reverse Replication\Reprotect.
+        /// Execute Reverse Replication\Reprotect
         /// </summary>
         /// <remarks>
         /// Operation to reprotect or reverse replicate a failed over
@@ -465,8 +434,8 @@ public partial interface IReplicationProtectedItemsOperations
         /// <param name='replicatedProtectedItemName'>
         /// Replication protected item name.
         /// </param>
-        /// <param name='reprotectInput'>
-        /// Reverse replication input.
+        /// <param name='rrInput'>
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -483,7 +452,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ReplicationProtectedItem>> ReprotectWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput reprotectInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ReplicationProtectedItem>> ReprotectWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput rrInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Resolve health errors.
         /// </summary>
@@ -520,7 +489,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> ResolveHealthErrorsWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ResolveHealthInput resolveHealthInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute test failover.
+        /// Execute test failover
         /// </summary>
         /// <remarks>
         /// Operation to perform a test failover of the replication protected
@@ -535,7 +504,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// <param name='replicatedProtectedItemName'>
         /// Replication protected item name.
         /// </param>
-        /// <param name='testfailoverInput'>
+        /// <param name='failoverInput'>
         /// Test failover input.
         /// </param>
         /// <param name='customHeaders'>
@@ -553,7 +522,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ReplicationProtectedItem>> TestFailoverWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput testfailoverInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ReplicationProtectedItem>> TestFailoverWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput failoverInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Execute test failover cleanup.
         /// </summary>
@@ -590,7 +559,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> TestFailoverCleanupWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverCleanupInput cleanupInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute unplanned failover.
+        /// Execute unplanned failover
         /// </summary>
         /// <remarks>
         /// Operation to initiate a failover of the replication protected item.
@@ -605,7 +574,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// Replication protected item name.
         /// </param>
         /// <param name='failoverInput'>
-        /// Failover input.
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -670,7 +639,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </param>
         /// <param name='skipToken'>
         /// The pagination token. Possible values: "FabricId" or
-        /// "FabricId_CloudId" or null.
+        /// "FabricId_CloudId" or null
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -755,7 +724,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse> BeginPurgeWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Updates the replication protected item settings.
+        /// Updates protection.
         /// </summary>
         /// <remarks>
         /// The operation to update the recovery settings of an ASR replication
@@ -837,7 +806,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// The protection container name.
         /// </param>
         /// <param name='replicatedProtectedItemName'>
-        /// The replicated protected item name.
+        /// The replicated protected item's name.
         /// </param>
         /// <param name='applyRecoveryPointInput'>
         /// The ApplyRecoveryPointInput.
@@ -859,38 +828,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> BeginApplyRecoveryPointWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ApplyRecoveryPointInput applyRecoveryPointInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute cancel failover.
-        /// </summary>
-        /// <remarks>
-        /// Operation to cancel the failover of the replication protected item.
-        /// </remarks>
-        /// <param name='fabricName'>
-        /// Unique fabric name.
-        /// </param>
-        /// <param name='protectionContainerName'>
-        /// Protection container name.
-        /// </param>
-        /// <param name='replicatedProtectedItemName'>
-        /// Replication protected item name.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<ReplicationProtectedItem>> BeginFailoverCancelWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Execute commit failover.
+        /// Execute commit failover
         /// </summary>
         /// <remarks>
         /// Operation to commit the failover of the replication protected item.
@@ -921,7 +859,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> BeginFailoverCommitWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute planned failover.
+        /// Execute planned failover
         /// </summary>
         /// <remarks>
         /// Operation to initiate a planned failover of the replication
@@ -937,7 +875,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// Replication protected item name.
         /// </param>
         /// <param name='failoverInput'>
-        /// Planned failover input.
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -1054,7 +992,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> BeginRepairReplicationWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute Reverse Replication\Reprotect.
+        /// Execute Reverse Replication\Reprotect
         /// </summary>
         /// <remarks>
         /// Operation to reprotect or reverse replicate a failed over
@@ -1069,8 +1007,8 @@ public partial interface IReplicationProtectedItemsOperations
         /// <param name='replicatedProtectedItemName'>
         /// Replication protected item name.
         /// </param>
-        /// <param name='reprotectInput'>
-        /// Reverse replication input.
+        /// <param name='rrInput'>
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -1087,7 +1025,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ReplicationProtectedItem>> BeginReprotectWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput reprotectInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ReplicationProtectedItem>> BeginReprotectWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput rrInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Resolve health errors.
         /// </summary>
@@ -1124,7 +1062,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> BeginResolveHealthErrorsWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ResolveHealthInput resolveHealthInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute test failover.
+        /// Execute test failover
         /// </summary>
         /// <remarks>
         /// Operation to perform a test failover of the replication protected
@@ -1139,7 +1077,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// <param name='replicatedProtectedItemName'>
         /// Replication protected item name.
         /// </param>
-        /// <param name='testfailoverInput'>
+        /// <param name='failoverInput'>
         /// Test failover input.
         /// </param>
         /// <param name='customHeaders'>
@@ -1157,7 +1095,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ReplicationProtectedItem>> BeginTestFailoverWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput testfailoverInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ReplicationProtectedItem>> BeginTestFailoverWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput failoverInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Execute test failover cleanup.
         /// </summary>
@@ -1194,7 +1132,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// </exception>
         Task<AzureOperationResponse<ReplicationProtectedItem>> BeginTestFailoverCleanupWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverCleanupInput cleanupInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute unplanned failover.
+        /// Execute unplanned failover
         /// </summary>
         /// <remarks>
         /// Operation to initiate a failover of the replication protected item.
@@ -1209,7 +1147,7 @@ public partial interface IReplicationProtectedItemsOperations
         /// Replication protected item name.
         /// </param>
         /// <param name='failoverInput'>
-        /// Failover input.
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionContainerMappingsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionContainerMappingsOperations.cs
index e3953baf00ec..bd9b10550cae 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionContainerMappingsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionContainerMappingsOperations.cs
@@ -53,7 +53,7 @@ public partial interface IReplicationProtectionContainerMappingsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ProtectionContainerMapping>>> ListByReplicationProtectionContainersWithHttpMessagesAsync(string fabricName, string protectionContainerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets a protection container mapping.
+        /// Gets a protection container mapping/
         /// </summary>
         /// <remarks>
         /// Gets the details of a protection container mapping.
@@ -121,8 +121,7 @@ public partial interface IReplicationProtectionContainerMappingsOperations
         /// Purge protection container mapping.
         /// </summary>
         /// <remarks>
-        /// The operation to purge(force delete) a protection container
-        /// mapping.
+        /// The operation to purge(force delete) a protection container mapping
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
@@ -271,8 +270,7 @@ public partial interface IReplicationProtectionContainerMappingsOperations
         /// Purge protection container mapping.
         /// </summary>
         /// <remarks>
-        /// The operation to purge(force delete) a protection container
-        /// mapping.
+        /// The operation to purge(force delete) a protection container mapping
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionContainersOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionContainersOperations.cs
index d1161aedf309..c41da22e4dd0 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionContainersOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionContainersOperations.cs
@@ -112,7 +112,7 @@ public partial interface IReplicationProtectionContainersOperations
         /// </summary>
         /// <remarks>
         /// The operation to a add a protectable item to a protection
-        /// container(Add physical server).
+        /// container(Add physical server.)
         /// </remarks>
         /// <param name='fabricName'>
         /// The name of the fabric.
@@ -255,7 +255,7 @@ public partial interface IReplicationProtectionContainersOperations
         /// </summary>
         /// <remarks>
         /// The operation to a add a protectable item to a protection
-        /// container(Add physical server).
+        /// container(Add physical server.)
         /// </remarks>
         /// <param name='fabricName'>
         /// The name of the fabric.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionIntentsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionIntentsOperations.cs
index 9ba188e1d974..a6641317ab29 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionIntentsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationProtectionIntentsOperations.cs
@@ -30,12 +30,6 @@ public partial interface IReplicationProtectionIntentsOperations
         /// Gets the list of ASR replication protection intent objects in the
         /// vault.
         /// </remarks>
-        /// <param name='skipToken'>
-        /// The pagination token.
-        /// </param>
-        /// <param name='takeToken'>
-        /// The page size.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -51,7 +45,7 @@ public partial interface IReplicationProtectionIntentsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ReplicationProtectionIntent>>> ListWithHttpMessagesAsync(string skipToken = default(string), string takeToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ReplicationProtectionIntent>>> ListWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets the details of a Replication protection intent item.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationRecoveryPlansOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationRecoveryPlansOperations.cs
index b8efc1feaad1..a6f740db6a3b 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationRecoveryPlansOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationRecoveryPlansOperations.cs
@@ -130,7 +130,7 @@ public partial interface IReplicationRecoveryPlansOperations
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Update recovery plan input.
+        /// Update recovery plan input
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -149,35 +149,10 @@ public partial interface IReplicationRecoveryPlansOperations
         /// </exception>
         Task<AzureOperationResponse<RecoveryPlan>> UpdateWithHttpMessagesAsync(string recoveryPlanName, UpdateRecoveryPlanInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute cancel failover of the recovery plan.
-        /// </summary>
-        /// <remarks>
-        /// The operation to cancel the failover of a recovery plan.
-        /// </remarks>
-        /// <param name='recoveryPlanName'>
-        /// Recovery plan name.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<RecoveryPlan>> FailoverCancelWithHttpMessagesAsync(string recoveryPlanName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Execute commit failover of the recovery plan.
         /// </summary>
         /// <remarks>
-        /// The operation to commit the failover of a recovery plan.
+        /// The operation to commit the fail over of a recovery plan.
         /// </remarks>
         /// <param name='recoveryPlanName'>
         /// Recovery plan name.
@@ -261,7 +236,7 @@ public partial interface IReplicationRecoveryPlansOperations
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan test failover input.
+        /// Failover input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -289,7 +264,7 @@ public partial interface IReplicationRecoveryPlansOperations
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan test failover cleanup input.
+        /// Test failover cleanup input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -311,13 +286,13 @@ public partial interface IReplicationRecoveryPlansOperations
         /// Execute unplanned failover of the recovery plan.
         /// </summary>
         /// <remarks>
-        /// The operation to start the unplanned failover of a recovery plan.
+        /// The operation to start the failover of a recovery plan.
         /// </remarks>
         /// <param name='recoveryPlanName'>
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan unplanned failover input.
+        /// Failover input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -395,7 +370,7 @@ public partial interface IReplicationRecoveryPlansOperations
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Update recovery plan input.
+        /// Update recovery plan input
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -414,35 +389,10 @@ public partial interface IReplicationRecoveryPlansOperations
         /// </exception>
         Task<AzureOperationResponse<RecoveryPlan>> BeginUpdateWithHttpMessagesAsync(string recoveryPlanName, UpdateRecoveryPlanInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Execute cancel failover of the recovery plan.
-        /// </summary>
-        /// <remarks>
-        /// The operation to cancel the failover of a recovery plan.
-        /// </remarks>
-        /// <param name='recoveryPlanName'>
-        /// Recovery plan name.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<RecoveryPlan>> BeginFailoverCancelWithHttpMessagesAsync(string recoveryPlanName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Execute commit failover of the recovery plan.
         /// </summary>
         /// <remarks>
-        /// The operation to commit the failover of a recovery plan.
+        /// The operation to commit the fail over of a recovery plan.
         /// </remarks>
         /// <param name='recoveryPlanName'>
         /// Recovery plan name.
@@ -526,7 +476,7 @@ public partial interface IReplicationRecoveryPlansOperations
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan test failover input.
+        /// Failover input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -554,7 +504,7 @@ public partial interface IReplicationRecoveryPlansOperations
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan test failover cleanup input.
+        /// Test failover cleanup input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -576,13 +526,13 @@ public partial interface IReplicationRecoveryPlansOperations
         /// Execute unplanned failover of the recovery plan.
         /// </summary>
         /// <remarks>
-        /// The operation to start the unplanned failover of a recovery plan.
+        /// The operation to start the failover of a recovery plan.
         /// </remarks>
         /// <param name='recoveryPlanName'>
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan unplanned failover input.
+        /// Failover input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationRecoveryServicesProvidersOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationRecoveryServicesProvidersOperations.cs
index 414b076e4b5e..4b5a376d3b21 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationRecoveryServicesProvidersOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationRecoveryServicesProvidersOperations.cs
@@ -32,7 +32,7 @@ public partial interface IReplicationRecoveryServicesProvidersOperations
         /// fabric.
         /// </remarks>
         /// <param name='fabricName'>
-        /// Fabric name.
+        /// Fabric name
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -60,7 +60,7 @@ public partial interface IReplicationRecoveryServicesProvidersOperations
         /// Fabric name.
         /// </param>
         /// <param name='providerName'>
-        /// Recovery services provider name.
+        /// Recovery services provider name
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -110,7 +110,7 @@ public partial interface IReplicationRecoveryServicesProvidersOperations
         /// </exception>
         Task<AzureOperationResponse<RecoveryServicesProvider>> CreateWithHttpMessagesAsync(string fabricName, string providerName, AddRecoveryServicesProviderInput addProviderInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Purges recovery service provider from fabric.
+        /// Purges recovery service provider from fabric
         /// </summary>
         /// <remarks>
         /// The operation to purge(force delete) a recovery services provider
@@ -173,7 +173,7 @@ public partial interface IReplicationRecoveryServicesProvidersOperations
         /// </summary>
         /// <remarks>
         /// The operation to removes/delete(unregister) a recovery services
-        /// provider from the vault.
+        /// provider from the vault
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
@@ -199,7 +199,7 @@ public partial interface IReplicationRecoveryServicesProvidersOperations
         /// vault. This is a view only api.
         /// </summary>
         /// <remarks>
-        /// Lists the registered recovery services providers in the vault.
+        /// Lists the registered recovery services providers in the vault
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -249,7 +249,7 @@ public partial interface IReplicationRecoveryServicesProvidersOperations
         /// </exception>
         Task<AzureOperationResponse<RecoveryServicesProvider>> BeginCreateWithHttpMessagesAsync(string fabricName, string providerName, AddRecoveryServicesProviderInput addProviderInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Purges recovery service provider from fabric.
+        /// Purges recovery service provider from fabric
         /// </summary>
         /// <remarks>
         /// The operation to purge(force delete) a recovery services provider
@@ -312,7 +312,7 @@ public partial interface IReplicationRecoveryServicesProvidersOperations
         /// </summary>
         /// <remarks>
         /// The operation to removes/delete(unregister) a recovery services
-        /// provider from the vault.
+        /// provider from the vault
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
@@ -365,7 +365,7 @@ public partial interface IReplicationRecoveryServicesProvidersOperations
         /// vault. This is a view only api.
         /// </summary>
         /// <remarks>
-        /// Lists the registered recovery services providers in the vault.
+        /// Lists the registered recovery services providers in the vault
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationVaultSettingOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationVaultSettingOperations.cs
index b7609aec84db..5312e4f78158 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationVaultSettingOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationVaultSettingOperations.cs
@@ -102,35 +102,6 @@ public partial interface IReplicationVaultSettingOperations
         /// </exception>
         Task<AzureOperationResponse<VaultSetting>> CreateWithHttpMessagesAsync(string vaultSettingName, VaultSettingCreationInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Updates vault setting. A vault setting object is a singleton per
-        /// vault and it is always present by default.
-        /// </summary>
-        /// <remarks>
-        /// The operation to configure vault setting.
-        /// </remarks>
-        /// <param name='vaultSettingName'>
-        /// Vault setting name.
-        /// </param>
-        /// <param name='input'>
-        /// Vault setting creation input.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<VaultSetting>> BeginCreateWithHttpMessagesAsync(string vaultSettingName, VaultSettingCreationInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Gets the list of vault setting.
         /// </summary>
         /// <remarks>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationvCentersOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationvCentersOperations.cs
index 1c473d5a0632..d9552f54967f 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationvCentersOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/IReplicationvCentersOperations.cs
@@ -53,13 +53,13 @@ public partial interface IReplicationvCentersOperations
         /// </summary>
         /// <remarks>
         /// Gets the details of a registered vCenter server(Add vCenter
-        /// server).
+        /// server.)
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -76,7 +76,7 @@ public partial interface IReplicationvCentersOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<VCenter>> GetWithHttpMessagesAsync(string fabricName, string vcenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<VCenter>> GetWithHttpMessagesAsync(string fabricName, string vCenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Add vCenter.
         /// </summary>
@@ -86,8 +86,8 @@ public partial interface IReplicationvCentersOperations
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='addVCenterRequest'>
         /// The input to the add vCenter operation.
@@ -107,9 +107,9 @@ public partial interface IReplicationvCentersOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<VCenter>> CreateWithHttpMessagesAsync(string fabricName, string vcenterName, AddVCenterRequest addVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<VCenter>> CreateWithHttpMessagesAsync(string fabricName, string vCenterName, AddVCenterRequest addVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Remove vcenter operation.
+        /// Remove vCenter operation.
         /// </summary>
         /// <remarks>
         /// The operation to remove(unregister) a registered vCenter server
@@ -118,8 +118,8 @@ public partial interface IReplicationvCentersOperations
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -133,7 +133,7 @@ public partial interface IReplicationvCentersOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse> DeleteWithHttpMessagesAsync(string fabricName, string vcenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse> DeleteWithHttpMessagesAsync(string fabricName, string vCenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Update vCenter operation.
         /// </summary>
@@ -143,8 +143,8 @@ public partial interface IReplicationvCentersOperations
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name
         /// </param>
         /// <param name='updateVCenterRequest'>
         /// The input to the update vCenter operation.
@@ -164,7 +164,7 @@ public partial interface IReplicationvCentersOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<VCenter>> UpdateWithHttpMessagesAsync(string fabricName, string vcenterName, UpdateVCenterRequest updateVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<VCenter>> UpdateWithHttpMessagesAsync(string fabricName, string vCenterName, UpdateVCenterRequest updateVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets the list of vCenter registered under the vault.
         /// </summary>
@@ -196,8 +196,8 @@ public partial interface IReplicationvCentersOperations
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='addVCenterRequest'>
         /// The input to the add vCenter operation.
@@ -217,9 +217,9 @@ public partial interface IReplicationvCentersOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<VCenter>> BeginCreateWithHttpMessagesAsync(string fabricName, string vcenterName, AddVCenterRequest addVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<VCenter>> BeginCreateWithHttpMessagesAsync(string fabricName, string vCenterName, AddVCenterRequest addVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Remove vcenter operation.
+        /// Remove vCenter operation.
         /// </summary>
         /// <remarks>
         /// The operation to remove(unregister) a registered vCenter server
@@ -228,8 +228,8 @@ public partial interface IReplicationvCentersOperations
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -243,7 +243,7 @@ public partial interface IReplicationvCentersOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse> BeginDeleteWithHttpMessagesAsync(string fabricName, string vcenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse> BeginDeleteWithHttpMessagesAsync(string fabricName, string vCenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Update vCenter operation.
         /// </summary>
@@ -253,8 +253,8 @@ public partial interface IReplicationvCentersOperations
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name
         /// </param>
         /// <param name='updateVCenterRequest'>
         /// The input to the update vCenter operation.
@@ -274,7 +274,7 @@ public partial interface IReplicationvCentersOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<VCenter>> BeginUpdateWithHttpMessagesAsync(string fabricName, string vcenterName, UpdateVCenterRequest updateVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<VCenter>> BeginUpdateWithHttpMessagesAsync(string fabricName, string vCenterName, UpdateVCenterRequest updateVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets the list of vCenter registered under a fabric.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ISiteRecoveryManagementClient.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ISiteRecoveryManagementClient.cs
index edfade7bbef0..4d4591e05625 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ISiteRecoveryManagementClient.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ISiteRecoveryManagementClient.cs
@@ -159,6 +159,11 @@ public partial interface ISiteRecoveryManagementClient : System.IDisposable
         /// </summary>
         IReplicationProtectionContainerMappingsOperations ReplicationProtectionContainerMappings { get; }
 
+        /// <summary>
+        /// Gets the IReplicationProtectionIntentsOperations.
+        /// </summary>
+        IReplicationProtectionIntentsOperations ReplicationProtectionIntents { get; }
+
         /// <summary>
         /// Gets the IReplicationRecoveryServicesProvidersOperations.
         /// </summary>
@@ -189,11 +194,6 @@ public partial interface ISiteRecoveryManagementClient : System.IDisposable
         /// </summary>
         IReplicationPoliciesOperations ReplicationPolicies { get; }
 
-        /// <summary>
-        /// Gets the IReplicationProtectionIntentsOperations.
-        /// </summary>
-        IReplicationProtectionIntentsOperations ReplicationProtectionIntents { get; }
-
         /// <summary>
         /// Gets the IReplicationRecoveryPlansOperations.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ISupportedOperatingSystemsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ISupportedOperatingSystemsOperations.cs
index 65506bd98c71..d785646ce58a 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ISupportedOperatingSystemsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ISupportedOperatingSystemsOperations.cs
@@ -24,11 +24,8 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
     public partial interface ISupportedOperatingSystemsOperations
     {
         /// <summary>
-        /// Gets the data of supported operating systems by SRS.
+        /// Gets the data of supported OSes by SRS.
         /// </summary>
-        /// <param name='instanceType'>
-        /// The instance type.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -44,6 +41,6 @@ public partial interface ISupportedOperatingSystemsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<SupportedOperatingSystems>> GetWithHttpMessagesAsync(string instanceType = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<SupportedOperatingSystems>> GetWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/MigrationRecoveryPointsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/MigrationRecoveryPointsOperations.cs
index 9a3b242620dd..6af1fea3048d 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/MigrationRecoveryPointsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/MigrationRecoveryPointsOperations.cs
@@ -128,7 +128,7 @@ internal MigrationRecoveryPointsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/migrationRecoveryPoints").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/migrationRecoveryPoints").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -351,7 +351,7 @@ internal MigrationRecoveryPointsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/migrationRecoveryPoints/{migrationRecoveryPointName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/migrationRecoveryPoints/{migrationRecoveryPointName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationApplyRecoveryPointInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationApplyRecoveryPointInput.cs
deleted file mode 100644
index 4fb0b5ba8844..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationApplyRecoveryPointInput.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// ApplyRecoveryPoint input specific to A2ACrossClusterMigration provider.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("A2ACrossClusterMigration")]
-    public partial class A2ACrossClusterMigrationApplyRecoveryPointInput : ApplyRecoveryPointProviderSpecificInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// A2ACrossClusterMigrationApplyRecoveryPointInput class.
-        /// </summary>
-        public A2ACrossClusterMigrationApplyRecoveryPointInput()
-        {
-            CustomInit();
-        }
-
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationContainerCreationInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationContainerCreationInput.cs
deleted file mode 100644
index a89c59d5a4bd..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationContainerCreationInput.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// A2ACrossClusterMigration cloud creation input.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("A2ACrossClusterMigration")]
-    public partial class A2ACrossClusterMigrationContainerCreationInput : ReplicationProviderSpecificContainerCreationInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// A2ACrossClusterMigrationContainerCreationInput class.
-        /// </summary>
-        public A2ACrossClusterMigrationContainerCreationInput()
-        {
-            CustomInit();
-        }
-
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationEnableProtectionInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationEnableProtectionInput.cs
deleted file mode 100644
index fb608a110a9e..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationEnableProtectionInput.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// A2A Cross-Cluster Migration enable protection input.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("A2ACrossClusterMigration")]
-    public partial class A2ACrossClusterMigrationEnableProtectionInput : EnableProtectionProviderSpecificInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// A2ACrossClusterMigrationEnableProtectionInput class.
-        /// </summary>
-        public A2ACrossClusterMigrationEnableProtectionInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// A2ACrossClusterMigrationEnableProtectionInput class.
-        /// </summary>
-        /// <param name="fabricObjectId">The fabric specific object Id of the
-        /// virtual machine.</param>
-        /// <param name="recoveryContainerId">The recovery container
-        /// Id.</param>
-        public A2ACrossClusterMigrationEnableProtectionInput(string fabricObjectId = default(string), string recoveryContainerId = default(string))
-        {
-            FabricObjectId = fabricObjectId;
-            RecoveryContainerId = recoveryContainerId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the fabric specific object Id of the virtual machine.
-        /// </summary>
-        [JsonProperty(PropertyName = "fabricObjectId")]
-        public string FabricObjectId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the recovery container Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryContainerId")]
-        public string RecoveryContainerId { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationPolicyCreationInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationPolicyCreationInput.cs
deleted file mode 100644
index 911c7a212b93..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationPolicyCreationInput.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// A2A Cross-Cluster Migration Policy creation input.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("A2ACrossClusterMigration")]
-    public partial class A2ACrossClusterMigrationPolicyCreationInput : PolicyProviderSpecificInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// A2ACrossClusterMigrationPolicyCreationInput class.
-        /// </summary>
-        public A2ACrossClusterMigrationPolicyCreationInput()
-        {
-            CustomInit();
-        }
-
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationReplicationDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationReplicationDetails.cs
deleted file mode 100644
index d05d6117f7ba..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ACrossClusterMigrationReplicationDetails.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// A2A provider specific settings.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("A2ACrossClusterMigration")]
-    public partial class A2ACrossClusterMigrationReplicationDetails : ReplicationProviderSpecificSettings
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// A2ACrossClusterMigrationReplicationDetails class.
-        /// </summary>
-        public A2ACrossClusterMigrationReplicationDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// A2ACrossClusterMigrationReplicationDetails class.
-        /// </summary>
-        /// <param name="fabricObjectId">The fabric specific object Id of the
-        /// virtual machine.</param>
-        /// <param name="primaryFabricLocation">Primary fabric
-        /// location.</param>
-        /// <param name="osType">The type of operating system.</param>
-        /// <param name="vmProtectionState">The protection state for the
-        /// vm.</param>
-        /// <param name="vmProtectionStateDescription">The protection state
-        /// description for the vm.</param>
-        /// <param name="lifecycleId">An id associated with the PE that
-        /// survives actions like switch protection which change the backing
-        /// PE/CPE objects internally.The lifecycle id gets carried forward to
-        /// have a link/continuity in being able to have an Id that denotes the
-        /// "same" protected item even though other internal Ids/ARM Id might
-        /// be changing.</param>
-        public A2ACrossClusterMigrationReplicationDetails(string fabricObjectId = default(string), string primaryFabricLocation = default(string), string osType = default(string), string vmProtectionState = default(string), string vmProtectionStateDescription = default(string), string lifecycleId = default(string))
-        {
-            FabricObjectId = fabricObjectId;
-            PrimaryFabricLocation = primaryFabricLocation;
-            OsType = osType;
-            VmProtectionState = vmProtectionState;
-            VmProtectionStateDescription = vmProtectionStateDescription;
-            LifecycleId = lifecycleId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the fabric specific object Id of the virtual machine.
-        /// </summary>
-        [JsonProperty(PropertyName = "fabricObjectId")]
-        public string FabricObjectId { get; set; }
-
-        /// <summary>
-        /// Gets or sets primary fabric location.
-        /// </summary>
-        [JsonProperty(PropertyName = "primaryFabricLocation")]
-        public string PrimaryFabricLocation { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of operating system.
-        /// </summary>
-        [JsonProperty(PropertyName = "osType")]
-        public string OsType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the protection state for the vm.
-        /// </summary>
-        [JsonProperty(PropertyName = "vmProtectionState")]
-        public string VmProtectionState { get; set; }
-
-        /// <summary>
-        /// Gets or sets the protection state description for the vm.
-        /// </summary>
-        [JsonProperty(PropertyName = "vmProtectionStateDescription")]
-        public string VmProtectionStateDescription { get; set; }
-
-        /// <summary>
-        /// Gets or sets an id associated with the PE that survives actions
-        /// like switch protection which change the backing PE/CPE objects
-        /// internally.The lifecycle id gets carried forward to have a
-        /// link/continuity in being able to have an Id that denotes the "same"
-        /// protected item even though other internal Ids/ARM Id might be
-        /// changing.
-        /// </summary>
-        [JsonProperty(PropertyName = "lifecycleId")]
-        public string LifecycleId { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AEnableProtectionInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AEnableProtectionInput.cs
index 2e4eabe9f745..05570464ebc8 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AEnableProtectionInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AEnableProtectionInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
@@ -49,19 +48,16 @@ public A2AEnableProtectionInput()
         /// <param name="vmManagedDisks">The list of vm managed disk
         /// details.</param>
         /// <param name="multiVmGroupName">The multi vm group name.</param>
-        /// <param name="multiVmGroupId">The multi vm group id.</param>
         /// <param name="recoveryBootDiagStorageAccountId">The boot diagnostic
         /// storage account.</param>
         /// <param name="diskEncryptionInfo">The recovery disk encryption
-        /// information (for two pass flows).</param>
+        /// information.</param>
         /// <param name="recoveryAvailabilityZone">The recovery availability
         /// zone.</param>
         /// <param name="recoveryAzureNetworkId">The recovery Azure virtual
         /// network ARM id.</param>
         /// <param name="recoverySubnetName">The recovery subnet name.</param>
-        /// <param name="recoveryVirtualMachineScaleSetId">The virtual machine
-        /// scale set Id.</param>
-        public A2AEnableProtectionInput(string fabricObjectId, string recoveryContainerId = default(string), string recoveryResourceGroupId = default(string), string recoveryCloudServiceId = default(string), string recoveryAvailabilitySetId = default(string), string recoveryProximityPlacementGroupId = default(string), IList<A2AVmDiskInputDetails> vmDisks = default(IList<A2AVmDiskInputDetails>), IList<A2AVmManagedDiskInputDetails> vmManagedDisks = default(IList<A2AVmManagedDiskInputDetails>), string multiVmGroupName = default(string), string multiVmGroupId = default(string), string recoveryBootDiagStorageAccountId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo), string recoveryAvailabilityZone = default(string), string recoveryAzureNetworkId = default(string), string recoverySubnetName = default(string), string recoveryVirtualMachineScaleSetId = default(string))
+        public A2AEnableProtectionInput(string fabricObjectId = default(string), string recoveryContainerId = default(string), string recoveryResourceGroupId = default(string), string recoveryCloudServiceId = default(string), string recoveryAvailabilitySetId = default(string), string recoveryProximityPlacementGroupId = default(string), IList<A2AVmDiskInputDetails> vmDisks = default(IList<A2AVmDiskInputDetails>), IList<A2AVmManagedDiskInputDetails> vmManagedDisks = default(IList<A2AVmManagedDiskInputDetails>), string multiVmGroupName = default(string), string recoveryBootDiagStorageAccountId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo), string recoveryAvailabilityZone = default(string), string recoveryAzureNetworkId = default(string), string recoverySubnetName = default(string))
         {
             FabricObjectId = fabricObjectId;
             RecoveryContainerId = recoveryContainerId;
@@ -72,13 +68,11 @@ public A2AEnableProtectionInput()
             VmDisks = vmDisks;
             VmManagedDisks = vmManagedDisks;
             MultiVmGroupName = multiVmGroupName;
-            MultiVmGroupId = multiVmGroupId;
             RecoveryBootDiagStorageAccountId = recoveryBootDiagStorageAccountId;
             DiskEncryptionInfo = diskEncryptionInfo;
             RecoveryAvailabilityZone = recoveryAvailabilityZone;
             RecoveryAzureNetworkId = recoveryAzureNetworkId;
             RecoverySubnetName = recoverySubnetName;
-            RecoveryVirtualMachineScaleSetId = recoveryVirtualMachineScaleSetId;
             CustomInit();
         }
 
@@ -142,12 +136,6 @@ public A2AEnableProtectionInput()
         [JsonProperty(PropertyName = "multiVmGroupName")]
         public string MultiVmGroupName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the multi vm group id.
-        /// </summary>
-        [JsonProperty(PropertyName = "multiVmGroupId")]
-        public string MultiVmGroupId { get; set; }
-
         /// <summary>
         /// Gets or sets the boot diagnostic storage account.
         /// </summary>
@@ -155,8 +143,7 @@ public A2AEnableProtectionInput()
         public string RecoveryBootDiagStorageAccountId { get; set; }
 
         /// <summary>
-        /// Gets or sets the recovery disk encryption information (for two pass
-        /// flows).
+        /// Gets or sets the recovery disk encryption information.
         /// </summary>
         [JsonProperty(PropertyName = "diskEncryptionInfo")]
         public DiskEncryptionInfo DiskEncryptionInfo { get; set; }
@@ -179,44 +166,5 @@ public A2AEnableProtectionInput()
         [JsonProperty(PropertyName = "recoverySubnetName")]
         public string RecoverySubnetName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the virtual machine scale set Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryVirtualMachineScaleSetId")]
-        public string RecoveryVirtualMachineScaleSetId { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (FabricObjectId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "FabricObjectId");
-            }
-            if (VmDisks != null)
-            {
-                foreach (var element in VmDisks)
-                {
-                    if (element != null)
-                    {
-                        element.Validate();
-                    }
-                }
-            }
-            if (VmManagedDisks != null)
-            {
-                foreach (var element1 in VmManagedDisks)
-                {
-                    if (element1 != null)
-                    {
-                        element1.Validate();
-                    }
-                }
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AFailoverProviderInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AFailoverProviderInput.cs
new file mode 100644
index 000000000000..1e9ed33b28e9
--- /dev/null
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AFailoverProviderInput.cs
@@ -0,0 +1,66 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// A2A provider specific input for failover.
+    /// </summary>
+    [Newtonsoft.Json.JsonObject("A2A")]
+    public partial class A2AFailoverProviderInput : ProviderSpecificFailoverInput
+    {
+        /// <summary>
+        /// Initializes a new instance of the A2AFailoverProviderInput class.
+        /// </summary>
+        public A2AFailoverProviderInput()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the A2AFailoverProviderInput class.
+        /// </summary>
+        /// <param name="recoveryPointId">The recovery point id to be passed to
+        /// failover to a particular recovery point. In case of latest recovery
+        /// point, null should be passed.</param>
+        /// <param name="cloudServiceCreationOption">A value indicating whether
+        /// to use recovery cloud service for TFO or not.</param>
+        public A2AFailoverProviderInput(string recoveryPointId = default(string), string cloudServiceCreationOption = default(string))
+        {
+            RecoveryPointId = recoveryPointId;
+            CloudServiceCreationOption = cloudServiceCreationOption;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets the recovery point id to be passed to failover to a
+        /// particular recovery point. In case of latest recovery point, null
+        /// should be passed.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryPointId")]
+        public string RecoveryPointId { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to use recovery cloud
+        /// service for TFO or not.
+        /// </summary>
+        [JsonProperty(PropertyName = "cloudServiceCreationOption")]
+        public string CloudServiceCreationOption { get; set; }
+
+    }
+}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedDiskDetails.cs
index 22b27bfa76d4..ba81eb50cad4 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedDiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedDiskDetails.cs
@@ -69,11 +69,7 @@ public A2AProtectedDiskDetails()
         /// <param name="keyIdentifier">The key URL / identifier (KEK).</param>
         /// <param name="kekKeyVaultArmId">The KeyVault resource id for key
         /// (KEK).</param>
-        /// <param name="failoverDiskName">The failover name for the managed
-        /// disk.</param>
-        /// <param name="tfoDiskName">The test failover name for the managed
-        /// disk.</param>
-        public A2AProtectedDiskDetails(string diskUri = default(string), string recoveryAzureStorageAccountId = default(string), string primaryDiskAzureStorageAccountId = default(string), string recoveryDiskUri = default(string), string diskName = default(string), long? diskCapacityInBytes = default(long?), string primaryStagingAzureStorageAccountId = default(string), string diskType = default(string), bool? resyncRequired = default(bool?), int? monitoringPercentageCompletion = default(int?), string monitoringJobType = default(string), double? dataPendingInStagingStorageAccountInMB = default(double?), double? dataPendingAtSourceAgentInMB = default(double?), string diskState = default(string), IList<string> allowedDiskLevelOperation = default(IList<string>), bool? isDiskEncrypted = default(bool?), string secretIdentifier = default(string), string dekKeyVaultArmId = default(string), bool? isDiskKeyEncrypted = default(bool?), string keyIdentifier = default(string), string kekKeyVaultArmId = default(string), string failoverDiskName = default(string), string tfoDiskName = default(string))
+        public A2AProtectedDiskDetails(string diskUri = default(string), string recoveryAzureStorageAccountId = default(string), string primaryDiskAzureStorageAccountId = default(string), string recoveryDiskUri = default(string), string diskName = default(string), long? diskCapacityInBytes = default(long?), string primaryStagingAzureStorageAccountId = default(string), string diskType = default(string), bool? resyncRequired = default(bool?), int? monitoringPercentageCompletion = default(int?), string monitoringJobType = default(string), double? dataPendingInStagingStorageAccountInMB = default(double?), double? dataPendingAtSourceAgentInMB = default(double?), string diskState = default(string), IList<string> allowedDiskLevelOperation = default(IList<string>), bool? isDiskEncrypted = default(bool?), string secretIdentifier = default(string), string dekKeyVaultArmId = default(string), bool? isDiskKeyEncrypted = default(bool?), string keyIdentifier = default(string), string kekKeyVaultArmId = default(string))
         {
             DiskUri = diskUri;
             RecoveryAzureStorageAccountId = recoveryAzureStorageAccountId;
@@ -96,8 +92,6 @@ public A2AProtectedDiskDetails()
             IsDiskKeyEncrypted = isDiskKeyEncrypted;
             KeyIdentifier = keyIdentifier;
             KekKeyVaultArmId = kekKeyVaultArmId;
-            FailoverDiskName = failoverDiskName;
-            TfoDiskName = tfoDiskName;
             CustomInit();
         }
 
@@ -238,17 +232,5 @@ public A2AProtectedDiskDetails()
         [JsonProperty(PropertyName = "kekKeyVaultArmId")]
         public string KekKeyVaultArmId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the failover name for the managed disk.
-        /// </summary>
-        [JsonProperty(PropertyName = "failoverDiskName")]
-        public string FailoverDiskName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the test failover name for the managed disk.
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoDiskName")]
-        public string TfoDiskName { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedManagedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedManagedDiskDetails.cs
index c2825bfc962d..b774d7a56957 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedManagedDiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedManagedDiskDetails.cs
@@ -40,8 +40,6 @@ public A2AProtectedManagedDiskDetails()
         /// Id.</param>
         /// <param name="recoveryReplicaDiskId">Recovery replica disk Arm
         /// Id.</param>
-        /// <param name="recoveryOrignalTargetDiskId">Recovery original target
-        /// disk Arm Id.</param>
         /// <param name="recoveryReplicaDiskAccountType">The replica disk type.
         /// Its an optional value and will be same as source disk type if not
         /// user provided.</param>
@@ -50,8 +48,6 @@ public A2AProtectedManagedDiskDetails()
         /// disk type if not user provided.</param>
         /// <param name="recoveryDiskEncryptionSetId">The recovery disk
         /// encryption set Id.</param>
-        /// <param name="primaryDiskEncryptionSetId">The primary disk
-        /// encryption set Id.</param>
         /// <param name="diskName">The disk name.</param>
         /// <param name="diskCapacityInBytes">The disk capacity in
         /// bytes.</param>
@@ -88,17 +84,15 @@ public A2AProtectedManagedDiskDetails()
         /// disk.</param>
         /// <param name="tfoDiskName">The test failover name for the managed
         /// disk.</param>
-        public A2AProtectedManagedDiskDetails(string diskId = default(string), string recoveryResourceGroupId = default(string), string recoveryTargetDiskId = default(string), string recoveryReplicaDiskId = default(string), string recoveryOrignalTargetDiskId = default(string), string recoveryReplicaDiskAccountType = default(string), string recoveryTargetDiskAccountType = default(string), string recoveryDiskEncryptionSetId = default(string), string primaryDiskEncryptionSetId = default(string), string diskName = default(string), long? diskCapacityInBytes = default(long?), string primaryStagingAzureStorageAccountId = default(string), string diskType = default(string), bool? resyncRequired = default(bool?), int? monitoringPercentageCompletion = default(int?), string monitoringJobType = default(string), double? dataPendingInStagingStorageAccountInMB = default(double?), double? dataPendingAtSourceAgentInMB = default(double?), string diskState = default(string), IList<string> allowedDiskLevelOperation = default(IList<string>), bool? isDiskEncrypted = default(bool?), string secretIdentifier = default(string), string dekKeyVaultArmId = default(string), bool? isDiskKeyEncrypted = default(bool?), string keyIdentifier = default(string), string kekKeyVaultArmId = default(string), string failoverDiskName = default(string), string tfoDiskName = default(string))
+        public A2AProtectedManagedDiskDetails(string diskId = default(string), string recoveryResourceGroupId = default(string), string recoveryTargetDiskId = default(string), string recoveryReplicaDiskId = default(string), string recoveryReplicaDiskAccountType = default(string), string recoveryTargetDiskAccountType = default(string), string recoveryDiskEncryptionSetId = default(string), string diskName = default(string), long? diskCapacityInBytes = default(long?), string primaryStagingAzureStorageAccountId = default(string), string diskType = default(string), bool? resyncRequired = default(bool?), int? monitoringPercentageCompletion = default(int?), string monitoringJobType = default(string), double? dataPendingInStagingStorageAccountInMB = default(double?), double? dataPendingAtSourceAgentInMB = default(double?), string diskState = default(string), IList<string> allowedDiskLevelOperation = default(IList<string>), bool? isDiskEncrypted = default(bool?), string secretIdentifier = default(string), string dekKeyVaultArmId = default(string), bool? isDiskKeyEncrypted = default(bool?), string keyIdentifier = default(string), string kekKeyVaultArmId = default(string), string failoverDiskName = default(string), string tfoDiskName = default(string))
         {
             DiskId = diskId;
             RecoveryResourceGroupId = recoveryResourceGroupId;
             RecoveryTargetDiskId = recoveryTargetDiskId;
             RecoveryReplicaDiskId = recoveryReplicaDiskId;
-            RecoveryOrignalTargetDiskId = recoveryOrignalTargetDiskId;
             RecoveryReplicaDiskAccountType = recoveryReplicaDiskAccountType;
             RecoveryTargetDiskAccountType = recoveryTargetDiskAccountType;
             RecoveryDiskEncryptionSetId = recoveryDiskEncryptionSetId;
-            PrimaryDiskEncryptionSetId = primaryDiskEncryptionSetId;
             DiskName = diskName;
             DiskCapacityInBytes = diskCapacityInBytes;
             PrimaryStagingAzureStorageAccountId = primaryStagingAzureStorageAccountId;
@@ -150,12 +144,6 @@ public A2AProtectedManagedDiskDetails()
         [JsonProperty(PropertyName = "recoveryReplicaDiskId")]
         public string RecoveryReplicaDiskId { get; set; }
 
-        /// <summary>
-        /// Gets or sets recovery original target disk Arm Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryOrignalTargetDiskId")]
-        public string RecoveryOrignalTargetDiskId { get; set; }
-
         /// <summary>
         /// Gets or sets the replica disk type. Its an optional value and will
         /// be same as source disk type if not user provided.
@@ -176,12 +164,6 @@ public A2AProtectedManagedDiskDetails()
         [JsonProperty(PropertyName = "recoveryDiskEncryptionSetId")]
         public string RecoveryDiskEncryptionSetId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the primary disk encryption set Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "primaryDiskEncryptionSetId")]
-        public string PrimaryDiskEncryptionSetId { get; set; }
-
         /// <summary>
         /// Gets or sets the disk name.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectionIntentDiskInputDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectionIntentDiskInputDetails.cs
index 7a654e3f1803..59a7d16d9e55 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectionIntentDiskInputDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectionIntentDiskInputDetails.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Azure VM unmanaged disk input details.
+    /// Azure VM disk input details.
     /// </summary>
     public partial class A2AProtectionIntentDiskInputDetails
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AReplicationDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AReplicationDetails.cs
index 00cbb73d00d4..84b86fb23e4d 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AReplicationDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AReplicationDetails.cs
@@ -34,14 +34,14 @@ public A2AReplicationDetails()
         /// </summary>
         /// <param name="fabricObjectId">The fabric specific object Id of the
         /// virtual machine.</param>
-        /// <param name="initialPrimaryZone">The initial primary availability
-        /// zone.</param>
         /// <param name="initialPrimaryFabricLocation">The initial primary
         /// fabric location.</param>
-        /// <param name="initialRecoveryZone">The initial recovery availability
-        /// zone.</param>
         /// <param name="initialRecoveryFabricLocation">The initial recovery
         /// fabric location.</param>
+        /// <param name="initialPrimaryZone">The initial primary availability
+        /// zone.</param>
+        /// <param name="initialRecoveryZone">The initial recovery availability
+        /// zone.</param>
         /// <param name="multiVmGroupId">The multi vm group Id.</param>
         /// <param name="multiVmGroupName">The multi vm group name.</param>
         /// <param name="multiVmGroupCreateOption">Whether Multi VM group is
@@ -86,13 +86,8 @@ public A2AReplicationDetails()
         /// <param name="lastHeartbeat">The last heartbeat received from the
         /// source server.</param>
         /// <param name="agentVersion">The agent version.</param>
-        /// <param name="agentExpiryDate">Agent expiry date.</param>
         /// <param name="isReplicationAgentUpdateRequired">A value indicating
         /// whether replication agent update is required.</param>
-        /// <param name="agentCertificateExpiryDate">Agent certificate expiry
-        /// date.</param>
-        /// <param name="isReplicationAgentCertificateUpdateRequired">A value
-        /// indicating whether agent certificate update is required.</param>
         /// <param name="recoveryFabricObjectId">The recovery fabric object
         /// Id.</param>
         /// <param name="vmProtectionState">The protection state for the
@@ -110,30 +105,21 @@ public A2AReplicationDetails()
         /// <param name="rpoInSeconds">The last RPO value in seconds.</param>
         /// <param name="lastRpoCalculatedTime">The time (in UTC) when the last
         /// RPO value was calculated by Protection Service.</param>
-        /// <param name="primaryAvailabilityZone">The primary availability
-        /// zone.</param>
         /// <param name="recoveryAvailabilityZone">The recovery availability
         /// zone.</param>
         /// <param name="vmEncryptionType">The encryption type of the VM.
         /// Possible values include: 'NotEncrypted', 'OnePassEncrypted',
         /// 'TwoPassEncrypted'</param>
-        /// <param name="tfoAzureVMName">The test failover vm name.</param>
-        /// <param name="recoveryAzureGeneration">The recovery azure
-        /// generation.</param>
+        /// <param name="tfoAzureVMName">The test failover VM name.</param>
         /// <param name="recoveryProximityPlacementGroupId">The recovery
         /// proximity placement group Id.</param>
-        /// <param name="autoProtectionOfDataDisk">A value indicating whether
-        /// the auto protection is enabled. Possible values include:
-        /// 'Disabled', 'Enabled'</param>
-        /// <param name="recoveryVirtualMachineScaleSetId">The recovery virtual
-        /// machine scale set id.</param>
-        public A2AReplicationDetails(string fabricObjectId = default(string), string initialPrimaryZone = default(string), string initialPrimaryFabricLocation = default(string), string initialRecoveryZone = default(string), string initialRecoveryFabricLocation = default(string), string multiVmGroupId = default(string), string multiVmGroupName = default(string), string multiVmGroupCreateOption = default(string), string managementId = default(string), IList<A2AProtectedDiskDetails> protectedDisks = default(IList<A2AProtectedDiskDetails>), IList<A2AUnprotectedDiskDetails> unprotectedDisks = default(IList<A2AUnprotectedDiskDetails>), IList<A2AProtectedManagedDiskDetails> protectedManagedDisks = default(IList<A2AProtectedManagedDiskDetails>), string recoveryBootDiagStorageAccountId = default(string), string primaryFabricLocation = default(string), string recoveryFabricLocation = default(string), string osType = default(string), string recoveryAzureVMSize = default(string), string recoveryAzureVMName = default(string), string recoveryAzureResourceGroupId = default(string), string recoveryCloudService = default(string), string recoveryAvailabilitySet = default(string), string selectedRecoveryAzureNetworkId = default(string), string selectedTfoAzureNetworkId = default(string), IList<VMNicDetails> vmNics = default(IList<VMNicDetails>), AzureToAzureVmSyncedConfigDetails vmSyncedConfigDetails = default(AzureToAzureVmSyncedConfigDetails), int? monitoringPercentageCompletion = default(int?), string monitoringJobType = default(string), System.DateTime? lastHeartbeat = default(System.DateTime?), string agentVersion = default(string), System.DateTime? agentExpiryDate = default(System.DateTime?), bool? isReplicationAgentUpdateRequired = default(bool?), System.DateTime? agentCertificateExpiryDate = default(System.DateTime?), bool? isReplicationAgentCertificateUpdateRequired = default(bool?), string recoveryFabricObjectId = default(string), string vmProtectionState = default(string), string vmProtectionStateDescription = default(string), string lifecycleId = default(string), string testFailoverRecoveryFabricObjectId = default(string), long? rpoInSeconds = default(long?), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), string primaryAvailabilityZone = default(string), string recoveryAvailabilityZone = default(string), string vmEncryptionType = default(string), string tfoAzureVMName = default(string), string recoveryAzureGeneration = default(string), string recoveryProximityPlacementGroupId = default(string), string autoProtectionOfDataDisk = default(string), string recoveryVirtualMachineScaleSetId = default(string))
+        public A2AReplicationDetails(string fabricObjectId = default(string), string initialPrimaryFabricLocation = default(string), string initialRecoveryFabricLocation = default(string), string initialPrimaryZone = default(string), string initialRecoveryZone = default(string), string multiVmGroupId = default(string), string multiVmGroupName = default(string), string multiVmGroupCreateOption = default(string), string managementId = default(string), IList<A2AProtectedDiskDetails> protectedDisks = default(IList<A2AProtectedDiskDetails>), IList<A2AUnprotectedDiskDetails> unprotectedDisks = default(IList<A2AUnprotectedDiskDetails>), IList<A2AProtectedManagedDiskDetails> protectedManagedDisks = default(IList<A2AProtectedManagedDiskDetails>), string recoveryBootDiagStorageAccountId = default(string), string primaryFabricLocation = default(string), string recoveryFabricLocation = default(string), string osType = default(string), string recoveryAzureVMSize = default(string), string recoveryAzureVMName = default(string), string recoveryAzureResourceGroupId = default(string), string recoveryCloudService = default(string), string recoveryAvailabilitySet = default(string), string selectedRecoveryAzureNetworkId = default(string), string selectedTfoAzureNetworkId = default(string), IList<VMNicDetails> vmNics = default(IList<VMNicDetails>), AzureToAzureVmSyncedConfigDetails vmSyncedConfigDetails = default(AzureToAzureVmSyncedConfigDetails), int? monitoringPercentageCompletion = default(int?), string monitoringJobType = default(string), System.DateTime? lastHeartbeat = default(System.DateTime?), string agentVersion = default(string), bool? isReplicationAgentUpdateRequired = default(bool?), string recoveryFabricObjectId = default(string), string vmProtectionState = default(string), string vmProtectionStateDescription = default(string), string lifecycleId = default(string), string testFailoverRecoveryFabricObjectId = default(string), long? rpoInSeconds = default(long?), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), string recoveryAvailabilityZone = default(string), string vmEncryptionType = default(string), string tfoAzureVMName = default(string), string recoveryProximityPlacementGroupId = default(string))
         {
             FabricObjectId = fabricObjectId;
-            InitialPrimaryZone = initialPrimaryZone;
             InitialPrimaryFabricLocation = initialPrimaryFabricLocation;
-            InitialRecoveryZone = initialRecoveryZone;
             InitialRecoveryFabricLocation = initialRecoveryFabricLocation;
+            InitialPrimaryZone = initialPrimaryZone;
+            InitialRecoveryZone = initialRecoveryZone;
             MultiVmGroupId = multiVmGroupId;
             MultiVmGroupName = multiVmGroupName;
             MultiVmGroupCreateOption = multiVmGroupCreateOption;
@@ -158,10 +144,7 @@ public A2AReplicationDetails()
             MonitoringJobType = monitoringJobType;
             LastHeartbeat = lastHeartbeat;
             AgentVersion = agentVersion;
-            AgentExpiryDate = agentExpiryDate;
             IsReplicationAgentUpdateRequired = isReplicationAgentUpdateRequired;
-            AgentCertificateExpiryDate = agentCertificateExpiryDate;
-            IsReplicationAgentCertificateUpdateRequired = isReplicationAgentCertificateUpdateRequired;
             RecoveryFabricObjectId = recoveryFabricObjectId;
             VmProtectionState = vmProtectionState;
             VmProtectionStateDescription = vmProtectionStateDescription;
@@ -169,14 +152,10 @@ public A2AReplicationDetails()
             TestFailoverRecoveryFabricObjectId = testFailoverRecoveryFabricObjectId;
             RpoInSeconds = rpoInSeconds;
             LastRpoCalculatedTime = lastRpoCalculatedTime;
-            PrimaryAvailabilityZone = primaryAvailabilityZone;
             RecoveryAvailabilityZone = recoveryAvailabilityZone;
             VmEncryptionType = vmEncryptionType;
             TfoAzureVMName = tfoAzureVMName;
-            RecoveryAzureGeneration = recoveryAzureGeneration;
             RecoveryProximityPlacementGroupId = recoveryProximityPlacementGroupId;
-            AutoProtectionOfDataDisk = autoProtectionOfDataDisk;
-            RecoveryVirtualMachineScaleSetId = recoveryVirtualMachineScaleSetId;
             CustomInit();
         }
 
@@ -191,30 +170,30 @@ public A2AReplicationDetails()
         [JsonProperty(PropertyName = "fabricObjectId")]
         public string FabricObjectId { get; set; }
 
-        /// <summary>
-        /// Gets the initial primary availability zone.
-        /// </summary>
-        [JsonProperty(PropertyName = "initialPrimaryZone")]
-        public string InitialPrimaryZone { get; private set; }
-
         /// <summary>
         /// Gets the initial primary fabric location.
         /// </summary>
         [JsonProperty(PropertyName = "initialPrimaryFabricLocation")]
         public string InitialPrimaryFabricLocation { get; private set; }
 
-        /// <summary>
-        /// Gets the initial recovery availability zone.
-        /// </summary>
-        [JsonProperty(PropertyName = "initialRecoveryZone")]
-        public string InitialRecoveryZone { get; private set; }
-
         /// <summary>
         /// Gets the initial recovery fabric location.
         /// </summary>
         [JsonProperty(PropertyName = "initialRecoveryFabricLocation")]
         public string InitialRecoveryFabricLocation { get; private set; }
 
+        /// <summary>
+        /// Gets the initial primary availability zone.
+        /// </summary>
+        [JsonProperty(PropertyName = "initialPrimaryZone")]
+        public string InitialPrimaryZone { get; private set; }
+
+        /// <summary>
+        /// Gets the initial recovery availability zone.
+        /// </summary>
+        [JsonProperty(PropertyName = "initialRecoveryZone")]
+        public string InitialRecoveryZone { get; private set; }
+
         /// <summary>
         /// Gets or sets the multi vm group Id.
         /// </summary>
@@ -362,12 +341,6 @@ public A2AReplicationDetails()
         [JsonProperty(PropertyName = "agentVersion")]
         public string AgentVersion { get; set; }
 
-        /// <summary>
-        /// Gets or sets agent expiry date.
-        /// </summary>
-        [JsonProperty(PropertyName = "agentExpiryDate")]
-        public System.DateTime? AgentExpiryDate { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether replication agent update is
         /// required.
@@ -375,19 +348,6 @@ public A2AReplicationDetails()
         [JsonProperty(PropertyName = "isReplicationAgentUpdateRequired")]
         public bool? IsReplicationAgentUpdateRequired { get; set; }
 
-        /// <summary>
-        /// Gets agent certificate expiry date.
-        /// </summary>
-        [JsonProperty(PropertyName = "agentCertificateExpiryDate")]
-        public System.DateTime? AgentCertificateExpiryDate { get; private set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether agent certificate update is
-        /// required.
-        /// </summary>
-        [JsonProperty(PropertyName = "isReplicationAgentCertificateUpdateRequired")]
-        public bool? IsReplicationAgentCertificateUpdateRequired { get; set; }
-
         /// <summary>
         /// Gets or sets the recovery fabric object Id.
         /// </summary>
@@ -436,12 +396,6 @@ public A2AReplicationDetails()
         [JsonProperty(PropertyName = "lastRpoCalculatedTime")]
         public System.DateTime? LastRpoCalculatedTime { get; set; }
 
-        /// <summary>
-        /// Gets or sets the primary availability zone.
-        /// </summary>
-        [JsonProperty(PropertyName = "primaryAvailabilityZone")]
-        public string PrimaryAvailabilityZone { get; set; }
-
         /// <summary>
         /// Gets or sets the recovery availability zone.
         /// </summary>
@@ -456,35 +410,16 @@ public A2AReplicationDetails()
         public string VmEncryptionType { get; private set; }
 
         /// <summary>
-        /// Gets or sets the test failover vm name.
+        /// Gets or sets the test failover VM name.
         /// </summary>
         [JsonProperty(PropertyName = "tfoAzureVMName")]
         public string TfoAzureVMName { get; set; }
 
-        /// <summary>
-        /// Gets the recovery azure generation.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryAzureGeneration")]
-        public string RecoveryAzureGeneration { get; private set; }
-
         /// <summary>
         /// Gets or sets the recovery proximity placement group Id.
         /// </summary>
         [JsonProperty(PropertyName = "recoveryProximityPlacementGroupId")]
         public string RecoveryProximityPlacementGroupId { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the auto protection is
-        /// enabled. Possible values include: 'Disabled', 'Enabled'
-        /// </summary>
-        [JsonProperty(PropertyName = "autoProtectionOfDataDisk")]
-        public string AutoProtectionOfDataDisk { get; set; }
-
-        /// <summary>
-        /// Gets or sets the recovery virtual machine scale set id.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryVirtualMachineScaleSetId")]
-        public string RecoveryVirtualMachineScaleSetId { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AReplicationIntentDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AReplicationIntentDetails.cs
index acec692bd0de..72259d74920f 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AReplicationIntentDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AReplicationIntentDetails.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
@@ -35,63 +34,71 @@ public A2AReplicationIntentDetails()
         /// Initializes a new instance of the A2AReplicationIntentDetails
         /// class.
         /// </summary>
-        /// <param name="recoveryAvailabilityType">The recovery availability
-        /// type of the virtual machine.</param>
         /// <param name="fabricObjectId">The fabric specific object Id of the
         /// virtual machine.</param>
+        /// <param name="policyId">The ID of Policy governing this PE.</param>
         /// <param name="primaryLocation">The primary location for the virtual
         /// machine.</param>
         /// <param name="recoveryLocation">The recovery location for the
         /// virtual machine.</param>
         /// <param name="recoverySubscriptionId">The recovery subscription Id
         /// of the virtual machine.</param>
+        /// <param name="primaryFabricFriendlyName">The recovery fabric
+        /// Name.</param>
+        /// <param name="recoveryFabricFriendlyName">The recovery fabric
+        /// Name.</param>
+        /// <param name="primaryContainerFriendlyName">The primary container
+        /// Name.</param>
+        /// <param name="recoveryContainerFriendlyName">The recovery container
+        /// Name.</param>
+        /// <param name="recoveryAvailabilityType">The recovery availability
+        /// type of the virtual machine.</param>
         /// <param name="vmDisks">The list of vm disk details.</param>
         /// <param name="vmManagedDisks">The list of vm managed disk
         /// details.</param>
         /// <param name="recoveryResourceGroupId">The recovery resource group
         /// id.</param>
-        /// <param name="protectionProfile">The protection profile custom
-        /// details.</param>
-        /// <param name="primaryStagingStorageAccount">The primary staging
-        /// storage account details.</param>
-        /// <param name="recoveryAvailabilitySet">The recovery availability set
-        /// details.</param>
-        /// <param name="recoveryVirtualNetwork">The recovery virtual network
-        /// details.</param>
-        /// <param name="recoveryProximityPlacementGroup">The recovery
+        /// <param name="recoveryAvailabilitySetId">The recovery availability
+        /// set Id.</param>
+        /// <param name="recoveryVirtualNetworkId">The recovery virtual network
+        /// Id.</param>
+        /// <param name="recoveryProximityPlacementGroupId">The recovery
         /// proximity placement group custom details.</param>
-        /// <param name="autoProtectionOfDataDisk">A value indicating whether
-        /// the auto protection is enabled. Possible values include:
+        /// <param name="autoProtectionOfDataDiskStatus">A value indicating
+        /// whether the auto protection is enabled. Possible values include:
         /// 'Disabled', 'Enabled'</param>
         /// <param name="multiVmGroupName">The multi vm group name.</param>
         /// <param name="multiVmGroupId">The multi vm group id.</param>
-        /// <param name="recoveryBootDiagStorageAccount">The boot diagnostic
+        /// <param name="recoveryBootDiagStorageAccountId">The boot diagnostic
         /// storage account.</param>
         /// <param name="diskEncryptionInfo">The recovery disk encryption
         /// information (for two pass flows).</param>
         /// <param name="recoveryAvailabilityZone">The recovery availability
         /// zone.</param>
-        public A2AReplicationIntentDetails(string recoveryAvailabilityType, string fabricObjectId = default(string), string primaryLocation = default(string), string recoveryLocation = default(string), string recoverySubscriptionId = default(string), IList<A2AProtectionIntentDiskInputDetails> vmDisks = default(IList<A2AProtectionIntentDiskInputDetails>), IList<A2AProtectionIntentManagedDiskInputDetails> vmManagedDisks = default(IList<A2AProtectionIntentManagedDiskInputDetails>), string recoveryResourceGroupId = default(string), ProtectionProfileCustomDetails protectionProfile = default(ProtectionProfileCustomDetails), StorageAccountCustomDetails primaryStagingStorageAccount = default(StorageAccountCustomDetails), RecoveryAvailabilitySetCustomDetails recoveryAvailabilitySet = default(RecoveryAvailabilitySetCustomDetails), RecoveryVirtualNetworkCustomDetails recoveryVirtualNetwork = default(RecoveryVirtualNetworkCustomDetails), RecoveryProximityPlacementGroupCustomDetails recoveryProximityPlacementGroup = default(RecoveryProximityPlacementGroupCustomDetails), string autoProtectionOfDataDisk = default(string), string multiVmGroupName = default(string), string multiVmGroupId = default(string), StorageAccountCustomDetails recoveryBootDiagStorageAccount = default(StorageAccountCustomDetails), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo), string recoveryAvailabilityZone = default(string))
+        public A2AReplicationIntentDetails(string fabricObjectId = default(string), string policyId = default(string), string primaryLocation = default(string), string recoveryLocation = default(string), string recoverySubscriptionId = default(string), string primaryFabricFriendlyName = default(string), string recoveryFabricFriendlyName = default(string), string primaryContainerFriendlyName = default(string), string recoveryContainerFriendlyName = default(string), string recoveryAvailabilityType = default(string), IList<A2AVmDiskDetails> vmDisks = default(IList<A2AVmDiskDetails>), IList<A2AVmManagedDiskDetails> vmManagedDisks = default(IList<A2AVmManagedDiskDetails>), string recoveryResourceGroupId = default(string), string recoveryAvailabilitySetId = default(string), string recoveryVirtualNetworkId = default(string), string recoveryProximityPlacementGroupId = default(string), string autoProtectionOfDataDiskStatus = default(string), string multiVmGroupName = default(string), string multiVmGroupId = default(string), string recoveryBootDiagStorageAccountId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo), string recoveryAvailabilityZone = default(string))
         {
             FabricObjectId = fabricObjectId;
+            PolicyId = policyId;
             PrimaryLocation = primaryLocation;
             RecoveryLocation = recoveryLocation;
             RecoverySubscriptionId = recoverySubscriptionId;
+            PrimaryFabricFriendlyName = primaryFabricFriendlyName;
+            RecoveryFabricFriendlyName = recoveryFabricFriendlyName;
+            PrimaryContainerFriendlyName = primaryContainerFriendlyName;
+            RecoveryContainerFriendlyName = recoveryContainerFriendlyName;
+            RecoveryAvailabilityType = recoveryAvailabilityType;
             VmDisks = vmDisks;
             VmManagedDisks = vmManagedDisks;
             RecoveryResourceGroupId = recoveryResourceGroupId;
-            ProtectionProfile = protectionProfile;
-            PrimaryStagingStorageAccount = primaryStagingStorageAccount;
-            RecoveryAvailabilitySet = recoveryAvailabilitySet;
-            RecoveryVirtualNetwork = recoveryVirtualNetwork;
-            RecoveryProximityPlacementGroup = recoveryProximityPlacementGroup;
-            AutoProtectionOfDataDisk = autoProtectionOfDataDisk;
+            RecoveryAvailabilitySetId = recoveryAvailabilitySetId;
+            RecoveryVirtualNetworkId = recoveryVirtualNetworkId;
+            RecoveryProximityPlacementGroupId = recoveryProximityPlacementGroupId;
+            AutoProtectionOfDataDiskStatus = autoProtectionOfDataDiskStatus;
             MultiVmGroupName = multiVmGroupName;
             MultiVmGroupId = multiVmGroupId;
-            RecoveryBootDiagStorageAccount = recoveryBootDiagStorageAccount;
+            RecoveryBootDiagStorageAccountId = recoveryBootDiagStorageAccountId;
             DiskEncryptionInfo = diskEncryptionInfo;
             RecoveryAvailabilityZone = recoveryAvailabilityZone;
-            RecoveryAvailabilityType = recoveryAvailabilityType;
             CustomInit();
         }
 
@@ -106,6 +113,12 @@ public A2AReplicationIntentDetails()
         [JsonProperty(PropertyName = "fabricObjectId")]
         public string FabricObjectId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the ID of Policy governing this PE.
+        /// </summary>
+        [JsonProperty(PropertyName = "policyId")]
+        public string PolicyId { get; set; }
+
         /// <summary>
         /// Gets or sets the primary location for the virtual machine.
         /// </summary>
@@ -124,17 +137,47 @@ public A2AReplicationIntentDetails()
         [JsonProperty(PropertyName = "recoverySubscriptionId")]
         public string RecoverySubscriptionId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the recovery fabric Name.
+        /// </summary>
+        [JsonProperty(PropertyName = "primaryFabricFriendlyName")]
+        public string PrimaryFabricFriendlyName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recovery fabric Name.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryFabricFriendlyName")]
+        public string RecoveryFabricFriendlyName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary container Name.
+        /// </summary>
+        [JsonProperty(PropertyName = "primaryContainerFriendlyName")]
+        public string PrimaryContainerFriendlyName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recovery container Name.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryContainerFriendlyName")]
+        public string RecoveryContainerFriendlyName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recovery availability type of the virtual machine.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryAvailabilityType")]
+        public string RecoveryAvailabilityType { get; set; }
+
         /// <summary>
         /// Gets or sets the list of vm disk details.
         /// </summary>
         [JsonProperty(PropertyName = "vmDisks")]
-        public IList<A2AProtectionIntentDiskInputDetails> VmDisks { get; set; }
+        public IList<A2AVmDiskDetails> VmDisks { get; set; }
 
         /// <summary>
         /// Gets or sets the list of vm managed disk details.
         /// </summary>
         [JsonProperty(PropertyName = "vmManagedDisks")]
-        public IList<A2AProtectionIntentManagedDiskInputDetails> VmManagedDisks { get; set; }
+        public IList<A2AVmManagedDiskDetails> VmManagedDisks { get; set; }
 
         /// <summary>
         /// Gets or sets the recovery resource group id.
@@ -143,41 +186,29 @@ public A2AReplicationIntentDetails()
         public string RecoveryResourceGroupId { get; set; }
 
         /// <summary>
-        /// Gets or sets the protection profile custom details.
-        /// </summary>
-        [JsonProperty(PropertyName = "protectionProfile")]
-        public ProtectionProfileCustomDetails ProtectionProfile { get; set; }
-
-        /// <summary>
-        /// Gets or sets the primary staging storage account details.
+        /// Gets or sets the recovery availability set Id.
         /// </summary>
-        [JsonProperty(PropertyName = "primaryStagingStorageAccount")]
-        public StorageAccountCustomDetails PrimaryStagingStorageAccount { get; set; }
+        [JsonProperty(PropertyName = "recoveryAvailabilitySetId")]
+        public string RecoveryAvailabilitySetId { get; set; }
 
         /// <summary>
-        /// Gets or sets the recovery availability set details.
+        /// Gets or sets the recovery virtual network Id.
         /// </summary>
-        [JsonProperty(PropertyName = "recoveryAvailabilitySet")]
-        public RecoveryAvailabilitySetCustomDetails RecoveryAvailabilitySet { get; set; }
-
-        /// <summary>
-        /// Gets or sets the recovery virtual network details.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryVirtualNetwork")]
-        public RecoveryVirtualNetworkCustomDetails RecoveryVirtualNetwork { get; set; }
+        [JsonProperty(PropertyName = "recoveryVirtualNetworkId")]
+        public string RecoveryVirtualNetworkId { get; set; }
 
         /// <summary>
         /// Gets or sets the recovery proximity placement group custom details.
         /// </summary>
-        [JsonProperty(PropertyName = "recoveryProximityPlacementGroup")]
-        public RecoveryProximityPlacementGroupCustomDetails RecoveryProximityPlacementGroup { get; set; }
+        [JsonProperty(PropertyName = "recoveryProximityPlacementGroupId")]
+        public string RecoveryProximityPlacementGroupId { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the auto protection is
         /// enabled. Possible values include: 'Disabled', 'Enabled'
         /// </summary>
-        [JsonProperty(PropertyName = "autoProtectionOfDataDisk")]
-        public string AutoProtectionOfDataDisk { get; set; }
+        [JsonProperty(PropertyName = "autoProtectionOfDataDiskStatus")]
+        public string AutoProtectionOfDataDiskStatus { get; set; }
 
         /// <summary>
         /// Gets or sets the multi vm group name.
@@ -194,8 +225,8 @@ public A2AReplicationIntentDetails()
         /// <summary>
         /// Gets or sets the boot diagnostic storage account.
         /// </summary>
-        [JsonProperty(PropertyName = "recoveryBootDiagStorageAccount")]
-        public StorageAccountCustomDetails RecoveryBootDiagStorageAccount { get; set; }
+        [JsonProperty(PropertyName = "recoveryBootDiagStorageAccountId")]
+        public string RecoveryBootDiagStorageAccountId { get; set; }
 
         /// <summary>
         /// Gets or sets the recovery disk encryption information (for two pass
@@ -210,44 +241,5 @@ public A2AReplicationIntentDetails()
         [JsonProperty(PropertyName = "recoveryAvailabilityZone")]
         public string RecoveryAvailabilityZone { get; set; }
 
-        /// <summary>
-        /// Gets or sets the recovery availability type of the virtual machine.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryAvailabilityType")]
-        public string RecoveryAvailabilityType { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (RecoveryAvailabilityType == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "RecoveryAvailabilityType");
-            }
-            if (VmDisks != null)
-            {
-                foreach (var element in VmDisks)
-                {
-                    if (element != null)
-                    {
-                        element.Validate();
-                    }
-                }
-            }
-            if (VmManagedDisks != null)
-            {
-                foreach (var element1 in VmManagedDisks)
-                {
-                    if (element1 != null)
-                    {
-                        element1.Validate();
-                    }
-                }
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ASwitchProtectionInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ASwitchProtectionInput.cs
index 7ba42f8e95e9..12342f4c29be 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ASwitchProtectionInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2ASwitchProtectionInput.cs
@@ -43,18 +43,14 @@ public A2ASwitchProtectionInput()
         /// Valid for V1 scenarios.</param>
         /// <param name="recoveryAvailabilitySetId">The recovery availability
         /// set.</param>
+        /// <param name="recoveryProximityPlacementGroupId">The recovery
+        /// proximity placement group Id.</param>
         /// <param name="policyId">The Policy Id.</param>
         /// <param name="recoveryBootDiagStorageAccountId">The boot diagnostic
         /// storage account.</param>
-        /// <param name="recoveryAvailabilityZone">The recovery availability
-        /// zone.</param>
-        /// <param name="recoveryProximityPlacementGroupId">The recovery
-        /// proximity placement group Id.</param>
-        /// <param name="recoveryVirtualMachineScaleSetId">The virtual machine
-        /// scale set id.</param>
         /// <param name="diskEncryptionInfo">The recovery disk encryption
         /// information.</param>
-        public A2ASwitchProtectionInput(string recoveryContainerId = default(string), IList<A2AVmDiskInputDetails> vmDisks = default(IList<A2AVmDiskInputDetails>), IList<A2AVmManagedDiskInputDetails> vmManagedDisks = default(IList<A2AVmManagedDiskInputDetails>), string recoveryResourceGroupId = default(string), string recoveryCloudServiceId = default(string), string recoveryAvailabilitySetId = default(string), string policyId = default(string), string recoveryBootDiagStorageAccountId = default(string), string recoveryAvailabilityZone = default(string), string recoveryProximityPlacementGroupId = default(string), string recoveryVirtualMachineScaleSetId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo))
+        public A2ASwitchProtectionInput(string recoveryContainerId = default(string), IList<A2AVmDiskInputDetails> vmDisks = default(IList<A2AVmDiskInputDetails>), IList<A2AVmManagedDiskInputDetails> vmManagedDisks = default(IList<A2AVmManagedDiskInputDetails>), string recoveryResourceGroupId = default(string), string recoveryCloudServiceId = default(string), string recoveryAvailabilitySetId = default(string), string recoveryProximityPlacementGroupId = default(string), string policyId = default(string), string recoveryBootDiagStorageAccountId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo))
         {
             RecoveryContainerId = recoveryContainerId;
             VmDisks = vmDisks;
@@ -62,11 +58,9 @@ public A2ASwitchProtectionInput()
             RecoveryResourceGroupId = recoveryResourceGroupId;
             RecoveryCloudServiceId = recoveryCloudServiceId;
             RecoveryAvailabilitySetId = recoveryAvailabilitySetId;
+            RecoveryProximityPlacementGroupId = recoveryProximityPlacementGroupId;
             PolicyId = policyId;
             RecoveryBootDiagStorageAccountId = recoveryBootDiagStorageAccountId;
-            RecoveryAvailabilityZone = recoveryAvailabilityZone;
-            RecoveryProximityPlacementGroupId = recoveryProximityPlacementGroupId;
-            RecoveryVirtualMachineScaleSetId = recoveryVirtualMachineScaleSetId;
             DiskEncryptionInfo = diskEncryptionInfo;
             CustomInit();
         }
@@ -113,6 +107,12 @@ public A2ASwitchProtectionInput()
         [JsonProperty(PropertyName = "recoveryAvailabilitySetId")]
         public string RecoveryAvailabilitySetId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the recovery proximity placement group Id.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryProximityPlacementGroupId")]
+        public string RecoveryProximityPlacementGroupId { get; set; }
+
         /// <summary>
         /// Gets or sets the Policy Id.
         /// </summary>
@@ -125,24 +125,6 @@ public A2ASwitchProtectionInput()
         [JsonProperty(PropertyName = "recoveryBootDiagStorageAccountId")]
         public string RecoveryBootDiagStorageAccountId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the recovery availability zone.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryAvailabilityZone")]
-        public string RecoveryAvailabilityZone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the recovery proximity placement group Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryProximityPlacementGroupId")]
-        public string RecoveryProximityPlacementGroupId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the virtual machine scale set id.
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryVirtualMachineScaleSetId")]
-        public string RecoveryVirtualMachineScaleSetId { get; set; }
-
         /// <summary>
         /// Gets or sets the recovery disk encryption information.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AUnprotectedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AUnprotectedDiskDetails.cs
index 62057a109977..2619ca0075e7 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AUnprotectedDiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AUnprotectedDiskDetails.cs
@@ -31,13 +31,9 @@ public A2AUnprotectedDiskDetails()
         /// </summary>
         /// <param name="diskLunId">The source lun Id for the data
         /// disk.</param>
-        /// <param name="diskAutoProtectionStatus">A value indicating whether
-        /// the disk auto protection is enabled. Possible values include:
-        /// 'Disabled', 'Enabled'</param>
-        public A2AUnprotectedDiskDetails(int? diskLunId = default(int?), string diskAutoProtectionStatus = default(string))
+        public A2AUnprotectedDiskDetails(int? diskLunId = default(int?))
         {
             DiskLunId = diskLunId;
-            DiskAutoProtectionStatus = diskAutoProtectionStatus;
             CustomInit();
         }
 
@@ -52,12 +48,5 @@ public A2AUnprotectedDiskDetails()
         [JsonProperty(PropertyName = "diskLunId")]
         public int? DiskLunId { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the disk auto protection is
-        /// enabled. Possible values include: 'Disabled', 'Enabled'
-        /// </summary>
-        [JsonProperty(PropertyName = "diskAutoProtectionStatus")]
-        public string DiskAutoProtectionStatus { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AUpdateReplicationProtectedItemInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AUpdateReplicationProtectedItemInput.cs
index cc5ef32cffaa..4045a71afb7e 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AUpdateReplicationProtectedItemInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AUpdateReplicationProtectedItemInput.cs
@@ -44,22 +44,19 @@ public A2AUpdateReplicationProtectedItemInput()
         /// storage account.</param>
         /// <param name="diskEncryptionInfo">The recovery os disk encryption
         /// information.</param>
-        /// <param name="tfoAzureVMName">The user given name for Test Failover
-        /// VM.</param>
         /// <param name="recoveryProximityPlacementGroupId">The recovery
         /// proximity placement group Id.</param>
-        /// <param name="recoveryVirtualMachineScaleSetId">The recovery virtual
-        /// machine scale set Id.</param>
-        public A2AUpdateReplicationProtectedItemInput(string recoveryCloudServiceId = default(string), string recoveryResourceGroupId = default(string), IList<A2AVmManagedDiskUpdateDetails> managedDiskUpdateDetails = default(IList<A2AVmManagedDiskUpdateDetails>), string recoveryBootDiagStorageAccountId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo), string tfoAzureVMName = default(string), string recoveryProximityPlacementGroupId = default(string), string recoveryVirtualMachineScaleSetId = default(string))
+        /// <param name="tfoAzureVMName">The user given name for test failover
+        /// VM.</param>
+        public A2AUpdateReplicationProtectedItemInput(string recoveryCloudServiceId = default(string), string recoveryResourceGroupId = default(string), IList<A2AVmManagedDiskUpdateDetails> managedDiskUpdateDetails = default(IList<A2AVmManagedDiskUpdateDetails>), string recoveryBootDiagStorageAccountId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo), string recoveryProximityPlacementGroupId = default(string), string tfoAzureVMName = default(string))
         {
             RecoveryCloudServiceId = recoveryCloudServiceId;
             RecoveryResourceGroupId = recoveryResourceGroupId;
             ManagedDiskUpdateDetails = managedDiskUpdateDetails;
             RecoveryBootDiagStorageAccountId = recoveryBootDiagStorageAccountId;
             DiskEncryptionInfo = diskEncryptionInfo;
-            TfoAzureVMName = tfoAzureVMName;
             RecoveryProximityPlacementGroupId = recoveryProximityPlacementGroupId;
-            RecoveryVirtualMachineScaleSetId = recoveryVirtualMachineScaleSetId;
+            TfoAzureVMName = tfoAzureVMName;
             CustomInit();
         }
 
@@ -98,12 +95,6 @@ public A2AUpdateReplicationProtectedItemInput()
         [JsonProperty(PropertyName = "diskEncryptionInfo")]
         public DiskEncryptionInfo DiskEncryptionInfo { get; set; }
 
-        /// <summary>
-        /// Gets or sets the user given name for Test Failover VM.
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoAzureVMName")]
-        public string TfoAzureVMName { get; set; }
-
         /// <summary>
         /// Gets or sets the recovery proximity placement group Id.
         /// </summary>
@@ -111,10 +102,10 @@ public A2AUpdateReplicationProtectedItemInput()
         public string RecoveryProximityPlacementGroupId { get; set; }
 
         /// <summary>
-        /// Gets or sets the recovery virtual machine scale set Id.
+        /// Gets or sets the user given name for test failover VM.
         /// </summary>
-        [JsonProperty(PropertyName = "recoveryVirtualMachineScaleSetId")]
-        public string RecoveryVirtualMachineScaleSetId { get; set; }
+        [JsonProperty(PropertyName = "tfoAzureVMName")]
+        public string TfoAzureVMName { get; set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmDiskDetails.cs
new file mode 100644
index 000000000000..c6558a3746c4
--- /dev/null
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmDiskDetails.cs
@@ -0,0 +1,69 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Azure VM disk details.
+    /// </summary>
+    public partial class A2AVmDiskDetails
+    {
+        /// <summary>
+        /// Initializes a new instance of the A2AVmDiskDetails class.
+        /// </summary>
+        public A2AVmDiskDetails()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the A2AVmDiskDetails class.
+        /// </summary>
+        /// <param name="diskUri">The disk Uri.</param>
+        /// <param name="recoveryAzureStorageAccountId">The recovery VHD
+        /// storage account Id.</param>
+        /// <param name="primaryStagingAzureStorageAccountId">The primary
+        /// staging storage account Id.</param>
+        public A2AVmDiskDetails(string diskUri = default(string), string recoveryAzureStorageAccountId = default(string), string primaryStagingAzureStorageAccountId = default(string))
+        {
+            DiskUri = diskUri;
+            RecoveryAzureStorageAccountId = recoveryAzureStorageAccountId;
+            PrimaryStagingAzureStorageAccountId = primaryStagingAzureStorageAccountId;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets the disk Uri.
+        /// </summary>
+        [JsonProperty(PropertyName = "diskUri")]
+        public string DiskUri { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recovery VHD storage account Id.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryAzureStorageAccountId")]
+        public string RecoveryAzureStorageAccountId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary staging storage account Id.
+        /// </summary>
+        [JsonProperty(PropertyName = "primaryStagingAzureStorageAccountId")]
+        public string PrimaryStagingAzureStorageAccountId { get; set; }
+
+    }
+}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmDiskInputDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmDiskInputDetails.cs
index 2eba97ba3c0e..c3cda59a247b 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmDiskInputDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmDiskInputDetails.cs
@@ -10,12 +10,11 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
-    /// A2A disk input details.
+    /// Azure VM disk input details.
     /// </summary>
     public partial class A2AVmDiskInputDetails
     {
@@ -35,7 +34,7 @@ public A2AVmDiskInputDetails()
         /// storage account Id.</param>
         /// <param name="primaryStagingAzureStorageAccountId">The primary
         /// staging storage account Id.</param>
-        public A2AVmDiskInputDetails(string diskUri, string recoveryAzureStorageAccountId, string primaryStagingAzureStorageAccountId)
+        public A2AVmDiskInputDetails(string diskUri = default(string), string recoveryAzureStorageAccountId = default(string), string primaryStagingAzureStorageAccountId = default(string))
         {
             DiskUri = diskUri;
             RecoveryAzureStorageAccountId = recoveryAzureStorageAccountId;
@@ -66,26 +65,5 @@ public A2AVmDiskInputDetails(string diskUri, string recoveryAzureStorageAccountI
         [JsonProperty(PropertyName = "primaryStagingAzureStorageAccountId")]
         public string PrimaryStagingAzureStorageAccountId { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (DiskUri == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "DiskUri");
-            }
-            if (RecoveryAzureStorageAccountId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "RecoveryAzureStorageAccountId");
-            }
-            if (PrimaryStagingAzureStorageAccountId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "PrimaryStagingAzureStorageAccountId");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskDetails.cs
new file mode 100644
index 000000000000..a228b6e9e6dc
--- /dev/null
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskDetails.cs
@@ -0,0 +1,106 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Azure VM managed disk input details.
+    /// </summary>
+    public partial class A2AVmManagedDiskDetails
+    {
+        /// <summary>
+        /// Initializes a new instance of the A2AVmManagedDiskDetails class.
+        /// </summary>
+        public A2AVmManagedDiskDetails()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the A2AVmManagedDiskDetails class.
+        /// </summary>
+        /// <param name="diskId">The disk Id.</param>
+        /// <param name="primaryStagingAzureStorageAccountId">The primary
+        /// staging storage account Arm Id.</param>
+        /// <param name="recoveryResourceGroupId">The target resource group Arm
+        /// Id.</param>
+        /// <param name="recoveryReplicaDiskAccountType">The replica disk
+        /// type.</param>
+        /// <param name="recoveryTargetDiskAccountType">The target disk type
+        /// after failover.</param>
+        /// <param name="recoveryDiskEncryptionSetId">The recovery disk
+        /// encryption set Id.</param>
+        /// <param name="diskEncryptionInfo">The recovery disk encryption
+        /// information (for one / single pass flows).</param>
+        public A2AVmManagedDiskDetails(string diskId = default(string), string primaryStagingAzureStorageAccountId = default(string), string recoveryResourceGroupId = default(string), string recoveryReplicaDiskAccountType = default(string), string recoveryTargetDiskAccountType = default(string), string recoveryDiskEncryptionSetId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo))
+        {
+            DiskId = diskId;
+            PrimaryStagingAzureStorageAccountId = primaryStagingAzureStorageAccountId;
+            RecoveryResourceGroupId = recoveryResourceGroupId;
+            RecoveryReplicaDiskAccountType = recoveryReplicaDiskAccountType;
+            RecoveryTargetDiskAccountType = recoveryTargetDiskAccountType;
+            RecoveryDiskEncryptionSetId = recoveryDiskEncryptionSetId;
+            DiskEncryptionInfo = diskEncryptionInfo;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets the disk Id.
+        /// </summary>
+        [JsonProperty(PropertyName = "diskId")]
+        public string DiskId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary staging storage account Arm Id.
+        /// </summary>
+        [JsonProperty(PropertyName = "primaryStagingAzureStorageAccountId")]
+        public string PrimaryStagingAzureStorageAccountId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the target resource group Arm Id.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryResourceGroupId")]
+        public string RecoveryResourceGroupId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the replica disk type.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryReplicaDiskAccountType")]
+        public string RecoveryReplicaDiskAccountType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the target disk type after failover.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryTargetDiskAccountType")]
+        public string RecoveryTargetDiskAccountType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recovery disk encryption set Id.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryDiskEncryptionSetId")]
+        public string RecoveryDiskEncryptionSetId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recovery disk encryption information (for one /
+        /// single pass flows).
+        /// </summary>
+        [JsonProperty(PropertyName = "diskEncryptionInfo")]
+        public DiskEncryptionInfo DiskEncryptionInfo { get; set; }
+
+    }
+}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskInputDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskInputDetails.cs
index 1348e6c18055..e6006fabbafc 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskInputDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskInputDetails.cs
@@ -10,12 +10,11 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
-    /// A2A managed disk input details.
+    /// Azure VM managed disk input details.
     /// </summary>
     public partial class A2AVmManagedDiskInputDetails
     {
@@ -47,7 +46,7 @@ public A2AVmManagedDiskInputDetails()
         /// encryption set Id.</param>
         /// <param name="diskEncryptionInfo">The recovery disk encryption
         /// information (for one / single pass flows).</param>
-        public A2AVmManagedDiskInputDetails(string diskId, string primaryStagingAzureStorageAccountId, string recoveryResourceGroupId, string recoveryReplicaDiskAccountType = default(string), string recoveryTargetDiskAccountType = default(string), string recoveryDiskEncryptionSetId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo))
+        public A2AVmManagedDiskInputDetails(string diskId = default(string), string primaryStagingAzureStorageAccountId = default(string), string recoveryResourceGroupId = default(string), string recoveryReplicaDiskAccountType = default(string), string recoveryTargetDiskAccountType = default(string), string recoveryDiskEncryptionSetId = default(string), DiskEncryptionInfo diskEncryptionInfo = default(DiskEncryptionInfo))
         {
             DiskId = diskId;
             PrimaryStagingAzureStorageAccountId = primaryStagingAzureStorageAccountId;
@@ -109,26 +108,5 @@ public A2AVmManagedDiskInputDetails()
         [JsonProperty(PropertyName = "diskEncryptionInfo")]
         public DiskEncryptionInfo DiskEncryptionInfo { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (DiskId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "DiskId");
-            }
-            if (PrimaryStagingAzureStorageAccountId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "PrimaryStagingAzureStorageAccountId");
-            }
-            if (RecoveryResourceGroupId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "RecoveryResourceGroupId");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskUpdateDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskUpdateDetails.cs
index 918a8de29bb5..fa03585d2cfd 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskUpdateDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskUpdateDetails.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// A2A Vm managed disk update details.
+    /// Azure VM managed disk update input details.
     /// </summary>
     public partial class A2AVmManagedDiskUpdateDetails
     {
@@ -36,8 +36,8 @@ public A2AVmManagedDiskUpdateDetails()
         /// before failover.</param>
         /// <param name="recoveryReplicaDiskAccountType">The replica disk type
         /// before failover.</param>
-        /// <param name="diskEncryptionInfo">The recovery os disk encryption
-        /// information.</param>
+        /// <param name="diskEncryptionInfo">The recovery disk encryption
+        /// information (for one / single pass flows).</param>
         /// <param name="failoverDiskName">The target disk name for unplanned
         /// failover operation.</param>
         /// <param name="tfoDiskName">The target disk name for test failover
@@ -77,7 +77,8 @@ public A2AVmManagedDiskUpdateDetails()
         public string RecoveryReplicaDiskAccountType { get; set; }
 
         /// <summary>
-        /// Gets or sets the recovery os disk encryption information.
+        /// Gets or sets the recovery disk encryption information (for one /
+        /// single pass flows).
         /// </summary>
         [JsonProperty(PropertyName = "diskEncryptionInfo")]
         public DiskEncryptionInfo DiskEncryptionInfo { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AZoneDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AZoneDetails.cs
deleted file mode 100644
index b4bc38b6a84a..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/A2AZoneDetails.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Zone details data.
-    /// </summary>
-    public partial class A2AZoneDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the A2AZoneDetails class.
-        /// </summary>
-        public A2AZoneDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the A2AZoneDetails class.
-        /// </summary>
-        /// <param name="source">Source zone info.</param>
-        /// <param name="target">The target zone info.</param>
-        public A2AZoneDetails(string source = default(string), string target = default(string))
-        {
-            Source = source;
-            Target = target;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets source zone info.
-        /// </summary>
-        [JsonProperty(PropertyName = "source")]
-        public string Source { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target zone info.
-        /// </summary>
-        [JsonProperty(PropertyName = "target")]
-        public string Target { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddDisksInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddDisksInput.cs
index a0e278f9ee47..4e6224bb5085 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddDisksInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddDisksInput.cs
@@ -47,18 +47,5 @@ public AddDisksInput()
         [JsonProperty(PropertyName = "properties")]
         public AddDisksInputProperties Properties { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="Rest.ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Properties != null)
-            {
-                Properties.Validate();
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddDisksInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddDisksInputProperties.cs
index d9baff412a2f..65a8fcffe6e2 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddDisksInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddDisksInputProperties.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -35,7 +34,7 @@ public AddDisksInputProperties()
         /// AzureEnableProtectionInput object. For San provider, it will be
         /// SanEnableProtectionInput object. For HyperVReplicaAzure provider,
         /// it can be null.</param>
-        public AddDisksInputProperties(AddDisksProviderSpecificInput providerSpecificDetails)
+        public AddDisksInputProperties(AddDisksProviderSpecificInput providerSpecificDetails = default(AddDisksProviderSpecificInput))
         {
             ProviderSpecificDetails = providerSpecificDetails;
             CustomInit();
@@ -55,18 +54,5 @@ public AddDisksInputProperties(AddDisksProviderSpecificInput providerSpecificDet
         [JsonProperty(PropertyName = "providerSpecificDetails")]
         public AddDisksProviderSpecificInput ProviderSpecificDetails { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (ProviderSpecificDetails == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "ProviderSpecificDetails");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddRecoveryServicesProviderInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddRecoveryServicesProviderInputProperties.cs
index 021833f83923..e310cb899312 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddRecoveryServicesProviderInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AddRecoveryServicesProviderInputProperties.cs
@@ -40,14 +40,12 @@ public AddRecoveryServicesProviderInputProperties()
         /// input for resource access.</param>
         /// <param name="machineId">The Id of the machine where the provider is
         /// getting added.</param>
-        /// <param name="biosId">The Bios Id of the machine.</param>
         /// <param name="dataPlaneAuthenticationIdentityInput">The identity
         /// provider input for data plane authentication.</param>
-        public AddRecoveryServicesProviderInputProperties(string machineName, IdentityProviderInput authenticationIdentityInput, IdentityProviderInput resourceAccessIdentityInput, string machineId = default(string), string biosId = default(string), IdentityProviderInput dataPlaneAuthenticationIdentityInput = default(IdentityProviderInput))
+        public AddRecoveryServicesProviderInputProperties(string machineName, IdentityProviderInput authenticationIdentityInput, IdentityProviderInput resourceAccessIdentityInput, string machineId = default(string), IdentityProviderInput dataPlaneAuthenticationIdentityInput = default(IdentityProviderInput))
         {
             MachineName = machineName;
             MachineId = machineId;
-            BiosId = biosId;
             AuthenticationIdentityInput = authenticationIdentityInput;
             ResourceAccessIdentityInput = resourceAccessIdentityInput;
             DataPlaneAuthenticationIdentityInput = dataPlaneAuthenticationIdentityInput;
@@ -73,12 +71,6 @@ public AddRecoveryServicesProviderInputProperties()
         [JsonProperty(PropertyName = "machineId")]
         public string MachineId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Bios Id of the machine.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; set; }
-
         /// <summary>
         /// Gets or sets the identity provider input for DRA authentication.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AgentDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AgentDetails.cs
index 129b8b99e431..a5fab74cfd38 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AgentDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AgentDetails.cs
@@ -37,7 +37,7 @@ public AgentDetails()
         /// registered.</param>
         /// <param name="biosId">The machine BIOS Id.</param>
         /// <param name="fqdn">The machine FQDN.</param>
-        /// <param name="disks">The disks.</param>
+        /// <param name="disks">The details of agent disks.</param>
         public AgentDetails(string agentId = default(string), string machineId = default(string), string biosId = default(string), string fqdn = default(string), IList<AgentDiskDetails> disks = default(IList<AgentDiskDetails>))
         {
             AgentId = agentId;
@@ -78,7 +78,7 @@ public AgentDetails()
         public string Fqdn { get; private set; }
 
         /// <summary>
-        /// Gets the disks.
+        /// Gets the details of agent disks.
         /// </summary>
         [JsonProperty(PropertyName = "disks")]
         public IList<AgentDiskDetails> Disks { get; private set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ApplyRecoveryPointInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ApplyRecoveryPointInput.cs
index ef7dabd5a7a6..f7ad85e5a4fa 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ApplyRecoveryPointInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ApplyRecoveryPointInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -32,7 +31,7 @@ public ApplyRecoveryPointInput()
         /// </summary>
         /// <param name="properties">The input properties to apply recovery
         /// point.</param>
-        public ApplyRecoveryPointInput(ApplyRecoveryPointInputProperties properties)
+        public ApplyRecoveryPointInput(ApplyRecoveryPointInputProperties properties = default(ApplyRecoveryPointInputProperties))
         {
             Properties = properties;
             CustomInit();
@@ -49,22 +48,5 @@ public ApplyRecoveryPointInput(ApplyRecoveryPointInputProperties properties)
         [JsonProperty(PropertyName = "properties")]
         public ApplyRecoveryPointInputProperties Properties { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Properties == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Properties");
-            }
-            if (Properties != null)
-            {
-                Properties.Validate();
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ApplyRecoveryPointInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ApplyRecoveryPointInputProperties.cs
index 8bc21a6c0104..6a036a119d23 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ApplyRecoveryPointInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ApplyRecoveryPointInputProperties.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -32,10 +31,10 @@ public ApplyRecoveryPointInputProperties()
         /// Initializes a new instance of the ApplyRecoveryPointInputProperties
         /// class.
         /// </summary>
+        /// <param name="recoveryPointId">The recovery point Id.</param>
         /// <param name="providerSpecificDetails">Provider specific input for
         /// applying recovery point.</param>
-        /// <param name="recoveryPointId">The recovery point Id.</param>
-        public ApplyRecoveryPointInputProperties(ApplyRecoveryPointProviderSpecificInput providerSpecificDetails, string recoveryPointId = default(string))
+        public ApplyRecoveryPointInputProperties(string recoveryPointId = default(string), ApplyRecoveryPointProviderSpecificInput providerSpecificDetails = default(ApplyRecoveryPointProviderSpecificInput))
         {
             RecoveryPointId = recoveryPointId;
             ProviderSpecificDetails = providerSpecificDetails;
@@ -59,18 +58,5 @@ public ApplyRecoveryPointInputProperties()
         [JsonProperty(PropertyName = "providerSpecificDetails")]
         public ApplyRecoveryPointProviderSpecificInput ProviderSpecificDetails { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (ProviderSpecificDetails == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "ProviderSpecificDetails");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ExportJobOutputSerializationType.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AutoProtectionOfDataDiskStatus.cs
similarity index 66%
rename from sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ExportJobOutputSerializationType.cs
rename to sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AutoProtectionOfDataDiskStatus.cs
index 560f3b988ffc..a9452a9297e2 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ExportJobOutputSerializationType.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AutoProtectionOfDataDiskStatus.cs
@@ -12,12 +12,11 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
 
     /// <summary>
-    /// Defines values for ExportJobOutputSerializationType.
+    /// Defines values for AutoProtectionOfDataDiskStatus.
     /// </summary>
-    public static class ExportJobOutputSerializationType
+    public static class AutoProtectionOfDataDiskStatus
     {
-        public const string Json = "Json";
-        public const string Xml = "Xml";
-        public const string Excel = "Excel";
+        public const string Disabled = "Disabled";
+        public const string Enabled = "Enabled";
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureFabricSpecificDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureFabricSpecificDetails.cs
index a2393d0986ff..ac72ec3fd2ae 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureFabricSpecificDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureFabricSpecificDetails.cs
@@ -35,12 +35,10 @@ public AzureFabricSpecificDetails()
         /// <param name="location">The Location for the Azure fabric.</param>
         /// <param name="containerIds">The container Ids for the Azure
         /// fabric.</param>
-        /// <param name="zones">The zones.</param>
-        public AzureFabricSpecificDetails(string location = default(string), IList<string> containerIds = default(IList<string>), IList<A2AZoneDetails> zones = default(IList<A2AZoneDetails>))
+        public AzureFabricSpecificDetails(string location = default(string), IList<string> containerIds = default(IList<string>))
         {
             Location = location;
             ContainerIds = containerIds;
-            Zones = zones;
             CustomInit();
         }
 
@@ -61,11 +59,5 @@ public AzureFabricSpecificDetails()
         [JsonProperty(PropertyName = "containerIds")]
         public IList<string> ContainerIds { get; set; }
 
-        /// <summary>
-        /// Gets or sets the zones.
-        /// </summary>
-        [JsonProperty(PropertyName = "zones")]
-        public IList<A2AZoneDetails> Zones { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureToAzureCreateNetworkMappingInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureToAzureCreateNetworkMappingInput.cs
index 1a71a3e954b5..179ca4b57249 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureToAzureCreateNetworkMappingInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureToAzureCreateNetworkMappingInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -35,7 +34,7 @@ public AzureToAzureCreateNetworkMappingInput()
         /// AzureToAzureCreateNetworkMappingInput class.
         /// </summary>
         /// <param name="primaryNetworkId">The primary azure vnet Id.</param>
-        public AzureToAzureCreateNetworkMappingInput(string primaryNetworkId)
+        public AzureToAzureCreateNetworkMappingInput(string primaryNetworkId = default(string))
         {
             PrimaryNetworkId = primaryNetworkId;
             CustomInit();
@@ -52,18 +51,5 @@ public AzureToAzureCreateNetworkMappingInput(string primaryNetworkId)
         [JsonProperty(PropertyName = "primaryNetworkId")]
         public string PrimaryNetworkId { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (PrimaryNetworkId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "PrimaryNetworkId");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateNetworkMappingInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateNetworkMappingInput.cs
index 6c7b8d441086..a6f336202d27 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateNetworkMappingInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateNetworkMappingInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -32,7 +31,7 @@ public CreateNetworkMappingInput()
         /// </summary>
         /// <param name="properties">Input properties for creating network
         /// mapping.</param>
-        public CreateNetworkMappingInput(CreateNetworkMappingInputProperties properties)
+        public CreateNetworkMappingInput(CreateNetworkMappingInputProperties properties = default(CreateNetworkMappingInputProperties))
         {
             Properties = properties;
             CustomInit();
@@ -49,22 +48,5 @@ public CreateNetworkMappingInput(CreateNetworkMappingInputProperties properties)
         [JsonProperty(PropertyName = "properties")]
         public CreateNetworkMappingInputProperties Properties { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Properties == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Properties");
-            }
-            if (Properties != null)
-            {
-                Properties.Validate();
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateNetworkMappingInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateNetworkMappingInputProperties.cs
index c76cabe16b55..c4c45f44896e 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateNetworkMappingInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateNetworkMappingInputProperties.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -32,11 +31,11 @@ public CreateNetworkMappingInputProperties()
         /// Initializes a new instance of the
         /// CreateNetworkMappingInputProperties class.
         /// </summary>
-        /// <param name="recoveryNetworkId">Recovery network Id.</param>
         /// <param name="recoveryFabricName">Recovery fabric Name.</param>
+        /// <param name="recoveryNetworkId">Recovery network Id.</param>
         /// <param name="fabricSpecificDetails">Fabric specific input
         /// properties.</param>
-        public CreateNetworkMappingInputProperties(string recoveryNetworkId, string recoveryFabricName = default(string), FabricSpecificCreateNetworkMappingInput fabricSpecificDetails = default(FabricSpecificCreateNetworkMappingInput))
+        public CreateNetworkMappingInputProperties(string recoveryFabricName = default(string), string recoveryNetworkId = default(string), FabricSpecificCreateNetworkMappingInput fabricSpecificDetails = default(FabricSpecificCreateNetworkMappingInput))
         {
             RecoveryFabricName = recoveryFabricName;
             RecoveryNetworkId = recoveryNetworkId;
@@ -67,18 +66,5 @@ public CreateNetworkMappingInputProperties()
         [JsonProperty(PropertyName = "fabricSpecificDetails")]
         public FabricSpecificCreateNetworkMappingInput FabricSpecificDetails { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (RecoveryNetworkId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "RecoveryNetworkId");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateProtectionIntentProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateProtectionIntentProperties.cs
index 7a410208e8b7..ae2f0e3f4872 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateProtectionIntentProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CreateProtectionIntentProperties.cs
@@ -32,8 +32,8 @@ public CreateProtectionIntentProperties()
         /// class.
         /// </summary>
         /// <param name="providerSpecificDetails">The ReplicationProviderInput.
-        /// For A2A provider, it will be A2ACreateProtectionIntentInput
-        /// object.</param>
+        /// For A2A provider, it will be A2ACreateProtectionIntentInput object.
+        /// For other providers, it can be null.</param>
         public CreateProtectionIntentProperties(CreateProtectionIntentProviderSpecificDetails providerSpecificDetails = default(CreateProtectionIntentProviderSpecificDetails))
         {
             ProviderSpecificDetails = providerSpecificDetails;
@@ -47,7 +47,8 @@ public CreateProtectionIntentProperties()
 
         /// <summary>
         /// Gets or sets the ReplicationProviderInput. For A2A provider, it
-        /// will be A2ACreateProtectionIntentInput object.
+        /// will be A2ACreateProtectionIntentInput object. For other providers,
+        /// it can be null.
         /// </summary>
         [JsonProperty(PropertyName = "providerSpecificDetails")]
         public CreateProtectionIntentProviderSpecificDetails ProviderSpecificDetails { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CurrentJobDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CurrentJobDetails.cs
index 33fa95e5e0f3..28c33e434630 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CurrentJobDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/CurrentJobDetails.cs
@@ -46,22 +46,22 @@ public CurrentJobDetails()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the job name.
+        /// Gets or sets the job name.
         /// </summary>
         [JsonProperty(PropertyName = "jobName")]
-        public string JobName { get; private set; }
+        public string JobName { get; set; }
 
         /// <summary>
-        /// Gets the ARM Id of the job being executed.
+        /// Gets or sets the ARM Id of the job being executed.
         /// </summary>
         [JsonProperty(PropertyName = "jobId")]
-        public string JobId { get; private set; }
+        public string JobId { get; set; }
 
         /// <summary>
-        /// Gets the start time of the job.
+        /// Gets or sets the start time of the job.
         /// </summary>
         [JsonProperty(PropertyName = "startTime")]
-        public System.DateTime? StartTime { get; private set; }
+        public System.DateTime? StartTime { get; set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DataStore.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DataStore.cs
index 7709f66edcfc..3d9aae721cea 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DataStore.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DataStore.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// The datastore details of the MT.
+    /// The data store details of the MT.
     /// </summary>
     public partial class DataStore
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DisableProtectionInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DisableProtectionInput.cs
index 4705b72d94e8..1c00d9046f7d 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DisableProtectionInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DisableProtectionInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -32,7 +31,7 @@ public DisableProtectionInput()
         /// </summary>
         /// <param name="properties">Disable protection input
         /// properties.</param>
-        public DisableProtectionInput(DisableProtectionInputProperties properties)
+        public DisableProtectionInput(DisableProtectionInputProperties properties = default(DisableProtectionInputProperties))
         {
             Properties = properties;
             CustomInit();
@@ -49,18 +48,5 @@ public DisableProtectionInput(DisableProtectionInputProperties properties)
         [JsonProperty(PropertyName = "properties")]
         public DisableProtectionInputProperties Properties { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Properties == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Properties");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskDetails.cs
index cc40139a924d..891e90ea5809 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskDetails.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Onprem disk details data.
+    /// On-prem disk details data.
     /// </summary>
     public partial class DiskDetails
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskEncryptionKeyInfo.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskEncryptionKeyInfo.cs
index 9125876971ce..8df13c8d8744 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskEncryptionKeyInfo.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskEncryptionKeyInfo.cs
@@ -30,8 +30,8 @@ public DiskEncryptionKeyInfo()
         /// <summary>
         /// Initializes a new instance of the DiskEncryptionKeyInfo class.
         /// </summary>
-        /// <param name="secretIdentifier">The secret url / identifier.</param>
-        /// <param name="keyVaultResourceArmId">The KeyVault resource ARM id
+        /// <param name="secretIdentifier">The secret URL / identifier.</param>
+        /// <param name="keyVaultResourceArmId">The KeyVault resource ARM Id
         /// for secret.</param>
         public DiskEncryptionKeyInfo(string secretIdentifier = default(string), string keyVaultResourceArmId = default(string))
         {
@@ -46,13 +46,13 @@ public DiskEncryptionKeyInfo()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the secret url / identifier.
+        /// Gets or sets the secret URL / identifier.
         /// </summary>
         [JsonProperty(PropertyName = "secretIdentifier")]
         public string SecretIdentifier { get; set; }
 
         /// <summary>
-        /// Gets or sets the KeyVault resource ARM id for secret.
+        /// Gets or sets the KeyVault resource ARM Id for secret.
         /// </summary>
         [JsonProperty(PropertyName = "keyVaultResourceArmId")]
         public string KeyVaultResourceArmId { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskReplicationProgressHealth.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskReplicationProgressHealth.cs
deleted file mode 100644
index f610ba6cec09..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskReplicationProgressHealth.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-
-    /// <summary>
-    /// Defines values for DiskReplicationProgressHealth.
-    /// </summary>
-    public static class DiskReplicationProgressHealth
-    {
-        public const string None = "None";
-        public const string InProgress = "InProgress";
-        public const string SlowProgress = "SlowProgress";
-        public const string NoProgress = "NoProgress";
-        public const string Queued = "Queued";
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackRecoveryPointType.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskType.cs
similarity index 64%
rename from sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackRecoveryPointType.cs
rename to sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskType.cs
index ea82a305b682..2aa4481dc01b 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackRecoveryPointType.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DiskType.cs
@@ -12,11 +12,12 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
 
     /// <summary>
-    /// Defines values for InMageRcmFailbackRecoveryPointType.
+    /// Defines values for DiskType.
     /// </summary>
-    public static class InMageRcmFailbackRecoveryPointType
+    public static class DiskType
     {
-        public const string ApplicationConsistent = "ApplicationConsistent";
-        public const string CrashConsistent = "CrashConsistent";
+        public const string StandardLRS = "Standard_LRS";
+        public const string PremiumLRS = "Premium_LRS";
+        public const string StandardSSDLRS = "StandardSSD_LRS";
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/Display.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/Display.cs
index 9ab745cb4930..4997e3127dfb 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/Display.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/Display.cs
@@ -34,32 +34,32 @@ public Display()
         /// Initializes a new instance of the Display class.
         /// </summary>
         /// <param name="provider">The provider. The localized friendly form of
-        /// the resource provider name - it is expected to also include the
+        /// the resource provider name – it is expected to also include the
         /// publisher/company responsible. It should use Title Casing and begin
         /// with "Microsoft" for 1st party services. e.g. "Microsoft Monitoring
-        /// Insights" or "Microsoft Compute.".</param>
+        /// Insights" or "Microsoft Compute."</param>
         /// <param name="resource">The resource. The localized friendly form of
-        /// the resource related to this action/operation - it should match the
+        /// the resource related to this action/operation – it should match the
         /// public documentation for the resource provider. It should use Title
         /// Casing. This value should be unique for a particular URL type (e.g.
-        /// nested types should *not* reuse their parent's display.resource
+        /// nested types should *not* reuse their parent’s display.resource
         /// field). e.g. "Virtual Machines" or "Scheduler Job Collections", or
-        /// "Virtual Machine VM Sizes" or "Scheduler Jobs".</param>
+        /// "Virtual Machine VM Sizes" or "Scheduler Jobs"</param>
         /// <param name="operation">The operation. The localized friendly name
         /// for the operation, as it should be shown to the user. It should be
         /// concise (to fit in drop downs) but clear (i.e. self-documenting).
         /// It should use Title Casing. Prescriptive guidance: Read Create or
-        /// Update Delete 'ActionName'.</param>
+        /// Update Delete 'ActionName'</param>
         /// <param name="description">The description. The localized friendly
         /// description for the operation, as it should be shown to the user.
-        /// It should be thorough, yet concise - it will be used in tool tips
+        /// It should be thorough, yet concise – it will be used in tool tips
         /// and detailed views. Prescriptive guidance for namespaces: Read any
         /// 'display.provider' resource Create or Update any 'display.provider'
         /// resource Delete any 'display.provider' resource Perform any other
         /// action on any 'display.provider' resource Prescriptive guidance for
         /// namespaces: Read any 'display.resource' Create or Update any
         /// 'display.resource' Delete any 'display.resource' 'ActionName' any
-        /// 'display.resources'.</param>
+        /// 'display.resources'</param>
         public Display(string provider = default(string), string resource = default(string), string operation = default(string), string description = default(string))
         {
             Provider = provider;
@@ -76,22 +76,22 @@ public Display()
 
         /// <summary>
         /// Gets or sets the provider. The localized friendly form of the
-        /// resource provider name - it is expected to also include the
+        /// resource provider name – it is expected to also include the
         /// publisher/company responsible. It should use Title Casing and begin
         /// with "Microsoft" for 1st party services. e.g. "Microsoft Monitoring
-        /// Insights" or "Microsoft Compute.".
+        /// Insights" or "Microsoft Compute."
         /// </summary>
         [JsonProperty(PropertyName = "provider")]
         public string Provider { get; set; }
 
         /// <summary>
         /// Gets or sets the resource. The localized friendly form of the
-        /// resource related to this action/operation - it should match the
+        /// resource related to this action/operation – it should match the
         /// public documentation for the resource provider. It should use Title
         /// Casing. This value should be unique for a particular URL type (e.g.
-        /// nested types should *not* reuse their parent's display.resource
+        /// nested types should *not* reuse their parent’s display.resource
         /// field). e.g. "Virtual Machines" or "Scheduler Job Collections", or
-        /// "Virtual Machine VM Sizes" or "Scheduler Jobs".
+        /// "Virtual Machine VM Sizes" or "Scheduler Jobs"
         /// </summary>
         [JsonProperty(PropertyName = "resource")]
         public string Resource { get; set; }
@@ -101,7 +101,7 @@ public Display()
         /// operation, as it should be shown to the user. It should be concise
         /// (to fit in drop downs) but clear (i.e. self-documenting). It should
         /// use Title Casing. Prescriptive guidance: Read Create or Update
-        /// Delete 'ActionName'.
+        /// Delete 'ActionName'
         /// </summary>
         [JsonProperty(PropertyName = "operation")]
         public string Operation { get; set; }
@@ -109,14 +109,14 @@ public Display()
         /// <summary>
         /// Gets or sets the description. The localized friendly description
         /// for the operation, as it should be shown to the user. It should be
-        /// thorough, yet concise - it will be used in tool tips and detailed
+        /// thorough, yet concise – it will be used in tool tips and detailed
         /// views. Prescriptive guidance for namespaces: Read any
         /// 'display.provider' resource Create or Update any 'display.provider'
         /// resource Delete any 'display.provider' resource Perform any other
         /// action on any 'display.provider' resource Prescriptive guidance for
         /// namespaces: Read any 'display.resource' Create or Update any
         /// 'display.resource' Delete any 'display.resource' 'ActionName' any
-        /// 'display.resources'.
+        /// 'display.resources'
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DraDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DraDetails.cs
index 560d1348b316..07a274a1eff9 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DraDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/DraDetails.cs
@@ -33,18 +33,16 @@ public DraDetails()
         /// </summary>
         /// <param name="id">The DRA Id.</param>
         /// <param name="name">The DRA name.</param>
-        /// <param name="biosId">The DRA Bios Id.</param>
-        /// <param name="version">The version.</param>
+        /// <param name="version">The DRA version.</param>
         /// <param name="lastHeartbeatUtc">The last heartbeat received from the
         /// DRA.</param>
-        /// <param name="health">The health. Possible values include: 'None',
-        /// 'Normal', 'Warning', 'Critical'</param>
+        /// <param name="health">The health of the DRA. Possible values
+        /// include: 'None', 'Normal', 'Warning', 'Critical'</param>
         /// <param name="healthErrors">The health errors.</param>
-        public DraDetails(string id = default(string), string name = default(string), string biosId = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
+        public DraDetails(string id = default(string), string name = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
         {
             Id = id;
             Name = name;
-            BiosId = biosId;
             Version = version;
             LastHeartbeatUtc = lastHeartbeatUtc;
             Health = health;
@@ -70,13 +68,7 @@ public DraDetails()
         public string Name { get; private set; }
 
         /// <summary>
-        /// Gets the DRA Bios Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; private set; }
-
-        /// <summary>
-        /// Gets the version.
+        /// Gets the DRA version.
         /// </summary>
         [JsonProperty(PropertyName = "version")]
         public string Version { get; private set; }
@@ -88,8 +80,8 @@ public DraDetails()
         public System.DateTime? LastHeartbeatUtc { get; private set; }
 
         /// <summary>
-        /// Gets the health. Possible values include: 'None', 'Normal',
-        /// 'Warning', 'Critical'
+        /// Gets the health of the DRA. Possible values include: 'None',
+        /// 'Normal', 'Warning', 'Critical'
         /// </summary>
         [JsonProperty(PropertyName = "health")]
         public string Health { get; private set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/EventProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/EventProperties.cs
index b909833a5f6d..fcdd2597b959 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/EventProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/EventProperties.cs
@@ -38,8 +38,6 @@ public EventProperties()
         /// <param name="affectedObjectFriendlyName">The friendly name of the
         /// source of the event on which it is raised (for example, VM, VMM
         /// etc).</param>
-        /// <param name="affectedObjectCorrelationId">The affected object
-        /// correlationId for the event.</param>
         /// <param name="severity">The severity of the event.</param>
         /// <param name="timeOfOccurrence">The time of occurrence of the
         /// event.</param>
@@ -50,13 +48,12 @@ public EventProperties()
         /// settings.</param>
         /// <param name="healthErrors">The list of errors / warnings capturing
         /// details associated with the issue(s).</param>
-        public EventProperties(string eventCode = default(string), string description = default(string), string eventType = default(string), string affectedObjectFriendlyName = default(string), string affectedObjectCorrelationId = default(string), string severity = default(string), System.DateTime? timeOfOccurrence = default(System.DateTime?), string fabricId = default(string), EventProviderSpecificDetails providerSpecificDetails = default(EventProviderSpecificDetails), EventSpecificDetails eventSpecificDetails = default(EventSpecificDetails), IList<HealthError> healthErrors = default(IList<HealthError>))
+        public EventProperties(string eventCode = default(string), string description = default(string), string eventType = default(string), string affectedObjectFriendlyName = default(string), string severity = default(string), System.DateTime? timeOfOccurrence = default(System.DateTime?), string fabricId = default(string), EventProviderSpecificDetails providerSpecificDetails = default(EventProviderSpecificDetails), EventSpecificDetails eventSpecificDetails = default(EventSpecificDetails), IList<HealthError> healthErrors = default(IList<HealthError>))
         {
             EventCode = eventCode;
             Description = description;
             EventType = eventType;
             AffectedObjectFriendlyName = affectedObjectFriendlyName;
-            AffectedObjectCorrelationId = affectedObjectCorrelationId;
             Severity = severity;
             TimeOfOccurrence = timeOfOccurrence;
             FabricId = fabricId;
@@ -97,12 +94,6 @@ public EventProperties()
         [JsonProperty(PropertyName = "affectedObjectFriendlyName")]
         public string AffectedObjectFriendlyName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the affected object correlationId for the event.
-        /// </summary>
-        [JsonProperty(PropertyName = "affectedObjectCorrelationId")]
-        public string AffectedObjectCorrelationId { get; set; }
-
         /// <summary>
         /// Gets or sets the severity of the event.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/EventQueryParameter.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/EventQueryParameter.cs
index 28caa55702a7..b57897b9c72c 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/EventQueryParameter.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/EventQueryParameter.cs
@@ -39,20 +39,17 @@ public EventQueryParameter()
         /// events to be queried.</param>
         /// <param name="affectedObjectFriendlyName">The affected object name
         /// of the events to be queried.</param>
-        /// <param name="affectedObjectCorrelationId">The affected object
-        /// correlationId for the events to be queried.</param>
         /// <param name="startTime">The start time of the time range within
         /// which the events are to be queried.</param>
         /// <param name="endTime">The end time of the time range within which
         /// the events are to be queried.</param>
-        public EventQueryParameter(string eventCode = default(string), string severity = default(string), string eventType = default(string), string fabricName = default(string), string affectedObjectFriendlyName = default(string), string affectedObjectCorrelationId = default(string), System.DateTime? startTime = default(System.DateTime?), System.DateTime? endTime = default(System.DateTime?))
+        public EventQueryParameter(string eventCode = default(string), string severity = default(string), string eventType = default(string), string fabricName = default(string), string affectedObjectFriendlyName = default(string), System.DateTime? startTime = default(System.DateTime?), System.DateTime? endTime = default(System.DateTime?))
         {
             EventCode = eventCode;
             Severity = severity;
             EventType = eventType;
             FabricName = fabricName;
             AffectedObjectFriendlyName = affectedObjectFriendlyName;
-            AffectedObjectCorrelationId = affectedObjectCorrelationId;
             StartTime = startTime;
             EndTime = endTime;
             CustomInit();
@@ -94,13 +91,6 @@ public EventQueryParameter()
         [JsonProperty(PropertyName = "affectedObjectFriendlyName")]
         public string AffectedObjectFriendlyName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the affected object correlationId for the events to be
-        /// queried.
-        /// </summary>
-        [JsonProperty(PropertyName = "affectedObjectCorrelationId")]
-        public string AffectedObjectCorrelationId { get; set; }
-
         /// <summary>
         /// Gets or sets the start time of the time range within which the
         /// events are to be queried.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricCreationInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricCreationInput.cs
index 7713b2b2bb0c..29392ec792b3 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricCreationInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricCreationInput.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Site details provided during the time of site creation.
+    /// Site details provided during the time of site creation
     /// </summary>
     public partial class FabricCreationInput
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricCreationInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricCreationInputProperties.cs
index c8cd9243bc37..68e71c51c0a2 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricCreationInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricCreationInputProperties.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Properties of site details provided during the time of site creation.
+    /// Properties of site details provided during the time of site creation
     /// </summary>
     public partial class FabricCreationInputProperties
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricQueryParameter.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricQueryParameter.cs
deleted file mode 100644
index 4aaa041d2388..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricQueryParameter.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Query parameter to get fabric.
-    /// </summary>
-    public partial class FabricQueryParameter
-    {
-        /// <summary>
-        /// Initializes a new instance of the FabricQueryParameter class.
-        /// </summary>
-        public FabricQueryParameter()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the FabricQueryParameter class.
-        /// </summary>
-        /// <param name="zoneToZoneMappings">A value indicating whether the
-        /// zone to zone mappings are to be returned.</param>
-        /// <param name="fetchAgentDetails">A value indicating whether the
-        /// agent details are to be fetched.</param>
-        /// <param name="biosId">The BIOS Id to be used for fetching agent
-        /// details.</param>
-        /// <param name="fqdn">The FQDN to be used for fetching agent
-        /// details.</param>
-        /// <param name="discoveryType">The type of the discovered machine to
-        /// be used for fetching agent details.</param>
-        /// <param name="osType">The OS type to be used for fetching agent
-        /// details.</param>
-        public FabricQueryParameter(string zoneToZoneMappings = default(string), string fetchAgentDetails = default(string), string biosId = default(string), string fqdn = default(string), string discoveryType = default(string), string osType = default(string))
-        {
-            ZoneToZoneMappings = zoneToZoneMappings;
-            FetchAgentDetails = fetchAgentDetails;
-            BiosId = biosId;
-            Fqdn = fqdn;
-            DiscoveryType = discoveryType;
-            OsType = osType;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the zone to zone mappings
-        /// are to be returned.
-        /// </summary>
-        [JsonProperty(PropertyName = "zoneToZoneMappings")]
-        public string ZoneToZoneMappings { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the agent details are to be
-        /// fetched.
-        /// </summary>
-        [JsonProperty(PropertyName = "fetchAgentDetails")]
-        public string FetchAgentDetails { get; set; }
-
-        /// <summary>
-        /// Gets or sets the BIOS Id to be used for fetching agent details.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the FQDN to be used for fetching agent details.
-        /// </summary>
-        [JsonProperty(PropertyName = "fqdn")]
-        public string Fqdn { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of the discovered machine to be used for
-        /// fetching agent details.
-        /// </summary>
-        [JsonProperty(PropertyName = "discoveryType")]
-        public string DiscoveryType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the OS type to be used for fetching agent details.
-        /// </summary>
-        [JsonProperty(PropertyName = "osType")]
-        public string OsType { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricReplicationGroupTaskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricReplicationGroupTaskDetails.cs
index 24227296ae39..1401afb8af60 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricReplicationGroupTaskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FabricReplicationGroupTaskDetails.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     /// <summary>
     /// This class represents the fabric replication group task details.
     /// </summary>
-    public partial class FabricReplicationGroupTaskDetails : JobTaskDetails
+    public partial class FabricReplicationGroupTaskDetails : TaskTypeDetails
     {
         /// <summary>
         /// Initializes a new instance of the FabricReplicationGroupTaskDetails
@@ -31,15 +31,15 @@ public FabricReplicationGroupTaskDetails()
         /// Initializes a new instance of the FabricReplicationGroupTaskDetails
         /// class.
         /// </summary>
-        /// <param name="jobTask">The job entity.</param>
         /// <param name="skippedReason">The skipped reason.</param>
         /// <param name="skippedReasonString">The skipped reason
         /// string.</param>
-        public FabricReplicationGroupTaskDetails(JobEntity jobTask = default(JobEntity), string skippedReason = default(string), string skippedReasonString = default(string))
-            : base(jobTask)
+        /// <param name="jobTask">The job entity.</param>
+        public FabricReplicationGroupTaskDetails(string skippedReason = default(string), string skippedReasonString = default(string), JobEntity jobTask = default(JobEntity))
         {
             SkippedReason = skippedReason;
             SkippedReasonString = skippedReasonString;
+            JobTask = jobTask;
             CustomInit();
         }
 
@@ -60,5 +60,11 @@ public FabricReplicationGroupTaskDetails()
         [JsonProperty(PropertyName = "skippedReasonString")]
         public string SkippedReasonString { get; set; }
 
+        /// <summary>
+        /// Gets or sets the job entity.
+        /// </summary>
+        [JsonProperty(PropertyName = "jobTask")]
+        public JobEntity JobTask { get; set; }
+
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FailoverProcessServerRequestProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FailoverProcessServerRequestProperties.cs
index fde7cacddb45..4ab02f1d1364 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FailoverProcessServerRequestProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/FailoverProcessServerRequestProperties.cs
@@ -39,7 +39,7 @@ public FailoverProcessServerRequestProperties()
         /// <param name="targetProcessServerId">The new process server.</param>
         /// <param name="vmsToMigrate">The VMS to migrate.</param>
         /// <param name="updateType">A value for failover type. It can be
-        /// systemlevel/serverlevel.</param>
+        /// systemlevel/serverlevel</param>
         public FailoverProcessServerRequestProperties(string containerName = default(string), string sourceProcessServerId = default(string), string targetProcessServerId = default(string), IList<string> vmsToMigrate = default(IList<string>), string updateType = default(string))
         {
             ContainerName = containerName;
@@ -81,7 +81,7 @@ public FailoverProcessServerRequestProperties()
 
         /// <summary>
         /// Gets or sets a value for failover type. It can be
-        /// systemlevel/serverlevel.
+        /// systemlevel/serverlevel
         /// </summary>
         [JsonProperty(PropertyName = "updateType")]
         public string UpdateType { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthError.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthError.cs
index a32264840521..95e259191e4f 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthError.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthError.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Health Error.
+    /// Health Error
     /// </summary>
     public partial class HealthError
     {
@@ -48,7 +48,7 @@ public HealthError()
         /// <param name="possibleCauses">Possible causes of error.</param>
         /// <param name="recommendedAction">Recommended action to resolve
         /// error.</param>
-        /// <param name="creationTimeUtc">Error creation time (UTC).</param>
+        /// <param name="creationTimeUtc">Error creation time (UTC)</param>
         /// <param name="recoveryProviderErrorMessage">DRA error
         /// message.</param>
         /// <param name="entityId">ID of the entity.</param>
@@ -148,7 +148,7 @@ public HealthError()
         public string RecommendedAction { get; set; }
 
         /// <summary>
-        /// Gets or sets error creation time (UTC).
+        /// Gets or sets error creation time (UTC)
         /// </summary>
         [JsonProperty(PropertyName = "creationTimeUtc")]
         public System.DateTime? CreationTimeUtc { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthErrorCategory.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthErrorCategory.cs
index 6b3558c8aea0..2209e474dc61 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthErrorCategory.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthErrorCategory.cs
@@ -22,10 +22,6 @@ public static class HealthErrorCategory
         public const string Configuration = "Configuration";
         public const string FabricInfrastructure = "FabricInfrastructure";
         public const string VersionExpiry = "VersionExpiry";
-        public const string AgentAutoUpdateInfra = "AgentAutoUpdateInfra";
-        public const string AgentAutoUpdateArtifactDeleted = "AgentAutoUpdateArtifactDeleted";
-        public const string AgentAutoUpdateRunAsAccount = "AgentAutoUpdateRunAsAccount";
-        public const string AgentAutoUpdateRunAsAccountExpiry = "AgentAutoUpdateRunAsAccountExpiry";
-        public const string AgentAutoUpdateRunAsAccountExpired = "AgentAutoUpdateRunAsAccountExpired";
+        public const string AgentAutoUpdate = "AgentAutoUpdate";
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthErrorSummary.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthErrorSummary.cs
index 55f84d81c49e..5cadc82904b1 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthErrorSummary.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HealthErrorSummary.cs
@@ -35,9 +35,7 @@ public HealthErrorSummary()
         /// <param name="category">The category of the health error. Possible
         /// values include: 'None', 'Replication', 'TestFailover',
         /// 'Configuration', 'FabricInfrastructure', 'VersionExpiry',
-        /// 'AgentAutoUpdateInfra', 'AgentAutoUpdateArtifactDeleted',
-        /// 'AgentAutoUpdateRunAsAccount', 'AgentAutoUpdateRunAsAccountExpiry',
-        /// 'AgentAutoUpdateRunAsAccountExpired'</param>
+        /// 'AgentAutoUpdate'</param>
         /// <param name="severity">Severity of error. Possible values include:
         /// 'NONE', 'Warning', 'Error', 'Info'</param>
         /// <param name="summaryMessage">The summary message of the health
@@ -77,10 +75,7 @@ public HealthErrorSummary()
         /// <summary>
         /// Gets or sets the category of the health error. Possible values
         /// include: 'None', 'Replication', 'TestFailover', 'Configuration',
-        /// 'FabricInfrastructure', 'VersionExpiry', 'AgentAutoUpdateInfra',
-        /// 'AgentAutoUpdateArtifactDeleted', 'AgentAutoUpdateRunAsAccount',
-        /// 'AgentAutoUpdateRunAsAccountExpiry',
-        /// 'AgentAutoUpdateRunAsAccountExpired'
+        /// 'FabricInfrastructure', 'VersionExpiry', 'AgentAutoUpdate'
         /// </summary>
         [JsonProperty(PropertyName = "category")]
         public string Category { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVHostDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVHostDetails.cs
deleted file mode 100644
index 572622f14b34..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVHostDetails.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Hyper-V host details.
-    /// </summary>
-    public partial class HyperVHostDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the HyperVHostDetails class.
-        /// </summary>
-        public HyperVHostDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the HyperVHostDetails class.
-        /// </summary>
-        /// <param name="id">The Hyper-V host Id.</param>
-        /// <param name="name">The Hyper-V host name.</param>
-        /// <param name="marsAgentVersion">The Mars agent version.</param>
-        public HyperVHostDetails(string id = default(string), string name = default(string), string marsAgentVersion = default(string))
-        {
-            Id = id;
-            Name = name;
-            MarsAgentVersion = marsAgentVersion;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the Hyper-V host Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; private set; }
-
-        /// <summary>
-        /// Gets the Hyper-V host name.
-        /// </summary>
-        [JsonProperty(PropertyName = "name")]
-        public string Name { get; private set; }
-
-        /// <summary>
-        /// Gets the Mars agent version.
-        /// </summary>
-        [JsonProperty(PropertyName = "marsAgentVersion")]
-        public string MarsAgentVersion { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureApplyRecoveryPointInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureApplyRecoveryPointInput.cs
index b550e4d11242..dadbaed4144c 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureApplyRecoveryPointInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureApplyRecoveryPointInput.cs
@@ -32,12 +32,15 @@ public HyperVReplicaAzureApplyRecoveryPointInput()
         /// Initializes a new instance of the
         /// HyperVReplicaAzureApplyRecoveryPointInput class.
         /// </summary>
+        /// <param name="vaultLocation">The vault location where the recovery
+        /// Vm resides.</param>
         /// <param name="primaryKekCertificatePfx">The primary kek certificate
         /// pfx.</param>
         /// <param name="secondaryKekCertificatePfx">The secondary kek
         /// certificate pfx.</param>
-        public HyperVReplicaAzureApplyRecoveryPointInput(string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string))
+        public HyperVReplicaAzureApplyRecoveryPointInput(string vaultLocation = default(string), string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string))
         {
+            VaultLocation = vaultLocation;
             PrimaryKekCertificatePfx = primaryKekCertificatePfx;
             SecondaryKekCertificatePfx = secondaryKekCertificatePfx;
             CustomInit();
@@ -48,6 +51,12 @@ public HyperVReplicaAzureApplyRecoveryPointInput()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets the vault location where the recovery Vm resides.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
         /// <summary>
         /// Gets or sets the primary kek certificate pfx.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureDiskInputDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureDiskInputDetails.cs
deleted file mode 100644
index 0a2bb08d58c9..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureDiskInputDetails.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Disk input details.
-    /// </summary>
-    public partial class HyperVReplicaAzureDiskInputDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// HyperVReplicaAzureDiskInputDetails class.
-        /// </summary>
-        public HyperVReplicaAzureDiskInputDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// HyperVReplicaAzureDiskInputDetails class.
-        /// </summary>
-        /// <param name="diskId">The DiskId.</param>
-        /// <param name="logStorageAccountId">The LogStorageAccountId.</param>
-        /// <param name="diskType">The DiskType. Possible values include:
-        /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'</param>
-        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
-        /// ID.</param>
-        public HyperVReplicaAzureDiskInputDetails(string diskId = default(string), string logStorageAccountId = default(string), string diskType = default(string), string diskEncryptionSetId = default(string))
-        {
-            DiskId = diskId;
-            LogStorageAccountId = logStorageAccountId;
-            DiskType = diskType;
-            DiskEncryptionSetId = diskEncryptionSetId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the DiskId.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskId")]
-        public string DiskId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the LogStorageAccountId.
-        /// </summary>
-        [JsonProperty(PropertyName = "logStorageAccountId")]
-        public string LogStorageAccountId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the DiskType. Possible values include: 'Standard_LRS',
-        /// 'Premium_LRS', 'StandardSSD_LRS'
-        /// </summary>
-        [JsonProperty(PropertyName = "diskType")]
-        public string DiskType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the DiskEncryptionSet ARM ID.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskEncryptionSetId")]
-        public string DiskEncryptionSetId { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureEnableProtectionInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureEnableProtectionInput.cs
index b7273b5dcdb2..794c8aa4d691 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureEnableProtectionInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureEnableProtectionInput.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// HyperVReplicaAzure specific enable protection input.
+    /// Azure specific enable protection input.
     /// </summary>
     [Newtonsoft.Json.JsonObject("HyperVReplicaAzure")]
     public partial class HyperVReplicaAzureEnableProtectionInput : EnableProtectionProviderSpecificInput
@@ -34,23 +34,23 @@ public HyperVReplicaAzureEnableProtectionInput()
         /// Initializes a new instance of the
         /// HyperVReplicaAzureEnableProtectionInput class.
         /// </summary>
-        /// <param name="hvHostVmId">The Hyper-V host VM Id.</param>
-        /// <param name="vmName">The VM Name.</param>
-        /// <param name="osType">The OS type associated with VM.</param>
-        /// <param name="vhdId">The OS disk VHD id associated with VM.</param>
+        /// <param name="hvHostVmId">The Hyper-V host Vm Id.</param>
+        /// <param name="vmName">The Vm Name.</param>
+        /// <param name="osType">The OS type associated with vm.</param>
+        /// <param name="vhdId">The OS disk VHD id associated with vm.</param>
         /// <param name="targetStorageAccountId">The storage account
-        /// Id.</param>
+        /// name.</param>
         /// <param name="targetAzureNetworkId">The selected target Azure
         /// network Id.</param>
         /// <param name="targetAzureSubnetId">The selected target Azure subnet
         /// Id.</param>
         /// <param name="enableRdpOnTargetOption">The selected option to enable
         /// RDP\SSH on target vm after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.</param>
-        /// <param name="targetAzureVmName">The target azure VM Name.</param>
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.</param>
+        /// <param name="targetAzureVmName">The target azure Vm Name.</param>
         /// <param name="logStorageAccountId">The storage account to be used
         /// for logging during replication.</param>
-        /// <param name="disksToInclude">The list of VHD Ids of disks to be
+        /// <param name="disksToInclude">The list of VHD IDs of disks to be
         /// protected.</param>
         /// <param name="targetAzureV1ResourceGroupId">The Id of the target
         /// resource group (for classic deployment) in which the failover VM is
@@ -60,33 +60,14 @@ public HyperVReplicaAzureEnableProtectionInput()
         /// failover VM is to be created.</param>
         /// <param name="useManagedDisks">A value indicating whether managed
         /// disks should be used during failover.</param>
-        /// <param name="targetAvailabilitySetId">The target availability set
-        /// ARM Id for resource manager deployment.</param>
         /// <param name="targetAvailabilityZone">The target availability
         /// zone.</param>
-        /// <param name="licenseType">License type. Possible values include:
-        /// 'NotSpecified', 'NoLicenseType', 'WindowsServer'</param>
-        /// <param name="sqlServerLicenseType">The SQL Server license type.
-        /// Possible values include: 'NotSpecified', 'NoLicenseType', 'PAYG',
-        /// 'AHUB'</param>
-        /// <param name="targetVmSize">The target VM size.</param>
         /// <param name="targetProximityPlacementGroupId">The proximity
         /// placement group ARM Id.</param>
-        /// <param name="useManagedDisksForReplication">A value indicating
-        /// whether managed disks should be used during replication.</param>
-        /// <param name="diskType">The DiskType. Possible values include:
-        /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'</param>
-        /// <param name="disksToIncludeForManagedDisks">The disks to include
-        /// list for managed disks.</param>
-        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
+        /// <param name="targetAvailabilitySetId">The availability set ARM
         /// Id.</param>
-        /// <param name="targetVmTags">The target VM tags.</param>
-        /// <param name="seedManagedDiskTags">The tags for the seed managed
-        /// disks.</param>
-        /// <param name="targetManagedDiskTags">The tags for the target managed
-        /// disks.</param>
-        /// <param name="targetNicTags">The tags for the target NICs.</param>
-        public HyperVReplicaAzureEnableProtectionInput(string hvHostVmId = default(string), string vmName = default(string), string osType = default(string), string vhdId = default(string), string targetStorageAccountId = default(string), string targetAzureNetworkId = default(string), string targetAzureSubnetId = default(string), string enableRdpOnTargetOption = default(string), string targetAzureVmName = default(string), string logStorageAccountId = default(string), IList<string> disksToInclude = default(IList<string>), string targetAzureV1ResourceGroupId = default(string), string targetAzureV2ResourceGroupId = default(string), string useManagedDisks = default(string), string targetAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string licenseType = default(string), string sqlServerLicenseType = default(string), string targetVmSize = default(string), string targetProximityPlacementGroupId = default(string), string useManagedDisksForReplication = default(string), string diskType = default(string), IList<HyperVReplicaAzureDiskInputDetails> disksToIncludeForManagedDisks = default(IList<HyperVReplicaAzureDiskInputDetails>), string diskEncryptionSetId = default(string), IDictionary<string, string> targetVmTags = default(IDictionary<string, string>), IDictionary<string, string> seedManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetNicTags = default(IDictionary<string, string>))
+        /// <param name="targetVmSize">The target VM size.</param>
+        public HyperVReplicaAzureEnableProtectionInput(string hvHostVmId = default(string), string vmName = default(string), string osType = default(string), string vhdId = default(string), string targetStorageAccountId = default(string), string targetAzureNetworkId = default(string), string targetAzureSubnetId = default(string), string enableRdpOnTargetOption = default(string), string targetAzureVmName = default(string), string logStorageAccountId = default(string), IList<string> disksToInclude = default(IList<string>), string targetAzureV1ResourceGroupId = default(string), string targetAzureV2ResourceGroupId = default(string), string useManagedDisks = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string targetAvailabilitySetId = default(string), string targetVmSize = default(string))
         {
             HvHostVmId = hvHostVmId;
             VmName = vmName;
@@ -102,20 +83,10 @@ public HyperVReplicaAzureEnableProtectionInput()
             TargetAzureV1ResourceGroupId = targetAzureV1ResourceGroupId;
             TargetAzureV2ResourceGroupId = targetAzureV2ResourceGroupId;
             UseManagedDisks = useManagedDisks;
-            TargetAvailabilitySetId = targetAvailabilitySetId;
             TargetAvailabilityZone = targetAvailabilityZone;
-            LicenseType = licenseType;
-            SqlServerLicenseType = sqlServerLicenseType;
-            TargetVmSize = targetVmSize;
             TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
-            UseManagedDisksForReplication = useManagedDisksForReplication;
-            DiskType = diskType;
-            DisksToIncludeForManagedDisks = disksToIncludeForManagedDisks;
-            DiskEncryptionSetId = diskEncryptionSetId;
-            TargetVmTags = targetVmTags;
-            SeedManagedDiskTags = seedManagedDiskTags;
-            TargetManagedDiskTags = targetManagedDiskTags;
-            TargetNicTags = targetNicTags;
+            TargetAvailabilitySetId = targetAvailabilitySetId;
+            TargetVmSize = targetVmSize;
             CustomInit();
         }
 
@@ -125,31 +96,31 @@ public HyperVReplicaAzureEnableProtectionInput()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the Hyper-V host VM Id.
+        /// Gets or sets the Hyper-V host Vm Id.
         /// </summary>
         [JsonProperty(PropertyName = "hvHostVmId")]
         public string HvHostVmId { get; set; }
 
         /// <summary>
-        /// Gets or sets the VM Name.
+        /// Gets or sets the Vm Name.
         /// </summary>
         [JsonProperty(PropertyName = "vmName")]
         public string VmName { get; set; }
 
         /// <summary>
-        /// Gets or sets the OS type associated with VM.
+        /// Gets or sets the OS type associated with vm.
         /// </summary>
         [JsonProperty(PropertyName = "osType")]
         public string OsType { get; set; }
 
         /// <summary>
-        /// Gets or sets the OS disk VHD id associated with VM.
+        /// Gets or sets the OS disk VHD id associated with vm.
         /// </summary>
         [JsonProperty(PropertyName = "vhdId")]
         public string VhdId { get; set; }
 
         /// <summary>
-        /// Gets or sets the storage account Id.
+        /// Gets or sets the storage account name.
         /// </summary>
         [JsonProperty(PropertyName = "targetStorageAccountId")]
         public string TargetStorageAccountId { get; set; }
@@ -169,13 +140,13 @@ public HyperVReplicaAzureEnableProtectionInput()
         /// <summary>
         /// Gets or sets the selected option to enable RDP\SSH on target vm
         /// after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.
         /// </summary>
         [JsonProperty(PropertyName = "enableRdpOnTargetOption")]
         public string EnableRdpOnTargetOption { get; set; }
 
         /// <summary>
-        /// Gets or sets the target azure VM Name.
+        /// Gets or sets the target azure Vm Name.
         /// </summary>
         [JsonProperty(PropertyName = "targetAzureVmName")]
         public string TargetAzureVmName { get; set; }
@@ -188,7 +159,7 @@ public HyperVReplicaAzureEnableProtectionInput()
         public string LogStorageAccountId { get; set; }
 
         /// <summary>
-        /// Gets or sets the list of VHD Ids of disks to be protected.
+        /// Gets or sets the list of VHD IDs of disks to be protected.
         /// </summary>
         [JsonProperty(PropertyName = "disksToInclude")]
         public IList<string> DisksToInclude { get; set; }
@@ -214,39 +185,12 @@ public HyperVReplicaAzureEnableProtectionInput()
         [JsonProperty(PropertyName = "useManagedDisks")]
         public string UseManagedDisks { get; set; }
 
-        /// <summary>
-        /// Gets or sets the target availability set ARM Id for resource
-        /// manager deployment.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetAvailabilitySetId")]
-        public string TargetAvailabilitySetId { get; set; }
-
         /// <summary>
         /// Gets or sets the target availability zone.
         /// </summary>
         [JsonProperty(PropertyName = "targetAvailabilityZone")]
         public string TargetAvailabilityZone { get; set; }
 
-        /// <summary>
-        /// Gets or sets license type. Possible values include: 'NotSpecified',
-        /// 'NoLicenseType', 'WindowsServer'
-        /// </summary>
-        [JsonProperty(PropertyName = "licenseType")]
-        public string LicenseType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the SQL Server license type. Possible values include:
-        /// 'NotSpecified', 'NoLicenseType', 'PAYG', 'AHUB'
-        /// </summary>
-        [JsonProperty(PropertyName = "sqlServerLicenseType")]
-        public string SqlServerLicenseType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target VM size.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmSize")]
-        public string TargetVmSize { get; set; }
-
         /// <summary>
         /// Gets or sets the proximity placement group ARM Id.
         /// </summary>
@@ -254,54 +198,16 @@ public HyperVReplicaAzureEnableProtectionInput()
         public string TargetProximityPlacementGroupId { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether managed disks should be
-        /// used during replication.
-        /// </summary>
-        [JsonProperty(PropertyName = "useManagedDisksForReplication")]
-        public string UseManagedDisksForReplication { get; set; }
-
-        /// <summary>
-        /// Gets or sets the DiskType. Possible values include: 'Standard_LRS',
-        /// 'Premium_LRS', 'StandardSSD_LRS'
-        /// </summary>
-        [JsonProperty(PropertyName = "diskType")]
-        public string DiskType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the disks to include list for managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "disksToIncludeForManagedDisks")]
-        public IList<HyperVReplicaAzureDiskInputDetails> DisksToIncludeForManagedDisks { get; set; }
-
-        /// <summary>
-        /// Gets or sets the DiskEncryptionSet ARM Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskEncryptionSetId")]
-        public string DiskEncryptionSetId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target VM tags.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmTags")]
-        public IDictionary<string, string> TargetVmTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the seed managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "seedManagedDiskTags")]
-        public IDictionary<string, string> SeedManagedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target managed disks.
+        /// Gets or sets the availability set ARM Id.
         /// </summary>
-        [JsonProperty(PropertyName = "targetManagedDiskTags")]
-        public IDictionary<string, string> TargetManagedDiskTags { get; set; }
+        [JsonProperty(PropertyName = "targetAvailabilitySetId")]
+        public string TargetAvailabilitySetId { get; set; }
 
         /// <summary>
-        /// Gets or sets the tags for the target NICs.
+        /// Gets or sets the target VM size.
         /// </summary>
-        [JsonProperty(PropertyName = "targetNicTags")]
-        public IDictionary<string, string> TargetNicTags { get; set; }
+        [JsonProperty(PropertyName = "targetVmSize")]
+        public string TargetVmSize { get; set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureFailbackProviderInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureFailbackProviderInput.cs
index 33398747c760..111d38fa9cc8 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureFailbackProviderInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureFailbackProviderInput.cs
@@ -14,10 +14,10 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// HyperVReplicaAzureFailback specific planned failover input.
+    /// HvrA provider specific input for failback.
     /// </summary>
     [Newtonsoft.Json.JsonObject("HyperVReplicaAzureFailback")]
-    public partial class HyperVReplicaAzureFailbackProviderInput : PlannedFailoverProviderSpecificFailoverInput
+    public partial class HyperVReplicaAzureFailbackProviderInput : ProviderSpecificFailoverInput
     {
         /// <summary>
         /// Initializes a new instance of the
@@ -35,8 +35,8 @@ public HyperVReplicaAzureFailbackProviderInput()
         /// <param name="dataSyncOption">Data sync option.</param>
         /// <param name="recoveryVmCreationOption">ALR options to create
         /// alternate recovery.</param>
-        /// <param name="providerIdForAlternateRecovery">Provider Id for
-        /// alternate location.</param>
+        /// <param name="providerIdForAlternateRecovery">Provider ID for
+        /// alternate location</param>
         public HyperVReplicaAzureFailbackProviderInput(string dataSyncOption = default(string), string recoveryVmCreationOption = default(string), string providerIdForAlternateRecovery = default(string))
         {
             DataSyncOption = dataSyncOption;
@@ -63,7 +63,7 @@ public HyperVReplicaAzureFailbackProviderInput()
         public string RecoveryVmCreationOption { get; set; }
 
         /// <summary>
-        /// Gets or sets provider Id for alternate location.
+        /// Gets or sets provider ID for alternate location
         /// </summary>
         [JsonProperty(PropertyName = "providerIdForAlternateRecovery")]
         public string ProviderIdForAlternateRecovery { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzurePlannedFailoverProviderInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureFailoverProviderInput.cs
similarity index 73%
rename from sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzurePlannedFailoverProviderInput.cs
rename to sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureFailoverProviderInput.cs
index 4018e7885c5d..7eca2a0f399c 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzurePlannedFailoverProviderInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureFailoverProviderInput.cs
@@ -14,24 +14,25 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// HyperVReplicaAzure specific planned failover input.
+    /// HvrA provider specific input for failover.
     /// </summary>
     [Newtonsoft.Json.JsonObject("HyperVReplicaAzure")]
-    public partial class HyperVReplicaAzurePlannedFailoverProviderInput : PlannedFailoverProviderSpecificFailoverInput
+    public partial class HyperVReplicaAzureFailoverProviderInput : ProviderSpecificFailoverInput
     {
         /// <summary>
         /// Initializes a new instance of the
-        /// HyperVReplicaAzurePlannedFailoverProviderInput class.
+        /// HyperVReplicaAzureFailoverProviderInput class.
         /// </summary>
-        public HyperVReplicaAzurePlannedFailoverProviderInput()
+        public HyperVReplicaAzureFailoverProviderInput()
         {
             CustomInit();
         }
 
         /// <summary>
         /// Initializes a new instance of the
-        /// HyperVReplicaAzurePlannedFailoverProviderInput class.
+        /// HyperVReplicaAzureFailoverProviderInput class.
         /// </summary>
+        /// <param name="vaultLocation">Location of the vault.</param>
         /// <param name="primaryKekCertificatePfx">Primary kek certificate
         /// pfx.</param>
         /// <param name="secondaryKekCertificatePfx">Secondary kek certificate
@@ -39,8 +40,9 @@ public HyperVReplicaAzurePlannedFailoverProviderInput()
         /// <param name="recoveryPointId">The recovery point id to be passed to
         /// failover to a particular recovery point. In case of latest recovery
         /// point, null should be passed.</param>
-        public HyperVReplicaAzurePlannedFailoverProviderInput(string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string), string recoveryPointId = default(string))
+        public HyperVReplicaAzureFailoverProviderInput(string vaultLocation = default(string), string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string), string recoveryPointId = default(string))
         {
+            VaultLocation = vaultLocation;
             PrimaryKekCertificatePfx = primaryKekCertificatePfx;
             SecondaryKekCertificatePfx = secondaryKekCertificatePfx;
             RecoveryPointId = recoveryPointId;
@@ -52,6 +54,12 @@ public HyperVReplicaAzurePlannedFailoverProviderInput()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets location of the vault.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
         /// <summary>
         /// Gets or sets primary kek certificate pfx.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureManagedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureManagedDiskDetails.cs
deleted file mode 100644
index b98bd5790f55..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureManagedDiskDetails.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Hyper-V Managed disk details.
-    /// </summary>
-    public partial class HyperVReplicaAzureManagedDiskDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// HyperVReplicaAzureManagedDiskDetails class.
-        /// </summary>
-        public HyperVReplicaAzureManagedDiskDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// HyperVReplicaAzureManagedDiskDetails class.
-        /// </summary>
-        /// <param name="diskId">The disk Id.</param>
-        /// <param name="seedManagedDiskId">Seed managed disk Id.</param>
-        /// <param name="replicaDiskType">The replica disk type.</param>
-        /// <param name="diskEncryptionSetId">The disk encryption set ARM
-        /// Id.</param>
-        public HyperVReplicaAzureManagedDiskDetails(string diskId = default(string), string seedManagedDiskId = default(string), string replicaDiskType = default(string), string diskEncryptionSetId = default(string))
-        {
-            DiskId = diskId;
-            SeedManagedDiskId = seedManagedDiskId;
-            ReplicaDiskType = replicaDiskType;
-            DiskEncryptionSetId = diskEncryptionSetId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the disk Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskId")]
-        public string DiskId { get; set; }
-
-        /// <summary>
-        /// Gets or sets seed managed disk Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "seedManagedDiskId")]
-        public string SeedManagedDiskId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the replica disk type.
-        /// </summary>
-        [JsonProperty(PropertyName = "replicaDiskType")]
-        public string ReplicaDiskType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the disk encryption set ARM Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskEncryptionSetId")]
-        public string DiskEncryptionSetId { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureReplicationDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureReplicationDetails.cs
index 697b99c10322..31a33960bb80 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureReplicationDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureReplicationDetails.cs
@@ -69,7 +69,7 @@ public HyperVReplicaAzureReplicationDetails()
         /// primary side.</param>
         /// <param name="enableRdpOnTargetOption">The selected option to enable
         /// RDP\SSH on target vm after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.</param>
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.</param>
         /// <param name="recoveryAzureResourceGroupId">The target resource
         /// group Id.</param>
         /// <param name="recoveryAvailabilitySetId">The recovery availability
@@ -82,19 +82,7 @@ public HyperVReplicaAzureReplicationDetails()
         /// disks should be used during failover.</param>
         /// <param name="licenseType">License Type of the VM to be
         /// used.</param>
-        /// <param name="sqlServerLicenseType">The SQL Server license
-        /// type.</param>
-        /// <param name="lastRecoveryPointReceived">The last recovery point
-        /// received time.</param>
-        /// <param name="targetVmTags">The target VM tags.</param>
-        /// <param name="seedManagedDiskTags">The tags for the seed managed
-        /// disks.</param>
-        /// <param name="targetManagedDiskTags">The tags for the target managed
-        /// disks.</param>
-        /// <param name="targetNicTags">The tags for the target NICs.</param>
-        /// <param name="protectedManagedDisks">The list of protected managed
-        /// disks.</param>
-        public HyperVReplicaAzureReplicationDetails(IList<AzureVmDiskDetails> azureVmDiskDetails = default(IList<AzureVmDiskDetails>), string recoveryAzureVmName = default(string), string recoveryAzureVMSize = default(string), string recoveryAzureStorageAccount = default(string), string recoveryAzureLogStorageAccountId = default(string), System.DateTime? lastReplicatedTime = default(System.DateTime?), long? rpoInSeconds = default(long?), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), string vmId = default(string), string vmProtectionState = default(string), string vmProtectionStateDescription = default(string), InitialReplicationDetails initialReplicationDetails = default(InitialReplicationDetails), IList<VMNicDetails> vmNics = default(IList<VMNicDetails>), string selectedRecoveryAzureNetworkId = default(string), string selectedSourceNicId = default(string), string encryption = default(string), OSDetails oSDetails = default(OSDetails), int? sourceVmRamSizeInMB = default(int?), int? sourceVmCpuCount = default(int?), string enableRdpOnTargetOption = default(string), string recoveryAzureResourceGroupId = default(string), string recoveryAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string useManagedDisks = default(string), string licenseType = default(string), string sqlServerLicenseType = default(string), System.DateTime? lastRecoveryPointReceived = default(System.DateTime?), IDictionary<string, string> targetVmTags = default(IDictionary<string, string>), IDictionary<string, string> seedManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetNicTags = default(IDictionary<string, string>), IList<HyperVReplicaAzureManagedDiskDetails> protectedManagedDisks = default(IList<HyperVReplicaAzureManagedDiskDetails>))
+        public HyperVReplicaAzureReplicationDetails(IList<AzureVmDiskDetails> azureVmDiskDetails = default(IList<AzureVmDiskDetails>), string recoveryAzureVmName = default(string), string recoveryAzureVMSize = default(string), string recoveryAzureStorageAccount = default(string), string recoveryAzureLogStorageAccountId = default(string), System.DateTime? lastReplicatedTime = default(System.DateTime?), long? rpoInSeconds = default(long?), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), string vmId = default(string), string vmProtectionState = default(string), string vmProtectionStateDescription = default(string), InitialReplicationDetails initialReplicationDetails = default(InitialReplicationDetails), IList<VMNicDetails> vmNics = default(IList<VMNicDetails>), string selectedRecoveryAzureNetworkId = default(string), string selectedSourceNicId = default(string), string encryption = default(string), OSDetails oSDetails = default(OSDetails), int? sourceVmRamSizeInMB = default(int?), int? sourceVmCpuCount = default(int?), string enableRdpOnTargetOption = default(string), string recoveryAzureResourceGroupId = default(string), string recoveryAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string useManagedDisks = default(string), string licenseType = default(string))
         {
             AzureVmDiskDetails = azureVmDiskDetails;
             RecoveryAzureVmName = recoveryAzureVmName;
@@ -122,13 +110,6 @@ public HyperVReplicaAzureReplicationDetails()
             TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
             UseManagedDisks = useManagedDisks;
             LicenseType = licenseType;
-            SqlServerLicenseType = sqlServerLicenseType;
-            LastRecoveryPointReceived = lastRecoveryPointReceived;
-            TargetVmTags = targetVmTags;
-            SeedManagedDiskTags = seedManagedDiskTags;
-            TargetManagedDiskTags = targetManagedDiskTags;
-            TargetNicTags = targetNicTags;
-            ProtectedManagedDisks = protectedManagedDisks;
             CustomInit();
         }
 
@@ -257,7 +238,7 @@ public HyperVReplicaAzureReplicationDetails()
         /// <summary>
         /// Gets or sets the selected option to enable RDP\SSH on target vm
         /// after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.
         /// </summary>
         [JsonProperty(PropertyName = "enableRdpOnTargetOption")]
         public string EnableRdpOnTargetOption { get; set; }
@@ -299,47 +280,5 @@ public HyperVReplicaAzureReplicationDetails()
         [JsonProperty(PropertyName = "licenseType")]
         public string LicenseType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the SQL Server license type.
-        /// </summary>
-        [JsonProperty(PropertyName = "sqlServerLicenseType")]
-        public string SqlServerLicenseType { get; set; }
-
-        /// <summary>
-        /// Gets the last recovery point received time.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastRecoveryPointReceived")]
-        public System.DateTime? LastRecoveryPointReceived { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the target VM tags.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmTags")]
-        public IDictionary<string, string> TargetVmTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the seed managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "seedManagedDiskTags")]
-        public IDictionary<string, string> SeedManagedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetManagedDiskTags")]
-        public IDictionary<string, string> TargetManagedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target NICs.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicTags")]
-        public IDictionary<string, string> TargetNicTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of protected managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "protectedManagedDisks")]
-        public IList<HyperVReplicaAzureManagedDiskDetails> ProtectedManagedDisks { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureTestFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureTestFailoverInput.cs
index 5598ecda4c2e..9ef12dafa808 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureTestFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureTestFailoverInput.cs
@@ -32,6 +32,7 @@ public HyperVReplicaAzureTestFailoverInput()
         /// Initializes a new instance of the
         /// HyperVReplicaAzureTestFailoverInput class.
         /// </summary>
+        /// <param name="vaultLocation">Location of the vault.</param>
         /// <param name="primaryKekCertificatePfx">Primary kek certificate
         /// pfx.</param>
         /// <param name="secondaryKekCertificatePfx">Secondary kek certificate
@@ -39,8 +40,9 @@ public HyperVReplicaAzureTestFailoverInput()
         /// <param name="recoveryPointId">The recovery point id to be passed to
         /// test failover to a particular recovery point. In case of latest
         /// recovery point, null should be passed.</param>
-        public HyperVReplicaAzureTestFailoverInput(string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string), string recoveryPointId = default(string))
+        public HyperVReplicaAzureTestFailoverInput(string vaultLocation = default(string), string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string), string recoveryPointId = default(string))
         {
+            VaultLocation = vaultLocation;
             PrimaryKekCertificatePfx = primaryKekCertificatePfx;
             SecondaryKekCertificatePfx = secondaryKekCertificatePfx;
             RecoveryPointId = recoveryPointId;
@@ -52,6 +54,12 @@ public HyperVReplicaAzureTestFailoverInput()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets location of the vault.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
         /// <summary>
         /// Gets or sets primary kek certificate pfx.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureUnplannedFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureUnplannedFailoverInput.cs
index 150bf3a29304..1c3612e7956b 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureUnplannedFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureUnplannedFailoverInput.cs
@@ -32,6 +32,7 @@ public HyperVReplicaAzureUnplannedFailoverInput()
         /// Initializes a new instance of the
         /// HyperVReplicaAzureUnplannedFailoverInput class.
         /// </summary>
+        /// <param name="vaultLocation">Location of the vault.</param>
         /// <param name="primaryKekCertificatePfx">Primary kek certificate
         /// pfx.</param>
         /// <param name="secondaryKekCertificatePfx">Secondary kek certificate
@@ -39,8 +40,9 @@ public HyperVReplicaAzureUnplannedFailoverInput()
         /// <param name="recoveryPointId">The recovery point id to be passed to
         /// failover to a particular recovery point. In case of latest recovery
         /// point, null should be passed.</param>
-        public HyperVReplicaAzureUnplannedFailoverInput(string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string), string recoveryPointId = default(string))
+        public HyperVReplicaAzureUnplannedFailoverInput(string vaultLocation = default(string), string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string), string recoveryPointId = default(string))
         {
+            VaultLocation = vaultLocation;
             PrimaryKekCertificatePfx = primaryKekCertificatePfx;
             SecondaryKekCertificatePfx = secondaryKekCertificatePfx;
             RecoveryPointId = recoveryPointId;
@@ -52,6 +54,12 @@ public HyperVReplicaAzureUnplannedFailoverInput()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets location of the vault.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
         /// <summary>
         /// Gets or sets primary kek certificate pfx.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureUpdateReplicationProtectedItemInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureUpdateReplicationProtectedItemInput.cs
index 38cdd9a0ba30..70c905f587c6 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureUpdateReplicationProtectedItemInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaAzureUpdateReplicationProtectedItemInput.cs
@@ -46,14 +46,7 @@ public HyperVReplicaAzureUpdateReplicationProtectedItemInput()
         /// placement group Id.</param>
         /// <param name="targetAvailabilityZone">The target availability
         /// zone.</param>
-        /// <param name="targetVmTags">The target VM tags.</param>
-        /// <param name="targetManagedDiskTags">The tags for the target managed
-        /// disks.</param>
-        /// <param name="targetNicTags">The tags for the target NICs.</param>
-        /// <param name="sqlServerLicenseType">The SQL Server license type.
-        /// Possible values include: 'NotSpecified', 'NoLicenseType', 'PAYG',
-        /// 'AHUB'</param>
-        public HyperVReplicaAzureUpdateReplicationProtectedItemInput(string recoveryAzureV1ResourceGroupId = default(string), string recoveryAzureV2ResourceGroupId = default(string), string useManagedDisks = default(string), IDictionary<string, string> diskIdToDiskEncryptionMap = default(IDictionary<string, string>), string targetProximityPlacementGroupId = default(string), string targetAvailabilityZone = default(string), IDictionary<string, string> targetVmTags = default(IDictionary<string, string>), IDictionary<string, string> targetManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetNicTags = default(IDictionary<string, string>), string sqlServerLicenseType = default(string))
+        public HyperVReplicaAzureUpdateReplicationProtectedItemInput(string recoveryAzureV1ResourceGroupId = default(string), string recoveryAzureV2ResourceGroupId = default(string), string useManagedDisks = default(string), IDictionary<string, string> diskIdToDiskEncryptionMap = default(IDictionary<string, string>), string targetProximityPlacementGroupId = default(string), string targetAvailabilityZone = default(string))
         {
             RecoveryAzureV1ResourceGroupId = recoveryAzureV1ResourceGroupId;
             RecoveryAzureV2ResourceGroupId = recoveryAzureV2ResourceGroupId;
@@ -61,10 +54,6 @@ public HyperVReplicaAzureUpdateReplicationProtectedItemInput()
             DiskIdToDiskEncryptionMap = diskIdToDiskEncryptionMap;
             TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
             TargetAvailabilityZone = targetAvailabilityZone;
-            TargetVmTags = targetVmTags;
-            TargetManagedDiskTags = targetManagedDiskTags;
-            TargetNicTags = targetNicTags;
-            SqlServerLicenseType = sqlServerLicenseType;
             CustomInit();
         }
 
@@ -113,30 +102,5 @@ public HyperVReplicaAzureUpdateReplicationProtectedItemInput()
         [JsonProperty(PropertyName = "targetAvailabilityZone")]
         public string TargetAvailabilityZone { get; set; }
 
-        /// <summary>
-        /// Gets or sets the target VM tags.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmTags")]
-        public IDictionary<string, string> TargetVmTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetManagedDiskTags")]
-        public IDictionary<string, string> TargetManagedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target NICs.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicTags")]
-        public IDictionary<string, string> TargetNicTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the SQL Server license type. Possible values include:
-        /// 'NotSpecified', 'NoLicenseType', 'PAYG', 'AHUB'
-        /// </summary>
-        [JsonProperty(PropertyName = "sqlServerLicenseType")]
-        public string SqlServerLicenseType { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaBasePolicyDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaBasePolicyDetails.cs
index ee237fae9d97..406d1dd76fcf 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaBasePolicyDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaBasePolicyDetails.cs
@@ -51,7 +51,7 @@ public HyperVReplicaBasePolicyDetails()
         /// authentication type.</param>
         /// <param name="replicaDeletionOption">A value indicating whether the
         /// VM has to be auto deleted. Supported Values: String.Empty, None,
-        /// OnRecoveryCloud.</param>
+        /// OnRecoveryCloud</param>
         public HyperVReplicaBasePolicyDetails(int? recoveryPoints = default(int?), int? applicationConsistentSnapshotFrequencyInHours = default(int?), string compression = default(string), string initialReplicationMethod = default(string), string onlineReplicationStartTime = default(string), string offlineReplicationImportPath = default(string), string offlineReplicationExportPath = default(string), int? replicationPort = default(int?), int? allowedAuthenticationType = default(int?), string replicaDeletionOption = default(string))
         {
             RecoveryPoints = recoveryPoints;
@@ -130,7 +130,7 @@ public HyperVReplicaBasePolicyDetails()
 
         /// <summary>
         /// Gets or sets a value indicating whether the VM has to be auto
-        /// deleted. Supported Values: String.Empty, None, OnRecoveryCloud.
+        /// deleted. Supported Values: String.Empty, None, OnRecoveryCloud
         /// </summary>
         [JsonProperty(PropertyName = "replicaDeletionOption")]
         public string ReplicaDeletionOption { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaBluePolicyInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaBluePolicyInput.cs
index a7dc2e63f013..45926b315540 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaBluePolicyInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVReplicaBluePolicyInput.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     /// HyperV Replica Blue policy input.
     /// </summary>
     [Newtonsoft.Json.JsonObject("HyperVReplica2012R2")]
-    public partial class HyperVReplicaBluePolicyInput : HyperVReplicaPolicyInput
+    public partial class HyperVReplicaBluePolicyInput : PolicyProviderSpecificInput
     {
         /// <summary>
         /// Initializes a new instance of the HyperVReplicaBluePolicyInput
@@ -32,6 +32,8 @@ public HyperVReplicaBluePolicyInput()
         /// Initializes a new instance of the HyperVReplicaBluePolicyInput
         /// class.
         /// </summary>
+        /// <param name="replicationFrequencyInSeconds">A value indicating the
+        /// replication interval.</param>
         /// <param name="recoveryPoints">A value indicating the number of
         /// recovery points.</param>
         /// <param name="applicationConsistentSnapshotFrequencyInHours">A value
@@ -52,12 +54,19 @@ public HyperVReplicaBluePolicyInput()
         /// authentication type.</param>
         /// <param name="replicaDeletion">A value indicating whether the VM has
         /// to be auto deleted.</param>
-        /// <param name="replicationFrequencyInSeconds">A value indicating the
-        /// replication interval.</param>
-        public HyperVReplicaBluePolicyInput(int? recoveryPoints = default(int?), int? applicationConsistentSnapshotFrequencyInHours = default(int?), string compression = default(string), string initialReplicationMethod = default(string), string onlineReplicationStartTime = default(string), string offlineReplicationImportPath = default(string), string offlineReplicationExportPath = default(string), int? replicationPort = default(int?), int? allowedAuthenticationType = default(int?), string replicaDeletion = default(string), int? replicationFrequencyInSeconds = default(int?))
-            : base(recoveryPoints, applicationConsistentSnapshotFrequencyInHours, compression, initialReplicationMethod, onlineReplicationStartTime, offlineReplicationImportPath, offlineReplicationExportPath, replicationPort, allowedAuthenticationType, replicaDeletion)
+        public HyperVReplicaBluePolicyInput(int? replicationFrequencyInSeconds = default(int?), int? recoveryPoints = default(int?), int? applicationConsistentSnapshotFrequencyInHours = default(int?), string compression = default(string), string initialReplicationMethod = default(string), string onlineReplicationStartTime = default(string), string offlineReplicationImportPath = default(string), string offlineReplicationExportPath = default(string), int? replicationPort = default(int?), int? allowedAuthenticationType = default(int?), string replicaDeletion = default(string))
         {
             ReplicationFrequencyInSeconds = replicationFrequencyInSeconds;
+            RecoveryPoints = recoveryPoints;
+            ApplicationConsistentSnapshotFrequencyInHours = applicationConsistentSnapshotFrequencyInHours;
+            Compression = compression;
+            InitialReplicationMethod = initialReplicationMethod;
+            OnlineReplicationStartTime = onlineReplicationStartTime;
+            OfflineReplicationImportPath = offlineReplicationImportPath;
+            OfflineReplicationExportPath = offlineReplicationExportPath;
+            ReplicationPort = replicationPort;
+            AllowedAuthenticationType = allowedAuthenticationType;
+            ReplicaDeletion = replicaDeletion;
             CustomInit();
         }
 
@@ -72,5 +81,68 @@ public HyperVReplicaBluePolicyInput()
         [JsonProperty(PropertyName = "replicationFrequencyInSeconds")]
         public int? ReplicationFrequencyInSeconds { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating the number of recovery points.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryPoints")]
+        public int? RecoveryPoints { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the application consistent
+        /// frequency.
+        /// </summary>
+        [JsonProperty(PropertyName = "applicationConsistentSnapshotFrequencyInHours")]
+        public int? ApplicationConsistentSnapshotFrequencyInHours { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether compression has to be
+        /// enabled.
+        /// </summary>
+        [JsonProperty(PropertyName = "compression")]
+        public string Compression { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether IR is online.
+        /// </summary>
+        [JsonProperty(PropertyName = "initialReplicationMethod")]
+        public string InitialReplicationMethod { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the online IR start time.
+        /// </summary>
+        [JsonProperty(PropertyName = "onlineReplicationStartTime")]
+        public string OnlineReplicationStartTime { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the offline IR import path.
+        /// </summary>
+        [JsonProperty(PropertyName = "offlineReplicationImportPath")]
+        public string OfflineReplicationImportPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the offline IR export path.
+        /// </summary>
+        [JsonProperty(PropertyName = "offlineReplicationExportPath")]
+        public string OfflineReplicationExportPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the recovery HTTPS port.
+        /// </summary>
+        [JsonProperty(PropertyName = "replicationPort")]
+        public int? ReplicationPort { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating the authentication type.
+        /// </summary>
+        [JsonProperty(PropertyName = "allowedAuthenticationType")]
+        public int? AllowedAuthenticationType { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the VM has to be auto
+        /// deleted.
+        /// </summary>
+        [JsonProperty(PropertyName = "replicaDeletion")]
+        public string ReplicaDeletion { get; set; }
+
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVSiteDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVSiteDetails.cs
index 7eefe0861533..02b44c853df5 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVSiteDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVSiteDetails.cs
@@ -11,8 +11,6 @@
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
     using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
     using System.Linq;
 
     /// <summary>
@@ -29,27 +27,11 @@ public HyperVSiteDetails()
             CustomInit();
         }
 
-        /// <summary>
-        /// Initializes a new instance of the HyperVSiteDetails class.
-        /// </summary>
-        /// <param name="hyperVHosts">The list of Hyper-V hosts associated with
-        /// the fabric.</param>
-        public HyperVSiteDetails(IList<HyperVHostDetails> hyperVHosts = default(IList<HyperVHostDetails>))
-        {
-            HyperVHosts = hyperVHosts;
-            CustomInit();
-        }
 
         /// <summary>
         /// An initialization method that performs custom operations like setting defaults
         /// </summary>
         partial void CustomInit();
 
-        /// <summary>
-        /// Gets or sets the list of Hyper-V hosts associated with the fabric.
-        /// </summary>
-        [JsonProperty(PropertyName = "hyperVHosts")]
-        public IList<HyperVHostDetails> HyperVHosts { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVVirtualMachineDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVVirtualMachineDetails.cs
index 4320822c8588..2383b948ead9 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVVirtualMachineDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/HyperVVirtualMachineDetails.cs
@@ -41,16 +41,16 @@ public HyperVVirtualMachineDetails()
         /// time.</param>
         /// <param name="hasPhysicalDisk">A value indicating whether the VM has
         /// a physical disk attached. String value of
-        /// SrsDataContract.PresenceStatus enum. Possible values include:
+        /// {SrsDataContract.PresenceStatus} enum. Possible values include:
         /// 'Unknown', 'Present', 'NotPresent'</param>
         /// <param name="hasFibreChannelAdapter">A value indicating whether the
         /// VM has a fibre channel adapter attached. String value of
-        /// SrsDataContract.PresenceStatus enum. Possible values include:
+        /// {SrsDataContract.PresenceStatus} enum. Possible values include:
         /// 'Unknown', 'Present', 'NotPresent'</param>
         /// <param name="hasSharedVhd">A value indicating whether the VM has a
-        /// shared VHD attached. String value of SrsDataContract.PresenceStatus
-        /// enum. Possible values include: 'Unknown', 'Present',
-        /// 'NotPresent'</param>
+        /// shared VHD attached. String value of
+        /// {SrsDataContract.PresenceStatus} enum. Possible values include:
+        /// 'Unknown', 'Present', 'NotPresent'</param>
         public HyperVVirtualMachineDetails(string sourceItemId = default(string), string generation = default(string), OSDetails osDetails = default(OSDetails), IList<DiskDetails> diskDetails = default(IList<DiskDetails>), string hasPhysicalDisk = default(string), string hasFibreChannelAdapter = default(string), string hasSharedVhd = default(string))
         {
             SourceItemId = sourceItemId;
@@ -94,7 +94,7 @@ public HyperVVirtualMachineDetails()
 
         /// <summary>
         /// Gets or sets a value indicating whether the VM has a physical disk
-        /// attached. String value of SrsDataContract.PresenceStatus enum.
+        /// attached. String value of {SrsDataContract.PresenceStatus} enum.
         /// Possible values include: 'Unknown', 'Present', 'NotPresent'
         /// </summary>
         [JsonProperty(PropertyName = "hasPhysicalDisk")]
@@ -102,7 +102,7 @@ public HyperVVirtualMachineDetails()
 
         /// <summary>
         /// Gets or sets a value indicating whether the VM has a fibre channel
-        /// adapter attached. String value of SrsDataContract.PresenceStatus
+        /// adapter attached. String value of {SrsDataContract.PresenceStatus}
         /// enum. Possible values include: 'Unknown', 'Present', 'NotPresent'
         /// </summary>
         [JsonProperty(PropertyName = "hasFibreChannelAdapter")]
@@ -110,7 +110,7 @@ public HyperVVirtualMachineDetails()
 
         /// <summary>
         /// Gets or sets a value indicating whether the VM has a shared VHD
-        /// attached. String value of SrsDataContract.PresenceStatus enum.
+        /// attached. String value of {SrsDataContract.PresenceStatus} enum.
         /// Possible values include: 'Unknown', 'Present', 'NotPresent'
         /// </summary>
         [JsonProperty(PropertyName = "hasSharedVhd")]
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/IPConfig.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/IPConfig.cs
new file mode 100644
index 000000000000..f0e6002a1a06
--- /dev/null
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/IPConfig.cs
@@ -0,0 +1,74 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
+{
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// IP configuration details.
+    /// </summary>
+    public partial class IPConfig
+    {
+        /// <summary>
+        /// Initializes a new instance of the IPConfig class.
+        /// </summary>
+        public IPConfig()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the IPConfig class.
+        /// </summary>
+        /// <param name="staticIPAddress">The static IP address of the IP
+        /// configuration.</param>
+        /// <param name="publicIpAddressId">The Id of the public IP address
+        /// associated with the IP configuration.</param>
+        /// <param name="lBBackendAddressPoolIds">The backend address pools
+        /// associated with the IP configuration.</param>
+        public IPConfig(string staticIPAddress = default(string), string publicIpAddressId = default(string), IList<string> lBBackendAddressPoolIds = default(IList<string>))
+        {
+            StaticIPAddress = staticIPAddress;
+            PublicIpAddressId = publicIpAddressId;
+            LBBackendAddressPoolIds = lBBackendAddressPoolIds;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets the static IP address of the IP configuration.
+        /// </summary>
+        [JsonProperty(PropertyName = "staticIPAddress")]
+        public string StaticIPAddress { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Id of the public IP address associated with the IP
+        /// configuration.
+        /// </summary>
+        [JsonProperty(PropertyName = "publicIpAddressId")]
+        public string PublicIpAddressId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the backend address pools associated with the IP
+        /// configuration.
+        /// </summary>
+        [JsonProperty(PropertyName = "lBBackendAddressPoolIds")]
+        public IList<string> LBBackendAddressPoolIds { get; set; }
+
+    }
+}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/IPConfigDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/IPConfigDetails.cs
deleted file mode 100644
index badd6b68e9ad..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/IPConfigDetails.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    public partial class IPConfigDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the IPConfigDetails class.
-        /// </summary>
-        public IPConfigDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the IPConfigDetails class.
-        /// </summary>
-        public IPConfigDetails(string name = default(string), bool? isPrimary = default(bool?), string subnetName = default(string), string staticIPAddress = default(string), string ipAddressType = default(string), bool? isSeletedForFailover = default(bool?), string recoverySubnetName = default(string), string recoveryStaticIPAddress = default(string), string recoveryIPAddressType = default(string), string recoveryPublicIPAddressId = default(string), IList<string> recoveryLBBackendAddressPoolIds = default(IList<string>), string tfoSubnetName = default(string), string tfoStaticIPAddress = default(string), string tfoPublicIPAddressId = default(string), IList<string> tfoLBBackendAddressPoolIds = default(IList<string>))
-        {
-            Name = name;
-            IsPrimary = isPrimary;
-            SubnetName = subnetName;
-            StaticIPAddress = staticIPAddress;
-            IpAddressType = ipAddressType;
-            IsSeletedForFailover = isSeletedForFailover;
-            RecoverySubnetName = recoverySubnetName;
-            RecoveryStaticIPAddress = recoveryStaticIPAddress;
-            RecoveryIPAddressType = recoveryIPAddressType;
-            RecoveryPublicIPAddressId = recoveryPublicIPAddressId;
-            RecoveryLBBackendAddressPoolIds = recoveryLBBackendAddressPoolIds;
-            TfoSubnetName = tfoSubnetName;
-            TfoStaticIPAddress = tfoStaticIPAddress;
-            TfoPublicIPAddressId = tfoPublicIPAddressId;
-            TfoLBBackendAddressPoolIds = tfoLBBackendAddressPoolIds;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "isPrimary")]
-        public bool? IsPrimary { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "subnetName")]
-        public string SubnetName { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "staticIPAddress")]
-        public string StaticIPAddress { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "ipAddressType")]
-        public string IpAddressType { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "isSeletedForFailover")]
-        public bool? IsSeletedForFailover { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "recoverySubnetName")]
-        public string RecoverySubnetName { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryStaticIPAddress")]
-        public string RecoveryStaticIPAddress { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryIPAddressType")]
-        public string RecoveryIPAddressType { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryPublicIPAddressId")]
-        public string RecoveryPublicIPAddressId { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryLBBackendAddressPoolIds")]
-        public IList<string> RecoveryLBBackendAddressPoolIds { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoSubnetName")]
-        public string TfoSubnetName { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoStaticIPAddress")]
-        public string TfoStaticIPAddress { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoPublicIPAddressId")]
-        public string TfoPublicIPAddressId { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoLBBackendAddressPoolIds")]
-        public IList<string> TfoLBBackendAddressPoolIds { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/IPConfigInputDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/IPConfigInputDetails.cs
deleted file mode 100644
index a854f6c485e9..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/IPConfigInputDetails.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    public partial class IPConfigInputDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the IPConfigInputDetails class.
-        /// </summary>
-        public IPConfigInputDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the IPConfigInputDetails class.
-        /// </summary>
-        public IPConfigInputDetails(string ipConfigName = default(string), bool? isPrimary = default(bool?), bool? isSeletedForFailover = default(bool?), string recoverySubnetName = default(string), string recoveryStaticIPAddress = default(string), string recoveryPublicIPAddressId = default(string), IList<string> recoveryLBBackendAddressPoolIds = default(IList<string>), string tfoSubnetName = default(string), string tfoStaticIPAddress = default(string), string tfoPublicIPAddressId = default(string), IList<string> tfoLBBackendAddressPoolIds = default(IList<string>))
-        {
-            IpConfigName = ipConfigName;
-            IsPrimary = isPrimary;
-            IsSeletedForFailover = isSeletedForFailover;
-            RecoverySubnetName = recoverySubnetName;
-            RecoveryStaticIPAddress = recoveryStaticIPAddress;
-            RecoveryPublicIPAddressId = recoveryPublicIPAddressId;
-            RecoveryLBBackendAddressPoolIds = recoveryLBBackendAddressPoolIds;
-            TfoSubnetName = tfoSubnetName;
-            TfoStaticIPAddress = tfoStaticIPAddress;
-            TfoPublicIPAddressId = tfoPublicIPAddressId;
-            TfoLBBackendAddressPoolIds = tfoLBBackendAddressPoolIds;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "ipConfigName")]
-        public string IpConfigName { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "isPrimary")]
-        public bool? IsPrimary { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "isSeletedForFailover")]
-        public bool? IsSeletedForFailover { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "recoverySubnetName")]
-        public string RecoverySubnetName { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryStaticIPAddress")]
-        public string RecoveryStaticIPAddress { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryPublicIPAddressId")]
-        public string RecoveryPublicIPAddressId { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryLBBackendAddressPoolIds")]
-        public IList<string> RecoveryLBBackendAddressPoolIds { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoSubnetName")]
-        public string TfoSubnetName { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoStaticIPAddress")]
-        public string TfoStaticIPAddress { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoPublicIPAddressId")]
-        public string TfoPublicIPAddressId { get; set; }
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "tfoLBBackendAddressPoolIds")]
-        public IList<string> TfoLBBackendAddressPoolIds { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAgentVersionDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAgentVersionDetails.cs
new file mode 100644
index 000000000000..5cfdfcac5604
--- /dev/null
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAgentVersionDetails.cs
@@ -0,0 +1,81 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// InMage agent version details.
+    /// </summary>
+    public partial class InMageAgentVersionDetails
+    {
+        /// <summary>
+        /// Initializes a new instance of the InMageAgentVersionDetails class.
+        /// </summary>
+        public InMageAgentVersionDetails()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the InMageAgentVersionDetails class.
+        /// </summary>
+        /// <param name="postUpdateRebootStatus">A value indicating whether
+        /// reboot is required after update is applied.</param>
+        /// <param name="version">The agent version.</param>
+        /// <param name="expiryDate">Version expiry date.</param>
+        /// <param name="status">A value indicating whether security update
+        /// required. Possible values include: 'Supported', 'NotSupported',
+        /// 'Deprecated', 'UpdateRequired', 'SecurityUpdateRequired'</param>
+        public InMageAgentVersionDetails(string postUpdateRebootStatus = default(string), string version = default(string), System.DateTime? expiryDate = default(System.DateTime?), string status = default(string))
+        {
+            PostUpdateRebootStatus = postUpdateRebootStatus;
+            Version = version;
+            ExpiryDate = expiryDate;
+            Status = status;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets a value indicating whether reboot is required after
+        /// update is applied.
+        /// </summary>
+        [JsonProperty(PropertyName = "postUpdateRebootStatus")]
+        public string PostUpdateRebootStatus { get; set; }
+
+        /// <summary>
+        /// Gets or sets the agent version.
+        /// </summary>
+        [JsonProperty(PropertyName = "version")]
+        public string Version { get; set; }
+
+        /// <summary>
+        /// Gets or sets version expiry date.
+        /// </summary>
+        [JsonProperty(PropertyName = "expiryDate")]
+        public System.DateTime? ExpiryDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether security update required.
+        /// Possible values include: 'Supported', 'NotSupported', 'Deprecated',
+        /// 'UpdateRequired', 'SecurityUpdateRequired'
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+
+    }
+}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ApplyRecoveryPointInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ApplyRecoveryPointInput.cs
index cd18b311c64a..f753c358ac62 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ApplyRecoveryPointInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ApplyRecoveryPointInput.cs
@@ -28,11 +28,28 @@ public InMageAzureV2ApplyRecoveryPointInput()
             CustomInit();
         }
 
+        /// <summary>
+        /// Initializes a new instance of the
+        /// InMageAzureV2ApplyRecoveryPointInput class.
+        /// </summary>
+        /// <param name="vaultLocation">The vault location where the recovery
+        /// Vm resides.</param>
+        public InMageAzureV2ApplyRecoveryPointInput(string vaultLocation = default(string))
+        {
+            VaultLocation = vaultLocation;
+            CustomInit();
+        }
 
         /// <summary>
         /// An initialization method that performs custom operations like setting defaults
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets the vault location where the recovery Vm resides.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2EnableProtectionInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2EnableProtectionInput.cs
index 845a3309b3ca..63231b88f3d4 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2EnableProtectionInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2EnableProtectionInput.cs
@@ -36,19 +36,19 @@ public InMageAzureV2EnableProtectionInput()
         /// </summary>
         /// <param name="masterTargetId">The Master target Id.</param>
         /// <param name="processServerId">The Process Server Id.</param>
-        /// <param name="storageAccountId">The storage account Id.</param>
+        /// <param name="storageAccountId">The storage account name.</param>
         /// <param name="runAsAccountId">The CS account Id.</param>
-        /// <param name="multiVmGroupId">The multi VM group Id.</param>
-        /// <param name="multiVmGroupName">The multi VM group name.</param>
+        /// <param name="multiVmGroupId">The multi vm group Id.</param>
+        /// <param name="multiVmGroupName">The multi vm group name.</param>
         /// <param name="disksToInclude">The disks to include list.</param>
         /// <param name="targetAzureNetworkId">The selected target Azure
         /// network Id.</param>
         /// <param name="targetAzureSubnetId">The selected target Azure subnet
         /// Id.</param>
         /// <param name="enableRdpOnTargetOption">The selected option to enable
-        /// RDP\SSH on target VM after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.</param>
-        /// <param name="targetAzureVmName">The target azure VM Name.</param>
+        /// RDP\SSH on target vm after failover. String value of
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.</param>
+        /// <param name="targetAzureVmName">The target azure Vm Name.</param>
         /// <param name="logStorageAccountId">The storage account to be used
         /// for logging during replication.</param>
         /// <param name="targetAzureV1ResourceGroupId">The Id of the target
@@ -59,27 +59,16 @@ public InMageAzureV2EnableProtectionInput()
         /// failover VM is to be created.</param>
         /// <param name="diskType">The DiskType. Possible values include:
         /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'</param>
-        /// <param name="targetAvailabilitySetId">The target availability set
-        /// ARM Id for resource manager deployment.</param>
+        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
+        /// ID.</param>
         /// <param name="targetAvailabilityZone">The target availability
         /// zone.</param>
         /// <param name="targetProximityPlacementGroupId">The proximity
         /// placement group ARM Id.</param>
-        /// <param name="licenseType">License type. Possible values include:
-        /// 'NotSpecified', 'NoLicenseType', 'WindowsServer'</param>
-        /// <param name="sqlServerLicenseType">The SQL Server license type.
-        /// Possible values include: 'NotSpecified', 'NoLicenseType', 'PAYG',
-        /// 'AHUB'</param>
-        /// <param name="targetVmSize">The target VM size.</param>
-        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
+        /// <param name="targetAvailabilitySetId">The availability set ARM
         /// Id.</param>
-        /// <param name="targetVmTags">The target VM tags.</param>
-        /// <param name="seedManagedDiskTags">The tags for the seed managed
-        /// disks.</param>
-        /// <param name="targetManagedDiskTags">The tags for the target managed
-        /// disks.</param>
-        /// <param name="targetNicTags">The tags for the target NICs.</param>
-        public InMageAzureV2EnableProtectionInput(string masterTargetId = default(string), string processServerId = default(string), string storageAccountId = default(string), string runAsAccountId = default(string), string multiVmGroupId = default(string), string multiVmGroupName = default(string), IList<InMageAzureV2DiskInputDetails> disksToInclude = default(IList<InMageAzureV2DiskInputDetails>), string targetAzureNetworkId = default(string), string targetAzureSubnetId = default(string), string enableRdpOnTargetOption = default(string), string targetAzureVmName = default(string), string logStorageAccountId = default(string), string targetAzureV1ResourceGroupId = default(string), string targetAzureV2ResourceGroupId = default(string), string diskType = default(string), string targetAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string licenseType = default(string), string sqlServerLicenseType = default(string), string targetVmSize = default(string), string diskEncryptionSetId = default(string), IDictionary<string, string> targetVmTags = default(IDictionary<string, string>), IDictionary<string, string> seedManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetNicTags = default(IDictionary<string, string>))
+        /// <param name="targetVmSize">The target VM size.</param>
+        public InMageAzureV2EnableProtectionInput(string masterTargetId = default(string), string processServerId = default(string), string storageAccountId = default(string), string runAsAccountId = default(string), string multiVmGroupId = default(string), string multiVmGroupName = default(string), IList<InMageAzureV2DiskInputDetails> disksToInclude = default(IList<InMageAzureV2DiskInputDetails>), string targetAzureNetworkId = default(string), string targetAzureSubnetId = default(string), string enableRdpOnTargetOption = default(string), string targetAzureVmName = default(string), string logStorageAccountId = default(string), string targetAzureV1ResourceGroupId = default(string), string targetAzureV2ResourceGroupId = default(string), string diskType = default(string), string diskEncryptionSetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string targetAvailabilitySetId = default(string), string targetVmSize = default(string))
         {
             MasterTargetId = masterTargetId;
             ProcessServerId = processServerId;
@@ -96,17 +85,11 @@ public InMageAzureV2EnableProtectionInput()
             TargetAzureV1ResourceGroupId = targetAzureV1ResourceGroupId;
             TargetAzureV2ResourceGroupId = targetAzureV2ResourceGroupId;
             DiskType = diskType;
-            TargetAvailabilitySetId = targetAvailabilitySetId;
+            DiskEncryptionSetId = diskEncryptionSetId;
             TargetAvailabilityZone = targetAvailabilityZone;
             TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
-            LicenseType = licenseType;
-            SqlServerLicenseType = sqlServerLicenseType;
+            TargetAvailabilitySetId = targetAvailabilitySetId;
             TargetVmSize = targetVmSize;
-            DiskEncryptionSetId = diskEncryptionSetId;
-            TargetVmTags = targetVmTags;
-            SeedManagedDiskTags = seedManagedDiskTags;
-            TargetManagedDiskTags = targetManagedDiskTags;
-            TargetNicTags = targetNicTags;
             CustomInit();
         }
 
@@ -128,7 +111,7 @@ public InMageAzureV2EnableProtectionInput()
         public string ProcessServerId { get; set; }
 
         /// <summary>
-        /// Gets or sets the storage account Id.
+        /// Gets or sets the storage account name.
         /// </summary>
         [JsonProperty(PropertyName = "storageAccountId")]
         public string StorageAccountId { get; set; }
@@ -140,13 +123,13 @@ public InMageAzureV2EnableProtectionInput()
         public string RunAsAccountId { get; set; }
 
         /// <summary>
-        /// Gets or sets the multi VM group Id.
+        /// Gets or sets the multi vm group Id.
         /// </summary>
         [JsonProperty(PropertyName = "multiVmGroupId")]
         public string MultiVmGroupId { get; set; }
 
         /// <summary>
-        /// Gets or sets the multi VM group name.
+        /// Gets or sets the multi vm group name.
         /// </summary>
         [JsonProperty(PropertyName = "multiVmGroupName")]
         public string MultiVmGroupName { get; set; }
@@ -170,15 +153,15 @@ public InMageAzureV2EnableProtectionInput()
         public string TargetAzureSubnetId { get; set; }
 
         /// <summary>
-        /// Gets or sets the selected option to enable RDP\SSH on target VM
+        /// Gets or sets the selected option to enable RDP\SSH on target vm
         /// after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.
         /// </summary>
         [JsonProperty(PropertyName = "enableRdpOnTargetOption")]
         public string EnableRdpOnTargetOption { get; set; }
 
         /// <summary>
-        /// Gets or sets the target azure VM Name.
+        /// Gets or sets the target azure Vm Name.
         /// </summary>
         [JsonProperty(PropertyName = "targetAzureVmName")]
         public string TargetAzureVmName { get; set; }
@@ -212,11 +195,10 @@ public InMageAzureV2EnableProtectionInput()
         public string DiskType { get; set; }
 
         /// <summary>
-        /// Gets or sets the target availability set ARM Id for resource
-        /// manager deployment.
+        /// Gets or sets the DiskEncryptionSet ARM ID.
         /// </summary>
-        [JsonProperty(PropertyName = "targetAvailabilitySetId")]
-        public string TargetAvailabilitySetId { get; set; }
+        [JsonProperty(PropertyName = "diskEncryptionSetId")]
+        public string DiskEncryptionSetId { get; set; }
 
         /// <summary>
         /// Gets or sets the target availability zone.
@@ -231,18 +213,10 @@ public InMageAzureV2EnableProtectionInput()
         public string TargetProximityPlacementGroupId { get; set; }
 
         /// <summary>
-        /// Gets or sets license type. Possible values include: 'NotSpecified',
-        /// 'NoLicenseType', 'WindowsServer'
-        /// </summary>
-        [JsonProperty(PropertyName = "licenseType")]
-        public string LicenseType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the SQL Server license type. Possible values include:
-        /// 'NotSpecified', 'NoLicenseType', 'PAYG', 'AHUB'
+        /// Gets or sets the availability set ARM Id.
         /// </summary>
-        [JsonProperty(PropertyName = "sqlServerLicenseType")]
-        public string SqlServerLicenseType { get; set; }
+        [JsonProperty(PropertyName = "targetAvailabilitySetId")]
+        public string TargetAvailabilitySetId { get; set; }
 
         /// <summary>
         /// Gets or sets the target VM size.
@@ -250,35 +224,5 @@ public InMageAzureV2EnableProtectionInput()
         [JsonProperty(PropertyName = "targetVmSize")]
         public string TargetVmSize { get; set; }
 
-        /// <summary>
-        /// Gets or sets the DiskEncryptionSet ARM Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskEncryptionSetId")]
-        public string DiskEncryptionSetId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target VM tags.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmTags")]
-        public IDictionary<string, string> TargetVmTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the seed managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "seedManagedDiskTags")]
-        public IDictionary<string, string> SeedManagedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetManagedDiskTags")]
-        public IDictionary<string, string> TargetManagedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target NICs.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicTags")]
-        public IDictionary<string, string> TargetNicTags { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2EventDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2EventDetails.cs
index abe6977ecbd6..2ae1af392316 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2EventDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2EventDetails.cs
@@ -31,7 +31,7 @@ public InMageAzureV2EventDetails()
         /// Initializes a new instance of the InMageAzureV2EventDetails class.
         /// </summary>
         /// <param name="eventType">InMage Event type. Takes one of the values
-        /// of InMageDataContract.InMageMonitoringEventType.</param>
+        /// of {InMageDataContract.InMageMonitoringEventType}.</param>
         /// <param name="category">InMage Event Category.</param>
         /// <param name="component">InMage Event Component.</param>
         /// <param name="correctiveAction">Corrective Action string for the
@@ -58,7 +58,7 @@ public InMageAzureV2EventDetails()
 
         /// <summary>
         /// Gets or sets inMage Event type. Takes one of the values of
-        /// InMageDataContract.InMageMonitoringEventType.
+        /// {InMageDataContract.InMageMonitoringEventType}.
         /// </summary>
         [JsonProperty(PropertyName = "eventType")]
         public string EventType { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2FailoverProviderInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2FailoverProviderInput.cs
new file mode 100644
index 000000000000..1565f2855cfe
--- /dev/null
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2FailoverProviderInput.cs
@@ -0,0 +1,66 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// InMageAzureV2 provider specific input for failover.
+    /// </summary>
+    [Newtonsoft.Json.JsonObject("InMageAzureV2")]
+    public partial class InMageAzureV2FailoverProviderInput : ProviderSpecificFailoverInput
+    {
+        /// <summary>
+        /// Initializes a new instance of the
+        /// InMageAzureV2FailoverProviderInput class.
+        /// </summary>
+        public InMageAzureV2FailoverProviderInput()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// InMageAzureV2FailoverProviderInput class.
+        /// </summary>
+        /// <param name="vaultLocation">Location of the vault.</param>
+        /// <param name="recoveryPointId">The recovery point id to be passed to
+        /// failover to a particular recovery point. In case of latest recovery
+        /// point, null should be passed.</param>
+        public InMageAzureV2FailoverProviderInput(string vaultLocation = default(string), string recoveryPointId = default(string))
+        {
+            VaultLocation = vaultLocation;
+            RecoveryPointId = recoveryPointId;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets location of the vault.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recovery point id to be passed to failover to a
+        /// particular recovery point. In case of latest recovery point, null
+        /// should be passed.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryPointId")]
+        public string RecoveryPointId { get; set; }
+
+    }
+}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ManagedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ManagedDiskDetails.cs
index afb8d952019e..8ce52ac99422 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ManagedDiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ManagedDiskDetails.cs
@@ -34,14 +34,11 @@ public InMageAzureV2ManagedDiskDetails()
         /// <param name="diskId">The disk id.</param>
         /// <param name="seedManagedDiskId">Seed managed disk Id.</param>
         /// <param name="replicaDiskType">The replica disk type.</param>
-        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
-        /// ID.</param>
-        public InMageAzureV2ManagedDiskDetails(string diskId = default(string), string seedManagedDiskId = default(string), string replicaDiskType = default(string), string diskEncryptionSetId = default(string))
+        public InMageAzureV2ManagedDiskDetails(string diskId = default(string), string seedManagedDiskId = default(string), string replicaDiskType = default(string))
         {
             DiskId = diskId;
             SeedManagedDiskId = seedManagedDiskId;
             ReplicaDiskType = replicaDiskType;
-            DiskEncryptionSetId = diskEncryptionSetId;
             CustomInit();
         }
 
@@ -68,11 +65,5 @@ public InMageAzureV2ManagedDiskDetails()
         [JsonProperty(PropertyName = "replicaDiskType")]
         public string ReplicaDiskType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the DiskEncryptionSet ARM ID.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskEncryptionSetId")]
-        public string DiskEncryptionSetId { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ProtectedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ProtectedDiskDetails.cs
index c2067c8f82cb..e7ceb1948a69 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ProtectedDiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ProtectedDiskDetails.cs
@@ -56,18 +56,7 @@ public InMageAzureV2ProtectedDiskDetails()
         /// resized.</param>
         /// <param name="lastRpoCalculatedTime">The last RPO calculated
         /// time.</param>
-        /// <param name="resyncProcessedBytes">The resync processed
-        /// bytes.</param>
-        /// <param name="resyncTotalTransferredBytes">The resync total
-        /// transferred bytes.</param>
-        /// <param name="resyncLast15MinutesTransferredBytes">The resync last
-        /// 15 minutes transferred bytes.</param>
-        /// <param name="resyncLastDataTransferTimeUTC">The last data transfer
-        /// time in UTC.</param>
-        /// <param name="resyncStartTime">The resync start time.</param>
-        /// <param name="progressHealth">The Progress Health.</param>
-        /// <param name="progressStatus">The Progress Status.</param>
-        public InMageAzureV2ProtectedDiskDetails(string diskId = default(string), string diskName = default(string), string protectionStage = default(string), string healthErrorCode = default(string), long? rpoInSeconds = default(long?), string resyncRequired = default(string), int? resyncProgressPercentage = default(int?), long? resyncDurationInSeconds = default(long?), long? diskCapacityInBytes = default(long?), long? fileSystemCapacityInBytes = default(long?), double? sourceDataInMegaBytes = default(double?), double? psDataInMegaBytes = default(double?), double? targetDataInMegaBytes = default(double?), string diskResized = default(string), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), long? resyncProcessedBytes = default(long?), long? resyncTotalTransferredBytes = default(long?), long? resyncLast15MinutesTransferredBytes = default(long?), System.DateTime? resyncLastDataTransferTimeUTC = default(System.DateTime?), System.DateTime? resyncStartTime = default(System.DateTime?), string progressHealth = default(string), string progressStatus = default(string))
+        public InMageAzureV2ProtectedDiskDetails(string diskId = default(string), string diskName = default(string), string protectionStage = default(string), string healthErrorCode = default(string), long? rpoInSeconds = default(long?), string resyncRequired = default(string), int? resyncProgressPercentage = default(int?), long? resyncDurationInSeconds = default(long?), long? diskCapacityInBytes = default(long?), long? fileSystemCapacityInBytes = default(long?), double? sourceDataInMegaBytes = default(double?), double? psDataInMegaBytes = default(double?), double? targetDataInMegaBytes = default(double?), string diskResized = default(string), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?))
         {
             DiskId = diskId;
             DiskName = diskName;
@@ -84,13 +73,6 @@ public InMageAzureV2ProtectedDiskDetails()
             TargetDataInMegaBytes = targetDataInMegaBytes;
             DiskResized = diskResized;
             LastRpoCalculatedTime = lastRpoCalculatedTime;
-            ResyncProcessedBytes = resyncProcessedBytes;
-            ResyncTotalTransferredBytes = resyncTotalTransferredBytes;
-            ResyncLast15MinutesTransferredBytes = resyncLast15MinutesTransferredBytes;
-            ResyncLastDataTransferTimeUTC = resyncLastDataTransferTimeUTC;
-            ResyncStartTime = resyncStartTime;
-            ProgressHealth = progressHealth;
-            ProgressStatus = progressStatus;
             CustomInit();
         }
 
@@ -190,47 +172,5 @@ public InMageAzureV2ProtectedDiskDetails()
         [JsonProperty(PropertyName = "lastRpoCalculatedTime")]
         public System.DateTime? LastRpoCalculatedTime { get; set; }
 
-        /// <summary>
-        /// Gets or sets the resync processed bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncProcessedBytes")]
-        public long? ResyncProcessedBytes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resync total transferred bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncTotalTransferredBytes")]
-        public long? ResyncTotalTransferredBytes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resync last 15 minutes transferred bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncLast15MinutesTransferredBytes")]
-        public long? ResyncLast15MinutesTransferredBytes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the last data transfer time in UTC.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncLastDataTransferTimeUTC")]
-        public System.DateTime? ResyncLastDataTransferTimeUTC { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resync start time.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncStartTime")]
-        public System.DateTime? ResyncStartTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Progress Health.
-        /// </summary>
-        [JsonProperty(PropertyName = "progressHealth")]
-        public string ProgressHealth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Progress Status.
-        /// </summary>
-        [JsonProperty(PropertyName = "progressStatus")]
-        public string ProgressStatus { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ReplicationDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ReplicationDetails.cs
index 89c244158602..e59783fe0541 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ReplicationDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2ReplicationDetails.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// InMageAzureV2 provider specific settings.
+    /// InMageAzureV2 provider specific settings
     /// </summary>
     [Newtonsoft.Json.JsonObject("InMageAzureV2")]
     public partial class InMageAzureV2ReplicationDetails : ReplicationProviderSpecificSettings
@@ -99,9 +99,9 @@ public InMageAzureV2ReplicationDetails()
         /// of the machine. Value can be vCenter or physical.</param>
         /// <param name="enableRdpOnTargetOption">The selected option to enable
         /// RDP\SSH on target vm after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.</param>
-        /// <param name="datastores">The datastores of the on-premise machine.
-        /// Value can be list of strings that contain datastore names.</param>
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.</param>
+        /// <param name="datastores">The data stores of the on-premise machine.
+        /// Value can be list of strings that contain data store names.</param>
         /// <param name="targetVmId">The ARM Id of the target Azure VM. This
         /// value will be null until the VM is failed over. Only after failure
         /// it will be populated with the ARM Id of the Azure VM.</param>
@@ -117,8 +117,6 @@ public InMageAzureV2ReplicationDetails()
         /// disks should be used during failover.</param>
         /// <param name="licenseType">License Type of the VM to be
         /// used.</param>
-        /// <param name="sqlServerLicenseType">The SQL Server license
-        /// type.</param>
         /// <param name="validationErrors">The validation errors of the
         /// on-premise machine Value can be list of validation errors.</param>
         /// <param name="lastRpoCalculatedTime">The last RPO calculated
@@ -131,24 +129,7 @@ public InMageAzureV2ReplicationDetails()
         /// item.</param>
         /// <param name="protectedManagedDisks">The list of protected managed
         /// disks.</param>
-        /// <param name="lastRecoveryPointReceived">The last recovery point
-        /// received time.</param>
-        /// <param name="firmwareType">The firmware type of this protected
-        /// item.</param>
-        /// <param name="azureVmGeneration">The target generation for this
-        /// protected item.</param>
-        /// <param name="isAdditionalStatsAvailable">A value indicating whether
-        /// additional IR stats are available or not.</param>
-        /// <param name="totalDataTransferred">The total transferred data in
-        /// bytes.</param>
-        /// <param name="totalProgressHealth">The progress health.</param>
-        /// <param name="targetVmTags">The target VM tags.</param>
-        /// <param name="seedManagedDiskTags">The tags for the seed managed
-        /// disks.</param>
-        /// <param name="targetManagedDiskTags">The tags for the target managed
-        /// disks.</param>
-        /// <param name="targetNicTags">The tags for the target NICs.</param>
-        public InMageAzureV2ReplicationDetails(string infrastructureVmId = default(string), string vCenterInfrastructureId = default(string), string protectionStage = default(string), string vmId = default(string), string vmProtectionState = default(string), string vmProtectionStateDescription = default(string), int? resyncProgressPercentage = default(int?), long? rpoInSeconds = default(long?), double? compressedDataRateInMB = default(double?), double? uncompressedDataRateInMB = default(double?), string ipAddress = default(string), string agentVersion = default(string), System.DateTime? agentExpiryDate = default(System.DateTime?), string isAgentUpdateRequired = default(string), string isRebootAfterUpdateRequired = default(string), System.DateTime? lastHeartbeat = default(System.DateTime?), string processServerId = default(string), string processServerName = default(string), string multiVmGroupId = default(string), string multiVmGroupName = default(string), string multiVmSyncStatus = default(string), IList<InMageAzureV2ProtectedDiskDetails> protectedDisks = default(IList<InMageAzureV2ProtectedDiskDetails>), string diskResized = default(string), string masterTargetId = default(string), int? sourceVmCpuCount = default(int?), int? sourceVmRamSizeInMB = default(int?), string osType = default(string), string vhdName = default(string), string osDiskId = default(string), IList<AzureVmDiskDetails> azureVMDiskDetails = default(IList<AzureVmDiskDetails>), string recoveryAzureVMName = default(string), string recoveryAzureVMSize = default(string), string recoveryAzureStorageAccount = default(string), string recoveryAzureLogStorageAccountId = default(string), IList<VMNicDetails> vmNics = default(IList<VMNicDetails>), string selectedRecoveryAzureNetworkId = default(string), string selectedTfoAzureNetworkId = default(string), string selectedSourceNicId = default(string), string discoveryType = default(string), string enableRdpOnTargetOption = default(string), IList<string> datastores = default(IList<string>), string targetVmId = default(string), string recoveryAzureResourceGroupId = default(string), string recoveryAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string useManagedDisks = default(string), string licenseType = default(string), string sqlServerLicenseType = default(string), IList<HealthError> validationErrors = default(IList<HealthError>), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), System.DateTime? lastUpdateReceivedTime = default(System.DateTime?), string replicaId = default(string), string osVersion = default(string), IList<InMageAzureV2ManagedDiskDetails> protectedManagedDisks = default(IList<InMageAzureV2ManagedDiskDetails>), System.DateTime? lastRecoveryPointReceived = default(System.DateTime?), string firmwareType = default(string), string azureVmGeneration = default(string), bool? isAdditionalStatsAvailable = default(bool?), long? totalDataTransferred = default(long?), string totalProgressHealth = default(string), IDictionary<string, string> targetVmTags = default(IDictionary<string, string>), IDictionary<string, string> seedManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetNicTags = default(IDictionary<string, string>))
+        public InMageAzureV2ReplicationDetails(string infrastructureVmId = default(string), string vCenterInfrastructureId = default(string), string protectionStage = default(string), string vmId = default(string), string vmProtectionState = default(string), string vmProtectionStateDescription = default(string), int? resyncProgressPercentage = default(int?), long? rpoInSeconds = default(long?), double? compressedDataRateInMB = default(double?), double? uncompressedDataRateInMB = default(double?), string ipAddress = default(string), string agentVersion = default(string), System.DateTime? agentExpiryDate = default(System.DateTime?), string isAgentUpdateRequired = default(string), string isRebootAfterUpdateRequired = default(string), System.DateTime? lastHeartbeat = default(System.DateTime?), string processServerId = default(string), string processServerName = default(string), string multiVmGroupId = default(string), string multiVmGroupName = default(string), string multiVmSyncStatus = default(string), IList<InMageAzureV2ProtectedDiskDetails> protectedDisks = default(IList<InMageAzureV2ProtectedDiskDetails>), string diskResized = default(string), string masterTargetId = default(string), int? sourceVmCpuCount = default(int?), int? sourceVmRamSizeInMB = default(int?), string osType = default(string), string vhdName = default(string), string osDiskId = default(string), IList<AzureVmDiskDetails> azureVMDiskDetails = default(IList<AzureVmDiskDetails>), string recoveryAzureVMName = default(string), string recoveryAzureVMSize = default(string), string recoveryAzureStorageAccount = default(string), string recoveryAzureLogStorageAccountId = default(string), IList<VMNicDetails> vmNics = default(IList<VMNicDetails>), string selectedRecoveryAzureNetworkId = default(string), string selectedTfoAzureNetworkId = default(string), string selectedSourceNicId = default(string), string discoveryType = default(string), string enableRdpOnTargetOption = default(string), IList<string> datastores = default(IList<string>), string targetVmId = default(string), string recoveryAzureResourceGroupId = default(string), string recoveryAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string useManagedDisks = default(string), string licenseType = default(string), IList<HealthError> validationErrors = default(IList<HealthError>), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), System.DateTime? lastUpdateReceivedTime = default(System.DateTime?), string replicaId = default(string), string osVersion = default(string), IList<InMageAzureV2ManagedDiskDetails> protectedManagedDisks = default(IList<InMageAzureV2ManagedDiskDetails>))
         {
             InfrastructureVmId = infrastructureVmId;
             VCenterInfrastructureId = vCenterInfrastructureId;
@@ -198,23 +179,12 @@ public InMageAzureV2ReplicationDetails()
             TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
             UseManagedDisks = useManagedDisks;
             LicenseType = licenseType;
-            SqlServerLicenseType = sqlServerLicenseType;
             ValidationErrors = validationErrors;
             LastRpoCalculatedTime = lastRpoCalculatedTime;
             LastUpdateReceivedTime = lastUpdateReceivedTime;
             ReplicaId = replicaId;
             OsVersion = osVersion;
             ProtectedManagedDisks = protectedManagedDisks;
-            LastRecoveryPointReceived = lastRecoveryPointReceived;
-            FirmwareType = firmwareType;
-            AzureVmGeneration = azureVmGeneration;
-            IsAdditionalStatsAvailable = isAdditionalStatsAvailable;
-            TotalDataTransferred = totalDataTransferred;
-            TotalProgressHealth = totalProgressHealth;
-            TargetVmTags = targetVmTags;
-            SeedManagedDiskTags = seedManagedDiskTags;
-            TargetManagedDiskTags = targetManagedDiskTags;
-            TargetNicTags = targetNicTags;
             CustomInit();
         }
 
@@ -328,10 +298,10 @@ public InMageAzureV2ReplicationDetails()
         public string ProcessServerId { get; set; }
 
         /// <summary>
-        /// Gets or sets the process server name.
+        /// Gets the process server name.
         /// </summary>
         [JsonProperty(PropertyName = "processServerName")]
-        public string ProcessServerName { get; set; }
+        public string ProcessServerName { get; private set; }
 
         /// <summary>
         /// Gets or sets the multi vm group Id.
@@ -468,14 +438,14 @@ public InMageAzureV2ReplicationDetails()
         /// <summary>
         /// Gets or sets the selected option to enable RDP\SSH on target vm
         /// after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.
         /// </summary>
         [JsonProperty(PropertyName = "enableRdpOnTargetOption")]
         public string EnableRdpOnTargetOption { get; set; }
 
         /// <summary>
-        /// Gets or sets the datastores of the on-premise machine. Value can be
-        /// list of strings that contain datastore names.
+        /// Gets or sets the data stores of the on-premise machine. Value can
+        /// be list of strings that contain data store names.
         /// </summary>
         [JsonProperty(PropertyName = "datastores")]
         public IList<string> Datastores { get; set; }
@@ -525,12 +495,6 @@ public InMageAzureV2ReplicationDetails()
         [JsonProperty(PropertyName = "licenseType")]
         public string LicenseType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the SQL Server license type.
-        /// </summary>
-        [JsonProperty(PropertyName = "sqlServerLicenseType")]
-        public string SqlServerLicenseType { get; set; }
-
         /// <summary>
         /// Gets or sets the validation errors of the on-premise machine Value
         /// can be list of validation errors.
@@ -568,66 +532,5 @@ public InMageAzureV2ReplicationDetails()
         [JsonProperty(PropertyName = "protectedManagedDisks")]
         public IList<InMageAzureV2ManagedDiskDetails> ProtectedManagedDisks { get; set; }
 
-        /// <summary>
-        /// Gets the last recovery point received time.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastRecoveryPointReceived")]
-        public System.DateTime? LastRecoveryPointReceived { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the firmware type of this protected item.
-        /// </summary>
-        [JsonProperty(PropertyName = "firmwareType")]
-        public string FirmwareType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target generation for this protected item.
-        /// </summary>
-        [JsonProperty(PropertyName = "azureVmGeneration")]
-        public string AzureVmGeneration { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether additional IR stats are
-        /// available or not.
-        /// </summary>
-        [JsonProperty(PropertyName = "isAdditionalStatsAvailable")]
-        public bool? IsAdditionalStatsAvailable { get; set; }
-
-        /// <summary>
-        /// Gets or sets the total transferred data in bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "totalDataTransferred")]
-        public long? TotalDataTransferred { get; set; }
-
-        /// <summary>
-        /// Gets or sets the progress health.
-        /// </summary>
-        [JsonProperty(PropertyName = "totalProgressHealth")]
-        public string TotalProgressHealth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target VM tags.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmTags")]
-        public IDictionary<string, string> TargetVmTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the seed managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "seedManagedDiskTags")]
-        public IDictionary<string, string> SeedManagedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetManagedDiskTags")]
-        public IDictionary<string, string> TargetManagedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target NICs.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicTags")]
-        public IDictionary<string, string> TargetNicTags { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2TestFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2TestFailoverInput.cs
index c7f4ce831560..c64bdaf4855f 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2TestFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2TestFailoverInput.cs
@@ -32,11 +32,13 @@ public InMageAzureV2TestFailoverInput()
         /// Initializes a new instance of the InMageAzureV2TestFailoverInput
         /// class.
         /// </summary>
+        /// <param name="vaultLocation">Location of the vault.</param>
         /// <param name="recoveryPointId">The recovery point id to be passed to
         /// test failover to a particular recovery point. In case of latest
         /// recovery point, null should be passed.</param>
-        public InMageAzureV2TestFailoverInput(string recoveryPointId = default(string))
+        public InMageAzureV2TestFailoverInput(string vaultLocation = default(string), string recoveryPointId = default(string))
         {
+            VaultLocation = vaultLocation;
             RecoveryPointId = recoveryPointId;
             CustomInit();
         }
@@ -46,6 +48,12 @@ public InMageAzureV2TestFailoverInput()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets location of the vault.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
         /// <summary>
         /// Gets or sets the recovery point id to be passed to test failover to
         /// a particular recovery point. In case of latest recovery point, null
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2UnplannedFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2UnplannedFailoverInput.cs
index c2924ec7279b..859118cb13bb 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2UnplannedFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2UnplannedFailoverInput.cs
@@ -32,11 +32,13 @@ public InMageAzureV2UnplannedFailoverInput()
         /// Initializes a new instance of the
         /// InMageAzureV2UnplannedFailoverInput class.
         /// </summary>
+        /// <param name="vaultLocation">Location of the vault.</param>
         /// <param name="recoveryPointId">The recovery point id to be passed to
         /// failover to a particular recovery point. In case of latest recovery
         /// point, null should be passed.</param>
-        public InMageAzureV2UnplannedFailoverInput(string recoveryPointId = default(string))
+        public InMageAzureV2UnplannedFailoverInput(string vaultLocation = default(string), string recoveryPointId = default(string))
         {
+            VaultLocation = vaultLocation;
             RecoveryPointId = recoveryPointId;
             CustomInit();
         }
@@ -46,6 +48,12 @@ public InMageAzureV2UnplannedFailoverInput()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets location of the vault.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
         /// <summary>
         /// Gets or sets the recovery point id to be passed to failover to a
         /// particular recovery point. In case of latest recovery point, null
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2UpdateReplicationProtectedItemInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2UpdateReplicationProtectedItemInput.cs
index 235733d2b98d..c51d03a92176 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2UpdateReplicationProtectedItemInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageAzureV2UpdateReplicationProtectedItemInput.cs
@@ -11,8 +11,6 @@
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
     using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
     using System.Linq;
 
     /// <summary>
@@ -44,24 +42,13 @@ public InMageAzureV2UpdateReplicationProtectedItemInput()
         /// placement group Id.</param>
         /// <param name="targetAvailabilityZone">The target availability
         /// zone.</param>
-        /// <param name="targetVmTags">The target VM tags.</param>
-        /// <param name="targetManagedDiskTags">The tags for the target managed
-        /// disks.</param>
-        /// <param name="targetNicTags">The tags for the target NICs.</param>
-        /// <param name="sqlServerLicenseType">The SQL Server license type.
-        /// Possible values include: 'NotSpecified', 'NoLicenseType', 'PAYG',
-        /// 'AHUB'</param>
-        public InMageAzureV2UpdateReplicationProtectedItemInput(string recoveryAzureV1ResourceGroupId = default(string), string recoveryAzureV2ResourceGroupId = default(string), string useManagedDisks = default(string), string targetProximityPlacementGroupId = default(string), string targetAvailabilityZone = default(string), IDictionary<string, string> targetVmTags = default(IDictionary<string, string>), IDictionary<string, string> targetManagedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetNicTags = default(IDictionary<string, string>), string sqlServerLicenseType = default(string))
+        public InMageAzureV2UpdateReplicationProtectedItemInput(string recoveryAzureV1ResourceGroupId = default(string), string recoveryAzureV2ResourceGroupId = default(string), string useManagedDisks = default(string), string targetProximityPlacementGroupId = default(string), string targetAvailabilityZone = default(string))
         {
             RecoveryAzureV1ResourceGroupId = recoveryAzureV1ResourceGroupId;
             RecoveryAzureV2ResourceGroupId = recoveryAzureV2ResourceGroupId;
             UseManagedDisks = useManagedDisks;
             TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
             TargetAvailabilityZone = targetAvailabilityZone;
-            TargetVmTags = targetVmTags;
-            TargetManagedDiskTags = targetManagedDiskTags;
-            TargetNicTags = targetNicTags;
-            SqlServerLicenseType = sqlServerLicenseType;
             CustomInit();
         }
 
@@ -103,30 +90,5 @@ public InMageAzureV2UpdateReplicationProtectedItemInput()
         [JsonProperty(PropertyName = "targetAvailabilityZone")]
         public string TargetAvailabilityZone { get; set; }
 
-        /// <summary>
-        /// Gets or sets the target VM tags.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmTags")]
-        public IDictionary<string, string> TargetVmTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target managed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetManagedDiskTags")]
-        public IDictionary<string, string> TargetManagedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target NICs.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicTags")]
-        public IDictionary<string, string> TargetNicTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the SQL Server license type. Possible values include:
-        /// 'NotSpecified', 'NoLicenseType', 'PAYG', 'AHUB'
-        /// </summary>
-        [JsonProperty(PropertyName = "sqlServerLicenseType")]
-        public string SqlServerLicenseType { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageDiskDetails.cs
index d0f82b56a451..8c9d32b1b6fd 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageDiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageDiskDetails.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// VMware/Physical specific Disk Details.
+    /// VMware/Physical specific Disk Details
     /// </summary>
     public partial class InMageDiskDetails
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageEnableProtectionInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageEnableProtectionInput.cs
index a7251e02d469..a597070213a3 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageEnableProtectionInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageEnableProtectionInput.cs
@@ -39,11 +39,11 @@ public InMageEnableProtectionInput()
         /// <param name="processServerId">The Process Server Id.</param>
         /// <param name="retentionDrive">The retention drive to use on the
         /// MT.</param>
-        /// <param name="multiVmGroupId">The multi VM group Id.</param>
-        /// <param name="multiVmGroupName">The multi VM group name.</param>
-        /// <param name="vmFriendlyName">The VM Name.</param>
+        /// <param name="multiVmGroupId">The multi vm group Id.</param>
+        /// <param name="multiVmGroupName">The multi vm group name.</param>
+        /// <param name="vmFriendlyName">The Vm Name.</param>
         /// <param name="runAsAccountId">The CS account Id.</param>
-        /// <param name="datastoreName">The target datastore name.</param>
+        /// <param name="datastoreName">The target data store name.</param>
         /// <param name="diskExclusionInput">The enable disk exclusion
         /// input.</param>
         /// <param name="disksToInclude">The disks to include list.</param>
@@ -68,7 +68,7 @@ public InMageEnableProtectionInput()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the VM Name.
+        /// Gets or sets the Vm Name.
         /// </summary>
         [JsonProperty(PropertyName = "vmFriendlyName")]
         public string VmFriendlyName { get; set; }
@@ -98,19 +98,19 @@ public InMageEnableProtectionInput()
         public string RunAsAccountId { get; set; }
 
         /// <summary>
-        /// Gets or sets the multi VM group Id.
+        /// Gets or sets the multi vm group Id.
         /// </summary>
         [JsonProperty(PropertyName = "multiVmGroupId")]
         public string MultiVmGroupId { get; set; }
 
         /// <summary>
-        /// Gets or sets the multi VM group name.
+        /// Gets or sets the multi vm group name.
         /// </summary>
         [JsonProperty(PropertyName = "multiVmGroupName")]
         public string MultiVmGroupName { get; set; }
 
         /// <summary>
-        /// Gets or sets the target datastore name.
+        /// Gets or sets the target data store name.
         /// </summary>
         [JsonProperty(PropertyName = "datastoreName")]
         public string DatastoreName { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageFailoverProviderInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageFailoverProviderInput.cs
new file mode 100644
index 000000000000..47c9303a2594
--- /dev/null
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageFailoverProviderInput.cs
@@ -0,0 +1,74 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Provider specific input for InMage failover.
+    /// </summary>
+    [Newtonsoft.Json.JsonObject("InMage")]
+    public partial class InMageFailoverProviderInput : ProviderSpecificFailoverInput
+    {
+        /// <summary>
+        /// Initializes a new instance of the InMageFailoverProviderInput
+        /// class.
+        /// </summary>
+        public InMageFailoverProviderInput()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the InMageFailoverProviderInput
+        /// class.
+        /// </summary>
+        /// <param name="recoveryPointType">The recovery point type. Values
+        /// from LatestTime, LatestTag or Custom. In the case of custom, the
+        /// recovery point provided by RecoveryPointId will be used. In the
+        /// other two cases, recovery point id will be ignored. Possible values
+        /// include: 'LatestTime', 'LatestTag', 'Custom'</param>
+        /// <param name="recoveryPointId">The recovery point id to be passed to
+        /// failover to a particular recovery point. In case of latest recovery
+        /// point, null should be passed.</param>
+        public InMageFailoverProviderInput(string recoveryPointType = default(string), string recoveryPointId = default(string))
+        {
+            RecoveryPointType = recoveryPointType;
+            RecoveryPointId = recoveryPointId;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets the recovery point type. Values from LatestTime,
+        /// LatestTag or Custom. In the case of custom, the recovery point
+        /// provided by RecoveryPointId will be used. In the other two cases,
+        /// recovery point id will be ignored. Possible values include:
+        /// 'LatestTime', 'LatestTag', 'Custom'
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryPointType")]
+        public string RecoveryPointType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recovery point id to be passed to failover to a
+        /// particular recovery point. In case of latest recovery point, null
+        /// should be passed.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryPointId")]
+        public string RecoveryPointId { get; set; }
+
+    }
+}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageProtectedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageProtectedDiskDetails.cs
index 75c9e56b4136..4ae7865821c6 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageProtectedDiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageProtectedDiskDetails.cs
@@ -52,18 +52,7 @@ public InMageProtectedDiskDetails()
         /// resized.</param>
         /// <param name="lastRpoCalculatedTime">The last RPO calculated
         /// time.</param>
-        /// <param name="resyncProcessedBytes">The resync processed
-        /// bytes.</param>
-        /// <param name="resyncTotalTransferredBytes">The resync total
-        /// transferred bytes.</param>
-        /// <param name="resyncLast15MinutesTransferredBytes">The resync last
-        /// 15 minutes transferred bytes.</param>
-        /// <param name="resyncLastDataTransferTimeUTC">The last data transfer
-        /// time in UTC.</param>
-        /// <param name="resyncStartTime">The resync start time.</param>
-        /// <param name="progressHealth">The Progress Health.</param>
-        /// <param name="progressStatus">The Progress Status.</param>
-        public InMageProtectedDiskDetails(string diskId = default(string), string diskName = default(string), string protectionStage = default(string), string healthErrorCode = default(string), long? rpoInSeconds = default(long?), string resyncRequired = default(string), int? resyncProgressPercentage = default(int?), long? resyncDurationInSeconds = default(long?), long? diskCapacityInBytes = default(long?), long? fileSystemCapacityInBytes = default(long?), double? sourceDataInMB = default(double?), double? psDataInMB = default(double?), double? targetDataInMB = default(double?), string diskResized = default(string), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), long? resyncProcessedBytes = default(long?), long? resyncTotalTransferredBytes = default(long?), long? resyncLast15MinutesTransferredBytes = default(long?), System.DateTime? resyncLastDataTransferTimeUTC = default(System.DateTime?), System.DateTime? resyncStartTime = default(System.DateTime?), string progressHealth = default(string), string progressStatus = default(string))
+        public InMageProtectedDiskDetails(string diskId = default(string), string diskName = default(string), string protectionStage = default(string), string healthErrorCode = default(string), long? rpoInSeconds = default(long?), string resyncRequired = default(string), int? resyncProgressPercentage = default(int?), long? resyncDurationInSeconds = default(long?), long? diskCapacityInBytes = default(long?), long? fileSystemCapacityInBytes = default(long?), double? sourceDataInMB = default(double?), double? psDataInMB = default(double?), double? targetDataInMB = default(double?), string diskResized = default(string), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?))
         {
             DiskId = diskId;
             DiskName = diskName;
@@ -80,13 +69,6 @@ public InMageProtectedDiskDetails()
             TargetDataInMB = targetDataInMB;
             DiskResized = diskResized;
             LastRpoCalculatedTime = lastRpoCalculatedTime;
-            ResyncProcessedBytes = resyncProcessedBytes;
-            ResyncTotalTransferredBytes = resyncTotalTransferredBytes;
-            ResyncLast15MinutesTransferredBytes = resyncLast15MinutesTransferredBytes;
-            ResyncLastDataTransferTimeUTC = resyncLastDataTransferTimeUTC;
-            ResyncStartTime = resyncStartTime;
-            ProgressHealth = progressHealth;
-            ProgressStatus = progressStatus;
             CustomInit();
         }
 
@@ -186,47 +168,5 @@ public InMageProtectedDiskDetails()
         [JsonProperty(PropertyName = "lastRpoCalculatedTime")]
         public System.DateTime? LastRpoCalculatedTime { get; set; }
 
-        /// <summary>
-        /// Gets or sets the resync processed bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncProcessedBytes")]
-        public long? ResyncProcessedBytes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resync total transferred bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncTotalTransferredBytes")]
-        public long? ResyncTotalTransferredBytes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resync last 15 minutes transferred bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncLast15MinutesTransferredBytes")]
-        public long? ResyncLast15MinutesTransferredBytes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the last data transfer time in UTC.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncLastDataTransferTimeUTC")]
-        public System.DateTime? ResyncLastDataTransferTimeUTC { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resync start time.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncStartTime")]
-        public System.DateTime? ResyncStartTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Progress Health.
-        /// </summary>
-        [JsonProperty(PropertyName = "progressHealth")]
-        public string ProgressHealth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Progress Status.
-        /// </summary>
-        [JsonProperty(PropertyName = "progressStatus")]
-        public string ProgressStatus { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmApplyRecoveryPointInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmApplyRecoveryPointInput.cs
index 770812983675..0ae911b78667 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmApplyRecoveryPointInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmApplyRecoveryPointInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -34,7 +33,7 @@ public InMageRcmApplyRecoveryPointInput()
         /// class.
         /// </summary>
         /// <param name="recoveryPointId">The recovery point Id.</param>
-        public InMageRcmApplyRecoveryPointInput(string recoveryPointId)
+        public InMageRcmApplyRecoveryPointInput(string recoveryPointId = default(string))
         {
             RecoveryPointId = recoveryPointId;
             CustomInit();
@@ -51,18 +50,5 @@ public InMageRcmApplyRecoveryPointInput(string recoveryPointId)
         [JsonProperty(PropertyName = "recoveryPointId")]
         public string RecoveryPointId { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (RecoveryPointId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "RecoveryPointId");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmDiskInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmDiskInput.cs
index 7bf3c16d574b..49e33eca066a 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmDiskInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmDiskInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -35,9 +34,9 @@ public InMageRcmDiskInput()
         /// Id.</param>
         /// <param name="diskType">The disk type. Possible values include:
         /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'</param>
-        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
+        /// <param name="diskEncryptionSetId">The disk encryption set ARM
         /// Id.</param>
-        public InMageRcmDiskInput(string diskId, string logStorageAccountId, string diskType, string diskEncryptionSetId = default(string))
+        public InMageRcmDiskInput(string diskId = default(string), string logStorageAccountId = default(string), string diskType = default(string), string diskEncryptionSetId = default(string))
         {
             DiskId = diskId;
             LogStorageAccountId = logStorageAccountId;
@@ -71,31 +70,10 @@ public InMageRcmDiskInput()
         public string DiskType { get; set; }
 
         /// <summary>
-        /// Gets or sets the DiskEncryptionSet ARM Id.
+        /// Gets or sets the disk encryption set ARM Id.
         /// </summary>
         [JsonProperty(PropertyName = "diskEncryptionSetId")]
         public string DiskEncryptionSetId { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (DiskId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "DiskId");
-            }
-            if (LogStorageAccountId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "LogStorageAccountId");
-            }
-            if (DiskType == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "DiskType");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmDisksDefaultInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmDisksDefaultInput.cs
index 19682c54ddda..333f49946ba7 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmDisksDefaultInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmDisksDefaultInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -34,9 +33,9 @@ public InMageRcmDisksDefaultInput()
         /// Id.</param>
         /// <param name="diskType">The disk type. Possible values include:
         /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'</param>
-        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
+        /// <param name="diskEncryptionSetId">The disk encryption set ARM
         /// Id.</param>
-        public InMageRcmDisksDefaultInput(string logStorageAccountId, string diskType, string diskEncryptionSetId = default(string))
+        public InMageRcmDisksDefaultInput(string logStorageAccountId = default(string), string diskType = default(string), string diskEncryptionSetId = default(string))
         {
             LogStorageAccountId = logStorageAccountId;
             DiskType = diskType;
@@ -63,27 +62,10 @@ public InMageRcmDisksDefaultInput()
         public string DiskType { get; set; }
 
         /// <summary>
-        /// Gets or sets the DiskEncryptionSet ARM Id.
+        /// Gets or sets the disk encryption set ARM Id.
         /// </summary>
         [JsonProperty(PropertyName = "diskEncryptionSetId")]
         public string DiskEncryptionSetId { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (LogStorageAccountId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "LogStorageAccountId");
-            }
-            if (DiskType == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "DiskType");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmEnableProtectionInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmEnableProtectionInput.cs
index 81207e8184ce..b315ffdf54dc 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmEnableProtectionInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmEnableProtectionInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
@@ -37,11 +36,10 @@ public InMageRcmEnableProtectionInput()
         /// </summary>
         /// <param name="fabricDiscoveryMachineId">The ARM Id of discovered
         /// machine.</param>
-        /// <param name="targetResourceGroupId">The target resource group ARM
-        /// Id.</param>
-        /// <param name="processServerId">The process server Id.</param>
         /// <param name="disksToInclude">The disks to include list.</param>
         /// <param name="disksDefault">The default disk input.</param>
+        /// <param name="targetResourceGroupId">The target resource group ARM
+        /// Id.</param>
         /// <param name="targetNetworkId">The selected target network ARM
         /// Id.</param>
         /// <param name="testNetworkId">The selected test network ARM
@@ -62,8 +60,9 @@ public InMageRcmEnableProtectionInput()
         /// <param name="targetBootDiagnosticsStorageAccountId">The target boot
         /// diagnostics storage account ARM Id.</param>
         /// <param name="runAsAccountId">The run-as account Id.</param>
+        /// <param name="processServerId">The process server Id.</param>
         /// <param name="multiVmGroupName">The multi VM group name.</param>
-        public InMageRcmEnableProtectionInput(string fabricDiscoveryMachineId, string targetResourceGroupId, string processServerId, IList<InMageRcmDiskInput> disksToInclude = default(IList<InMageRcmDiskInput>), InMageRcmDisksDefaultInput disksDefault = default(InMageRcmDisksDefaultInput), string targetNetworkId = default(string), string testNetworkId = default(string), string targetSubnetName = default(string), string testSubnetName = default(string), string targetVmName = default(string), string targetVmSize = default(string), string licenseType = default(string), string targetAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string targetBootDiagnosticsStorageAccountId = default(string), string runAsAccountId = default(string), string multiVmGroupName = default(string))
+        public InMageRcmEnableProtectionInput(string fabricDiscoveryMachineId = default(string), IList<InMageRcmDiskInput> disksToInclude = default(IList<InMageRcmDiskInput>), InMageRcmDisksDefaultInput disksDefault = default(InMageRcmDisksDefaultInput), string targetResourceGroupId = default(string), string targetNetworkId = default(string), string testNetworkId = default(string), string targetSubnetName = default(string), string testSubnetName = default(string), string targetVmName = default(string), string targetVmSize = default(string), string licenseType = default(string), string targetAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string targetBootDiagnosticsStorageAccountId = default(string), string runAsAccountId = default(string), string processServerId = default(string), string multiVmGroupName = default(string))
         {
             FabricDiscoveryMachineId = fabricDiscoveryMachineId;
             DisksToInclude = disksToInclude;
@@ -200,40 +199,5 @@ public InMageRcmEnableProtectionInput()
         [JsonProperty(PropertyName = "multiVmGroupName")]
         public string MultiVmGroupName { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (FabricDiscoveryMachineId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "FabricDiscoveryMachineId");
-            }
-            if (TargetResourceGroupId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "TargetResourceGroupId");
-            }
-            if (ProcessServerId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "ProcessServerId");
-            }
-            if (DisksToInclude != null)
-            {
-                foreach (var element in DisksToInclude)
-                {
-                    if (element != null)
-                    {
-                        element.Validate();
-                    }
-                }
-            }
-            if (DisksDefault != null)
-            {
-                DisksDefault.Validate();
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmEventDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmEventDetails.cs
index ac83cb83f888..a6a6af08ab7e 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmEventDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmEventDetails.cs
@@ -31,24 +31,9 @@ public InMageRcmEventDetails()
         /// Initializes a new instance of the InMageRcmEventDetails class.
         /// </summary>
         /// <param name="protectedItemName">The protected item name.</param>
-        /// <param name="vmName">The protected item name.</param>
-        /// <param name="latestAgentVersion">The latest agent version.</param>
-        /// <param name="jobId">The job Id.</param>
-        /// <param name="fabricName">The fabric name.</param>
-        /// <param name="applianceName">The appliance name.</param>
-        /// <param name="serverType">The server type.</param>
-        /// <param name="componentDisplayName">The component display
-        /// name.</param>
-        public InMageRcmEventDetails(string protectedItemName = default(string), string vmName = default(string), string latestAgentVersion = default(string), string jobId = default(string), string fabricName = default(string), string applianceName = default(string), string serverType = default(string), string componentDisplayName = default(string))
+        public InMageRcmEventDetails(string protectedItemName = default(string))
         {
             ProtectedItemName = protectedItemName;
-            VmName = vmName;
-            LatestAgentVersion = latestAgentVersion;
-            JobId = jobId;
-            FabricName = fabricName;
-            ApplianceName = applianceName;
-            ServerType = serverType;
-            ComponentDisplayName = componentDisplayName;
             CustomInit();
         }
 
@@ -63,47 +48,5 @@ public InMageRcmEventDetails()
         [JsonProperty(PropertyName = "protectedItemName")]
         public string ProtectedItemName { get; private set; }
 
-        /// <summary>
-        /// Gets the protected item name.
-        /// </summary>
-        [JsonProperty(PropertyName = "vmName")]
-        public string VmName { get; private set; }
-
-        /// <summary>
-        /// Gets the latest agent version.
-        /// </summary>
-        [JsonProperty(PropertyName = "latestAgentVersion")]
-        public string LatestAgentVersion { get; private set; }
-
-        /// <summary>
-        /// Gets the job Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "jobId")]
-        public string JobId { get; private set; }
-
-        /// <summary>
-        /// Gets the fabric name.
-        /// </summary>
-        [JsonProperty(PropertyName = "fabricName")]
-        public string FabricName { get; private set; }
-
-        /// <summary>
-        /// Gets the appliance name.
-        /// </summary>
-        [JsonProperty(PropertyName = "applianceName")]
-        public string ApplianceName { get; private set; }
-
-        /// <summary>
-        /// Gets the server type.
-        /// </summary>
-        [JsonProperty(PropertyName = "serverType")]
-        public string ServerType { get; private set; }
-
-        /// <summary>
-        /// Gets the component display name.
-        /// </summary>
-        [JsonProperty(PropertyName = "componentDisplayName")]
-        public string ComponentDisplayName { get; private set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFabricCreationInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFabricCreationInput.cs
index 8ee5e4f8b7d8..8a19a015406c 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFabricCreationInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFabricCreationInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -38,11 +37,14 @@ public InMageRcmFabricCreationInput()
         /// site.</param>
         /// <param name="sourceAgentIdentity">The identity provider input for
         /// source agent authentication.</param>
-        public InMageRcmFabricCreationInput(string vmwareSiteId, string physicalSiteId, IdentityProviderInput sourceAgentIdentity)
+        /// <param name="authCertificate">The certificate to be used for AAD
+        /// authentication.</param>
+        public InMageRcmFabricCreationInput(string vmwareSiteId = default(string), string physicalSiteId = default(string), IdentityProviderInput sourceAgentIdentity = default(IdentityProviderInput), string authCertificate = default(string))
         {
             VmwareSiteId = vmwareSiteId;
             PhysicalSiteId = physicalSiteId;
             SourceAgentIdentity = sourceAgentIdentity;
+            AuthCertificate = authCertificate;
             CustomInit();
         }
 
@@ -70,26 +72,20 @@ public InMageRcmFabricCreationInput(string vmwareSiteId, string physicalSiteId,
         [JsonProperty(PropertyName = "sourceAgentIdentity")]
         public IdentityProviderInput SourceAgentIdentity { get; set; }
 
+        /// <summary>
+        /// Gets or sets the certificate to be used for AAD authentication.
+        /// </summary>
+        [JsonProperty(PropertyName = "authCertificate")]
+        public string AuthCertificate { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>
-        /// <exception cref="ValidationException">
+        /// <exception cref="Rest.ValidationException">
         /// Thrown if validation fails
         /// </exception>
         public virtual void Validate()
         {
-            if (VmwareSiteId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "VmwareSiteId");
-            }
-            if (PhysicalSiteId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "PhysicalSiteId");
-            }
-            if (SourceAgentIdentity == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "SourceAgentIdentity");
-            }
             if (SourceAgentIdentity != null)
             {
                 SourceAgentIdentity.Validate();
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFabricSpecificDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFabricSpecificDetails.cs
index f5a90ee52a27..50dbd883a043 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFabricSpecificDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFabricSpecificDetails.cs
@@ -48,10 +48,9 @@ public InMageRcmFabricSpecificDetails()
         /// <param name="replicationAgents">The list of replication
         /// agents.</param>
         /// <param name="reprotectAgents">The list of reprotect agents.</param>
-        /// <param name="marsAgents">The list of Mars agents.</param>
         /// <param name="dras">The list of DRAs.</param>
         /// <param name="agentDetails">The list of agent details.</param>
-        public InMageRcmFabricSpecificDetails(string vmwareSiteId = default(string), string physicalSiteId = default(string), string serviceEndpoint = default(string), string serviceResourceId = default(string), string serviceContainerId = default(string), string dataPlaneUri = default(string), string controlPlaneUri = default(string), IList<ProcessServerDetails> processServers = default(IList<ProcessServerDetails>), IList<RcmProxyDetails> rcmProxies = default(IList<RcmProxyDetails>), IList<PushInstallerDetails> pushInstallers = default(IList<PushInstallerDetails>), IList<ReplicationAgentDetails> replicationAgents = default(IList<ReplicationAgentDetails>), IList<ReprotectAgentDetails> reprotectAgents = default(IList<ReprotectAgentDetails>), IList<MarsAgentDetails> marsAgents = default(IList<MarsAgentDetails>), IList<DraDetails> dras = default(IList<DraDetails>), IList<AgentDetails> agentDetails = default(IList<AgentDetails>))
+        public InMageRcmFabricSpecificDetails(string vmwareSiteId = default(string), string physicalSiteId = default(string), string serviceEndpoint = default(string), string serviceResourceId = default(string), string serviceContainerId = default(string), string dataPlaneUri = default(string), string controlPlaneUri = default(string), IList<ProcessServerDetails> processServers = default(IList<ProcessServerDetails>), IList<RcmProxyDetails> rcmProxies = default(IList<RcmProxyDetails>), IList<PushInstallerDetails> pushInstallers = default(IList<PushInstallerDetails>), IList<ReplicationAgentDetails> replicationAgents = default(IList<ReplicationAgentDetails>), IList<ReprotectAgentDetails> reprotectAgents = default(IList<ReprotectAgentDetails>), IList<DraDetails> dras = default(IList<DraDetails>), IList<AgentDetails> agentDetails = default(IList<AgentDetails>))
         {
             VmwareSiteId = vmwareSiteId;
             PhysicalSiteId = physicalSiteId;
@@ -65,7 +64,6 @@ public InMageRcmFabricSpecificDetails()
             PushInstallers = pushInstallers;
             ReplicationAgents = replicationAgents;
             ReprotectAgents = reprotectAgents;
-            MarsAgents = marsAgents;
             Dras = dras;
             AgentDetails = agentDetails;
             CustomInit();
@@ -148,12 +146,6 @@ public InMageRcmFabricSpecificDetails()
         [JsonProperty(PropertyName = "reprotectAgents")]
         public IList<ReprotectAgentDetails> ReprotectAgents { get; private set; }
 
-        /// <summary>
-        /// Gets the list of Mars agents.
-        /// </summary>
-        [JsonProperty(PropertyName = "marsAgents")]
-        public IList<MarsAgentDetails> MarsAgents { get; private set; }
-
         /// <summary>
         /// Gets the list of DRAs.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackEventDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackEventDetails.cs
deleted file mode 100644
index 3f77612949a1..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackEventDetails.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Event details for InMageRcmFailback provider.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcmFailback")]
-    public partial class InMageRcmFailbackEventDetails : EventProviderSpecificDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackEventDetails
-        /// class.
-        /// </summary>
-        public InMageRcmFailbackEventDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackEventDetails
-        /// class.
-        /// </summary>
-        /// <param name="protectedItemName">The protected item name.</param>
-        public InMageRcmFailbackEventDetails(string protectedItemName = default(string))
-        {
-            ProtectedItemName = protectedItemName;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the protected item name.
-        /// </summary>
-        [JsonProperty(PropertyName = "protectedItemName")]
-        public string ProtectedItemName { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackMobilityAgentDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackMobilityAgentDetails.cs
deleted file mode 100644
index fa8159b43583..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackMobilityAgentDetails.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcmFailback mobility agent details.
-    /// </summary>
-    public partial class InMageRcmFailbackMobilityAgentDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackMobilityAgentDetails class.
-        /// </summary>
-        public InMageRcmFailbackMobilityAgentDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackMobilityAgentDetails class.
-        /// </summary>
-        /// <param name="version">The agent version.</param>
-        /// <param name="latestVersion">The latest agent version
-        /// available.</param>
-        /// <param name="driverVersion">The driver version.</param>
-        /// <param name="latestUpgradableVersionWithoutReboot">The latest
-        /// upgradeable version available without reboot.</param>
-        /// <param name="agentVersionExpiryDate">The agent version expiry
-        /// date.</param>
-        /// <param name="driverVersionExpiryDate">The driver version expiry
-        /// date.</param>
-        /// <param name="lastHeartbeatUtc">The time of the last heartbeat
-        /// received from the agent.</param>
-        /// <param name="reasonsBlockingUpgrade">The whether update is possible
-        /// or not.</param>
-        /// <param name="isUpgradeable">A value indicating whether agent is
-        /// upgradeable or not.</param>
-        public InMageRcmFailbackMobilityAgentDetails(string version = default(string), string latestVersion = default(string), string driverVersion = default(string), string latestUpgradableVersionWithoutReboot = default(string), System.DateTime? agentVersionExpiryDate = default(System.DateTime?), System.DateTime? driverVersionExpiryDate = default(System.DateTime?), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), IList<string> reasonsBlockingUpgrade = default(IList<string>), string isUpgradeable = default(string))
-        {
-            Version = version;
-            LatestVersion = latestVersion;
-            DriverVersion = driverVersion;
-            LatestUpgradableVersionWithoutReboot = latestUpgradableVersionWithoutReboot;
-            AgentVersionExpiryDate = agentVersionExpiryDate;
-            DriverVersionExpiryDate = driverVersionExpiryDate;
-            LastHeartbeatUtc = lastHeartbeatUtc;
-            ReasonsBlockingUpgrade = reasonsBlockingUpgrade;
-            IsUpgradeable = isUpgradeable;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the agent version.
-        /// </summary>
-        [JsonProperty(PropertyName = "version")]
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// Gets the latest agent version available.
-        /// </summary>
-        [JsonProperty(PropertyName = "latestVersion")]
-        public string LatestVersion { get; private set; }
-
-        /// <summary>
-        /// Gets the driver version.
-        /// </summary>
-        [JsonProperty(PropertyName = "driverVersion")]
-        public string DriverVersion { get; private set; }
-
-        /// <summary>
-        /// Gets the latest upgradeable version available without reboot.
-        /// </summary>
-        [JsonProperty(PropertyName = "latestUpgradableVersionWithoutReboot")]
-        public string LatestUpgradableVersionWithoutReboot { get; private set; }
-
-        /// <summary>
-        /// Gets the agent version expiry date.
-        /// </summary>
-        [JsonProperty(PropertyName = "agentVersionExpiryDate")]
-        public System.DateTime? AgentVersionExpiryDate { get; private set; }
-
-        /// <summary>
-        /// Gets the driver version expiry date.
-        /// </summary>
-        [JsonProperty(PropertyName = "driverVersionExpiryDate")]
-        public System.DateTime? DriverVersionExpiryDate { get; private set; }
-
-        /// <summary>
-        /// Gets the time of the last heartbeat received from the agent.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastHeartbeatUtc")]
-        public System.DateTime? LastHeartbeatUtc { get; private set; }
-
-        /// <summary>
-        /// Gets the whether update is possible or not.
-        /// </summary>
-        [JsonProperty(PropertyName = "reasonsBlockingUpgrade")]
-        public IList<string> ReasonsBlockingUpgrade { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether agent is upgradeable or not.
-        /// </summary>
-        [JsonProperty(PropertyName = "isUpgradeable")]
-        public string IsUpgradeable { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackNicDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackNicDetails.cs
deleted file mode 100644
index 5bdb3f2a66d9..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackNicDetails.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcmFailback NIC details.
-    /// </summary>
-    public partial class InMageRcmFailbackNicDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackNicDetails
-        /// class.
-        /// </summary>
-        public InMageRcmFailbackNicDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackNicDetails
-        /// class.
-        /// </summary>
-        /// <param name="macAddress">The mac address.</param>
-        /// <param name="networkName">The network name.</param>
-        /// <param name="adapterType">The adapter type.</param>
-        /// <param name="sourceIpAddress">The IP address.</param>
-        public InMageRcmFailbackNicDetails(string macAddress = default(string), string networkName = default(string), string adapterType = default(string), string sourceIpAddress = default(string))
-        {
-            MacAddress = macAddress;
-            NetworkName = networkName;
-            AdapterType = adapterType;
-            SourceIpAddress = sourceIpAddress;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the mac address.
-        /// </summary>
-        [JsonProperty(PropertyName = "macAddress")]
-        public string MacAddress { get; private set; }
-
-        /// <summary>
-        /// Gets the network name.
-        /// </summary>
-        [JsonProperty(PropertyName = "networkName")]
-        public string NetworkName { get; private set; }
-
-        /// <summary>
-        /// Gets the adapter type.
-        /// </summary>
-        [JsonProperty(PropertyName = "adapterType")]
-        public string AdapterType { get; private set; }
-
-        /// <summary>
-        /// Gets the IP address.
-        /// </summary>
-        [JsonProperty(PropertyName = "sourceIpAddress")]
-        public string SourceIpAddress { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackPlannedFailoverProviderInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackPlannedFailoverProviderInput.cs
deleted file mode 100644
index d8e36ed86be9..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackPlannedFailoverProviderInput.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Microsoft.Rest;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Provider specific input for InMageRcmFailback failover.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcmFailback")]
-    public partial class InMageRcmFailbackPlannedFailoverProviderInput : PlannedFailoverProviderSpecificFailoverInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackPlannedFailoverProviderInput class.
-        /// </summary>
-        public InMageRcmFailbackPlannedFailoverProviderInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackPlannedFailoverProviderInput class.
-        /// </summary>
-        /// <param name="recoveryPointType">The recovery point type. Possible
-        /// values include: 'ApplicationConsistent', 'CrashConsistent'</param>
-        public InMageRcmFailbackPlannedFailoverProviderInput(string recoveryPointType)
-        {
-            RecoveryPointType = recoveryPointType;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the recovery point type. Possible values include:
-        /// 'ApplicationConsistent', 'CrashConsistent'
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryPointType")]
-        public string RecoveryPointType { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (RecoveryPointType == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "RecoveryPointType");
-            }
-        }
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackPolicyCreationInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackPolicyCreationInput.cs
deleted file mode 100644
index cd6f31d3cde9..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackPolicyCreationInput.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcmFailback policy creation input.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcmFailback")]
-    public partial class InMageRcmFailbackPolicyCreationInput : PolicyProviderSpecificInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackPolicyCreationInput class.
-        /// </summary>
-        public InMageRcmFailbackPolicyCreationInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackPolicyCreationInput class.
-        /// </summary>
-        /// <param name="crashConsistentFrequencyInMinutes">The crash
-        /// consistent snapshot frequency (in minutes).</param>
-        /// <param name="appConsistentFrequencyInMinutes">The app consistent
-        /// snapshot frequency (in minutes).</param>
-        public InMageRcmFailbackPolicyCreationInput(int? crashConsistentFrequencyInMinutes = default(int?), int? appConsistentFrequencyInMinutes = default(int?))
-        {
-            CrashConsistentFrequencyInMinutes = crashConsistentFrequencyInMinutes;
-            AppConsistentFrequencyInMinutes = appConsistentFrequencyInMinutes;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the crash consistent snapshot frequency (in minutes).
-        /// </summary>
-        [JsonProperty(PropertyName = "crashConsistentFrequencyInMinutes")]
-        public int? CrashConsistentFrequencyInMinutes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the app consistent snapshot frequency (in minutes).
-        /// </summary>
-        [JsonProperty(PropertyName = "appConsistentFrequencyInMinutes")]
-        public int? AppConsistentFrequencyInMinutes { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackPolicyDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackPolicyDetails.cs
deleted file mode 100644
index c6c55d10a981..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackPolicyDetails.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcm failback specific policy details.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcmFailback")]
-    public partial class InMageRcmFailbackPolicyDetails : PolicyProviderSpecificDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackPolicyDetails
-        /// class.
-        /// </summary>
-        public InMageRcmFailbackPolicyDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackPolicyDetails
-        /// class.
-        /// </summary>
-        /// <param name="appConsistentFrequencyInMinutes">The app consistent
-        /// snapshot frequency in minutes.</param>
-        /// <param name="crashConsistentFrequencyInMinutes">The crash
-        /// consistent snapshot frequency in minutes.</param>
-        public InMageRcmFailbackPolicyDetails(int? appConsistentFrequencyInMinutes = default(int?), int? crashConsistentFrequencyInMinutes = default(int?))
-        {
-            AppConsistentFrequencyInMinutes = appConsistentFrequencyInMinutes;
-            CrashConsistentFrequencyInMinutes = crashConsistentFrequencyInMinutes;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the app consistent snapshot frequency in minutes.
-        /// </summary>
-        [JsonProperty(PropertyName = "appConsistentFrequencyInMinutes")]
-        public int? AppConsistentFrequencyInMinutes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the crash consistent snapshot frequency in minutes.
-        /// </summary>
-        [JsonProperty(PropertyName = "crashConsistentFrequencyInMinutes")]
-        public int? CrashConsistentFrequencyInMinutes { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackProtectedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackProtectedDiskDetails.cs
deleted file mode 100644
index 1c996c2fc2ee..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackProtectedDiskDetails.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcmFailback protected disk details.
-    /// </summary>
-    public partial class InMageRcmFailbackProtectedDiskDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackProtectedDiskDetails class.
-        /// </summary>
-        public InMageRcmFailbackProtectedDiskDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackProtectedDiskDetails class.
-        /// </summary>
-        /// <param name="diskId">The disk Id (reported by source
-        /// agent).</param>
-        /// <param name="diskName">The disk name.</param>
-        /// <param name="isOSDisk">A value indicating whether the disk is the
-        /// OS disk.</param>
-        /// <param name="capacityInBytes">The disk capacity in bytes.</param>
-        /// <param name="diskUuid">The disk Uuid (reported by vCenter).</param>
-        /// <param name="dataPendingInLogDataStoreInMB">The data pending in log
-        /// data store in MB.</param>
-        /// <param name="dataPendingAtSourceAgentInMB">The data pending at
-        /// source agent in MB.</param>
-        /// <param name="isInitialReplicationComplete">A value indicating
-        /// whether initial replication is complete or not.</param>
-        /// <param name="irDetails">The initial replication details.</param>
-        /// <param name="resyncDetails">The resync details.</param>
-        /// <param name="lastSyncTime">The last sync time.</param>
-        public InMageRcmFailbackProtectedDiskDetails(string diskId = default(string), string diskName = default(string), string isOSDisk = default(string), long? capacityInBytes = default(long?), string diskUuid = default(string), double? dataPendingInLogDataStoreInMB = default(double?), double? dataPendingAtSourceAgentInMB = default(double?), string isInitialReplicationComplete = default(string), InMageRcmFailbackSyncDetails irDetails = default(InMageRcmFailbackSyncDetails), InMageRcmFailbackSyncDetails resyncDetails = default(InMageRcmFailbackSyncDetails), System.DateTime? lastSyncTime = default(System.DateTime?))
-        {
-            DiskId = diskId;
-            DiskName = diskName;
-            IsOSDisk = isOSDisk;
-            CapacityInBytes = capacityInBytes;
-            DiskUuid = diskUuid;
-            DataPendingInLogDataStoreInMB = dataPendingInLogDataStoreInMB;
-            DataPendingAtSourceAgentInMB = dataPendingAtSourceAgentInMB;
-            IsInitialReplicationComplete = isInitialReplicationComplete;
-            IrDetails = irDetails;
-            ResyncDetails = resyncDetails;
-            LastSyncTime = lastSyncTime;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the disk Id (reported by source agent).
-        /// </summary>
-        [JsonProperty(PropertyName = "diskId")]
-        public string DiskId { get; private set; }
-
-        /// <summary>
-        /// Gets the disk name.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskName")]
-        public string DiskName { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the disk is the OS disk.
-        /// </summary>
-        [JsonProperty(PropertyName = "isOSDisk")]
-        public string IsOSDisk { get; private set; }
-
-        /// <summary>
-        /// Gets the disk capacity in bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "capacityInBytes")]
-        public long? CapacityInBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the disk Uuid (reported by vCenter).
-        /// </summary>
-        [JsonProperty(PropertyName = "diskUuid")]
-        public string DiskUuid { get; private set; }
-
-        /// <summary>
-        /// Gets the data pending in log data store in MB.
-        /// </summary>
-        [JsonProperty(PropertyName = "dataPendingInLogDataStoreInMB")]
-        public double? DataPendingInLogDataStoreInMB { get; private set; }
-
-        /// <summary>
-        /// Gets the data pending at source agent in MB.
-        /// </summary>
-        [JsonProperty(PropertyName = "dataPendingAtSourceAgentInMB")]
-        public double? DataPendingAtSourceAgentInMB { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether initial replication is complete or
-        /// not.
-        /// </summary>
-        [JsonProperty(PropertyName = "isInitialReplicationComplete")]
-        public string IsInitialReplicationComplete { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the initial replication details.
-        /// </summary>
-        [JsonProperty(PropertyName = "irDetails")]
-        public InMageRcmFailbackSyncDetails IrDetails { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resync details.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncDetails")]
-        public InMageRcmFailbackSyncDetails ResyncDetails { get; set; }
-
-        /// <summary>
-        /// Gets the last sync time.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastSyncTime")]
-        public System.DateTime? LastSyncTime { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackReplicationDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackReplicationDetails.cs
deleted file mode 100644
index 201e2f8d59c7..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackReplicationDetails.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcmFailback provider specific details.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcmFailback")]
-    public partial class InMageRcmFailbackReplicationDetails : ReplicationProviderSpecificSettings
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackReplicationDetails class.
-        /// </summary>
-        public InMageRcmFailbackReplicationDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmFailbackReplicationDetails class.
-        /// </summary>
-        /// <param name="internalIdentifier">The virtual machine internal
-        /// identifier.</param>
-        /// <param name="azureVirtualMachineId">The ARM Id of the azure
-        /// VM.</param>
-        /// <param name="multiVmGroupName">The multi VM group name.</param>
-        /// <param name="reprotectAgentId">The reprotect agent Id.</param>
-        /// <param name="reprotectAgentName">The reprotect agent name.</param>
-        /// <param name="osType">The type of the OS on the VM.</param>
-        /// <param name="logStorageAccountId">The log storage account ARM
-        /// Id.</param>
-        /// <param name="targetvCenterId">The target vCenter Id.</param>
-        /// <param name="targetDataStoreName">The target datastore
-        /// name.</param>
-        /// <param name="targetVmName">The target VM name.</param>
-        /// <param name="initialReplicationProgressPercentage">The initial
-        /// replication progress percentage.</param>
-        /// <param name="initialReplicationProcessedBytes">The initial
-        /// replication processed bytes. This includes sum of total bytes
-        /// transferred and matched bytes on all selected disks in source
-        /// VM.</param>
-        /// <param name="initialReplicationTransferredBytes">The initial
-        /// replication transferred bytes from source VM to target for all
-        /// selected disks on source VM.</param>
-        /// <param name="initialReplicationProgressHealth">The initial
-        /// replication progress health. Possible values include: 'None',
-        /// 'InProgress', 'SlowProgress', 'NoProgress'</param>
-        /// <param name="resyncProgressPercentage">The resync progress
-        /// percentage.</param>
-        /// <param name="resyncProcessedBytes">The resync processed bytes. This
-        /// includes sum of total bytes transferred and matched bytes on all
-        /// selected disks in source VM.</param>
-        /// <param name="resyncTransferredBytes">The resync transferred bytes
-        /// from source VM to target for all selected disks on source
-        /// VM.</param>
-        /// <param name="resyncProgressHealth">The resync progress health.
-        /// Possible values include: 'None', 'InProgress', 'SlowProgress',
-        /// 'NoProgress'</param>
-        /// <param name="resyncRequired">A value indicating whether resync is
-        /// required.</param>
-        /// <param name="resyncState">The resync state. Possible values
-        /// include: 'None', 'PreparedForResynchronization',
-        /// 'StartedResynchronization'</param>
-        /// <param name="protectedDisks">The list of protected disks.</param>
-        /// <param name="mobilityAgentDetails">The mobility agent
-        /// information.</param>
-        /// <param name="vmNics">The network details.</param>
-        public InMageRcmFailbackReplicationDetails(string internalIdentifier = default(string), string azureVirtualMachineId = default(string), string multiVmGroupName = default(string), string reprotectAgentId = default(string), string reprotectAgentName = default(string), string osType = default(string), string logStorageAccountId = default(string), string targetvCenterId = default(string), string targetDataStoreName = default(string), string targetVmName = default(string), int? initialReplicationProgressPercentage = default(int?), long? initialReplicationProcessedBytes = default(long?), long? initialReplicationTransferredBytes = default(long?), string initialReplicationProgressHealth = default(string), int? resyncProgressPercentage = default(int?), long? resyncProcessedBytes = default(long?), long? resyncTransferredBytes = default(long?), string resyncProgressHealth = default(string), string resyncRequired = default(string), string resyncState = default(string), IList<InMageRcmFailbackProtectedDiskDetails> protectedDisks = default(IList<InMageRcmFailbackProtectedDiskDetails>), InMageRcmFailbackMobilityAgentDetails mobilityAgentDetails = default(InMageRcmFailbackMobilityAgentDetails), IList<InMageRcmFailbackNicDetails> vmNics = default(IList<InMageRcmFailbackNicDetails>))
-        {
-            InternalIdentifier = internalIdentifier;
-            AzureVirtualMachineId = azureVirtualMachineId;
-            MultiVmGroupName = multiVmGroupName;
-            ReprotectAgentId = reprotectAgentId;
-            ReprotectAgentName = reprotectAgentName;
-            OsType = osType;
-            LogStorageAccountId = logStorageAccountId;
-            TargetvCenterId = targetvCenterId;
-            TargetDataStoreName = targetDataStoreName;
-            TargetVmName = targetVmName;
-            InitialReplicationProgressPercentage = initialReplicationProgressPercentage;
-            InitialReplicationProcessedBytes = initialReplicationProcessedBytes;
-            InitialReplicationTransferredBytes = initialReplicationTransferredBytes;
-            InitialReplicationProgressHealth = initialReplicationProgressHealth;
-            ResyncProgressPercentage = resyncProgressPercentage;
-            ResyncProcessedBytes = resyncProcessedBytes;
-            ResyncTransferredBytes = resyncTransferredBytes;
-            ResyncProgressHealth = resyncProgressHealth;
-            ResyncRequired = resyncRequired;
-            ResyncState = resyncState;
-            ProtectedDisks = protectedDisks;
-            MobilityAgentDetails = mobilityAgentDetails;
-            VmNics = vmNics;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the virtual machine internal identifier.
-        /// </summary>
-        [JsonProperty(PropertyName = "internalIdentifier")]
-        public string InternalIdentifier { get; private set; }
-
-        /// <summary>
-        /// Gets the ARM Id of the azure VM.
-        /// </summary>
-        [JsonProperty(PropertyName = "azureVirtualMachineId")]
-        public string AzureVirtualMachineId { get; private set; }
-
-        /// <summary>
-        /// Gets the multi VM group name.
-        /// </summary>
-        [JsonProperty(PropertyName = "multiVmGroupName")]
-        public string MultiVmGroupName { get; private set; }
-
-        /// <summary>
-        /// Gets the reprotect agent Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "reprotectAgentId")]
-        public string ReprotectAgentId { get; private set; }
-
-        /// <summary>
-        /// Gets the reprotect agent name.
-        /// </summary>
-        [JsonProperty(PropertyName = "reprotectAgentName")]
-        public string ReprotectAgentName { get; private set; }
-
-        /// <summary>
-        /// Gets the type of the OS on the VM.
-        /// </summary>
-        [JsonProperty(PropertyName = "osType")]
-        public string OsType { get; private set; }
-
-        /// <summary>
-        /// Gets the log storage account ARM Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "logStorageAccountId")]
-        public string LogStorageAccountId { get; private set; }
-
-        /// <summary>
-        /// Gets the target vCenter Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetvCenterId")]
-        public string TargetvCenterId { get; private set; }
-
-        /// <summary>
-        /// Gets the target datastore name.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetDataStoreName")]
-        public string TargetDataStoreName { get; private set; }
-
-        /// <summary>
-        /// Gets the target VM name.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmName")]
-        public string TargetVmName { get; private set; }
-
-        /// <summary>
-        /// Gets the initial replication progress percentage.
-        /// </summary>
-        [JsonProperty(PropertyName = "initialReplicationProgressPercentage")]
-        public int? InitialReplicationProgressPercentage { get; private set; }
-
-        /// <summary>
-        /// Gets the initial replication processed bytes. This includes sum of
-        /// total bytes transferred and matched bytes on all selected disks in
-        /// source VM.
-        /// </summary>
-        [JsonProperty(PropertyName = "initialReplicationProcessedBytes")]
-        public long? InitialReplicationProcessedBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the initial replication transferred bytes from source VM to
-        /// target for all selected disks on source VM.
-        /// </summary>
-        [JsonProperty(PropertyName = "initialReplicationTransferredBytes")]
-        public long? InitialReplicationTransferredBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the initial replication progress health. Possible values
-        /// include: 'None', 'InProgress', 'SlowProgress', 'NoProgress'
-        /// </summary>
-        [JsonProperty(PropertyName = "initialReplicationProgressHealth")]
-        public string InitialReplicationProgressHealth { get; private set; }
-
-        /// <summary>
-        /// Gets the resync progress percentage.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncProgressPercentage")]
-        public int? ResyncProgressPercentage { get; private set; }
-
-        /// <summary>
-        /// Gets the resync processed bytes. This includes sum of total bytes
-        /// transferred and matched bytes on all selected disks in source VM.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncProcessedBytes")]
-        public long? ResyncProcessedBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the resync transferred bytes from source VM to target for all
-        /// selected disks on source VM.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncTransferredBytes")]
-        public long? ResyncTransferredBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the resync progress health. Possible values include: 'None',
-        /// 'InProgress', 'SlowProgress', 'NoProgress'
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncProgressHealth")]
-        public string ResyncProgressHealth { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether resync is required.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncRequired")]
-        public string ResyncRequired { get; private set; }
-
-        /// <summary>
-        /// Gets the resync state. Possible values include: 'None',
-        /// 'PreparedForResynchronization', 'StartedResynchronization'
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncState")]
-        public string ResyncState { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the list of protected disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "protectedDisks")]
-        public IList<InMageRcmFailbackProtectedDiskDetails> ProtectedDisks { get; set; }
-
-        /// <summary>
-        /// Gets or sets the mobility agent information.
-        /// </summary>
-        [JsonProperty(PropertyName = "mobilityAgentDetails")]
-        public InMageRcmFailbackMobilityAgentDetails MobilityAgentDetails { get; set; }
-
-        /// <summary>
-        /// Gets or sets the network details.
-        /// </summary>
-        [JsonProperty(PropertyName = "vmNics")]
-        public IList<InMageRcmFailbackNicDetails> VmNics { get; set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackReprotectInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackReprotectInput.cs
deleted file mode 100644
index 68025d4cd328..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackReprotectInput.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Microsoft.Rest;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcmFailback specific provider input.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcmFailback")]
-    public partial class InMageRcmFailbackReprotectInput : ReverseReplicationProviderSpecificInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackReprotectInput
-        /// class.
-        /// </summary>
-        public InMageRcmFailbackReprotectInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackReprotectInput
-        /// class.
-        /// </summary>
-        /// <param name="processServerId">The process server Id.</param>
-        /// <param name="policyId">The Policy Id.</param>
-        /// <param name="runAsAccountId">The run as account Id.</param>
-        public InMageRcmFailbackReprotectInput(string processServerId, string policyId, string runAsAccountId = default(string))
-        {
-            ProcessServerId = processServerId;
-            RunAsAccountId = runAsAccountId;
-            PolicyId = policyId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the process server Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "processServerId")]
-        public string ProcessServerId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the run as account Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "runAsAccountId")]
-        public string RunAsAccountId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Policy Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "policyId")]
-        public string PolicyId { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (ProcessServerId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "ProcessServerId");
-            }
-            if (PolicyId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "PolicyId");
-            }
-        }
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackSyncDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackSyncDetails.cs
deleted file mode 100644
index 93d54bb1cfd2..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmFailbackSyncDetails.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcmFailback disk level sync details.
-    /// </summary>
-    public partial class InMageRcmFailbackSyncDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackSyncDetails
-        /// class.
-        /// </summary>
-        public InMageRcmFailbackSyncDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmFailbackSyncDetails
-        /// class.
-        /// </summary>
-        /// <param name="progressHealth">The progress health. Possible values
-        /// include: 'None', 'InProgress', 'SlowProgress', 'NoProgress',
-        /// 'Queued'</param>
-        /// <param name="transferredBytes">The transferred bytes from source VM
-        /// to azure for the disk.</param>
-        /// <param name="last15MinutesTransferredBytes">The bytes transferred
-        /// in last 15 minutes from source VM to target.</param>
-        /// <param name="lastDataTransferTimeUtc">The time of the last data
-        /// transfer from source VM to target.</param>
-        /// <param name="processedBytes">The total processed bytes. This
-        /// includes bytes that are transferred from source VM to target and
-        /// matched bytes.</param>
-        /// <param name="startTime">The start time.</param>
-        /// <param name="lastRefreshTime">The last refresh time.</param>
-        /// <param name="progressPercentage">Progress in percentage. Progress
-        /// percentage is calculated based on processed bytes.</param>
-        public InMageRcmFailbackSyncDetails(string progressHealth = default(string), long? transferredBytes = default(long?), long? last15MinutesTransferredBytes = default(long?), string lastDataTransferTimeUtc = default(string), long? processedBytes = default(long?), string startTime = default(string), string lastRefreshTime = default(string), int? progressPercentage = default(int?))
-        {
-            ProgressHealth = progressHealth;
-            TransferredBytes = transferredBytes;
-            Last15MinutesTransferredBytes = last15MinutesTransferredBytes;
-            LastDataTransferTimeUtc = lastDataTransferTimeUtc;
-            ProcessedBytes = processedBytes;
-            StartTime = startTime;
-            LastRefreshTime = lastRefreshTime;
-            ProgressPercentage = progressPercentage;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the progress health. Possible values include: 'None',
-        /// 'InProgress', 'SlowProgress', 'NoProgress', 'Queued'
-        /// </summary>
-        [JsonProperty(PropertyName = "progressHealth")]
-        public string ProgressHealth { get; private set; }
-
-        /// <summary>
-        /// Gets the transferred bytes from source VM to azure for the disk.
-        /// </summary>
-        [JsonProperty(PropertyName = "transferredBytes")]
-        public long? TransferredBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the bytes transferred in last 15 minutes from source VM to
-        /// target.
-        /// </summary>
-        [JsonProperty(PropertyName = "last15MinutesTransferredBytes")]
-        public long? Last15MinutesTransferredBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the time of the last data transfer from source VM to target.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastDataTransferTimeUtc")]
-        public string LastDataTransferTimeUtc { get; private set; }
-
-        /// <summary>
-        /// Gets the total processed bytes. This includes bytes that are
-        /// transferred from source VM to target and matched bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "processedBytes")]
-        public long? ProcessedBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the start time.
-        /// </summary>
-        [JsonProperty(PropertyName = "startTime")]
-        public string StartTime { get; private set; }
-
-        /// <summary>
-        /// Gets the last refresh time.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastRefreshTime")]
-        public string LastRefreshTime { get; private set; }
-
-        /// <summary>
-        /// Gets progress in percentage. Progress percentage is calculated
-        /// based on processed bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "progressPercentage")]
-        public int? ProgressPercentage { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmMobilityAgentDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmMobilityAgentDetails.cs
index 24f428c508e5..a6c9048c34b7 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmMobilityAgentDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmMobilityAgentDetails.cs
@@ -36,8 +36,6 @@ public InMageRcmMobilityAgentDetails()
         /// <param name="version">The agent version.</param>
         /// <param name="latestVersion">The latest agent version
         /// available.</param>
-        /// <param name="latestAgentReleaseDate">The latest agent version
-        /// release date.</param>
         /// <param name="driverVersion">The driver version.</param>
         /// <param name="latestUpgradableVersionWithoutReboot">The latest
         /// upgradeable version available without reboot.</param>
@@ -51,11 +49,10 @@ public InMageRcmMobilityAgentDetails()
         /// or not.</param>
         /// <param name="isUpgradeable">A value indicating whether agent is
         /// upgradeable or not.</param>
-        public InMageRcmMobilityAgentDetails(string version = default(string), string latestVersion = default(string), string latestAgentReleaseDate = default(string), string driverVersion = default(string), string latestUpgradableVersionWithoutReboot = default(string), System.DateTime? agentVersionExpiryDate = default(System.DateTime?), System.DateTime? driverVersionExpiryDate = default(System.DateTime?), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), IList<string> reasonsBlockingUpgrade = default(IList<string>), string isUpgradeable = default(string))
+        public InMageRcmMobilityAgentDetails(string version = default(string), string latestVersion = default(string), string driverVersion = default(string), string latestUpgradableVersionWithoutReboot = default(string), System.DateTime? agentVersionExpiryDate = default(System.DateTime?), System.DateTime? driverVersionExpiryDate = default(System.DateTime?), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), IList<string> reasonsBlockingUpgrade = default(IList<string>), string isUpgradeable = default(string))
         {
             Version = version;
             LatestVersion = latestVersion;
-            LatestAgentReleaseDate = latestAgentReleaseDate;
             DriverVersion = driverVersion;
             LatestUpgradableVersionWithoutReboot = latestUpgradableVersionWithoutReboot;
             AgentVersionExpiryDate = agentVersionExpiryDate;
@@ -83,12 +80,6 @@ public InMageRcmMobilityAgentDetails()
         [JsonProperty(PropertyName = "latestVersion")]
         public string LatestVersion { get; private set; }
 
-        /// <summary>
-        /// Gets the latest agent version release date.
-        /// </summary>
-        [JsonProperty(PropertyName = "latestAgentReleaseDate")]
-        public string LatestAgentReleaseDate { get; private set; }
-
         /// <summary>
         /// Gets the driver version.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmNicDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmNicDetails.cs
index e3795d31334b..967f6195914a 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmNicDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmNicDetails.cs
@@ -77,17 +77,16 @@ public InMageRcmNicDetails()
         public string NicId { get; private set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this is the primary NIC.
+        /// Gets a value indicating whether this is the primary NIC.
         /// </summary>
         [JsonProperty(PropertyName = "isPrimaryNic")]
-        public string IsPrimaryNic { get; set; }
+        public string IsPrimaryNic { get; private set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this NIC is selected for
-        /// failover.
+        /// Gets a value indicating whether this NIC is selected for failover.
         /// </summary>
         [JsonProperty(PropertyName = "isSelectedForFailover")]
-        public string IsSelectedForFailover { get; set; }
+        public string IsSelectedForFailover { get; private set; }
 
         /// <summary>
         /// Gets the source IP address.
@@ -115,42 +114,42 @@ public InMageRcmNicDetails()
         public string SourceSubnetName { get; private set; }
 
         /// <summary>
-        /// Gets or sets the target IP address.
+        /// Gets the target IP address.
         /// </summary>
         [JsonProperty(PropertyName = "targetIPAddress")]
-        public string TargetIPAddress { get; set; }
+        public string TargetIPAddress { get; private set; }
 
         /// <summary>
-        /// Gets or sets the target IP address type. Possible values include:
+        /// Gets the target IP address type. Possible values include:
         /// 'Dynamic', 'Static'
         /// </summary>
         [JsonProperty(PropertyName = "targetIPAddressType")]
-        public string TargetIPAddressType { get; set; }
+        public string TargetIPAddressType { get; private set; }
 
         /// <summary>
-        /// Gets or sets target subnet name.
+        /// Gets target subnet name.
         /// </summary>
         [JsonProperty(PropertyName = "targetSubnetName")]
-        public string TargetSubnetName { get; set; }
+        public string TargetSubnetName { get; private set; }
 
         /// <summary>
-        /// Gets or sets test subnet name.
+        /// Gets test subnet name.
         /// </summary>
         [JsonProperty(PropertyName = "testSubnetName")]
-        public string TestSubnetName { get; set; }
+        public string TestSubnetName { get; private set; }
 
         /// <summary>
-        /// Gets or sets the test IP address.
+        /// Gets the test IP address.
         /// </summary>
         [JsonProperty(PropertyName = "testIPAddress")]
-        public string TestIPAddress { get; set; }
+        public string TestIPAddress { get; private set; }
 
         /// <summary>
-        /// Gets or sets the test IP address type. Possible values include:
-        /// 'Dynamic', 'Static'
+        /// Gets the test IP address type. Possible values include: 'Dynamic',
+        /// 'Static'
         /// </summary>
         [JsonProperty(PropertyName = "testIPAddressType")]
-        public string TestIPAddressType { get; set; }
+        public string TestIPAddressType { get; private set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmNicInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmNicInput.cs
index 381821d10ef0..a98b1a00e279 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmNicInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmNicInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -41,7 +40,7 @@ public InMageRcmNicInput()
         /// <param name="testSubnetName">The test subnet name.</param>
         /// <param name="testStaticIPAddress">The test static IP
         /// address.</param>
-        public InMageRcmNicInput(string nicId, string isPrimaryNic, string isSelectedForFailover = default(string), string targetSubnetName = default(string), string targetStaticIPAddress = default(string), string testSubnetName = default(string), string testStaticIPAddress = default(string))
+        public InMageRcmNicInput(string nicId = default(string), string isPrimaryNic = default(string), string isSelectedForFailover = default(string), string targetSubnetName = default(string), string targetStaticIPAddress = default(string), string testSubnetName = default(string), string testStaticIPAddress = default(string))
         {
             NicId = nicId;
             IsPrimaryNic = isPrimaryNic;
@@ -101,22 +100,5 @@ public InMageRcmNicInput()
         [JsonProperty(PropertyName = "testStaticIPAddress")]
         public string TestStaticIPAddress { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (NicId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "NicId");
-            }
-            if (IsPrimaryNic == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "IsPrimaryNic");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmPolicyDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmPolicyDetails.cs
index 4f480f5fefa7..dcc5a8d4153e 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmPolicyDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmPolicyDetails.cs
@@ -53,30 +53,29 @@ public InMageRcmPolicyDetails()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the duration in minutes until which the recovery
-        /// points need to be stored.
+        /// Gets the duration in minutes until which the recovery points need
+        /// to be stored.
         /// </summary>
         [JsonProperty(PropertyName = "recoveryPointHistoryInMinutes")]
-        public int? RecoveryPointHistoryInMinutes { get; set; }
+        public int? RecoveryPointHistoryInMinutes { get; private set; }
 
         /// <summary>
-        /// Gets or sets the app consistent snapshot frequency in minutes.
+        /// Gets the app consistent snapshot frequency in minutes.
         /// </summary>
         [JsonProperty(PropertyName = "appConsistentFrequencyInMinutes")]
-        public int? AppConsistentFrequencyInMinutes { get; set; }
+        public int? AppConsistentFrequencyInMinutes { get; private set; }
 
         /// <summary>
-        /// Gets or sets the crash consistent snapshot frequency in minutes.
+        /// Gets the crash consistent snapshot frequency in minutes.
         /// </summary>
         [JsonProperty(PropertyName = "crashConsistentFrequencyInMinutes")]
-        public int? CrashConsistentFrequencyInMinutes { get; set; }
+        public int? CrashConsistentFrequencyInMinutes { get; private set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether multi-VM sync has to be
-        /// enabled.
+        /// Gets a value indicating whether multi-VM sync has to be enabled.
         /// </summary>
         [JsonProperty(PropertyName = "enableMultiVmSync")]
-        public string EnableMultiVmSync { get; set; }
+        public string EnableMultiVmSync { get; private set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmProtectedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmProtectedDiskDetails.cs
index 65d75bb2d90f..08a4e5b75584 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmProtectedDiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmProtectedDiskDetails.cs
@@ -38,7 +38,7 @@ public InMageRcmProtectedDiskDetails()
         /// <param name="capacityInBytes">The disk capacity in bytes.</param>
         /// <param name="logStorageAccountId">The log storage account ARM
         /// Id.</param>
-        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
+        /// <param name="diskEncryptionSetId">The disk encryption set ARM
         /// Id.</param>
         /// <param name="seedManagedDiskId">The ARM Id of the seed managed
         /// disk.</param>
@@ -46,15 +46,7 @@ public InMageRcmProtectedDiskDetails()
         /// disk.</param>
         /// <param name="diskType">The disk type. Possible values include:
         /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'</param>
-        /// <param name="dataPendingInLogDataStoreInMB">The data pending in log
-        /// data store in MB.</param>
-        /// <param name="dataPendingAtSourceAgentInMB">The data pending at
-        /// source agent in MB.</param>
-        /// <param name="isInitialReplicationComplete">A value indicating
-        /// whether initial replication is complete or not.</param>
-        /// <param name="irDetails">The initial replication details.</param>
-        /// <param name="resyncDetails">The resync details.</param>
-        public InMageRcmProtectedDiskDetails(string diskId = default(string), string diskName = default(string), string isOSDisk = default(string), long? capacityInBytes = default(long?), string logStorageAccountId = default(string), string diskEncryptionSetId = default(string), string seedManagedDiskId = default(string), string targetManagedDiskId = default(string), string diskType = default(string), double? dataPendingInLogDataStoreInMB = default(double?), double? dataPendingAtSourceAgentInMB = default(double?), string isInitialReplicationComplete = default(string), InMageRcmSyncDetails irDetails = default(InMageRcmSyncDetails), InMageRcmSyncDetails resyncDetails = default(InMageRcmSyncDetails))
+        public InMageRcmProtectedDiskDetails(string diskId = default(string), string diskName = default(string), string isOSDisk = default(string), long? capacityInBytes = default(long?), string logStorageAccountId = default(string), string diskEncryptionSetId = default(string), string seedManagedDiskId = default(string), string targetManagedDiskId = default(string), string diskType = default(string))
         {
             DiskId = diskId;
             DiskName = diskName;
@@ -65,11 +57,6 @@ public InMageRcmProtectedDiskDetails()
             SeedManagedDiskId = seedManagedDiskId;
             TargetManagedDiskId = targetManagedDiskId;
             DiskType = diskType;
-            DataPendingInLogDataStoreInMB = dataPendingInLogDataStoreInMB;
-            DataPendingAtSourceAgentInMB = dataPendingAtSourceAgentInMB;
-            IsInitialReplicationComplete = isInitialReplicationComplete;
-            IrDetails = irDetails;
-            ResyncDetails = resyncDetails;
             CustomInit();
         }
 
@@ -109,7 +96,7 @@ public InMageRcmProtectedDiskDetails()
         public string LogStorageAccountId { get; private set; }
 
         /// <summary>
-        /// Gets the DiskEncryptionSet ARM Id.
+        /// Gets the disk encryption set ARM Id.
         /// </summary>
         [JsonProperty(PropertyName = "diskEncryptionSetId")]
         public string DiskEncryptionSetId { get; private set; }
@@ -127,42 +114,11 @@ public InMageRcmProtectedDiskDetails()
         public string TargetManagedDiskId { get; private set; }
 
         /// <summary>
-        /// Gets or sets the disk type. Possible values include:
-        /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'
+        /// Gets the disk type. Possible values include: 'Standard_LRS',
+        /// 'Premium_LRS', 'StandardSSD_LRS'
         /// </summary>
         [JsonProperty(PropertyName = "diskType")]
-        public string DiskType { get; set; }
-
-        /// <summary>
-        /// Gets the data pending in log data store in MB.
-        /// </summary>
-        [JsonProperty(PropertyName = "dataPendingInLogDataStoreInMB")]
-        public double? DataPendingInLogDataStoreInMB { get; private set; }
-
-        /// <summary>
-        /// Gets the data pending at source agent in MB.
-        /// </summary>
-        [JsonProperty(PropertyName = "dataPendingAtSourceAgentInMB")]
-        public double? DataPendingAtSourceAgentInMB { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether initial replication is complete or
-        /// not.
-        /// </summary>
-        [JsonProperty(PropertyName = "isInitialReplicationComplete")]
-        public string IsInitialReplicationComplete { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the initial replication details.
-        /// </summary>
-        [JsonProperty(PropertyName = "irDetails")]
-        public InMageRcmSyncDetails IrDetails { get; set; }
-
-        /// <summary>
-        /// Gets or sets the resync details.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncDetails")]
-        public InMageRcmSyncDetails ResyncDetails { get; set; }
+        public string DiskType { get; private set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmProtectionContainerMappingDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmProtectionContainerMappingDetails.cs
deleted file mode 100644
index e5f790616cf3..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmProtectionContainerMappingDetails.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcm provider specific container mapping details.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcm")]
-    public partial class InMageRcmProtectionContainerMappingDetails : ProtectionContainerMappingProviderSpecificDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmProtectionContainerMappingDetails class.
-        /// </summary>
-        public InMageRcmProtectionContainerMappingDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmProtectionContainerMappingDetails class.
-        /// </summary>
-        /// <param name="enableAgentAutoUpgrade">A value indicating whether the
-        /// flag for enable agent auto upgrade.</param>
-        public InMageRcmProtectionContainerMappingDetails(string enableAgentAutoUpgrade = default(string))
-        {
-            EnableAgentAutoUpgrade = enableAgentAutoUpgrade;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets a value indicating whether the flag for enable agent auto
-        /// upgrade.
-        /// </summary>
-        [JsonProperty(PropertyName = "enableAgentAutoUpgrade")]
-        public string EnableAgentAutoUpgrade { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmReplicationDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmReplicationDetails.cs
index f7b9cb045ae8..97e27d9a2db6 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmReplicationDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmReplicationDetails.cs
@@ -48,8 +48,6 @@ public InMageRcmReplicationDetails()
         /// <param name="runAsAccountId">The run-as account Id.</param>
         /// <param name="osType">The type of the OS on the VM.</param>
         /// <param name="firmwareType">The firmware type.</param>
-        /// <param name="primaryNicIpAddress">The IP address of the primary
-        /// network interface.</param>
         /// <param name="targetGeneration">The target generation.</param>
         /// <param name="licenseType">License Type of the VM to be
         /// used.</param>
@@ -57,7 +55,6 @@ public InMageRcmReplicationDetails()
         /// <param name="targetVmSize">The target VM size.</param>
         /// <param name="targetResourceGroupId">The target resource group
         /// Id.</param>
-        /// <param name="targetLocation">The target location.</param>
         /// <param name="targetAvailabilitySetId">The target availability set
         /// Id.</param>
         /// <param name="targetAvailabilityZone">The target availability
@@ -88,9 +85,6 @@ public InMageRcmReplicationDetails()
         /// <param name="initialReplicationTransferredBytes">The initial
         /// replication transferred bytes from source VM to azure for all
         /// selected disks on source VM.</param>
-        /// <param name="initialReplicationProgressHealth">The initial
-        /// replication progress health. Possible values include: 'None',
-        /// 'InProgress', 'SlowProgress', 'NoProgress'</param>
         /// <param name="resyncProgressPercentage">The resync progress
         /// percentage. This is calculated based on total bytes processed for
         /// all disks in the source VM.</param>
@@ -100,9 +94,6 @@ public InMageRcmReplicationDetails()
         /// <param name="resyncTransferredBytes">The resync transferred bytes
         /// from source VM to azure for all selected disks on source
         /// VM.</param>
-        /// <param name="resyncProgressHealth">The resync progress health.
-        /// Possible values include: 'None', 'InProgress', 'SlowProgress',
-        /// 'NoProgress'</param>
         /// <param name="resyncRequired">A value indicating whether resync is
         /// required.</param>
         /// <param name="resyncState">The resync state. Possible values
@@ -113,9 +104,8 @@ public InMageRcmReplicationDetails()
         /// 'Commit'</param>
         /// <param name="lastAgentUpgradeType">The last agent upgrade
         /// type.</param>
-        /// <param name="agentUpgradeJobId">The agent upgrade job Id.</param>
-        /// <param name="agentUpgradeAttemptToVersion">The agent version to
-        /// which last agent upgrade was attempted.</param>
+        /// <param name="lastAgentUpgradeFailedJobId">The last agent upgrade
+        /// failed or cancelled job Id.</param>
         /// <param name="protectedDisks">The list of protected disks.</param>
         /// <param name="isLastUpgradeSuccessful">A value indicating whether
         /// last agent upgrade was successful or not.</param>
@@ -126,7 +116,7 @@ public InMageRcmReplicationDetails()
         /// <param name="agentUpgradeBlockingErrorDetails">The agent upgrade
         /// blocking error information.</param>
         /// <param name="vmNics">The network details.</param>
-        public InMageRcmReplicationDetails(string internalIdentifier = default(string), string fabricDiscoveryMachineId = default(string), string multiVmGroupName = default(string), string discoveryType = default(string), string processServerId = default(string), int? processorCoreCount = default(int?), double? allocatedMemoryInMB = default(double?), string processServerName = default(string), string runAsAccountId = default(string), string osType = default(string), string firmwareType = default(string), string primaryNicIpAddress = default(string), string targetGeneration = default(string), string licenseType = default(string), string targetVmName = default(string), string targetVmSize = default(string), string targetResourceGroupId = default(string), string targetLocation = default(string), string targetAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string targetBootDiagnosticsStorageAccountId = default(string), string targetNetworkId = default(string), string testNetworkId = default(string), string failoverRecoveryPointId = default(string), System.DateTime? lastRecoveryPointReceived = default(System.DateTime?), long? lastRpoInSeconds = default(long?), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), string lastRecoveryPointId = default(string), int? initialReplicationProgressPercentage = default(int?), long? initialReplicationProcessedBytes = default(long?), long? initialReplicationTransferredBytes = default(long?), string initialReplicationProgressHealth = default(string), int? resyncProgressPercentage = default(int?), long? resyncProcessedBytes = default(long?), long? resyncTransferredBytes = default(long?), string resyncProgressHealth = default(string), string resyncRequired = default(string), string resyncState = default(string), string agentUpgradeState = default(string), string lastAgentUpgradeType = default(string), string agentUpgradeJobId = default(string), string agentUpgradeAttemptToVersion = default(string), IList<InMageRcmProtectedDiskDetails> protectedDisks = default(IList<InMageRcmProtectedDiskDetails>), string isLastUpgradeSuccessful = default(string), InMageRcmMobilityAgentDetails mobilityAgentDetails = default(InMageRcmMobilityAgentDetails), IList<InMageRcmLastAgentUpgradeErrorDetails> lastAgentUpgradeErrorDetails = default(IList<InMageRcmLastAgentUpgradeErrorDetails>), IList<InMageRcmAgentUpgradeBlockingErrorDetails> agentUpgradeBlockingErrorDetails = default(IList<InMageRcmAgentUpgradeBlockingErrorDetails>), IList<InMageRcmNicDetails> vmNics = default(IList<InMageRcmNicDetails>))
+        public InMageRcmReplicationDetails(string internalIdentifier = default(string), string fabricDiscoveryMachineId = default(string), string multiVmGroupName = default(string), string discoveryType = default(string), string processServerId = default(string), int? processorCoreCount = default(int?), double? allocatedMemoryInMB = default(double?), string processServerName = default(string), string runAsAccountId = default(string), string osType = default(string), string firmwareType = default(string), string targetGeneration = default(string), string licenseType = default(string), string targetVmName = default(string), string targetVmSize = default(string), string targetResourceGroupId = default(string), string targetAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string targetBootDiagnosticsStorageAccountId = default(string), string targetNetworkId = default(string), string testNetworkId = default(string), string failoverRecoveryPointId = default(string), System.DateTime? lastRecoveryPointReceived = default(System.DateTime?), long? lastRpoInSeconds = default(long?), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), string lastRecoveryPointId = default(string), int? initialReplicationProgressPercentage = default(int?), long? initialReplicationProcessedBytes = default(long?), long? initialReplicationTransferredBytes = default(long?), int? resyncProgressPercentage = default(int?), long? resyncProcessedBytes = default(long?), long? resyncTransferredBytes = default(long?), string resyncRequired = default(string), string resyncState = default(string), string agentUpgradeState = default(string), string lastAgentUpgradeType = default(string), string lastAgentUpgradeFailedJobId = default(string), IList<InMageRcmProtectedDiskDetails> protectedDisks = default(IList<InMageRcmProtectedDiskDetails>), string isLastUpgradeSuccessful = default(string), InMageRcmMobilityAgentDetails mobilityAgentDetails = default(InMageRcmMobilityAgentDetails), IList<InMageRcmLastAgentUpgradeErrorDetails> lastAgentUpgradeErrorDetails = default(IList<InMageRcmLastAgentUpgradeErrorDetails>), IList<InMageRcmAgentUpgradeBlockingErrorDetails> agentUpgradeBlockingErrorDetails = default(IList<InMageRcmAgentUpgradeBlockingErrorDetails>), IList<InMageRcmNicDetails> vmNics = default(IList<InMageRcmNicDetails>))
         {
             InternalIdentifier = internalIdentifier;
             FabricDiscoveryMachineId = fabricDiscoveryMachineId;
@@ -139,13 +129,11 @@ public InMageRcmReplicationDetails()
             RunAsAccountId = runAsAccountId;
             OsType = osType;
             FirmwareType = firmwareType;
-            PrimaryNicIpAddress = primaryNicIpAddress;
             TargetGeneration = targetGeneration;
             LicenseType = licenseType;
             TargetVmName = targetVmName;
             TargetVmSize = targetVmSize;
             TargetResourceGroupId = targetResourceGroupId;
-            TargetLocation = targetLocation;
             TargetAvailabilitySetId = targetAvailabilitySetId;
             TargetAvailabilityZone = targetAvailabilityZone;
             TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
@@ -160,17 +148,14 @@ public InMageRcmReplicationDetails()
             InitialReplicationProgressPercentage = initialReplicationProgressPercentage;
             InitialReplicationProcessedBytes = initialReplicationProcessedBytes;
             InitialReplicationTransferredBytes = initialReplicationTransferredBytes;
-            InitialReplicationProgressHealth = initialReplicationProgressHealth;
             ResyncProgressPercentage = resyncProgressPercentage;
             ResyncProcessedBytes = resyncProcessedBytes;
             ResyncTransferredBytes = resyncTransferredBytes;
-            ResyncProgressHealth = resyncProgressHealth;
             ResyncRequired = resyncRequired;
             ResyncState = resyncState;
             AgentUpgradeState = agentUpgradeState;
             LastAgentUpgradeType = lastAgentUpgradeType;
-            AgentUpgradeJobId = agentUpgradeJobId;
-            AgentUpgradeAttemptToVersion = agentUpgradeAttemptToVersion;
+            LastAgentUpgradeFailedJobId = lastAgentUpgradeFailedJobId;
             ProtectedDisks = protectedDisks;
             IsLastUpgradeSuccessful = isLastUpgradeSuccessful;
             MobilityAgentDetails = mobilityAgentDetails;
@@ -251,12 +236,6 @@ public InMageRcmReplicationDetails()
         [JsonProperty(PropertyName = "firmwareType")]
         public string FirmwareType { get; private set; }
 
-        /// <summary>
-        /// Gets the IP address of the primary network interface.
-        /// </summary>
-        [JsonProperty(PropertyName = "primaryNicIpAddress")]
-        public string PrimaryNicIpAddress { get; private set; }
-
         /// <summary>
         /// Gets the target generation.
         /// </summary>
@@ -264,70 +243,64 @@ public InMageRcmReplicationDetails()
         public string TargetGeneration { get; private set; }
 
         /// <summary>
-        /// Gets or sets license Type of the VM to be used.
+        /// Gets license Type of the VM to be used.
         /// </summary>
         [JsonProperty(PropertyName = "licenseType")]
-        public string LicenseType { get; set; }
+        public string LicenseType { get; private set; }
 
         /// <summary>
-        /// Gets or sets target VM name.
+        /// Gets target VM name.
         /// </summary>
         [JsonProperty(PropertyName = "targetVmName")]
-        public string TargetVmName { get; set; }
+        public string TargetVmName { get; private set; }
 
         /// <summary>
-        /// Gets or sets the target VM size.
+        /// Gets the target VM size.
         /// </summary>
         [JsonProperty(PropertyName = "targetVmSize")]
-        public string TargetVmSize { get; set; }
+        public string TargetVmSize { get; private set; }
 
         /// <summary>
-        /// Gets or sets the target resource group Id.
+        /// Gets the target resource group Id.
         /// </summary>
         [JsonProperty(PropertyName = "targetResourceGroupId")]
-        public string TargetResourceGroupId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target location.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetLocation")]
-        public string TargetLocation { get; set; }
+        public string TargetResourceGroupId { get; private set; }
 
         /// <summary>
-        /// Gets or sets the target availability set Id.
+        /// Gets the target availability set Id.
         /// </summary>
         [JsonProperty(PropertyName = "targetAvailabilitySetId")]
-        public string TargetAvailabilitySetId { get; set; }
+        public string TargetAvailabilitySetId { get; private set; }
 
         /// <summary>
-        /// Gets or sets the target availability zone.
+        /// Gets the target availability zone.
         /// </summary>
         [JsonProperty(PropertyName = "targetAvailabilityZone")]
-        public string TargetAvailabilityZone { get; set; }
+        public string TargetAvailabilityZone { get; private set; }
 
         /// <summary>
-        /// Gets or sets the target proximity placement group Id.
+        /// Gets the target proximity placement group Id.
         /// </summary>
         [JsonProperty(PropertyName = "targetProximityPlacementGroupId")]
-        public string TargetProximityPlacementGroupId { get; set; }
+        public string TargetProximityPlacementGroupId { get; private set; }
 
         /// <summary>
-        /// Gets or sets the target boot diagnostics storage account ARM Id.
+        /// Gets the target boot diagnostics storage account ARM Id.
         /// </summary>
         [JsonProperty(PropertyName = "targetBootDiagnosticsStorageAccountId")]
-        public string TargetBootDiagnosticsStorageAccountId { get; set; }
+        public string TargetBootDiagnosticsStorageAccountId { get; private set; }
 
         /// <summary>
-        /// Gets or sets the target network Id.
+        /// Gets the target network Id.
         /// </summary>
         [JsonProperty(PropertyName = "targetNetworkId")]
-        public string TargetNetworkId { get; set; }
+        public string TargetNetworkId { get; private set; }
 
         /// <summary>
-        /// Gets or sets the test network Id.
+        /// Gets the test network Id.
         /// </summary>
         [JsonProperty(PropertyName = "testNetworkId")]
-        public string TestNetworkId { get; set; }
+        public string TestNetworkId { get; private set; }
 
         /// <summary>
         /// Gets the recovery point Id to which the VM was failed over.
@@ -382,13 +355,6 @@ public InMageRcmReplicationDetails()
         [JsonProperty(PropertyName = "initialReplicationTransferredBytes")]
         public long? InitialReplicationTransferredBytes { get; private set; }
 
-        /// <summary>
-        /// Gets the initial replication progress health. Possible values
-        /// include: 'None', 'InProgress', 'SlowProgress', 'NoProgress'
-        /// </summary>
-        [JsonProperty(PropertyName = "initialReplicationProgressHealth")]
-        public string InitialReplicationProgressHealth { get; private set; }
-
         /// <summary>
         /// Gets the resync progress percentage. This is calculated based on
         /// total bytes processed for all disks in the source VM.
@@ -410,13 +376,6 @@ public InMageRcmReplicationDetails()
         [JsonProperty(PropertyName = "resyncTransferredBytes")]
         public long? ResyncTransferredBytes { get; private set; }
 
-        /// <summary>
-        /// Gets the resync progress health. Possible values include: 'None',
-        /// 'InProgress', 'SlowProgress', 'NoProgress'
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncProgressHealth")]
-        public string ResyncProgressHealth { get; private set; }
-
         /// <summary>
         /// Gets a value indicating whether resync is required.
         /// </summary>
@@ -444,22 +403,16 @@ public InMageRcmReplicationDetails()
         public string LastAgentUpgradeType { get; private set; }
 
         /// <summary>
-        /// Gets the agent upgrade job Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "agentUpgradeJobId")]
-        public string AgentUpgradeJobId { get; private set; }
-
-        /// <summary>
-        /// Gets the agent version to which last agent upgrade was attempted.
+        /// Gets the last agent upgrade failed or cancelled job Id.
         /// </summary>
-        [JsonProperty(PropertyName = "agentUpgradeAttemptToVersion")]
-        public string AgentUpgradeAttemptToVersion { get; private set; }
+        [JsonProperty(PropertyName = "lastAgentUpgradeFailedJobId")]
+        public string LastAgentUpgradeFailedJobId { get; private set; }
 
         /// <summary>
-        /// Gets or sets the list of protected disks.
+        /// Gets the list of protected disks.
         /// </summary>
         [JsonProperty(PropertyName = "protectedDisks")]
-        public IList<InMageRcmProtectedDiskDetails> ProtectedDisks { get; set; }
+        public IList<InMageRcmProtectedDiskDetails> ProtectedDisks { get; private set; }
 
         /// <summary>
         /// Gets a value indicating whether last agent upgrade was successful
@@ -469,28 +422,28 @@ public InMageRcmReplicationDetails()
         public string IsLastUpgradeSuccessful { get; private set; }
 
         /// <summary>
-        /// Gets or sets the mobility agent information.
+        /// Gets the mobility agent information.
         /// </summary>
         [JsonProperty(PropertyName = "mobilityAgentDetails")]
-        public InMageRcmMobilityAgentDetails MobilityAgentDetails { get; set; }
+        public InMageRcmMobilityAgentDetails MobilityAgentDetails { get; private set; }
 
         /// <summary>
-        /// Gets or sets the last agent upgrade error information.
+        /// Gets the last agent upgrade error information.
         /// </summary>
         [JsonProperty(PropertyName = "lastAgentUpgradeErrorDetails")]
-        public IList<InMageRcmLastAgentUpgradeErrorDetails> LastAgentUpgradeErrorDetails { get; set; }
+        public IList<InMageRcmLastAgentUpgradeErrorDetails> LastAgentUpgradeErrorDetails { get; private set; }
 
         /// <summary>
-        /// Gets or sets the agent upgrade blocking error information.
+        /// Gets the agent upgrade blocking error information.
         /// </summary>
         [JsonProperty(PropertyName = "agentUpgradeBlockingErrorDetails")]
-        public IList<InMageRcmAgentUpgradeBlockingErrorDetails> AgentUpgradeBlockingErrorDetails { get; set; }
+        public IList<InMageRcmAgentUpgradeBlockingErrorDetails> AgentUpgradeBlockingErrorDetails { get; private set; }
 
         /// <summary>
-        /// Gets or sets the network details.
+        /// Gets the network details.
         /// </summary>
         [JsonProperty(PropertyName = "vmNics")]
-        public IList<InMageRcmNicDetails> VmNics { get; set; }
+        public IList<InMageRcmNicDetails> VmNics { get; private set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmReprotectInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmReprotectInput.cs
deleted file mode 100644
index c963c886439a..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmReprotectInput.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Microsoft.Rest;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcm specific provider input.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcm")]
-    public partial class InMageRcmReprotectInput : ReverseReplicationProviderSpecificInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmReprotectInput class.
-        /// </summary>
-        public InMageRcmReprotectInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmReprotectInput class.
-        /// </summary>
-        /// <param name="reprotectAgentId">The reprotect agent Id.</param>
-        /// <param name="datastoreName">The target datastore name.</param>
-        /// <param name="logStorageAccountId">The log storage account ARM
-        /// Id.</param>
-        /// <param name="policyId">The Policy Id.</param>
-        public InMageRcmReprotectInput(string reprotectAgentId, string datastoreName, string logStorageAccountId, string policyId = default(string))
-        {
-            ReprotectAgentId = reprotectAgentId;
-            DatastoreName = datastoreName;
-            LogStorageAccountId = logStorageAccountId;
-            PolicyId = policyId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the reprotect agent Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "reprotectAgentId")]
-        public string ReprotectAgentId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target datastore name.
-        /// </summary>
-        [JsonProperty(PropertyName = "datastoreName")]
-        public string DatastoreName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the log storage account ARM Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "logStorageAccountId")]
-        public string LogStorageAccountId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Policy Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "policyId")]
-        public string PolicyId { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (ReprotectAgentId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "ReprotectAgentId");
-            }
-            if (DatastoreName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "DatastoreName");
-            }
-            if (LogStorageAccountId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "LogStorageAccountId");
-            }
-        }
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmSyncDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmSyncDetails.cs
deleted file mode 100644
index 3bc0b95fa574..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmSyncDetails.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcm disk level sync details.
-    /// </summary>
-    public partial class InMageRcmSyncDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmSyncDetails class.
-        /// </summary>
-        public InMageRcmSyncDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InMageRcmSyncDetails class.
-        /// </summary>
-        /// <param name="progressHealth">The progress health. Possible values
-        /// include: 'None', 'InProgress', 'SlowProgress', 'NoProgress',
-        /// 'Queued'</param>
-        /// <param name="transferredBytes">The transferred bytes from source VM
-        /// to azure for the disk.</param>
-        /// <param name="last15MinutesTransferredBytes">The bytes transferred
-        /// in last 15 minutes from source VM to azure.</param>
-        /// <param name="lastDataTransferTimeUtc">The time of the last data
-        /// transfer from source VM to azure.</param>
-        /// <param name="processedBytes">The total processed bytes. This
-        /// includes bytes that are transferred from source VM to azure and
-        /// matched bytes.</param>
-        /// <param name="startTime">The start time.</param>
-        /// <param name="lastRefreshTime">The last refresh time.</param>
-        /// <param name="progressPercentage">Progress in percentage. Progress
-        /// percentage is calculated based on processed bytes.</param>
-        public InMageRcmSyncDetails(string progressHealth = default(string), long? transferredBytes = default(long?), long? last15MinutesTransferredBytes = default(long?), string lastDataTransferTimeUtc = default(string), long? processedBytes = default(long?), string startTime = default(string), string lastRefreshTime = default(string), int? progressPercentage = default(int?))
-        {
-            ProgressHealth = progressHealth;
-            TransferredBytes = transferredBytes;
-            Last15MinutesTransferredBytes = last15MinutesTransferredBytes;
-            LastDataTransferTimeUtc = lastDataTransferTimeUtc;
-            ProcessedBytes = processedBytes;
-            StartTime = startTime;
-            LastRefreshTime = lastRefreshTime;
-            ProgressPercentage = progressPercentage;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the progress health. Possible values include: 'None',
-        /// 'InProgress', 'SlowProgress', 'NoProgress', 'Queued'
-        /// </summary>
-        [JsonProperty(PropertyName = "progressHealth")]
-        public string ProgressHealth { get; private set; }
-
-        /// <summary>
-        /// Gets the transferred bytes from source VM to azure for the disk.
-        /// </summary>
-        [JsonProperty(PropertyName = "transferredBytes")]
-        public long? TransferredBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the bytes transferred in last 15 minutes from source VM to
-        /// azure.
-        /// </summary>
-        [JsonProperty(PropertyName = "last15MinutesTransferredBytes")]
-        public long? Last15MinutesTransferredBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the time of the last data transfer from source VM to azure.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastDataTransferTimeUtc")]
-        public string LastDataTransferTimeUtc { get; private set; }
-
-        /// <summary>
-        /// Gets the total processed bytes. This includes bytes that are
-        /// transferred from source VM to azure and matched bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "processedBytes")]
-        public long? ProcessedBytes { get; private set; }
-
-        /// <summary>
-        /// Gets the start time.
-        /// </summary>
-        [JsonProperty(PropertyName = "startTime")]
-        public string StartTime { get; private set; }
-
-        /// <summary>
-        /// Gets the last refresh time.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastRefreshTime")]
-        public string LastRefreshTime { get; private set; }
-
-        /// <summary>
-        /// Gets progress in percentage. Progress percentage is calculated
-        /// based on processed bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "progressPercentage")]
-        public int? ProgressPercentage { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmUnplannedFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmUnplannedFailoverInput.cs
index 9b54f303fdec..0db3adaad619 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmUnplannedFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmUnplannedFailoverInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -38,7 +37,7 @@ public InMageRcmUnplannedFailoverInput()
         /// <param name="recoveryPointId">The recovery point id to be passed to
         /// failover to a particular recovery point. In case of latest recovery
         /// point, null should be passed.</param>
-        public InMageRcmUnplannedFailoverInput(string performShutdown, string recoveryPointId = default(string))
+        public InMageRcmUnplannedFailoverInput(string performShutdown = default(string), string recoveryPointId = default(string))
         {
             PerformShutdown = performShutdown;
             RecoveryPointId = recoveryPointId;
@@ -64,18 +63,5 @@ public InMageRcmUnplannedFailoverInput()
         [JsonProperty(PropertyName = "recoveryPointId")]
         public string RecoveryPointId { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (PerformShutdown == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "PerformShutdown");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmUpdateContainerMappingInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmUpdateContainerMappingInput.cs
deleted file mode 100644
index 2c1b0cac383c..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageRcmUpdateContainerMappingInput.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Microsoft.Rest;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// InMageRcm update protection container mapping.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcm")]
-    public partial class InMageRcmUpdateContainerMappingInput : ReplicationProviderSpecificUpdateContainerMappingInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmUpdateContainerMappingInput class.
-        /// </summary>
-        public InMageRcmUpdateContainerMappingInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// InMageRcmUpdateContainerMappingInput class.
-        /// </summary>
-        /// <param name="enableAgentAutoUpgrade">A value indicating whether
-        /// agent auto upgrade has to be enabled.</param>
-        public InMageRcmUpdateContainerMappingInput(string enableAgentAutoUpgrade)
-        {
-            EnableAgentAutoUpgrade = enableAgentAutoUpgrade;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets a value indicating whether agent auto upgrade has to
-        /// be enabled.
-        /// </summary>
-        [JsonProperty(PropertyName = "enableAgentAutoUpgrade")]
-        public string EnableAgentAutoUpgrade { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (EnableAgentAutoUpgrade == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "EnableAgentAutoUpgrade");
-            }
-        }
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageReplicationDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageReplicationDetails.cs
index 3160559f812c..e62489d2572f 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageReplicationDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageReplicationDetails.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// InMage provider specific settings.
+    /// InMage provider specific settings
     /// </summary>
     [Newtonsoft.Json.JsonObject("InMage")]
     public partial class InMageReplicationDetails : ReplicationProviderSpecificSettings
@@ -48,7 +48,7 @@ public InMageReplicationDetails()
         /// <param name="vmProtectionStateDescription">The protection state
         /// description for the vm.</param>
         /// <param name="resyncDetails">The resync details of the
-        /// machine.</param>
+        /// machine</param>
         /// <param name="retentionWindowStart">The retention window start
         /// time.</param>
         /// <param name="retentionWindowEnd">The retention window end
@@ -85,10 +85,10 @@ public InMageReplicationDetails()
         /// <param name="azureStorageAccountId">A value indicating the
         /// underlying Azure storage account. If the VM is not running in
         /// Azure, this value shall be set to null.</param>
-        /// <param name="datastores">The datastores of the on-premise machine
-        /// Value can be list of strings that contain datastore names.</param>
+        /// <param name="datastores">The data stores of the on-premise machine
+        /// Value can be list of strings that contain data store names</param>
         /// <param name="validationErrors">The validation errors of the
-        /// on-premise machine Value can be list of validation errors.</param>
+        /// on-premise machine Value can be list of validation errors</param>
         /// <param name="lastRpoCalculatedTime">The last RPO calculated
         /// time.</param>
         /// <param name="lastUpdateReceivedTime">The last update time received
@@ -97,12 +97,7 @@ public InMageReplicationDetails()
         /// item.</param>
         /// <param name="osVersion">The OS Version of the protected
         /// item.</param>
-        /// <param name="isAdditionalStatsAvailable">A value indicating whether
-        /// additional IR stats are available or not.</param>
-        /// <param name="totalDataTransferred">The total transferred data in
-        /// bytes.</param>
-        /// <param name="totalProgressHealth">The progress health.</param>
-        public InMageReplicationDetails(string activeSiteType = default(string), int? sourceVmCpuCount = default(int?), int? sourceVmRamSizeInMB = default(int?), OSDiskDetails osDetails = default(OSDiskDetails), string protectionStage = default(string), string vmId = default(string), string vmProtectionState = default(string), string vmProtectionStateDescription = default(string), InitialReplicationDetails resyncDetails = default(InitialReplicationDetails), System.DateTime? retentionWindowStart = default(System.DateTime?), System.DateTime? retentionWindowEnd = default(System.DateTime?), double? compressedDataRateInMB = default(double?), double? uncompressedDataRateInMB = default(double?), long? rpoInSeconds = default(long?), IList<InMageProtectedDiskDetails> protectedDisks = default(IList<InMageProtectedDiskDetails>), string ipAddress = default(string), System.DateTime? lastHeartbeat = default(System.DateTime?), string processServerId = default(string), string masterTargetId = default(string), IDictionary<string, System.DateTime?> consistencyPoints = default(IDictionary<string, System.DateTime?>), string diskResized = default(string), string rebootAfterUpdateStatus = default(string), string multiVmGroupId = default(string), string multiVmGroupName = default(string), string multiVmSyncStatus = default(string), InMageAgentDetails agentDetails = default(InMageAgentDetails), string vCenterInfrastructureId = default(string), string infrastructureVmId = default(string), IList<VMNicDetails> vmNics = default(IList<VMNicDetails>), string discoveryType = default(string), string azureStorageAccountId = default(string), IList<string> datastores = default(IList<string>), IList<HealthError> validationErrors = default(IList<HealthError>), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), System.DateTime? lastUpdateReceivedTime = default(System.DateTime?), string replicaId = default(string), string osVersion = default(string), bool? isAdditionalStatsAvailable = default(bool?), long? totalDataTransferred = default(long?), string totalProgressHealth = default(string))
+        public InMageReplicationDetails(string activeSiteType = default(string), int? sourceVmCpuCount = default(int?), int? sourceVmRamSizeInMB = default(int?), OSDiskDetails osDetails = default(OSDiskDetails), string protectionStage = default(string), string vmId = default(string), string vmProtectionState = default(string), string vmProtectionStateDescription = default(string), InitialReplicationDetails resyncDetails = default(InitialReplicationDetails), System.DateTime? retentionWindowStart = default(System.DateTime?), System.DateTime? retentionWindowEnd = default(System.DateTime?), double? compressedDataRateInMB = default(double?), double? uncompressedDataRateInMB = default(double?), long? rpoInSeconds = default(long?), IList<InMageProtectedDiskDetails> protectedDisks = default(IList<InMageProtectedDiskDetails>), string ipAddress = default(string), System.DateTime? lastHeartbeat = default(System.DateTime?), string processServerId = default(string), string masterTargetId = default(string), IDictionary<string, System.DateTime?> consistencyPoints = default(IDictionary<string, System.DateTime?>), string diskResized = default(string), string rebootAfterUpdateStatus = default(string), string multiVmGroupId = default(string), string multiVmGroupName = default(string), string multiVmSyncStatus = default(string), InMageAgentDetails agentDetails = default(InMageAgentDetails), string vCenterInfrastructureId = default(string), string infrastructureVmId = default(string), IList<VMNicDetails> vmNics = default(IList<VMNicDetails>), string discoveryType = default(string), string azureStorageAccountId = default(string), IList<string> datastores = default(IList<string>), IList<HealthError> validationErrors = default(IList<HealthError>), System.DateTime? lastRpoCalculatedTime = default(System.DateTime?), System.DateTime? lastUpdateReceivedTime = default(System.DateTime?), string replicaId = default(string), string osVersion = default(string))
         {
             ActiveSiteType = activeSiteType;
             SourceVmCpuCount = sourceVmCpuCount;
@@ -141,9 +136,6 @@ public InMageReplicationDetails()
             LastUpdateReceivedTime = lastUpdateReceivedTime;
             ReplicaId = replicaId;
             OsVersion = osVersion;
-            IsAdditionalStatsAvailable = isAdditionalStatsAvailable;
-            TotalDataTransferred = totalDataTransferred;
-            TotalProgressHealth = totalProgressHealth;
             CustomInit();
         }
 
@@ -204,7 +196,7 @@ public InMageReplicationDetails()
         public string VmProtectionStateDescription { get; set; }
 
         /// <summary>
-        /// Gets or sets the resync details of the machine.
+        /// Gets or sets the resync details of the machine
         /// </summary>
         [JsonProperty(PropertyName = "resyncDetails")]
         public InitialReplicationDetails ResyncDetails { get; set; }
@@ -347,15 +339,15 @@ public InMageReplicationDetails()
         public string AzureStorageAccountId { get; set; }
 
         /// <summary>
-        /// Gets or sets the datastores of the on-premise machine Value can be
-        /// list of strings that contain datastore names.
+        /// Gets or sets the data stores of the on-premise machine Value can be
+        /// list of strings that contain data store names
         /// </summary>
         [JsonProperty(PropertyName = "datastores")]
         public IList<string> Datastores { get; set; }
 
         /// <summary>
         /// Gets or sets the validation errors of the on-premise machine Value
-        /// can be list of validation errors.
+        /// can be list of validation errors
         /// </summary>
         [JsonProperty(PropertyName = "validationErrors")]
         public IList<HealthError> ValidationErrors { get; set; }
@@ -384,24 +376,5 @@ public InMageReplicationDetails()
         [JsonProperty(PropertyName = "osVersion")]
         public string OsVersion { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether additional IR stats are
-        /// available or not.
-        /// </summary>
-        [JsonProperty(PropertyName = "isAdditionalStatsAvailable")]
-        public bool? IsAdditionalStatsAvailable { get; set; }
-
-        /// <summary>
-        /// Gets or sets the total transferred data in bytes.
-        /// </summary>
-        [JsonProperty(PropertyName = "totalDataTransferred")]
-        public long? TotalDataTransferred { get; set; }
-
-        /// <summary>
-        /// Gets or sets the progress health.
-        /// </summary>
-        [JsonProperty(PropertyName = "totalProgressHealth")]
-        public string TotalProgressHealth { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageReprotectInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageReprotectInput.cs
index 9da32820fe9e..744a30739471 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageReprotectInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InMageReprotectInput.cs
@@ -39,7 +39,7 @@ public InMageReprotectInput()
         /// MT.</param>
         /// <param name="profileId">The Policy Id.</param>
         /// <param name="runAsAccountId">The CS account Id.</param>
-        /// <param name="datastoreName">The target datastore name.</param>
+        /// <param name="datastoreName">The target data store name.</param>
         /// <param name="diskExclusionInput">The enable disk exclusion
         /// input.</param>
         /// <param name="disksToInclude">The disks to include list.</param>
@@ -86,7 +86,7 @@ public InMageReprotectInput()
         public string RunAsAccountId { get; set; }
 
         /// <summary>
-        /// Gets or sets the target datastore name.
+        /// Gets or sets the target data store name.
         /// </summary>
         [JsonProperty(PropertyName = "datastoreName")]
         public string DatastoreName { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InnerHealthError.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InnerHealthError.cs
index e04a2492a5fd..4d585044e4f4 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InnerHealthError.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InnerHealthError.cs
@@ -44,15 +44,11 @@ public InnerHealthError()
         /// <param name="possibleCauses">Possible causes of error.</param>
         /// <param name="recommendedAction">Recommended action to resolve
         /// error.</param>
-        /// <param name="creationTimeUtc">Error creation time (UTC).</param>
+        /// <param name="creationTimeUtc">Error creation time (UTC)</param>
         /// <param name="recoveryProviderErrorMessage">DRA error
         /// message.</param>
         /// <param name="entityId">ID of the entity.</param>
-        /// <param name="errorId">The health error unique id.</param>
-        /// <param name="customerResolvability">Value indicating whether the
-        /// health error is customer resolvable. Possible values include:
-        /// 'Allowed', 'NotAllowed'</param>
-        public InnerHealthError(string errorSource = default(string), string errorType = default(string), string errorLevel = default(string), string errorCategory = default(string), string errorCode = default(string), string summaryMessage = default(string), string errorMessage = default(string), string possibleCauses = default(string), string recommendedAction = default(string), System.DateTime? creationTimeUtc = default(System.DateTime?), string recoveryProviderErrorMessage = default(string), string entityId = default(string), string errorId = default(string), string customerResolvability = default(string))
+        public InnerHealthError(string errorSource = default(string), string errorType = default(string), string errorLevel = default(string), string errorCategory = default(string), string errorCode = default(string), string summaryMessage = default(string), string errorMessage = default(string), string possibleCauses = default(string), string recommendedAction = default(string), System.DateTime? creationTimeUtc = default(System.DateTime?), string recoveryProviderErrorMessage = default(string), string entityId = default(string))
         {
             ErrorSource = errorSource;
             ErrorType = errorType;
@@ -66,8 +62,6 @@ public InnerHealthError()
             CreationTimeUtc = creationTimeUtc;
             RecoveryProviderErrorMessage = recoveryProviderErrorMessage;
             EntityId = entityId;
-            ErrorId = errorId;
-            CustomerResolvability = customerResolvability;
             CustomInit();
         }
 
@@ -131,7 +125,7 @@ public InnerHealthError()
         public string RecommendedAction { get; set; }
 
         /// <summary>
-        /// Gets or sets error creation time (UTC).
+        /// Gets or sets error creation time (UTC)
         /// </summary>
         [JsonProperty(PropertyName = "creationTimeUtc")]
         public System.DateTime? CreationTimeUtc { get; set; }
@@ -148,18 +142,5 @@ public InnerHealthError()
         [JsonProperty(PropertyName = "entityId")]
         public string EntityId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the health error unique id.
-        /// </summary>
-        [JsonProperty(PropertyName = "errorId")]
-        public string ErrorId { get; set; }
-
-        /// <summary>
-        /// Gets or sets value indicating whether the health error is customer
-        /// resolvable. Possible values include: 'Allowed', 'NotAllowed'
-        /// </summary>
-        [JsonProperty(PropertyName = "customerResolvability")]
-        public string CustomerResolvability { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InputEndpoint.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InputEndpoint.cs
index f1e9f3ad5a9e..dc2b029bba3e 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InputEndpoint.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/InputEndpoint.cs
@@ -13,6 +13,9 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using Newtonsoft.Json;
     using System.Linq;
 
+    /// <summary>
+    /// Azure VM input endpoint details.
+    /// </summary>
     public partial class InputEndpoint
     {
         /// <summary>
@@ -26,6 +29,10 @@ public InputEndpoint()
         /// <summary>
         /// Initializes a new instance of the InputEndpoint class.
         /// </summary>
+        /// <param name="endpointName">The input endpoint name.</param>
+        /// <param name="privatePort">The input endpoint private port.</param>
+        /// <param name="publicPort">The input endpoint public port.</param>
+        /// <param name="protocol">The input endpoint protocol.</param>
         public InputEndpoint(string endpointName = default(string), int? privatePort = default(int?), int? publicPort = default(int?), string protocol = default(string))
         {
             EndpointName = endpointName;
@@ -41,21 +48,25 @@ public InputEndpoint()
         partial void CustomInit();
 
         /// <summary>
+        /// Gets or sets the input endpoint name.
         /// </summary>
         [JsonProperty(PropertyName = "endpointName")]
         public string EndpointName { get; set; }
 
         /// <summary>
+        /// Gets or sets the input endpoint private port.
         /// </summary>
         [JsonProperty(PropertyName = "privatePort")]
         public int? PrivatePort { get; set; }
 
         /// <summary>
+        /// Gets or sets the input endpoint public port.
         /// </summary>
         [JsonProperty(PropertyName = "publicPort")]
         public int? PublicPort { get; set; }
 
         /// <summary>
+        /// Gets or sets the input endpoint protocol.
         /// </summary>
         [JsonProperty(PropertyName = "protocol")]
         public string Protocol { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/JobProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/JobProperties.cs
index 15e620fb337c..be9133e6cbe0 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/JobProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/JobProperties.cs
@@ -50,7 +50,7 @@ public JobProperties()
         /// object.</param>
         /// <param name="targetInstanceType">The type of the affected object
         /// which is of
-        /// Microsoft.Azure.SiteRecovery.V2015_11_10.AffectedObjectType
+        /// {Microsoft.Azure.SiteRecovery.V2015_11_10.AffectedObjectType}
         /// class.</param>
         /// <param name="customDetails">The custom job details like test
         /// failover job details.</param>
@@ -156,7 +156,8 @@ public JobProperties()
 
         /// <summary>
         /// Gets or sets the type of the affected object which is of
-        /// Microsoft.Azure.SiteRecovery.V2015_11_10.AffectedObjectType class.
+        /// {Microsoft.Azure.SiteRecovery.V2015_11_10.AffectedObjectType}
+        /// class.
         /// </summary>
         [JsonProperty(PropertyName = "targetInstanceType")]
         public string TargetInstanceType { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/JobQueryParameter.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/JobQueryParameter.cs
index e358dc193302..743e983a315c 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/JobQueryParameter.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/JobQueryParameter.cs
@@ -30,27 +30,19 @@ public JobQueryParameter()
         /// Initializes a new instance of the JobQueryParameter class.
         /// </summary>
         /// <param name="startTime">Date time to get jobs from.</param>
-        /// <param name="endTime">Date time to get jobs upto.</param>
+        /// <param name="endTime">Date time to get jobs up to.</param>
         /// <param name="fabricId">The Id of the fabric to search jobs
         /// under.</param>
         /// <param name="affectedObjectTypes">The type of objects.</param>
         /// <param name="jobStatus">The states of the job to be filtered can be
         /// in.</param>
-        /// <param name="jobOutputType">The output type of the jobs. Possible
-        /// values include: 'Json', 'Xml', 'Excel'</param>
-        /// <param name="jobName">The job Name.</param>
-        /// <param name="timezoneOffset">The timezone offset for the location
-        /// of the request (in minutes).</param>
-        public JobQueryParameter(string startTime = default(string), string endTime = default(string), string fabricId = default(string), string affectedObjectTypes = default(string), string jobStatus = default(string), string jobOutputType = default(string), string jobName = default(string), double? timezoneOffset = default(double?))
+        public JobQueryParameter(string startTime = default(string), string endTime = default(string), string fabricId = default(string), string affectedObjectTypes = default(string), string jobStatus = default(string))
         {
             StartTime = startTime;
             EndTime = endTime;
             FabricId = fabricId;
             AffectedObjectTypes = affectedObjectTypes;
             JobStatus = jobStatus;
-            JobOutputType = jobOutputType;
-            JobName = jobName;
-            TimezoneOffset = timezoneOffset;
             CustomInit();
         }
 
@@ -66,7 +58,7 @@ public JobQueryParameter()
         public string StartTime { get; set; }
 
         /// <summary>
-        /// Gets or sets date time to get jobs upto.
+        /// Gets or sets date time to get jobs up to.
         /// </summary>
         [JsonProperty(PropertyName = "endTime")]
         public string EndTime { get; set; }
@@ -89,25 +81,5 @@ public JobQueryParameter()
         [JsonProperty(PropertyName = "jobStatus")]
         public string JobStatus { get; set; }
 
-        /// <summary>
-        /// Gets or sets the output type of the jobs. Possible values include:
-        /// 'Json', 'Xml', 'Excel'
-        /// </summary>
-        [JsonProperty(PropertyName = "jobOutputType")]
-        public string JobOutputType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the job Name.
-        /// </summary>
-        [JsonProperty(PropertyName = "jobName")]
-        public string JobName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the timezone offset for the location of the request
-        /// (in minutes).
-        /// </summary>
-        [JsonProperty(PropertyName = "timezoneOffset")]
-        public double? TimezoneOffset { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MarsAgentDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MarsAgentDetails.cs
deleted file mode 100644
index 7939133fe76f..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MarsAgentDetails.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Mars agent details.
-    /// </summary>
-    public partial class MarsAgentDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the MarsAgentDetails class.
-        /// </summary>
-        public MarsAgentDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the MarsAgentDetails class.
-        /// </summary>
-        /// <param name="id">The Mars agent Id.</param>
-        /// <param name="name">The Mars agent name.</param>
-        /// <param name="biosId">The Mars agent Bios Id.</param>
-        /// <param name="fabricObjectId">The fabric object Id.</param>
-        /// <param name="fqdn">The Mars agent Fqdn.</param>
-        /// <param name="version">The version.</param>
-        /// <param name="lastHeartbeatUtc">The last heartbeat received from the
-        /// Mars agent.</param>
-        /// <param name="health">The health of the Mars agent. Possible values
-        /// include: 'None', 'Normal', 'Warning', 'Critical'</param>
-        /// <param name="healthErrors">The health errors.</param>
-        public MarsAgentDetails(string id = default(string), string name = default(string), string biosId = default(string), string fabricObjectId = default(string), string fqdn = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
-        {
-            Id = id;
-            Name = name;
-            BiosId = biosId;
-            FabricObjectId = fabricObjectId;
-            Fqdn = fqdn;
-            Version = version;
-            LastHeartbeatUtc = lastHeartbeatUtc;
-            Health = health;
-            HealthErrors = healthErrors;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the Mars agent Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; private set; }
-
-        /// <summary>
-        /// Gets the Mars agent name.
-        /// </summary>
-        [JsonProperty(PropertyName = "name")]
-        public string Name { get; private set; }
-
-        /// <summary>
-        /// Gets the Mars agent Bios Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; private set; }
-
-        /// <summary>
-        /// Gets the fabric object Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "fabricObjectId")]
-        public string FabricObjectId { get; private set; }
-
-        /// <summary>
-        /// Gets the Mars agent Fqdn.
-        /// </summary>
-        [JsonProperty(PropertyName = "fqdn")]
-        public string Fqdn { get; private set; }
-
-        /// <summary>
-        /// Gets the version.
-        /// </summary>
-        [JsonProperty(PropertyName = "version")]
-        public string Version { get; private set; }
-
-        /// <summary>
-        /// Gets the last heartbeat received from the Mars agent.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastHeartbeatUtc")]
-        public System.DateTime? LastHeartbeatUtc { get; private set; }
-
-        /// <summary>
-        /// Gets the health of the Mars agent. Possible values include: 'None',
-        /// 'Normal', 'Warning', 'Critical'
-        /// </summary>
-        [JsonProperty(PropertyName = "health")]
-        public string Health { get; private set; }
-
-        /// <summary>
-        /// Gets the health errors.
-        /// </summary>
-        [JsonProperty(PropertyName = "healthErrors")]
-        public IList<HealthError> HealthErrors { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MasterTargetServer.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MasterTargetServer.cs
index f6e60f92b6fa..996b07a113fc 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MasterTargetServer.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MasterTargetServer.cs
@@ -39,7 +39,7 @@ public MasterTargetServer()
         /// the server.</param>
         /// <param name="lastHeartbeat">The last heartbeat received from the
         /// server.</param>
-        /// <param name="versionStatus">Version status.</param>
+        /// <param name="versionStatus">Version status</param>
         /// <param name="retentionVolumes">The retention volumes of Master
         /// target Server.</param>
         /// <param name="dataStores">The list of data stores in the
@@ -119,7 +119,7 @@ public MasterTargetServer()
         public System.DateTime? LastHeartbeat { get; set; }
 
         /// <summary>
-        /// Gets or sets version status.
+        /// Gets or sets version status
         /// </summary>
         [JsonProperty(PropertyName = "versionStatus")]
         public string VersionStatus { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemOperation.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemOperation.cs
index 50f5a6391699..ea3fb9646965 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemOperation.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemOperation.cs
@@ -20,6 +20,5 @@ public static class MigrationItemOperation
         public const string TestMigrate = "TestMigrate";
         public const string TestMigrateCleanup = "TestMigrateCleanup";
         public const string Migrate = "Migrate";
-        public const string StartResync = "StartResync";
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemProperties.cs
index 9435bc902735..d8a7b6b98dcc 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemProperties.cs
@@ -37,6 +37,8 @@ public MigrationItemProperties()
         /// item.</param>
         /// <param name="policyFriendlyName">The name of policy governing this
         /// item.</param>
+        /// <param name="recoveryServicesProviderId">The recovery services
+        /// provider ARM Id.</param>
         /// <param name="migrationState">The migration status. Possible values
         /// include: 'None', 'EnableMigrationInProgress',
         /// 'EnableMigrationFailed', 'DisableMigrationInProgress',
@@ -45,43 +47,34 @@ public MigrationItemProperties()
         /// 'MigrationSucceeded', 'MigrationFailed'</param>
         /// <param name="migrationStateDescription">The migration state
         /// description.</param>
-        /// <param name="lastTestMigrationTime">The last test migration
-        /// time.</param>
-        /// <param name="lastTestMigrationStatus">The status of the last test
-        /// migration.</param>
         /// <param name="testMigrateState">The test migrate state. Possible
         /// values include: 'None', 'TestMigrationInProgress',
         /// 'TestMigrationSucceeded', 'TestMigrationFailed',
         /// 'TestMigrationCleanupInProgress'</param>
         /// <param name="testMigrateStateDescription">The test migrate state
         /// description.</param>
-        /// <param name="health">The consolidated health. Possible values
-        /// include: 'None', 'Normal', 'Warning', 'Critical'</param>
+        /// <param name="health">The consolidated health.</param>
         /// <param name="healthErrors">The list of health errors.</param>
         /// <param name="allowedOperations">The allowed operations on the
-        /// migration item based on the current migration state of the
+        /// migration item, based on the current migration state of the
         /// item.</param>
         /// <param name="currentJob">The current job details.</param>
-        /// <param name="eventCorrelationId">The correlation Id for events
-        /// associated with this migration item.</param>
         /// <param name="providerSpecificDetails">The migration provider custom
         /// settings.</param>
-        public MigrationItemProperties(string machineName = default(string), string policyId = default(string), string policyFriendlyName = default(string), string migrationState = default(string), string migrationStateDescription = default(string), System.DateTime? lastTestMigrationTime = default(System.DateTime?), string lastTestMigrationStatus = default(string), string testMigrateState = default(string), string testMigrateStateDescription = default(string), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>), IList<string> allowedOperations = default(IList<string>), CurrentJobDetails currentJob = default(CurrentJobDetails), string eventCorrelationId = default(string), MigrationProviderSpecificSettings providerSpecificDetails = default(MigrationProviderSpecificSettings))
+        public MigrationItemProperties(string machineName = default(string), string policyId = default(string), string policyFriendlyName = default(string), string recoveryServicesProviderId = default(string), string migrationState = default(string), string migrationStateDescription = default(string), string testMigrateState = default(string), string testMigrateStateDescription = default(string), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>), IList<string> allowedOperations = default(IList<string>), CurrentJobDetails currentJob = default(CurrentJobDetails), MigrationProviderSpecificSettings providerSpecificDetails = default(MigrationProviderSpecificSettings))
         {
             MachineName = machineName;
             PolicyId = policyId;
             PolicyFriendlyName = policyFriendlyName;
+            RecoveryServicesProviderId = recoveryServicesProviderId;
             MigrationState = migrationState;
             MigrationStateDescription = migrationStateDescription;
-            LastTestMigrationTime = lastTestMigrationTime;
-            LastTestMigrationStatus = lastTestMigrationStatus;
             TestMigrateState = testMigrateState;
             TestMigrateStateDescription = testMigrateStateDescription;
             Health = health;
             HealthErrors = healthErrors;
             AllowedOperations = allowedOperations;
             CurrentJob = currentJob;
-            EventCorrelationId = eventCorrelationId;
             ProviderSpecificDetails = providerSpecificDetails;
             CustomInit();
         }
@@ -109,6 +102,12 @@ public MigrationItemProperties()
         [JsonProperty(PropertyName = "policyFriendlyName")]
         public string PolicyFriendlyName { get; private set; }
 
+        /// <summary>
+        /// Gets the recovery services provider ARM Id.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryServicesProviderId")]
+        public string RecoveryServicesProviderId { get; private set; }
+
         /// <summary>
         /// Gets the migration status. Possible values include: 'None',
         /// 'EnableMigrationInProgress', 'EnableMigrationFailed',
@@ -125,18 +124,6 @@ public MigrationItemProperties()
         [JsonProperty(PropertyName = "migrationStateDescription")]
         public string MigrationStateDescription { get; private set; }
 
-        /// <summary>
-        /// Gets the last test migration time.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastTestMigrationTime")]
-        public System.DateTime? LastTestMigrationTime { get; private set; }
-
-        /// <summary>
-        /// Gets the status of the last test migration.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastTestMigrationStatus")]
-        public string LastTestMigrationStatus { get; private set; }
-
         /// <summary>
         /// Gets the test migrate state. Possible values include: 'None',
         /// 'TestMigrationInProgress', 'TestMigrationSucceeded',
@@ -152,8 +139,7 @@ public MigrationItemProperties()
         public string TestMigrateStateDescription { get; private set; }
 
         /// <summary>
-        /// Gets the consolidated health. Possible values include: 'None',
-        /// 'Normal', 'Warning', 'Critical'
+        /// Gets the consolidated health.
         /// </summary>
         [JsonProperty(PropertyName = "health")]
         public string Health { get; private set; }
@@ -165,7 +151,7 @@ public MigrationItemProperties()
         public IList<HealthError> HealthErrors { get; private set; }
 
         /// <summary>
-        /// Gets the allowed operations on the migration item based on the
+        /// Gets the allowed operations on the migration item, based on the
         /// current migration state of the item.
         /// </summary>
         [JsonProperty(PropertyName = "allowedOperations")]
@@ -177,13 +163,6 @@ public MigrationItemProperties()
         [JsonProperty(PropertyName = "currentJob")]
         public CurrentJobDetails CurrentJob { get; private set; }
 
-        /// <summary>
-        /// Gets the correlation Id for events associated with this migration
-        /// item.
-        /// </summary>
-        [JsonProperty(PropertyName = "eventCorrelationId")]
-        public string EventCorrelationId { get; private set; }
-
         /// <summary>
         /// Gets or sets the migration provider custom settings.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemsQueryParameter.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemsQueryParameter.cs
index 15610f390293..5581a7df642c 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemsQueryParameter.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MigrationItemsQueryParameter.cs
@@ -33,13 +33,10 @@ public MigrationItemsQueryParameter()
         /// </summary>
         /// <param name="sourceFabricName">The source fabric name
         /// filter.</param>
-        /// <param name="sourceContainerName">The source container name
-        /// filter.</param>
         /// <param name="instanceType">The replication provider type.</param>
-        public MigrationItemsQueryParameter(string sourceFabricName = default(string), string sourceContainerName = default(string), string instanceType = default(string))
+        public MigrationItemsQueryParameter(string sourceFabricName = default(string), string instanceType = default(string))
         {
             SourceFabricName = sourceFabricName;
-            SourceContainerName = sourceContainerName;
             InstanceType = instanceType;
             CustomInit();
         }
@@ -55,12 +52,6 @@ public MigrationItemsQueryParameter()
         [JsonProperty(PropertyName = "sourceFabricName")]
         public string SourceFabricName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the source container name filter.
-        /// </summary>
-        [JsonProperty(PropertyName = "sourceContainerName")]
-        public string SourceContainerName { get; set; }
-
         /// <summary>
         /// Gets or sets the replication provider type.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmComponentStatus.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MultiVmSyncStatus.cs
similarity index 62%
rename from sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmComponentStatus.cs
rename to sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MultiVmSyncStatus.cs
index ad47bb065310..3193f4eae5dc 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmComponentStatus.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/MultiVmSyncStatus.cs
@@ -12,13 +12,11 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
 
     /// <summary>
-    /// Defines values for RcmComponentStatus.
+    /// Defines values for MultiVmSyncStatus.
     /// </summary>
-    public static class RcmComponentStatus
+    public static class MultiVmSyncStatus
     {
-        public const string Healthy = "Healthy";
-        public const string Warning = "Warning";
-        public const string Critical = "Critical";
-        public const string Unknown = "Unknown";
+        public const string Enabled = "Enabled";
+        public const string Disabled = "Disabled";
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/NetworkProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/NetworkProperties.cs
index 48d27b395a4b..e8d42125f9d7 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/NetworkProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/NetworkProperties.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Network Properties.
+    /// Network Properties
     /// </summary>
     public partial class NetworkProperties
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/OSVersionWrapper.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/OSVersionWrapper.cs
index cb4ba753ab71..09944c92a601 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/OSVersionWrapper.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/OSVersionWrapper.cs
@@ -30,7 +30,7 @@ public OSVersionWrapper()
         /// Initializes a new instance of the OSVersionWrapper class.
         /// </summary>
         /// <param name="version">The version.</param>
-        /// <param name="servicePack">The service pack.</param>
+        /// <param name="servicePack">Service pack.</param>
         public OSVersionWrapper(string version = default(string), string servicePack = default(string))
         {
             Version = version;
@@ -50,7 +50,7 @@ public OSVersionWrapper()
         public string Version { get; set; }
 
         /// <summary>
-        /// Gets or sets the service pack.
+        /// Gets or sets service pack.
         /// </summary>
         [JsonProperty(PropertyName = "servicePack")]
         public string ServicePack { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/OperationsDiscovery.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/OperationsDiscovery.cs
index 0d3b3dd0b01d..8e613bfee1dc 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/OperationsDiscovery.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/OperationsDiscovery.cs
@@ -49,11 +49,11 @@ public OperationsDiscovery()
         /// response. This API is used to register for their service, and
         /// should include details about the operation (e.g. a localized name
         /// for the resource provider + any special considerations like PII
-        /// release).</param>
-        /// <param name="display">Object type.</param>
+        /// release)</param>
+        /// <param name="display">Object type</param>
         /// <param name="origin">Origin. The intended executor of the
         /// operation; governs the display of the operation in the RBAC UX and
-        /// the audit logs UX. Default value is "user,system".</param>
+        /// the audit logs UX. Default value is "user,system"</param>
         /// <param name="properties">Properties. Reserved for future
         /// use.</param>
         public OperationsDiscovery(string name = default(string), Display display = default(Display), string origin = default(string), object properties = default(object))
@@ -91,13 +91,13 @@ public OperationsDiscovery()
         /// response. This API is used to register for their service, and
         /// should include details about the operation (e.g. a localized name
         /// for the resource provider + any special considerations like PII
-        /// release).
+        /// release)
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets object type.
+        /// Gets or sets object type
         /// </summary>
         [JsonProperty(PropertyName = "display")]
         public Display Display { get; set; }
@@ -105,7 +105,7 @@ public OperationsDiscovery()
         /// <summary>
         /// Gets or sets origin. The intended executor of the operation;
         /// governs the display of the operation in the RBAC UX and the audit
-        /// logs UX. Default value is "user,system".
+        /// logs UX. Default value is "user,system"
         /// </summary>
         [JsonProperty(PropertyName = "origin")]
         public string Origin { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverInput.cs
index a53ea0c28374..9716a911bae4 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverInput.cs
@@ -29,7 +29,7 @@ public PlannedFailoverInput()
         /// <summary>
         /// Initializes a new instance of the PlannedFailoverInput class.
         /// </summary>
-        /// <param name="properties">Planned failover input properties.</param>
+        /// <param name="properties">Planned failover input properties</param>
         public PlannedFailoverInput(PlannedFailoverInputProperties properties = default(PlannedFailoverInputProperties))
         {
             Properties = properties;
@@ -42,7 +42,7 @@ public PlannedFailoverInput()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets planned failover input properties.
+        /// Gets or sets planned failover input properties
         /// </summary>
         [JsonProperty(PropertyName = "properties")]
         public PlannedFailoverInputProperties Properties { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverInputProperties.cs
index 4bf0b3f79957..b69e04918b42 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverInputProperties.cs
@@ -33,8 +33,8 @@ public PlannedFailoverInputProperties()
         /// </summary>
         /// <param name="failoverDirection">Failover direction.</param>
         /// <param name="providerSpecificDetails">Provider specific
-        /// settings.</param>
-        public PlannedFailoverInputProperties(string failoverDirection = default(string), PlannedFailoverProviderSpecificFailoverInput providerSpecificDetails = default(PlannedFailoverProviderSpecificFailoverInput))
+        /// settings</param>
+        public PlannedFailoverInputProperties(string failoverDirection = default(string), ProviderSpecificFailoverInput providerSpecificDetails = default(ProviderSpecificFailoverInput))
         {
             FailoverDirection = failoverDirection;
             ProviderSpecificDetails = providerSpecificDetails;
@@ -53,10 +53,10 @@ public PlannedFailoverInputProperties()
         public string FailoverDirection { get; set; }
 
         /// <summary>
-        /// Gets or sets provider specific settings.
+        /// Gets or sets provider specific settings
         /// </summary>
         [JsonProperty(PropertyName = "providerSpecificDetails")]
-        public PlannedFailoverProviderSpecificFailoverInput ProviderSpecificDetails { get; set; }
+        public ProviderSpecificFailoverInput ProviderSpecificDetails { get; set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PolicyProviderSpecificInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PolicyProviderSpecificInput.cs
index a536b64f2594..4409c7b33410 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PolicyProviderSpecificInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PolicyProviderSpecificInput.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Base class for provider specific input.
+    /// Base class for provider specific input
     /// </summary>
     public partial class PolicyProviderSpecificInput
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProcessServer.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProcessServer.cs
index 88bc38dad8ad..70ac3b815d92 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProcessServer.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProcessServer.cs
@@ -40,7 +40,7 @@ public ProcessServer()
         /// the server.</param>
         /// <param name="lastHeartbeat">The last heartbeat received from the
         /// server.</param>
-        /// <param name="versionStatus">Version status.</param>
+        /// <param name="versionStatus">Version status</param>
         /// <param name="mobilityServiceUpdates">The list of the mobility
         /// service updates available on the Process Server.</param>
         /// <param name="hostId">The agent generated Id.</param>
@@ -166,7 +166,7 @@ public ProcessServer()
         public System.DateTime? LastHeartbeat { get; set; }
 
         /// <summary>
-        /// Gets or sets version status.
+        /// Gets or sets version status
         /// </summary>
         [JsonProperty(PropertyName = "versionStatus")]
         public string VersionStatus { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProcessServerDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProcessServerDetails.cs
index d110093db7ec..c79c46382f38 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProcessServerDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProcessServerDetails.cs
@@ -33,10 +33,7 @@ public ProcessServerDetails()
         /// </summary>
         /// <param name="id">The process server Id.</param>
         /// <param name="name">The process server name.</param>
-        /// <param name="biosId">The process server Bios Id.</param>
-        /// <param name="fabricObjectId">The fabric object Id.</param>
-        /// <param name="fqdn">The process server Fqdn.</param>
-        /// <param name="version">The version.</param>
+        /// <param name="version">The process server version.</param>
         /// <param name="lastHeartbeatUtc">The last heartbeat received from the
         /// process server.</param>
         /// <param name="totalMemoryInBytes">The total memory.</param>
@@ -55,31 +52,16 @@ public ProcessServerDetails()
         /// <param name="throughputInBytes">The throughput in bytes.</param>
         /// <param name="processorUsagePercentage">The processor usage
         /// percentage.</param>
-        /// <param name="throughputStatus">The throughput status. Possible
-        /// values include: 'Healthy', 'Warning', 'Critical', 'Unknown'</param>
-        /// <param name="systemLoad">The system load.</param>
-        /// <param name="systemLoadStatus">The system load status. Possible
-        /// values include: 'Healthy', 'Warning', 'Critical', 'Unknown'</param>
-        /// <param name="diskUsageStatus">The disk usage status. Possible
-        /// values include: 'Healthy', 'Warning', 'Critical', 'Unknown'</param>
-        /// <param name="memoryUsageStatus">The memory usage status. Possible
-        /// values include: 'Healthy', 'Warning', 'Critical', 'Unknown'</param>
-        /// <param name="processorUsageStatus">The processor usage status.
-        /// Possible values include: 'Healthy', 'Warning', 'Critical',
-        /// 'Unknown'</param>
         /// <param name="health">The health of the process server. Possible
         /// values include: 'None', 'Normal', 'Warning', 'Critical'</param>
         /// <param name="healthErrors">The health errors.</param>
         /// <param name="historicHealth">The historic health of the process
         /// server based on the health in last 24 hours. Possible values
         /// include: 'None', 'Normal', 'Warning', 'Critical'</param>
-        public ProcessServerDetails(string id = default(string), string name = default(string), string biosId = default(string), string fabricObjectId = default(string), string fqdn = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), long? totalMemoryInBytes = default(long?), long? availableMemoryInBytes = default(long?), long? usedMemoryInBytes = default(long?), double? memoryUsagePercentage = default(double?), long? totalSpaceInBytes = default(long?), long? availableSpaceInBytes = default(long?), long? usedSpaceInBytes = default(long?), double? freeSpacePercentage = default(double?), long? throughputUploadPendingDataInBytes = default(long?), long? throughputInBytes = default(long?), double? processorUsagePercentage = default(double?), string throughputStatus = default(string), long? systemLoad = default(long?), string systemLoadStatus = default(string), string diskUsageStatus = default(string), string memoryUsageStatus = default(string), string processorUsageStatus = default(string), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>), string historicHealth = default(string))
+        public ProcessServerDetails(string id = default(string), string name = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), long? totalMemoryInBytes = default(long?), long? availableMemoryInBytes = default(long?), long? usedMemoryInBytes = default(long?), double? memoryUsagePercentage = default(double?), long? totalSpaceInBytes = default(long?), long? availableSpaceInBytes = default(long?), long? usedSpaceInBytes = default(long?), double? freeSpacePercentage = default(double?), long? throughputUploadPendingDataInBytes = default(long?), long? throughputInBytes = default(long?), double? processorUsagePercentage = default(double?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>), string historicHealth = default(string))
         {
             Id = id;
             Name = name;
-            BiosId = biosId;
-            FabricObjectId = fabricObjectId;
-            Fqdn = fqdn;
             Version = version;
             LastHeartbeatUtc = lastHeartbeatUtc;
             TotalMemoryInBytes = totalMemoryInBytes;
@@ -93,12 +75,6 @@ public ProcessServerDetails()
             ThroughputUploadPendingDataInBytes = throughputUploadPendingDataInBytes;
             ThroughputInBytes = throughputInBytes;
             ProcessorUsagePercentage = processorUsagePercentage;
-            ThroughputStatus = throughputStatus;
-            SystemLoad = systemLoad;
-            SystemLoadStatus = systemLoadStatus;
-            DiskUsageStatus = diskUsageStatus;
-            MemoryUsageStatus = memoryUsageStatus;
-            ProcessorUsageStatus = processorUsageStatus;
             Health = health;
             HealthErrors = healthErrors;
             HistoricHealth = historicHealth;
@@ -123,25 +99,7 @@ public ProcessServerDetails()
         public string Name { get; private set; }
 
         /// <summary>
-        /// Gets the process server Bios Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; private set; }
-
-        /// <summary>
-        /// Gets the fabric object Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "fabricObjectId")]
-        public string FabricObjectId { get; private set; }
-
-        /// <summary>
-        /// Gets the process server Fqdn.
-        /// </summary>
-        [JsonProperty(PropertyName = "fqdn")]
-        public string Fqdn { get; private set; }
-
-        /// <summary>
-        /// Gets the version.
+        /// Gets the process server version.
         /// </summary>
         [JsonProperty(PropertyName = "version")]
         public string Version { get; private set; }
@@ -218,47 +176,6 @@ public ProcessServerDetails()
         [JsonProperty(PropertyName = "processorUsagePercentage")]
         public double? ProcessorUsagePercentage { get; private set; }
 
-        /// <summary>
-        /// Gets the throughput status. Possible values include: 'Healthy',
-        /// 'Warning', 'Critical', 'Unknown'
-        /// </summary>
-        [JsonProperty(PropertyName = "throughputStatus")]
-        public string ThroughputStatus { get; private set; }
-
-        /// <summary>
-        /// Gets the system load.
-        /// </summary>
-        [JsonProperty(PropertyName = "systemLoad")]
-        public long? SystemLoad { get; private set; }
-
-        /// <summary>
-        /// Gets the system load status. Possible values include: 'Healthy',
-        /// 'Warning', 'Critical', 'Unknown'
-        /// </summary>
-        [JsonProperty(PropertyName = "systemLoadStatus")]
-        public string SystemLoadStatus { get; private set; }
-
-        /// <summary>
-        /// Gets the disk usage status. Possible values include: 'Healthy',
-        /// 'Warning', 'Critical', 'Unknown'
-        /// </summary>
-        [JsonProperty(PropertyName = "diskUsageStatus")]
-        public string DiskUsageStatus { get; private set; }
-
-        /// <summary>
-        /// Gets the memory usage status. Possible values include: 'Healthy',
-        /// 'Warning', 'Critical', 'Unknown'
-        /// </summary>
-        [JsonProperty(PropertyName = "memoryUsageStatus")]
-        public string MemoryUsageStatus { get; private set; }
-
-        /// <summary>
-        /// Gets the processor usage status. Possible values include:
-        /// 'Healthy', 'Warning', 'Critical', 'Unknown'
-        /// </summary>
-        [JsonProperty(PropertyName = "processorUsageStatus")]
-        public string ProcessorUsageStatus { get; private set; }
-
         /// <summary>
         /// Gets the health of the process server. Possible values include:
         /// 'None', 'Normal', 'Warning', 'Critical'
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectableItem.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectableItem.cs
index e140f5b84365..2593d53769da 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectableItem.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectableItem.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Replication protected item.
+    /// Replication protected item
     /// </summary>
     public partial class ProtectableItem : Resource
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectedItemsQueryParameter.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectedItemsQueryParameter.cs
index c1aba2f7beac..4e2e30688ed6 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectedItemsQueryParameter.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectedItemsQueryParameter.cs
@@ -39,15 +39,13 @@ public ProtectedItemsQueryParameter()
         /// <param name="multiVmGroupCreateOption">Whether Multi VM group is
         /// auto created or specified by user. Possible values include:
         /// 'AutoCreated', 'UserSpecified'</param>
-        /// <param name="processServerId">The process server Id filter.</param>
-        public ProtectedItemsQueryParameter(string sourceFabricName = default(string), string recoveryPlanName = default(string), string vCenterName = default(string), string instanceType = default(string), string multiVmGroupCreateOption = default(string), string processServerId = default(string))
+        public ProtectedItemsQueryParameter(string sourceFabricName = default(string), string recoveryPlanName = default(string), string vCenterName = default(string), string instanceType = default(string), string multiVmGroupCreateOption = default(string))
         {
             SourceFabricName = sourceFabricName;
             RecoveryPlanName = recoveryPlanName;
             VCenterName = vCenterName;
             InstanceType = instanceType;
             MultiVmGroupCreateOption = multiVmGroupCreateOption;
-            ProcessServerId = processServerId;
             CustomInit();
         }
 
@@ -87,11 +85,5 @@ public ProtectedItemsQueryParameter()
         [JsonProperty(PropertyName = "multiVmGroupCreateOption")]
         public string MultiVmGroupCreateOption { get; set; }
 
-        /// <summary>
-        /// Gets or sets the process server Id filter.
-        /// </summary>
-        [JsonProperty(PropertyName = "processServerId")]
-        public string ProcessServerId { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectionContainerMappingProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectionContainerMappingProperties.cs
index 275c772c0330..2ff0f1cedaf7 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectionContainerMappingProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectionContainerMappingProperties.cs
@@ -42,7 +42,7 @@ public ProtectionContainerMappingProperties()
         /// <param name="health">Health of pairing.</param>
         /// <param name="healthErrorDetails">Health error.</param>
         /// <param name="policyId">Policy ARM Id.</param>
-        /// <param name="state">Association Status.</param>
+        /// <param name="state">Association Status</param>
         /// <param name="sourceProtectionContainerFriendlyName">Friendly name
         /// of source protection container.</param>
         /// <param name="sourceFabricFriendlyName">Friendly name of source
@@ -109,7 +109,7 @@ public ProtectionContainerMappingProperties()
         public string PolicyId { get; set; }
 
         /// <summary>
-        /// Gets or sets association Status.
+        /// Gets or sets association Status
         /// </summary>
         [JsonProperty(PropertyName = "state")]
         public string State { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectionContainerProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectionContainerProperties.cs
index f07b8a43d557..aa1667f38639 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectionContainerProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProtectionContainerProperties.cs
@@ -34,7 +34,7 @@ public ProtectionContainerProperties()
         /// <param name="fabricFriendlyName">Fabric friendly name.</param>
         /// <param name="friendlyName">The name.</param>
         /// <param name="fabricType">The fabric type.</param>
-        /// <param name="protectedItemCount">Number of protected PEs.</param>
+        /// <param name="protectedItemCount">Number of protected PEs</param>
         /// <param name="pairingStatus">The pairing status of this
         /// cloud.</param>
         /// <param name="role">The role of this cloud.</param>
@@ -76,7 +76,7 @@ public ProtectionContainerProperties()
         public string FabricType { get; set; }
 
         /// <summary>
-        /// Gets or sets number of protected PEs.
+        /// Gets or sets number of protected PEs
         /// </summary>
         [JsonProperty(PropertyName = "protectedItemCount")]
         public int? ProtectedItemCount { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResyncProviderSpecificInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProviderSpecificFailoverInput.cs
similarity index 78%
rename from sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResyncProviderSpecificInput.cs
rename to sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProviderSpecificFailoverInput.cs
index 7e2b0c37fe6b..7ee542f769aa 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResyncProviderSpecificInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ProviderSpecificFailoverInput.cs
@@ -13,15 +13,15 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Resync provider specific input.
+    /// Provider specific failover input.
     /// </summary>
-    public partial class ResyncProviderSpecificInput
+    public partial class ProviderSpecificFailoverInput
     {
         /// <summary>
-        /// Initializes a new instance of the ResyncProviderSpecificInput
+        /// Initializes a new instance of the ProviderSpecificFailoverInput
         /// class.
         /// </summary>
-        public ResyncProviderSpecificInput()
+        public ProviderSpecificFailoverInput()
         {
             CustomInit();
         }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PushInstallerDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PushInstallerDetails.cs
index 474d21c42efc..5e5db309594d 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PushInstallerDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PushInstallerDetails.cs
@@ -33,22 +33,16 @@ public PushInstallerDetails()
         /// </summary>
         /// <param name="id">The push installer Id.</param>
         /// <param name="name">The push installer name.</param>
-        /// <param name="biosId">The push installer Bios Id.</param>
-        /// <param name="fabricObjectId">The fabric object Id.</param>
-        /// <param name="fqdn">The push installer Fqdn.</param>
-        /// <param name="version">The version.</param>
+        /// <param name="version">The push installer version.</param>
         /// <param name="lastHeartbeatUtc">The last heartbeat received from the
         /// push installer.</param>
         /// <param name="health">The health of the push installer. Possible
         /// values include: 'None', 'Normal', 'Warning', 'Critical'</param>
         /// <param name="healthErrors">The health errors.</param>
-        public PushInstallerDetails(string id = default(string), string name = default(string), string biosId = default(string), string fabricObjectId = default(string), string fqdn = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
+        public PushInstallerDetails(string id = default(string), string name = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
         {
             Id = id;
             Name = name;
-            BiosId = biosId;
-            FabricObjectId = fabricObjectId;
-            Fqdn = fqdn;
             Version = version;
             LastHeartbeatUtc = lastHeartbeatUtc;
             Health = health;
@@ -74,25 +68,7 @@ public PushInstallerDetails()
         public string Name { get; private set; }
 
         /// <summary>
-        /// Gets the push installer Bios Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; private set; }
-
-        /// <summary>
-        /// Gets the fabric object Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "fabricObjectId")]
-        public string FabricObjectId { get; private set; }
-
-        /// <summary>
-        /// Gets the push installer Fqdn.
-        /// </summary>
-        [JsonProperty(PropertyName = "fqdn")]
-        public string Fqdn { get; private set; }
-
-        /// <summary>
-        /// Gets the version.
+        /// Gets the push installer version.
         /// </summary>
         [JsonProperty(PropertyName = "version")]
         public string Version { get; private set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmAzureMigrationPolicyDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmAzureMigrationPolicyDetails.cs
new file mode 100644
index 000000000000..c57469a8f933
--- /dev/null
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmAzureMigrationPolicyDetails.cs
@@ -0,0 +1,94 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// RCM based Azure migration specific policy details.
+    /// </summary>
+    [Newtonsoft.Json.JsonObject("RcmAzureMigration")]
+    public partial class RcmAzureMigrationPolicyDetails : PolicyProviderSpecificDetails
+    {
+        /// <summary>
+        /// Initializes a new instance of the RcmAzureMigrationPolicyDetails
+        /// class.
+        /// </summary>
+        public RcmAzureMigrationPolicyDetails()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RcmAzureMigrationPolicyDetails
+        /// class.
+        /// </summary>
+        /// <param name="recoveryPointThresholdInMinutes">The recovery point
+        /// threshold in minutes.</param>
+        /// <param name="recoveryPointHistory">The duration in minutes until
+        /// which the recovery points need to be stored.</param>
+        /// <param name="appConsistentFrequencyInMinutes">The app consistent
+        /// snapshot frequency in minutes.</param>
+        /// <param name="multiVmSyncStatus">A value indicating whether multi-VM
+        /// sync has to be enabled. Possible values include: 'Enabled',
+        /// 'Disabled'</param>
+        /// <param name="crashConsistentFrequencyInMinutes">The crash
+        /// consistent snapshot frequency in minutes.</param>
+        public RcmAzureMigrationPolicyDetails(int? recoveryPointThresholdInMinutes = default(int?), int? recoveryPointHistory = default(int?), int? appConsistentFrequencyInMinutes = default(int?), string multiVmSyncStatus = default(string), int? crashConsistentFrequencyInMinutes = default(int?))
+        {
+            RecoveryPointThresholdInMinutes = recoveryPointThresholdInMinutes;
+            RecoveryPointHistory = recoveryPointHistory;
+            AppConsistentFrequencyInMinutes = appConsistentFrequencyInMinutes;
+            MultiVmSyncStatus = multiVmSyncStatus;
+            CrashConsistentFrequencyInMinutes = crashConsistentFrequencyInMinutes;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets the recovery point threshold in minutes.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryPointThresholdInMinutes")]
+        public int? RecoveryPointThresholdInMinutes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the duration in minutes until which the recovery
+        /// points need to be stored.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryPointHistory")]
+        public int? RecoveryPointHistory { get; set; }
+
+        /// <summary>
+        /// Gets or sets the app consistent snapshot frequency in minutes.
+        /// </summary>
+        [JsonProperty(PropertyName = "appConsistentFrequencyInMinutes")]
+        public int? AppConsistentFrequencyInMinutes { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether multi-VM sync has to be
+        /// enabled. Possible values include: 'Enabled', 'Disabled'
+        /// </summary>
+        [JsonProperty(PropertyName = "multiVmSyncStatus")]
+        public string MultiVmSyncStatus { get; set; }
+
+        /// <summary>
+        /// Gets or sets the crash consistent snapshot frequency in minutes.
+        /// </summary>
+        [JsonProperty(PropertyName = "crashConsistentFrequencyInMinutes")]
+        public int? CrashConsistentFrequencyInMinutes { get; set; }
+
+    }
+}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmProxyDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmProxyDetails.cs
index b0d2a933ed5b..5b8856a900bf 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmProxyDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RcmProxyDetails.cs
@@ -33,22 +33,16 @@ public RcmProxyDetails()
         /// </summary>
         /// <param name="id">The RCM proxy Id.</param>
         /// <param name="name">The RCM proxy name.</param>
-        /// <param name="biosId">The RCM proxy Bios Id.</param>
-        /// <param name="fabricObjectId">The fabric object Id.</param>
-        /// <param name="fqdn">The RCM proxy Fqdn.</param>
-        /// <param name="version">The version.</param>
+        /// <param name="version">The RCM proxy version.</param>
         /// <param name="lastHeartbeatUtc">The last heartbeat received from the
         /// RCM proxy.</param>
         /// <param name="health">The health of the RCM proxy. Possible values
         /// include: 'None', 'Normal', 'Warning', 'Critical'</param>
         /// <param name="healthErrors">The health errors.</param>
-        public RcmProxyDetails(string id = default(string), string name = default(string), string biosId = default(string), string fabricObjectId = default(string), string fqdn = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
+        public RcmProxyDetails(string id = default(string), string name = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
         {
             Id = id;
             Name = name;
-            BiosId = biosId;
-            FabricObjectId = fabricObjectId;
-            Fqdn = fqdn;
             Version = version;
             LastHeartbeatUtc = lastHeartbeatUtc;
             Health = health;
@@ -74,25 +68,7 @@ public RcmProxyDetails()
         public string Name { get; private set; }
 
         /// <summary>
-        /// Gets the RCM proxy Bios Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; private set; }
-
-        /// <summary>
-        /// Gets the fabric object Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "fabricObjectId")]
-        public string FabricObjectId { get; private set; }
-
-        /// <summary>
-        /// Gets the RCM proxy Fqdn.
-        /// </summary>
-        [JsonProperty(PropertyName = "fqdn")]
-        public string Fqdn { get; private set; }
-
-        /// <summary>
-        /// Gets the version.
+        /// Gets the RCM proxy version.
         /// </summary>
         [JsonProperty(PropertyName = "version")]
         public string Version { get; private set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanHyperVReplicaAzureFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanHyperVReplicaAzureFailoverInput.cs
index 08dd4c256a1e..e42eeac5c02a 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanHyperVReplicaAzureFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanHyperVReplicaAzureFailoverInput.cs
@@ -32,6 +32,7 @@ public RecoveryPlanHyperVReplicaAzureFailoverInput()
         /// Initializes a new instance of the
         /// RecoveryPlanHyperVReplicaAzureFailoverInput class.
         /// </summary>
+        /// <param name="vaultLocation">The vault location.</param>
         /// <param name="primaryKekCertificatePfx">The primary KEK certificate
         /// PFX.</param>
         /// <param name="secondaryKekCertificatePfx">The secondary KEK
@@ -39,8 +40,9 @@ public RecoveryPlanHyperVReplicaAzureFailoverInput()
         /// <param name="recoveryPointType">The recovery point type. Possible
         /// values include: 'Latest', 'LatestApplicationConsistent',
         /// 'LatestProcessed'</param>
-        public RecoveryPlanHyperVReplicaAzureFailoverInput(string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string), string recoveryPointType = default(string))
+        public RecoveryPlanHyperVReplicaAzureFailoverInput(string vaultLocation = default(string), string primaryKekCertificatePfx = default(string), string secondaryKekCertificatePfx = default(string), string recoveryPointType = default(string))
         {
+            VaultLocation = vaultLocation;
             PrimaryKekCertificatePfx = primaryKekCertificatePfx;
             SecondaryKekCertificatePfx = secondaryKekCertificatePfx;
             RecoveryPointType = recoveryPointType;
@@ -52,6 +54,12 @@ public RecoveryPlanHyperVReplicaAzureFailoverInput()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets the vault location.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
         /// <summary>
         /// Gets or sets the primary KEK certificate PFX.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageAzureV2FailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageAzureV2FailoverInput.cs
index 8063a4a24c90..eae1b2cac85d 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageAzureV2FailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageAzureV2FailoverInput.cs
@@ -33,14 +33,16 @@ public RecoveryPlanInMageAzureV2FailoverInput()
         /// Initializes a new instance of the
         /// RecoveryPlanInMageAzureV2FailoverInput class.
         /// </summary>
+        /// <param name="vaultLocation">The vault location.</param>
         /// <param name="recoveryPointType">The recovery point type. Possible
         /// values include: 'Latest', 'LatestApplicationConsistent',
         /// 'LatestCrashConsistent', 'LatestProcessed'</param>
         /// <param name="useMultiVmSyncPoint">A value indicating whether multi
         /// VM sync enabled VMs should use multi VM sync points for
         /// failover.</param>
-        public RecoveryPlanInMageAzureV2FailoverInput(string recoveryPointType, string useMultiVmSyncPoint = default(string))
+        public RecoveryPlanInMageAzureV2FailoverInput(string vaultLocation, string recoveryPointType, string useMultiVmSyncPoint = default(string))
         {
+            VaultLocation = vaultLocation;
             RecoveryPointType = recoveryPointType;
             UseMultiVmSyncPoint = useMultiVmSyncPoint;
             CustomInit();
@@ -51,6 +53,12 @@ public RecoveryPlanInMageAzureV2FailoverInput()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets the vault location.
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultLocation")]
+        public string VaultLocation { get; set; }
+
         /// <summary>
         /// Gets or sets the recovery point type. Possible values include:
         /// 'Latest', 'LatestApplicationConsistent', 'LatestCrashConsistent',
@@ -74,6 +82,10 @@ public RecoveryPlanInMageAzureV2FailoverInput()
         /// </exception>
         public virtual void Validate()
         {
+            if (VaultLocation == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "VaultLocation");
+            }
             if (RecoveryPointType == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "RecoveryPointType");
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageRcmFailbackFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageRcmFailbackFailoverInput.cs
deleted file mode 100644
index 795dbf7b1a39..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageRcmFailbackFailoverInput.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Microsoft.Rest;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Recovery plan InMageRcmFailback failover input.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("InMageRcmFailback")]
-    public partial class RecoveryPlanInMageRcmFailbackFailoverInput : RecoveryPlanProviderSpecificFailoverInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// RecoveryPlanInMageRcmFailbackFailoverInput class.
-        /// </summary>
-        public RecoveryPlanInMageRcmFailbackFailoverInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// RecoveryPlanInMageRcmFailbackFailoverInput class.
-        /// </summary>
-        /// <param name="recoveryPointType">The recovery point type. Possible
-        /// values include: 'ApplicationConsistent', 'CrashConsistent'</param>
-        /// <param name="useMultiVmSyncPoint">A value indicating whether multi
-        /// VM sync enabled VMs should use multi VM sync points for
-        /// failover.</param>
-        public RecoveryPlanInMageRcmFailbackFailoverInput(string recoveryPointType, string useMultiVmSyncPoint = default(string))
-        {
-            RecoveryPointType = recoveryPointType;
-            UseMultiVmSyncPoint = useMultiVmSyncPoint;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the recovery point type. Possible values include:
-        /// 'ApplicationConsistent', 'CrashConsistent'
-        /// </summary>
-        [JsonProperty(PropertyName = "recoveryPointType")]
-        public string RecoveryPointType { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether multi VM sync enabled VMs
-        /// should use multi VM sync points for failover.
-        /// </summary>
-        [JsonProperty(PropertyName = "useMultiVmSyncPoint")]
-        public string UseMultiVmSyncPoint { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (RecoveryPointType == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "RecoveryPointType");
-            }
-        }
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageRcmFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageRcmFailoverInput.cs
index 3797aba59bc1..1b03e6ffa1c4 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageRcmFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanInMageRcmFailoverInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -39,7 +38,7 @@ public RecoveryPlanInMageRcmFailoverInput()
         /// <param name="useMultiVmSyncPoint">A value indicating whether multi
         /// VM sync enabled VMs should use multi VM sync points for
         /// failover.</param>
-        public RecoveryPlanInMageRcmFailoverInput(string recoveryPointType, string useMultiVmSyncPoint = default(string))
+        public RecoveryPlanInMageRcmFailoverInput(string recoveryPointType = default(string), string useMultiVmSyncPoint = default(string))
         {
             RecoveryPointType = recoveryPointType;
             UseMultiVmSyncPoint = useMultiVmSyncPoint;
@@ -66,18 +65,5 @@ public RecoveryPlanInMageRcmFailoverInput()
         [JsonProperty(PropertyName = "useMultiVmSyncPoint")]
         public string UseMultiVmSyncPoint { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (RecoveryPointType == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "RecoveryPointType");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanProperties.cs
index 1e9342e7f996..8314327d14af 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanProperties.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Recovery plan properties.
+    /// Recovery plan custom details.
     /// </summary>
     public partial class RecoveryPlanProperties
     {
@@ -175,10 +175,10 @@ public RecoveryPlanProperties()
         public IList<RecoveryPlanGroup> Groups { get; set; }
 
         /// <summary>
-        /// Gets or sets the provider id and provider specific details.
+        /// Gets the provider id and provider specific details.
         /// </summary>
         [JsonProperty(PropertyName = "providerSpecificDetails")]
-        public IList<RecoveryPlanProviderSpecificDetails> ProviderSpecificDetails { get; set; }
+        public IList<RecoveryPlanProviderSpecificDetails> ProviderSpecificDetails { get; private set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanProviderSpecificFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanProviderSpecificFailoverInput.cs
index b5f81a849462..a90b9cc186f0 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanProviderSpecificFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanProviderSpecificFailoverInput.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Recovery plan provider specific failover input.
+    /// Recovery plan provider specific failover input base class.
     /// </summary>
     public partial class RecoveryPlanProviderSpecificFailoverInput
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanShutdownGroupTaskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanShutdownGroupTaskDetails.cs
index e5fa930346e1..5941581275d4 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanShutdownGroupTaskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanShutdownGroupTaskDetails.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
+    using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
@@ -17,7 +18,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     /// <summary>
     /// This class represents the recovery plan shutdown group task details.
     /// </summary>
-    public partial class RecoveryPlanShutdownGroupTaskDetails : RecoveryPlanGroupTaskDetails
+    public partial class RecoveryPlanShutdownGroupTaskDetails : GroupTaskDetails
     {
         /// <summary>
         /// Initializes a new instance of the
@@ -37,8 +38,11 @@ public RecoveryPlanShutdownGroupTaskDetails()
         /// <param name="groupId">The group identifier.</param>
         /// <param name="rpGroupType">The group type.</param>
         public RecoveryPlanShutdownGroupTaskDetails(IList<ASRTask> childTasks = default(IList<ASRTask>), string name = default(string), string groupId = default(string), string rpGroupType = default(string))
-            : base(childTasks, name, groupId, rpGroupType)
+            : base(childTasks)
         {
+            Name = name;
+            GroupId = groupId;
+            RpGroupType = rpGroupType;
             CustomInit();
         }
 
@@ -47,5 +51,23 @@ public RecoveryPlanShutdownGroupTaskDetails()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        [JsonProperty(PropertyName = "name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the group identifier.
+        /// </summary>
+        [JsonProperty(PropertyName = "groupId")]
+        public string GroupId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the group type.
+        /// </summary>
+        [JsonProperty(PropertyName = "rpGroupType")]
+        public string RpGroupType { get; set; }
+
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverCleanupInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverCleanupInput.cs
index 201391cc4c1f..cff69a0c56b2 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverCleanupInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverCleanupInput.cs
@@ -64,10 +64,6 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Properties");
             }
-            if (Properties != null)
-            {
-                Properties.Validate();
-            }
         }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverCleanupInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverCleanupInputProperties.cs
index 6bb27f969f09..ea4f61693755 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverCleanupInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverCleanupInputProperties.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -50,21 +49,5 @@ public RecoveryPlanTestFailoverCleanupInputProperties()
         [JsonProperty(PropertyName = "comments")]
         public string Comments { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Comments != null)
-            {
-                if (Comments.Length > 1024)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "Comments", 1024);
-                }
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverInputProperties.cs
index e6ff95beaf83..717858bfe603 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPlanTestFailoverInputProperties.cs
@@ -40,13 +40,16 @@ public RecoveryPlanTestFailoverInputProperties()
         /// failover.</param>
         /// <param name="networkId">The Id of the network to be used for test
         /// failover.</param>
+        /// <param name="skipTestFailoverCleanup">A value indicating whether
+        /// the test failover cleanup is to be skipped.</param>
         /// <param name="providerSpecificDetails">The provider specific
         /// properties.</param>
-        public RecoveryPlanTestFailoverInputProperties(string failoverDirection, string networkType, string networkId = default(string), IList<RecoveryPlanProviderSpecificFailoverInput> providerSpecificDetails = default(IList<RecoveryPlanProviderSpecificFailoverInput>))
+        public RecoveryPlanTestFailoverInputProperties(string failoverDirection, string networkType, string networkId = default(string), string skipTestFailoverCleanup = default(string), IList<RecoveryPlanProviderSpecificFailoverInput> providerSpecificDetails = default(IList<RecoveryPlanProviderSpecificFailoverInput>))
         {
             FailoverDirection = failoverDirection;
             NetworkType = networkType;
             NetworkId = networkId;
+            SkipTestFailoverCleanup = skipTestFailoverCleanup;
             ProviderSpecificDetails = providerSpecificDetails;
             CustomInit();
         }
@@ -75,6 +78,13 @@ public RecoveryPlanTestFailoverInputProperties()
         [JsonProperty(PropertyName = "networkId")]
         public string NetworkId { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the test failover cleanup
+        /// is to be skipped.
+        /// </summary>
+        [JsonProperty(PropertyName = "skipTestFailoverCleanup")]
+        public string SkipTestFailoverCleanup { get; set; }
+
         /// <summary>
         /// Gets or sets the provider specific properties.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPoint.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPoint.cs
index 6aea1e61c6a9..0a726f64de82 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPoint.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryPoint.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Recovery point.
+    /// Base class representing a recovery point.
     /// </summary>
     public partial class RecoveryPoint : Resource
     {
@@ -33,7 +33,7 @@ public RecoveryPoint()
         /// <param name="name">Resource Name</param>
         /// <param name="type">Resource Type</param>
         /// <param name="location">Resource Location</param>
-        /// <param name="properties">The recovery point properties.</param>
+        /// <param name="properties">Recovery point related data.</param>
         public RecoveryPoint(string id = default(string), string name = default(string), string type = default(string), string location = default(string), RecoveryPointProperties properties = default(RecoveryPointProperties))
             : base(id, name, type, location)
         {
@@ -47,7 +47,7 @@ public RecoveryPoint()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the recovery point properties.
+        /// Gets or sets recovery point related data.
         /// </summary>
         [JsonProperty(PropertyName = "properties")]
         public RecoveryPointProperties Properties { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryServicesProviderProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryServicesProviderProperties.cs
index 350857e29cd1..d2e27fcccd54 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryServicesProviderProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RecoveryServicesProviderProperties.cs
@@ -52,18 +52,13 @@ public RecoveryServicesProviderProperties()
         /// <param name="healthErrorDetails">The recovery services provider
         /// health error details.</param>
         /// <param name="draIdentifier">The DRA Id.</param>
-        /// <param name="machineId">The machine Id.</param>
-        /// <param name="machineName">The machine name.</param>
-        /// <param name="biosId">The Bios Id.</param>
         /// <param name="authenticationIdentityDetails">The authentication
         /// identity details.</param>
         /// <param name="resourceAccessIdentityDetails">The resource access
         /// identity details.</param>
-        /// <param name="dataPlaneAuthenticationIdentityDetails">The data plane
-        /// authentication identity details.</param>
         /// <param name="providerVersionDetails">The provider version
         /// details.</param>
-        public RecoveryServicesProviderProperties(string fabricType = default(string), string friendlyName = default(string), string providerVersion = default(string), string serverVersion = default(string), string providerVersionState = default(string), System.DateTime? providerVersionExpiryDate = default(System.DateTime?), string fabricFriendlyName = default(string), System.DateTime? lastHeartBeat = default(System.DateTime?), string connectionStatus = default(string), int? protectedItemCount = default(int?), IList<string> allowedScenarios = default(IList<string>), IList<HealthError> healthErrorDetails = default(IList<HealthError>), string draIdentifier = default(string), string machineId = default(string), string machineName = default(string), string biosId = default(string), IdentityProviderDetails authenticationIdentityDetails = default(IdentityProviderDetails), IdentityProviderDetails resourceAccessIdentityDetails = default(IdentityProviderDetails), IdentityProviderDetails dataPlaneAuthenticationIdentityDetails = default(IdentityProviderDetails), VersionDetails providerVersionDetails = default(VersionDetails))
+        public RecoveryServicesProviderProperties(string fabricType = default(string), string friendlyName = default(string), string providerVersion = default(string), string serverVersion = default(string), string providerVersionState = default(string), System.DateTime? providerVersionExpiryDate = default(System.DateTime?), string fabricFriendlyName = default(string), System.DateTime? lastHeartBeat = default(System.DateTime?), string connectionStatus = default(string), int? protectedItemCount = default(int?), IList<string> allowedScenarios = default(IList<string>), IList<HealthError> healthErrorDetails = default(IList<HealthError>), string draIdentifier = default(string), IdentityProviderDetails authenticationIdentityDetails = default(IdentityProviderDetails), IdentityProviderDetails resourceAccessIdentityDetails = default(IdentityProviderDetails), VersionDetails providerVersionDetails = default(VersionDetails))
         {
             FabricType = fabricType;
             FriendlyName = friendlyName;
@@ -78,12 +73,8 @@ public RecoveryServicesProviderProperties()
             AllowedScenarios = allowedScenarios;
             HealthErrorDetails = healthErrorDetails;
             DraIdentifier = draIdentifier;
-            MachineId = machineId;
-            MachineName = machineName;
-            BiosId = biosId;
             AuthenticationIdentityDetails = authenticationIdentityDetails;
             ResourceAccessIdentityDetails = resourceAccessIdentityDetails;
-            DataPlaneAuthenticationIdentityDetails = dataPlaneAuthenticationIdentityDetails;
             ProviderVersionDetails = providerVersionDetails;
             CustomInit();
         }
@@ -171,24 +162,6 @@ public RecoveryServicesProviderProperties()
         [JsonProperty(PropertyName = "draIdentifier")]
         public string DraIdentifier { get; set; }
 
-        /// <summary>
-        /// Gets or sets the machine Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "machineId")]
-        public string MachineId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the machine name.
-        /// </summary>
-        [JsonProperty(PropertyName = "machineName")]
-        public string MachineName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Bios Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; set; }
-
         /// <summary>
         /// Gets or sets the authentication identity details.
         /// </summary>
@@ -201,12 +174,6 @@ public RecoveryServicesProviderProperties()
         [JsonProperty(PropertyName = "resourceAccessIdentityDetails")]
         public IdentityProviderDetails ResourceAccessIdentityDetails { get; set; }
 
-        /// <summary>
-        /// Gets or sets the data plane authentication identity details.
-        /// </summary>
-        [JsonProperty(PropertyName = "dataPlaneAuthenticationIdentityDetails")]
-        public IdentityProviderDetails DataPlaneAuthenticationIdentityDetails { get; set; }
-
         /// <summary>
         /// Gets or sets the provider version details.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationAgentDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationAgentDetails.cs
index b6cb1707f543..f4b65cb0b0dc 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationAgentDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationAgentDetails.cs
@@ -33,22 +33,16 @@ public ReplicationAgentDetails()
         /// </summary>
         /// <param name="id">The replication agent Id.</param>
         /// <param name="name">The replication agent name.</param>
-        /// <param name="biosId">The replication agent Bios Id.</param>
-        /// <param name="fabricObjectId">The fabric object Id.</param>
-        /// <param name="fqdn">The replication agent Fqdn.</param>
-        /// <param name="version">The version.</param>
+        /// <param name="version">The replication agent version.</param>
         /// <param name="lastHeartbeatUtc">The last heartbeat received from the
         /// replication agent.</param>
         /// <param name="health">The health of the replication agent. Possible
         /// values include: 'None', 'Normal', 'Warning', 'Critical'</param>
         /// <param name="healthErrors">The health errors.</param>
-        public ReplicationAgentDetails(string id = default(string), string name = default(string), string biosId = default(string), string fabricObjectId = default(string), string fqdn = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
+        public ReplicationAgentDetails(string id = default(string), string name = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
         {
             Id = id;
             Name = name;
-            BiosId = biosId;
-            FabricObjectId = fabricObjectId;
-            Fqdn = fqdn;
             Version = version;
             LastHeartbeatUtc = lastHeartbeatUtc;
             Health = health;
@@ -74,25 +68,7 @@ public ReplicationAgentDetails()
         public string Name { get; private set; }
 
         /// <summary>
-        /// Gets the replication agent Bios Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; private set; }
-
-        /// <summary>
-        /// Gets the fabric object Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "fabricObjectId")]
-        public string FabricObjectId { get; private set; }
-
-        /// <summary>
-        /// Gets the replication agent Fqdn.
-        /// </summary>
-        [JsonProperty(PropertyName = "fqdn")]
-        public string Fqdn { get; private set; }
-
-        /// <summary>
-        /// Gets the version.
+        /// Gets the replication agent version.
         /// </summary>
         [JsonProperty(PropertyName = "version")]
         public string Version { get; private set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationEligibilityResultsErrorInfo.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationEligibilityResultsErrorInfo.cs
index 4f235ed58244..bc0cde952eb2 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationEligibilityResultsErrorInfo.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationEligibilityResultsErrorInfo.cs
@@ -52,28 +52,28 @@ public ReplicationEligibilityResultsErrorInfo()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the error code.
+        /// Gets the error code.
         /// </summary>
         [JsonProperty(PropertyName = "code")]
-        public string Code { get; set; }
+        public string Code { get; private set; }
 
         /// <summary>
-        /// Gets or sets the error message.
+        /// Gets the error message.
         /// </summary>
         [JsonProperty(PropertyName = "message")]
-        public string Message { get; set; }
+        public string Message { get; private set; }
 
         /// <summary>
-        /// Gets or sets the possible causes.
+        /// Gets the possible causes.
         /// </summary>
         [JsonProperty(PropertyName = "possibleCauses")]
-        public string PossibleCauses { get; set; }
+        public string PossibleCauses { get; private set; }
 
         /// <summary>
-        /// Gets or sets the recommended action.
+        /// Gets the recommended action.
         /// </summary>
         [JsonProperty(PropertyName = "recommendedAction")]
-        public string RecommendedAction { get; set; }
+        public string RecommendedAction { get; private set; }
 
         /// <summary>
         /// Gets the error status.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationGroupDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationGroupDetails.cs
index d1030ff24563..e12efb20739e 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationGroupDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationGroupDetails.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Replication group details. This will be used in case of San.
+    /// Replication group details. This will be used in case of San and Wvr.
     /// </summary>
     public partial class ReplicationGroupDetails : ConfigurationSettings
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationProtectedItemOperation.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationProtectedItemOperation.cs
index d32500db1bb0..5b08dfb7a4f9 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationProtectedItemOperation.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationProtectedItemOperation.cs
@@ -25,7 +25,6 @@ public static class ReplicationProtectedItemOperation
         public const string TestFailoverCleanup = "TestFailoverCleanup";
         public const string Failback = "Failback";
         public const string FinalizeFailback = "FinalizeFailback";
-        public const string CancelFailover = "CancelFailover";
         public const string ChangePit = "ChangePit";
         public const string RepairReplication = "RepairReplication";
         public const string SwitchProtection = "SwitchProtection";
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationProtectedItemProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationProtectedItemProperties.cs
index da5da4f7dd38..25f1b6fca665 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationProtectedItemProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReplicationProtectedItemProperties.cs
@@ -83,9 +83,7 @@ public ReplicationProtectedItemProperties()
         /// custom settings.</param>
         /// <param name="recoveryContainerId">The recovery container
         /// Id.</param>
-        /// <param name="eventCorrelationId">The correlation Id for events
-        /// associated with this protected item.</param>
-        public ReplicationProtectedItemProperties(string friendlyName = default(string), string protectedItemType = default(string), string protectableItemId = default(string), string recoveryServicesProviderId = default(string), string primaryFabricFriendlyName = default(string), string primaryFabricProvider = default(string), string recoveryFabricFriendlyName = default(string), string recoveryFabricId = default(string), string primaryProtectionContainerFriendlyName = default(string), string recoveryProtectionContainerFriendlyName = default(string), string protectionState = default(string), string protectionStateDescription = default(string), string activeLocation = default(string), string testFailoverState = default(string), string testFailoverStateDescription = default(string), IList<string> allowedOperations = default(IList<string>), string replicationHealth = default(string), string failoverHealth = default(string), IList<HealthError> healthErrors = default(IList<HealthError>), string policyId = default(string), string policyFriendlyName = default(string), System.DateTime? lastSuccessfulFailoverTime = default(System.DateTime?), System.DateTime? lastSuccessfulTestFailoverTime = default(System.DateTime?), CurrentScenarioDetails currentScenario = default(CurrentScenarioDetails), string failoverRecoveryPointId = default(string), ReplicationProviderSpecificSettings providerSpecificDetails = default(ReplicationProviderSpecificSettings), string recoveryContainerId = default(string), string eventCorrelationId = default(string))
+        public ReplicationProtectedItemProperties(string friendlyName = default(string), string protectedItemType = default(string), string protectableItemId = default(string), string recoveryServicesProviderId = default(string), string primaryFabricFriendlyName = default(string), string primaryFabricProvider = default(string), string recoveryFabricFriendlyName = default(string), string recoveryFabricId = default(string), string primaryProtectionContainerFriendlyName = default(string), string recoveryProtectionContainerFriendlyName = default(string), string protectionState = default(string), string protectionStateDescription = default(string), string activeLocation = default(string), string testFailoverState = default(string), string testFailoverStateDescription = default(string), IList<string> allowedOperations = default(IList<string>), string replicationHealth = default(string), string failoverHealth = default(string), IList<HealthError> healthErrors = default(IList<HealthError>), string policyId = default(string), string policyFriendlyName = default(string), System.DateTime? lastSuccessfulFailoverTime = default(System.DateTime?), System.DateTime? lastSuccessfulTestFailoverTime = default(System.DateTime?), CurrentScenarioDetails currentScenario = default(CurrentScenarioDetails), string failoverRecoveryPointId = default(string), ReplicationProviderSpecificSettings providerSpecificDetails = default(ReplicationProviderSpecificSettings), string recoveryContainerId = default(string))
         {
             FriendlyName = friendlyName;
             ProtectedItemType = protectedItemType;
@@ -114,7 +112,6 @@ public ReplicationProtectedItemProperties()
             FailoverRecoveryPointId = failoverRecoveryPointId;
             ProviderSpecificDetails = providerSpecificDetails;
             RecoveryContainerId = recoveryContainerId;
-            EventCorrelationId = eventCorrelationId;
             CustomInit();
         }
 
@@ -291,12 +288,5 @@ public ReplicationProtectedItemProperties()
         [JsonProperty(PropertyName = "recoveryContainerId")]
         public string RecoveryContainerId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the correlation Id for events associated with this
-        /// protected item.
-        /// </summary>
-        [JsonProperty(PropertyName = "eventCorrelationId")]
-        public string EventCorrelationId { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReprotectAgentDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReprotectAgentDetails.cs
index d0e4e9c4d43a..8b15b4a1e1b1 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReprotectAgentDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReprotectAgentDetails.cs
@@ -33,22 +33,16 @@ public ReprotectAgentDetails()
         /// </summary>
         /// <param name="id">The reprotect agent Id.</param>
         /// <param name="name">The reprotect agent name.</param>
-        /// <param name="biosId">The reprotect agent Bios Id.</param>
-        /// <param name="fabricObjectId">The fabric object Id.</param>
-        /// <param name="fqdn">The reprotect agent Fqdn.</param>
         /// <param name="version">The version.</param>
         /// <param name="lastHeartbeatUtc">The last heartbeat received from the
         /// reprotect agent.</param>
         /// <param name="health">The health of the reprotect agent. Possible
         /// values include: 'None', 'Normal', 'Warning', 'Critical'</param>
         /// <param name="healthErrors">The health errors.</param>
-        public ReprotectAgentDetails(string id = default(string), string name = default(string), string biosId = default(string), string fabricObjectId = default(string), string fqdn = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
+        public ReprotectAgentDetails(string id = default(string), string name = default(string), string version = default(string), System.DateTime? lastHeartbeatUtc = default(System.DateTime?), string health = default(string), IList<HealthError> healthErrors = default(IList<HealthError>))
         {
             Id = id;
             Name = name;
-            BiosId = biosId;
-            FabricObjectId = fabricObjectId;
-            Fqdn = fqdn;
             Version = version;
             LastHeartbeatUtc = lastHeartbeatUtc;
             Health = health;
@@ -73,24 +67,6 @@ public ReprotectAgentDetails()
         [JsonProperty(PropertyName = "name")]
         public string Name { get; private set; }
 
-        /// <summary>
-        /// Gets the reprotect agent Bios Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "biosId")]
-        public string BiosId { get; private set; }
-
-        /// <summary>
-        /// Gets the fabric object Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "fabricObjectId")]
-        public string FabricObjectId { get; private set; }
-
-        /// <summary>
-        /// Gets the reprotect agent Fqdn.
-        /// </summary>
-        [JsonProperty(PropertyName = "fqdn")]
-        public string Fqdn { get; private set; }
-
         /// <summary>
         /// Gets the version.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResourceHealthSummary.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResourceHealthSummary.cs
index ebc60c186ec1..9bc4a6c18dfe 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResourceHealthSummary.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResourceHealthSummary.cs
@@ -36,13 +36,10 @@ public ResourceHealthSummary()
         /// container.</param>
         /// <param name="issues">The list of summary of health errors across
         /// the resources under the container.</param>
-        /// <param name="categorizedResourceCounts">The categorized resource
-        /// counts.</param>
-        public ResourceHealthSummary(int? resourceCount = default(int?), IList<HealthErrorSummary> issues = default(IList<HealthErrorSummary>), IDictionary<string, int?> categorizedResourceCounts = default(IDictionary<string, int?>))
+        public ResourceHealthSummary(int? resourceCount = default(int?), IList<HealthErrorSummary> issues = default(IList<HealthErrorSummary>))
         {
             ResourceCount = resourceCount;
             Issues = issues;
-            CategorizedResourceCounts = categorizedResourceCounts;
             CustomInit();
         }
 
@@ -64,11 +61,5 @@ public ResourceHealthSummary()
         [JsonProperty(PropertyName = "issues")]
         public IList<HealthErrorSummary> Issues { get; set; }
 
-        /// <summary>
-        /// Gets or sets the categorized resource counts.
-        /// </summary>
-        [JsonProperty(PropertyName = "categorizedResourceCounts")]
-        public IDictionary<string, int?> CategorizedResourceCounts { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResyncInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResyncInput.cs
deleted file mode 100644
index aa5b3783b804..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResyncInput.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Microsoft.Rest;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Resync input.
-    /// </summary>
-    public partial class ResyncInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the ResyncInput class.
-        /// </summary>
-        public ResyncInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ResyncInput class.
-        /// </summary>
-        /// <param name="properties">Resync input properties.</param>
-        public ResyncInput(ResyncInputProperties properties)
-        {
-            Properties = properties;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets resync input properties.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties")]
-        public ResyncInputProperties Properties { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Properties == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Properties");
-            }
-            if (Properties != null)
-            {
-                Properties.Validate();
-            }
-        }
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResyncInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResyncInputProperties.cs
deleted file mode 100644
index 95374ed8452b..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ResyncInputProperties.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Microsoft.Rest;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Resync input properties.
-    /// </summary>
-    public partial class ResyncInputProperties
-    {
-        /// <summary>
-        /// Initializes a new instance of the ResyncInputProperties class.
-        /// </summary>
-        public ResyncInputProperties()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ResyncInputProperties class.
-        /// </summary>
-        /// <param name="providerSpecificDetails">The provider specific
-        /// details.</param>
-        public ResyncInputProperties(ResyncProviderSpecificInput providerSpecificDetails)
-        {
-            ProviderSpecificDetails = providerSpecificDetails;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the provider specific details.
-        /// </summary>
-        [JsonProperty(PropertyName = "providerSpecificDetails")]
-        public ResyncProviderSpecificInput ProviderSpecificDetails { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (ProviderSpecificDetails == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "ProviderSpecificDetails");
-            }
-        }
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReverseReplicationInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReverseReplicationInput.cs
index 629d75f48e5e..95bb25618b79 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReverseReplicationInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ReverseReplicationInput.cs
@@ -29,7 +29,7 @@ public ReverseReplicationInput()
         /// <summary>
         /// Initializes a new instance of the ReverseReplicationInput class.
         /// </summary>
-        /// <param name="properties">Reverse replication properties.</param>
+        /// <param name="properties">Reverse replication properties</param>
         public ReverseReplicationInput(ReverseReplicationInputProperties properties = default(ReverseReplicationInputProperties))
         {
             Properties = properties;
@@ -42,7 +42,7 @@ public ReverseReplicationInput()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets reverse replication properties.
+        /// Gets or sets reverse replication properties
         /// </summary>
         [JsonProperty(PropertyName = "properties")]
         public ReverseReplicationInputProperties Properties { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RoleAssignment.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RoleAssignment.cs
new file mode 100644
index 000000000000..4aee3fa65dd0
--- /dev/null
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/RoleAssignment.cs
@@ -0,0 +1,83 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Azure role assignment details.
+    /// </summary>
+    public partial class RoleAssignment
+    {
+        /// <summary>
+        /// Initializes a new instance of the RoleAssignment class.
+        /// </summary>
+        public RoleAssignment()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RoleAssignment class.
+        /// </summary>
+        /// <param name="id">The ARM Id of the role assignment.</param>
+        /// <param name="name">The name of the role assignment.</param>
+        /// <param name="scope">Role assignment scope.</param>
+        /// <param name="principalId">Principal Id.</param>
+        /// <param name="roleDefinitionId">Role definition id.</param>
+        public RoleAssignment(string id = default(string), string name = default(string), string scope = default(string), string principalId = default(string), string roleDefinitionId = default(string))
+        {
+            Id = id;
+            Name = name;
+            Scope = scope;
+            PrincipalId = principalId;
+            RoleDefinitionId = roleDefinitionId;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets the ARM Id of the role assignment.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the role assignment.
+        /// </summary>
+        [JsonProperty(PropertyName = "name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets role assignment scope.
+        /// </summary>
+        [JsonProperty(PropertyName = "scope")]
+        public string Scope { get; set; }
+
+        /// <summary>
+        /// Gets or sets principal Id.
+        /// </summary>
+        [JsonProperty(PropertyName = "principalId")]
+        public string PrincipalId { get; set; }
+
+        /// <summary>
+        /// Gets or sets role definition id.
+        /// </summary>
+        [JsonProperty(PropertyName = "roleDefinitionId")]
+        public string RoleDefinitionId { get; set; }
+
+    }
+}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverProviderSpecificFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SanEnableProtectionInput.cs
similarity index 69%
rename from sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverProviderSpecificFailoverInput.cs
rename to sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SanEnableProtectionInput.cs
index a48d6caf5e64..81e5ac538a71 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/PlannedFailoverProviderSpecificFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SanEnableProtectionInput.cs
@@ -10,18 +10,19 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
+    using Newtonsoft.Json;
     using System.Linq;
 
     /// <summary>
-    /// Provider specific failover input.
+    /// San enable protection provider specific input.
     /// </summary>
-    public partial class PlannedFailoverProviderSpecificFailoverInput
+    [Newtonsoft.Json.JsonObject("San")]
+    public partial class SanEnableProtectionInput : EnableProtectionProviderSpecificInput
     {
         /// <summary>
-        /// Initializes a new instance of the
-        /// PlannedFailoverProviderSpecificFailoverInput class.
+        /// Initializes a new instance of the SanEnableProtectionInput class.
         /// </summary>
-        public PlannedFailoverProviderSpecificFailoverInput()
+        public SanEnableProtectionInput()
         {
             CustomInit();
         }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ServiceError.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ServiceError.cs
index bc9d2999f5d1..7d44f18fc748 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ServiceError.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/ServiceError.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// ASR error model.
+    /// ASR error model
     /// </summary>
     public partial class ServiceError
     {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SqlServerLicenseType.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SqlServerLicenseType.cs
deleted file mode 100644
index 9211f0e4676d..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SqlServerLicenseType.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-
-    /// <summary>
-    /// Defines values for SqlServerLicenseType.
-    /// </summary>
-    public static class SqlServerLicenseType
-    {
-        public const string NotSpecified = "NotSpecified";
-        public const string NoLicenseType = "NoLicenseType";
-        public const string PAYG = "PAYG";
-        public const string AHUB = "AHUB";
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSDetails.cs
index bb8bf0973d0b..8f350561e668 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSDetails.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Supported operating system details.
+    /// Supported Operating system details.
     /// </summary>
     public partial class SupportedOSDetails
     {
@@ -33,8 +33,7 @@ public SupportedOSDetails()
         /// </summary>
         /// <param name="osName">The name.</param>
         /// <param name="osType">The type.</param>
-        /// <param name="osVersions">The list of version for operating
-        /// system.</param>
+        /// <param name="osVersions">List of version for OS.</param>
         public SupportedOSDetails(string osName = default(string), string osType = default(string), IList<OSVersionWrapper> osVersions = default(IList<OSVersionWrapper>))
         {
             OsName = osName;
@@ -61,7 +60,7 @@ public SupportedOSDetails()
         public string OsType { get; set; }
 
         /// <summary>
-        /// Gets or sets the list of version for operating system.
+        /// Gets or sets list of version for OS.
         /// </summary>
         [JsonProperty(PropertyName = "osVersions")]
         public IList<OSVersionWrapper> OsVersions { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSProperties.cs
index b65d6f3650cd..0aca6e59620a 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSProperties.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Supported operating systems properties.
+    /// Properties model for supported OS API.
     /// </summary>
     public partial class SupportedOSProperties
     {
@@ -31,8 +31,7 @@ public SupportedOSProperties()
         /// <summary>
         /// Initializes a new instance of the SupportedOSProperties class.
         /// </summary>
-        /// <param name="supportedOsList">The supported operating systems
-        /// property list.</param>
+        /// <param name="supportedOsList">The supported OS List.</param>
         public SupportedOSProperties(IList<SupportedOSProperty> supportedOsList = default(IList<SupportedOSProperty>))
         {
             SupportedOsList = supportedOsList;
@@ -45,7 +44,7 @@ public SupportedOSProperties()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the supported operating systems property list.
+        /// Gets or sets the supported OS List.
         /// </summary>
         [JsonProperty(PropertyName = "supportedOsList")]
         public IList<SupportedOSProperty> SupportedOsList { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSProperty.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSProperty.cs
index 97989f11f22c..3bdccca16722 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSProperty.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOSProperty.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Supported operating systems property.
+    /// Property object for supported OS api.
     /// </summary>
     public partial class SupportedOSProperty
     {
@@ -31,9 +31,9 @@ public SupportedOSProperty()
         /// <summary>
         /// Initializes a new instance of the SupportedOSProperty class.
         /// </summary>
-        /// <param name="instanceType">The replication provider type.</param>
-        /// <param name="supportedOs">The list of supported operating
-        /// systems.</param>
+        /// <param name="instanceType">Gets the replication provider
+        /// type.</param>
+        /// <param name="supportedOs">List of supported OS.</param>
         public SupportedOSProperty(string instanceType = default(string), IList<SupportedOSDetails> supportedOs = default(IList<SupportedOSDetails>))
         {
             InstanceType = instanceType;
@@ -47,13 +47,13 @@ public SupportedOSProperty()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the replication provider type.
+        /// Gets the replication provider type.
         /// </summary>
         [JsonProperty(PropertyName = "instanceType")]
-        public string InstanceType { get; set; }
+        public string InstanceType { get; private set; }
 
         /// <summary>
-        /// Gets or sets the list of supported operating systems.
+        /// Gets or sets list of supported OS.
         /// </summary>
         [JsonProperty(PropertyName = "supportedOs")]
         public IList<SupportedOSDetails> SupportedOs { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOperatingSystems.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOperatingSystems.cs
index 70cdaf071d7a..3525d2eeed82 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOperatingSystems.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SupportedOperatingSystems.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// Supported operating systems.
+    /// Response object for supported operating systems API.
     /// </summary>
     public partial class SupportedOperatingSystems : Resource
     {
@@ -33,8 +33,8 @@ public SupportedOperatingSystems()
         /// <param name="name">Resource Name</param>
         /// <param name="type">Resource Type</param>
         /// <param name="location">Resource Location</param>
-        /// <param name="properties">The supported operating systems
-        /// properties.</param>
+        /// <param name="properties">Properties model for supported OS
+        /// API.</param>
         public SupportedOperatingSystems(string id = default(string), string name = default(string), string type = default(string), string location = default(string), SupportedOSProperties properties = default(SupportedOSProperties))
             : base(id, name, type, location)
         {
@@ -48,7 +48,7 @@ public SupportedOperatingSystems()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the supported operating systems properties.
+        /// Gets or sets properties model for supported OS API.
         /// </summary>
         [JsonProperty(PropertyName = "properties")]
         public SupportedOSProperties Properties { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SwitchProtectionInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SwitchProtectionInput.cs
index 5c4c0336a681..b11ff7f7d562 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SwitchProtectionInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/SwitchProtectionInput.cs
@@ -29,7 +29,7 @@ public SwitchProtectionInput()
         /// <summary>
         /// Initializes a new instance of the SwitchProtectionInput class.
         /// </summary>
-        /// <param name="properties">Switch protection properties.</param>
+        /// <param name="properties">Switch protection properties</param>
         public SwitchProtectionInput(SwitchProtectionInputProperties properties = default(SwitchProtectionInputProperties))
         {
             Properties = properties;
@@ -42,7 +42,7 @@ public SwitchProtectionInput()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets switch protection properties.
+        /// Gets or sets switch protection properties
         /// </summary>
         [JsonProperty(PropertyName = "properties")]
         public SwitchProtectionInputProperties Properties { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TargetComputeSizeProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TargetComputeSizeProperties.cs
index 700ce189a3a9..feb083db72e8 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TargetComputeSizeProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TargetComputeSizeProperties.cs
@@ -133,10 +133,10 @@ public TargetComputeSizeProperties()
         public string HighIopsSupported { get; set; }
 
         /// <summary>
-        /// Gets or sets the supported HyperV Generations.
+        /// Gets the supported HyperV Generations.
         /// </summary>
         [JsonProperty(PropertyName = "hyperVGenerations")]
-        public IList<string> HyperVGenerations { get; set; }
+        public IList<string> HyperVGenerations { get; private set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverCleanupInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverCleanupInput.cs
index df4494989bb4..c9213927ce18 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverCleanupInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverCleanupInput.cs
@@ -61,10 +61,6 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Properties");
             }
-            if (Properties != null)
-            {
-                Properties.Validate();
-            }
         }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverCleanupInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverCleanupInputProperties.cs
index 60696e21e3a1..903ca6ab9307 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverCleanupInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverCleanupInputProperties.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -50,21 +49,5 @@ public TestFailoverCleanupInputProperties()
         [JsonProperty(PropertyName = "comments")]
         public string Comments { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Comments != null)
-            {
-                if (Comments.Length > 1024)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "Comments", 1024);
-                }
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverInput.cs
index f100453fb0a8..958c4ffcda77 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -30,8 +29,8 @@ public TestFailoverInput()
         /// <summary>
         /// Initializes a new instance of the TestFailoverInput class.
         /// </summary>
-        /// <param name="properties">Test failover input properties.</param>
-        public TestFailoverInput(TestFailoverInputProperties properties)
+        /// <param name="properties">test failover input properties</param>
+        public TestFailoverInput(TestFailoverInputProperties properties = default(TestFailoverInputProperties))
         {
             Properties = properties;
             CustomInit();
@@ -43,23 +42,10 @@ public TestFailoverInput(TestFailoverInputProperties properties)
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets test failover input properties.
+        /// Gets or sets test failover input properties
         /// </summary>
         [JsonProperty(PropertyName = "properties")]
         public TestFailoverInputProperties Properties { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Properties == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Properties");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverInputProperties.cs
index b2eb3df6c60e..cf62d4a0e63e 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestFailoverInputProperties.cs
@@ -35,14 +35,17 @@ public TestFailoverInputProperties()
         /// <param name="networkType">Network type to be used for test
         /// failover.</param>
         /// <param name="networkId">The id of the network to be used for test
-        /// failover.</param>
+        /// failover</param>
+        /// <param name="skipTestFailoverCleanup">A value indicating whether
+        /// the test failover cleanup is to be skipped.</param>
         /// <param name="providerSpecificDetails">Provider specific
-        /// settings.</param>
-        public TestFailoverInputProperties(string failoverDirection = default(string), string networkType = default(string), string networkId = default(string), TestFailoverProviderSpecificInput providerSpecificDetails = default(TestFailoverProviderSpecificInput))
+        /// settings</param>
+        public TestFailoverInputProperties(string failoverDirection = default(string), string networkType = default(string), string networkId = default(string), string skipTestFailoverCleanup = default(string), TestFailoverProviderSpecificInput providerSpecificDetails = default(TestFailoverProviderSpecificInput))
         {
             FailoverDirection = failoverDirection;
             NetworkType = networkType;
             NetworkId = networkId;
+            SkipTestFailoverCleanup = skipTestFailoverCleanup;
             ProviderSpecificDetails = providerSpecificDetails;
             CustomInit();
         }
@@ -65,13 +68,20 @@ public TestFailoverInputProperties()
         public string NetworkType { get; set; }
 
         /// <summary>
-        /// Gets or sets the id of the network to be used for test failover.
+        /// Gets or sets the id of the network to be used for test failover
         /// </summary>
         [JsonProperty(PropertyName = "networkId")]
         public string NetworkId { get; set; }
 
         /// <summary>
-        /// Gets or sets provider specific settings.
+        /// Gets or sets a value indicating whether the test failover cleanup
+        /// is to be skipped.
+        /// </summary>
+        [JsonProperty(PropertyName = "skipTestFailoverCleanup")]
+        public string SkipTestFailoverCleanup { get; set; }
+
+        /// <summary>
+        /// Gets or sets provider specific settings
         /// </summary>
         [JsonProperty(PropertyName = "providerSpecificDetails")]
         public TestFailoverProviderSpecificInput ProviderSpecificDetails { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestMigrateCleanupInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestMigrateCleanupInput.cs
index 3574ea3f5940..120038f6470a 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestMigrateCleanupInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestMigrateCleanupInput.cs
@@ -61,10 +61,6 @@ public virtual void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Properties");
             }
-            if (Properties != null)
-            {
-                Properties.Validate();
-            }
         }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestMigrateCleanupInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestMigrateCleanupInputProperties.cs
index 32b37896e33c..4a3575b1d749 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestMigrateCleanupInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/TestMigrateCleanupInputProperties.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -50,21 +49,5 @@ public TestMigrateCleanupInputProperties()
         [JsonProperty(PropertyName = "comments")]
         public string Comments { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Comments != null)
-            {
-                if (Comments.Length > 1024)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "Comments", 1024);
-                }
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UnplannedFailoverInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UnplannedFailoverInput.cs
index fe9ce95e0d2e..cb0977f946c1 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UnplannedFailoverInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UnplannedFailoverInput.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
-    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -32,7 +31,7 @@ public UnplannedFailoverInput()
         /// </summary>
         /// <param name="properties">Unplanned failover input
         /// properties.</param>
-        public UnplannedFailoverInput(UnplannedFailoverInputProperties properties)
+        public UnplannedFailoverInput(UnplannedFailoverInputProperties properties = default(UnplannedFailoverInputProperties))
         {
             Properties = properties;
             CustomInit();
@@ -49,18 +48,5 @@ public UnplannedFailoverInput(UnplannedFailoverInputProperties properties)
         [JsonProperty(PropertyName = "properties")]
         public UnplannedFailoverInputProperties Properties { get; set; }
 
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (Properties == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "Properties");
-            }
-        }
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UnplannedFailoverInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UnplannedFailoverInputProperties.cs
index 8a7fd3df6051..d49243995f90 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UnplannedFailoverInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UnplannedFailoverInputProperties.cs
@@ -33,9 +33,9 @@ public UnplannedFailoverInputProperties()
         /// </summary>
         /// <param name="failoverDirection">Failover direction.</param>
         /// <param name="sourceSiteOperations">Source site operations
-        /// status.</param>
+        /// status</param>
         /// <param name="providerSpecificDetails">Provider specific
-        /// settings.</param>
+        /// settings</param>
         public UnplannedFailoverInputProperties(string failoverDirection = default(string), string sourceSiteOperations = default(string), UnplannedFailoverProviderSpecificInput providerSpecificDetails = default(UnplannedFailoverProviderSpecificInput))
         {
             FailoverDirection = failoverDirection;
@@ -56,13 +56,13 @@ public UnplannedFailoverInputProperties()
         public string FailoverDirection { get; set; }
 
         /// <summary>
-        /// Gets or sets source site operations status.
+        /// Gets or sets source site operations status
         /// </summary>
         [JsonProperty(PropertyName = "sourceSiteOperations")]
         public string SourceSiteOperations { get; set; }
 
         /// <summary>
-        /// Gets or sets provider specific settings.
+        /// Gets or sets provider specific settings
         /// </summary>
         [JsonProperty(PropertyName = "providerSpecificDetails")]
         public UnplannedFailoverProviderSpecificInput ProviderSpecificDetails { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UpdateReplicationProtectedItemInputProperties.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UpdateReplicationProtectedItemInputProperties.cs
index d66b9ee49893..12e3f5756750 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UpdateReplicationProtectedItemInputProperties.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/UpdateReplicationProtectedItemInputProperties.cs
@@ -33,9 +33,9 @@ public UpdateReplicationProtectedItemInputProperties()
         /// Initializes a new instance of the
         /// UpdateReplicationProtectedItemInputProperties class.
         /// </summary>
-        /// <param name="recoveryAzureVMName">Target Azure VM name given by the
+        /// <param name="recoveryAzureVMName">Target azure VM name given by the
         /// user.</param>
-        /// <param name="recoveryAzureVMSize">Target Azure VM size.</param>
+        /// <param name="recoveryAzureVMSize">Target Azure Vm size.</param>
         /// <param name="selectedRecoveryAzureNetworkId">Target Azure Network
         /// Id.</param>
         /// <param name="selectedTfoAzureNetworkId">The Azure Network Id for
@@ -44,12 +44,12 @@ public UpdateReplicationProtectedItemInputProperties()
         /// will be used as the primary nic during failover.</param>
         /// <param name="enableRdpOnTargetOption">The selected option to enable
         /// RDP\SSH on target vm after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.</param>
-        /// <param name="vmNics">The list of VM nic details.</param>
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.</param>
+        /// <param name="vmNics">The list of vm nic details.</param>
         /// <param name="licenseType">License type. Possible values include:
         /// 'NotSpecified', 'NoLicenseType', 'WindowsServer'</param>
         /// <param name="recoveryAvailabilitySetId">The target availability set
-        /// Id.</param>
+        /// id.</param>
         /// <param name="providerSpecificDetails">The provider specific input
         /// to update replication protected item.</param>
         public UpdateReplicationProtectedItemInputProperties(string recoveryAzureVMName = default(string), string recoveryAzureVMSize = default(string), string selectedRecoveryAzureNetworkId = default(string), string selectedTfoAzureNetworkId = default(string), string selectedSourceNicId = default(string), string enableRdpOnTargetOption = default(string), IList<VMNicInputDetails> vmNics = default(IList<VMNicInputDetails>), string licenseType = default(string), string recoveryAvailabilitySetId = default(string), UpdateReplicationProtectedItemProviderInput providerSpecificDetails = default(UpdateReplicationProtectedItemProviderInput))
@@ -73,13 +73,13 @@ public UpdateReplicationProtectedItemInputProperties()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets target Azure VM name given by the user.
+        /// Gets or sets target azure VM name given by the user.
         /// </summary>
         [JsonProperty(PropertyName = "recoveryAzureVMName")]
         public string RecoveryAzureVMName { get; set; }
 
         /// <summary>
-        /// Gets or sets target Azure VM size.
+        /// Gets or sets target Azure Vm size.
         /// </summary>
         [JsonProperty(PropertyName = "recoveryAzureVMSize")]
         public string RecoveryAzureVMSize { get; set; }
@@ -106,13 +106,13 @@ public UpdateReplicationProtectedItemInputProperties()
         /// <summary>
         /// Gets or sets the selected option to enable RDP\SSH on target vm
         /// after failover. String value of
-        /// SrsDataContract.EnableRDPOnTargetOption enum.
+        /// {SrsDataContract.EnableRDPOnTargetOption} enum.
         /// </summary>
         [JsonProperty(PropertyName = "enableRdpOnTargetOption")]
         public string EnableRdpOnTargetOption { get; set; }
 
         /// <summary>
-        /// Gets or sets the list of VM nic details.
+        /// Gets or sets the list of vm nic details.
         /// </summary>
         [JsonProperty(PropertyName = "vmNics")]
         public IList<VMNicInputDetails> VmNics { get; set; }
@@ -125,7 +125,7 @@ public UpdateReplicationProtectedItemInputProperties()
         public string LicenseType { get; set; }
 
         /// <summary>
-        /// Gets or sets the target availability set Id.
+        /// Gets or sets the target availability set id.
         /// </summary>
         [JsonProperty(PropertyName = "recoveryAvailabilitySetId")]
         public string RecoveryAvailabilitySetId { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMNicDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMNicDetails.cs
index 638aa32af69d..071d487cfdea 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMNicDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMNicDetails.cs
@@ -34,21 +34,37 @@ public VMNicDetails()
         /// <param name="nicId">The nic Id.</param>
         /// <param name="replicaNicId">The replica nic Id.</param>
         /// <param name="sourceNicArmId">The source nic ARM Id.</param>
+        /// <param name="vMSubnetName">VM subnet name.</param>
         /// <param name="vMNetworkName">VM network name.</param>
         /// <param name="recoveryVMNetworkId">Recovery VM network Id.</param>
-        /// <param name="ipConfigs">The IP configurations of the NIC.</param>
+        /// <param name="recoveryVMSubnetName">Recovery VM subnet name.</param>
+        /// <param name="ipAddressType">Ip address type.</param>
+        /// <param name="primaryNicStaticIPAddress">Primary nic static IP
+        /// address.</param>
+        /// <param name="replicaNicStaticIPAddress">Replica nic static IP
+        /// address.</param>
         /// <param name="selectionType">Selection type for failover.</param>
+        /// <param name="recoveryNicIpAddressType">IP allocation type for
+        /// recovery VM.</param>
+        /// <param name="recoveryPublicIpAddressId">The id of the public IP
+        /// address resource associated with the NIC.</param>
         /// <param name="recoveryNetworkSecurityGroupId">The id of the NSG
         /// associated with the NIC.</param>
+        /// <param name="recoveryLBBackendAddressPoolIds">The target backend
+        /// address pools for the NIC.</param>
         /// <param name="enableAcceleratedNetworkingOnRecovery">A value
         /// indicating whether the NIC has accelerated networking
         /// enabled.</param>
         /// <param name="tfoVMNetworkId">The network to be used by NIC during
         /// test failover.</param>
+        /// <param name="tfoVMSubnetName">The subnet to be used by NIC during
+        /// test failover.</param>
         /// <param name="tfoNetworkSecurityGroupId">The NSG to be used by NIC
         /// during test failover.</param>
-        /// <param name="enableAcceleratedNetworkingOnTfo">Whether the TFO NIC
-        /// has accelerated networking enabled.</param>
+        /// <param name="enableAcceleratedNetworkingOnTfo">Whether the test
+        /// failover NIC has accelerated networking enabled.</param>
+        /// <param name="tfoIPConfigs">The IP configurations to be used by NIC
+        /// during test failover.</param>
         /// <param name="recoveryNicName">The name of the NIC to be used when
         /// creating target NICs.</param>
         /// <param name="recoveryNicResourceGroupName">The resource group of
@@ -63,20 +79,29 @@ public VMNicDetails()
         /// <param name="tfoReuseExistingNic">A value indicating whether an
         /// existing NIC is allowed to be reused during test failover subject
         /// to availability.</param>
-        public VMNicDetails(string nicId = default(string), string replicaNicId = default(string), string sourceNicArmId = default(string), string vMNetworkName = default(string), string recoveryVMNetworkId = default(string), IList<IPConfigDetails> ipConfigs = default(IList<IPConfigDetails>), string selectionType = default(string), string recoveryNetworkSecurityGroupId = default(string), bool? enableAcceleratedNetworkingOnRecovery = default(bool?), string tfoVMNetworkId = default(string), string tfoNetworkSecurityGroupId = default(string), bool? enableAcceleratedNetworkingOnTfo = default(bool?), string recoveryNicName = default(string), string recoveryNicResourceGroupName = default(string), bool? reuseExistingNic = default(bool?), string tfoRecoveryNicName = default(string), string tfoRecoveryNicResourceGroupName = default(string), bool? tfoReuseExistingNic = default(bool?))
+        public VMNicDetails(string nicId = default(string), string replicaNicId = default(string), string sourceNicArmId = default(string), string vMSubnetName = default(string), string vMNetworkName = default(string), string recoveryVMNetworkId = default(string), string recoveryVMSubnetName = default(string), string ipAddressType = default(string), string primaryNicStaticIPAddress = default(string), string replicaNicStaticIPAddress = default(string), string selectionType = default(string), string recoveryNicIpAddressType = default(string), string recoveryPublicIpAddressId = default(string), string recoveryNetworkSecurityGroupId = default(string), IList<string> recoveryLBBackendAddressPoolIds = default(IList<string>), bool? enableAcceleratedNetworkingOnRecovery = default(bool?), string tfoVMNetworkId = default(string), string tfoVMSubnetName = default(string), string tfoNetworkSecurityGroupId = default(string), bool? enableAcceleratedNetworkingOnTfo = default(bool?), IList<IPConfig> tfoIPConfigs = default(IList<IPConfig>), string recoveryNicName = default(string), string recoveryNicResourceGroupName = default(string), bool? reuseExistingNic = default(bool?), string tfoRecoveryNicName = default(string), string tfoRecoveryNicResourceGroupName = default(string), bool? tfoReuseExistingNic = default(bool?))
         {
             NicId = nicId;
             ReplicaNicId = replicaNicId;
             SourceNicArmId = sourceNicArmId;
+            VMSubnetName = vMSubnetName;
             VMNetworkName = vMNetworkName;
             RecoveryVMNetworkId = recoveryVMNetworkId;
-            IpConfigs = ipConfigs;
+            RecoveryVMSubnetName = recoveryVMSubnetName;
+            IpAddressType = ipAddressType;
+            PrimaryNicStaticIPAddress = primaryNicStaticIPAddress;
+            ReplicaNicStaticIPAddress = replicaNicStaticIPAddress;
             SelectionType = selectionType;
+            RecoveryNicIpAddressType = recoveryNicIpAddressType;
+            RecoveryPublicIpAddressId = recoveryPublicIpAddressId;
             RecoveryNetworkSecurityGroupId = recoveryNetworkSecurityGroupId;
+            RecoveryLBBackendAddressPoolIds = recoveryLBBackendAddressPoolIds;
             EnableAcceleratedNetworkingOnRecovery = enableAcceleratedNetworkingOnRecovery;
             TfoVMNetworkId = tfoVMNetworkId;
+            TfoVMSubnetName = tfoVMSubnetName;
             TfoNetworkSecurityGroupId = tfoNetworkSecurityGroupId;
             EnableAcceleratedNetworkingOnTfo = enableAcceleratedNetworkingOnTfo;
+            TfoIPConfigs = tfoIPConfigs;
             RecoveryNicName = recoveryNicName;
             RecoveryNicResourceGroupName = recoveryNicResourceGroupName;
             ReuseExistingNic = reuseExistingNic;
@@ -109,6 +134,12 @@ public VMNicDetails()
         [JsonProperty(PropertyName = "sourceNicArmId")]
         public string SourceNicArmId { get; set; }
 
+        /// <summary>
+        /// Gets or sets VM subnet name.
+        /// </summary>
+        [JsonProperty(PropertyName = "vMSubnetName")]
+        public string VMSubnetName { get; set; }
+
         /// <summary>
         /// Gets or sets VM network name.
         /// </summary>
@@ -122,10 +153,28 @@ public VMNicDetails()
         public string RecoveryVMNetworkId { get; set; }
 
         /// <summary>
-        /// Gets or sets the IP configurations of the NIC.
+        /// Gets or sets recovery VM subnet name.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryVMSubnetName")]
+        public string RecoveryVMSubnetName { get; set; }
+
+        /// <summary>
+        /// Gets or sets ip address type.
         /// </summary>
-        [JsonProperty(PropertyName = "ipConfigs")]
-        public IList<IPConfigDetails> IpConfigs { get; set; }
+        [JsonProperty(PropertyName = "ipAddressType")]
+        public string IpAddressType { get; set; }
+
+        /// <summary>
+        /// Gets or sets primary nic static IP address.
+        /// </summary>
+        [JsonProperty(PropertyName = "primaryNicStaticIPAddress")]
+        public string PrimaryNicStaticIPAddress { get; set; }
+
+        /// <summary>
+        /// Gets or sets replica nic static IP address.
+        /// </summary>
+        [JsonProperty(PropertyName = "replicaNicStaticIPAddress")]
+        public string ReplicaNicStaticIPAddress { get; set; }
 
         /// <summary>
         /// Gets or sets selection type for failover.
@@ -133,12 +182,31 @@ public VMNicDetails()
         [JsonProperty(PropertyName = "selectionType")]
         public string SelectionType { get; set; }
 
+        /// <summary>
+        /// Gets or sets IP allocation type for recovery VM.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryNicIpAddressType")]
+        public string RecoveryNicIpAddressType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id of the public IP address resource associated
+        /// with the NIC.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryPublicIpAddressId")]
+        public string RecoveryPublicIpAddressId { get; set; }
+
         /// <summary>
         /// Gets or sets the id of the NSG associated with the NIC.
         /// </summary>
         [JsonProperty(PropertyName = "recoveryNetworkSecurityGroupId")]
         public string RecoveryNetworkSecurityGroupId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the target backend address pools for the NIC.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryLBBackendAddressPoolIds")]
+        public IList<string> RecoveryLBBackendAddressPoolIds { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether the NIC has accelerated
         /// networking enabled.
@@ -152,6 +220,12 @@ public VMNicDetails()
         [JsonProperty(PropertyName = "tfoVMNetworkId")]
         public string TfoVMNetworkId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the subnet to be used by NIC during test failover.
+        /// </summary>
+        [JsonProperty(PropertyName = "tfoVMSubnetName")]
+        public string TfoVMSubnetName { get; set; }
+
         /// <summary>
         /// Gets or sets the NSG to be used by NIC during test failover.
         /// </summary>
@@ -159,12 +233,19 @@ public VMNicDetails()
         public string TfoNetworkSecurityGroupId { get; set; }
 
         /// <summary>
-        /// Gets or sets whether the TFO NIC has accelerated networking
-        /// enabled.
+        /// Gets or sets whether the test failover NIC has accelerated
+        /// networking enabled.
         /// </summary>
         [JsonProperty(PropertyName = "enableAcceleratedNetworkingOnTfo")]
         public bool? EnableAcceleratedNetworkingOnTfo { get; set; }
 
+        /// <summary>
+        /// Gets or sets the IP configurations to be used by NIC during test
+        /// failover.
+        /// </summary>
+        [JsonProperty(PropertyName = "tfoIPConfigs")]
+        public IList<IPConfig> TfoIPConfigs { get; set; }
+
         /// <summary>
         /// Gets or sets the name of the NIC to be used when creating target
         /// NICs.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMNicInputDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMNicInputDetails.cs
index 1e31de9704e7..69097f452d11 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMNicInputDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMNicInputDetails.cs
@@ -32,17 +32,26 @@ public VMNicInputDetails()
         /// Initializes a new instance of the VMNicInputDetails class.
         /// </summary>
         /// <param name="nicId">The nic Id.</param>
-        /// <param name="ipConfigs">The IP configurations to be used by NIC
-        /// during test failover and failover.</param>
+        /// <param name="recoveryVMSubnetName">Recovery VM subnet name.</param>
+        /// <param name="replicaNicStaticIPAddress">Replica nic static IP
+        /// address.</param>
         /// <param name="selectionType">Selection type for failover.</param>
+        /// <param name="recoveryPublicIpAddressId">The id of the public IP
+        /// address resource associated with the NIC.</param>
         /// <param name="recoveryNetworkSecurityGroupId">The id of the NSG
         /// associated with the NIC.</param>
+        /// <param name="recoveryLBBackendAddressPoolIds">The target backend
+        /// address pools for the NIC.</param>
         /// <param name="enableAcceleratedNetworkingOnRecovery">Whether the NIC
         /// has accelerated networking enabled.</param>
+        /// <param name="tfoVMSubnetName">The subnet to be used by NIC during
+        /// test failover.</param>
         /// <param name="tfoNetworkSecurityGroupId">The NSG to be used by NIC
         /// during test failover.</param>
         /// <param name="enableAcceleratedNetworkingOnTfo">Whether the test NIC
         /// has accelerated networking enabled.</param>
+        /// <param name="tfoIPConfigs">The IP configurations to be used by NIC
+        /// during test failover.</param>
         /// <param name="recoveryNicName">The name of the NIC to be used when
         /// creating target NICs.</param>
         /// <param name="recoveryNicResourceGroupName">The resource group of
@@ -57,15 +66,20 @@ public VMNicInputDetails()
         /// <param name="tfoReuseExistingNic">A value indicating whether an
         /// existing NIC is allowed to be reused during test failover subject
         /// to availability.</param>
-        public VMNicInputDetails(string nicId = default(string), IList<IPConfigInputDetails> ipConfigs = default(IList<IPConfigInputDetails>), string selectionType = default(string), string recoveryNetworkSecurityGroupId = default(string), bool? enableAcceleratedNetworkingOnRecovery = default(bool?), string tfoNetworkSecurityGroupId = default(string), bool? enableAcceleratedNetworkingOnTfo = default(bool?), string recoveryNicName = default(string), string recoveryNicResourceGroupName = default(string), bool? reuseExistingNic = default(bool?), string tfoNicName = default(string), string tfoNicResourceGroupName = default(string), bool? tfoReuseExistingNic = default(bool?))
+        public VMNicInputDetails(string nicId = default(string), string recoveryVMSubnetName = default(string), string replicaNicStaticIPAddress = default(string), string selectionType = default(string), string recoveryPublicIpAddressId = default(string), string recoveryNetworkSecurityGroupId = default(string), IList<string> recoveryLBBackendAddressPoolIds = default(IList<string>), bool? enableAcceleratedNetworkingOnRecovery = default(bool?), string tfoVMSubnetName = default(string), string tfoNetworkSecurityGroupId = default(string), bool? enableAcceleratedNetworkingOnTfo = default(bool?), IList<IPConfig> tfoIPConfigs = default(IList<IPConfig>), string recoveryNicName = default(string), string recoveryNicResourceGroupName = default(string), bool? reuseExistingNic = default(bool?), string tfoNicName = default(string), string tfoNicResourceGroupName = default(string), bool? tfoReuseExistingNic = default(bool?))
         {
             NicId = nicId;
-            IpConfigs = ipConfigs;
+            RecoveryVMSubnetName = recoveryVMSubnetName;
+            ReplicaNicStaticIPAddress = replicaNicStaticIPAddress;
             SelectionType = selectionType;
+            RecoveryPublicIpAddressId = recoveryPublicIpAddressId;
             RecoveryNetworkSecurityGroupId = recoveryNetworkSecurityGroupId;
+            RecoveryLBBackendAddressPoolIds = recoveryLBBackendAddressPoolIds;
             EnableAcceleratedNetworkingOnRecovery = enableAcceleratedNetworkingOnRecovery;
+            TfoVMSubnetName = tfoVMSubnetName;
             TfoNetworkSecurityGroupId = tfoNetworkSecurityGroupId;
             EnableAcceleratedNetworkingOnTfo = enableAcceleratedNetworkingOnTfo;
+            TfoIPConfigs = tfoIPConfigs;
             RecoveryNicName = recoveryNicName;
             RecoveryNicResourceGroupName = recoveryNicResourceGroupName;
             ReuseExistingNic = reuseExistingNic;
@@ -87,11 +101,16 @@ public VMNicInputDetails()
         public string NicId { get; set; }
 
         /// <summary>
-        /// Gets or sets the IP configurations to be used by NIC during test
-        /// failover and failover.
+        /// Gets or sets recovery VM subnet name.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryVMSubnetName")]
+        public string RecoveryVMSubnetName { get; set; }
+
+        /// <summary>
+        /// Gets or sets replica nic static IP address.
         /// </summary>
-        [JsonProperty(PropertyName = "ipConfigs")]
-        public IList<IPConfigInputDetails> IpConfigs { get; set; }
+        [JsonProperty(PropertyName = "replicaNicStaticIPAddress")]
+        public string ReplicaNicStaticIPAddress { get; set; }
 
         /// <summary>
         /// Gets or sets selection type for failover.
@@ -99,18 +118,37 @@ public VMNicInputDetails()
         [JsonProperty(PropertyName = "selectionType")]
         public string SelectionType { get; set; }
 
+        /// <summary>
+        /// Gets or sets the id of the public IP address resource associated
+        /// with the NIC.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryPublicIpAddressId")]
+        public string RecoveryPublicIpAddressId { get; set; }
+
         /// <summary>
         /// Gets or sets the id of the NSG associated with the NIC.
         /// </summary>
         [JsonProperty(PropertyName = "recoveryNetworkSecurityGroupId")]
         public string RecoveryNetworkSecurityGroupId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the target backend address pools for the NIC.
+        /// </summary>
+        [JsonProperty(PropertyName = "recoveryLBBackendAddressPoolIds")]
+        public IList<string> RecoveryLBBackendAddressPoolIds { get; set; }
+
         /// <summary>
         /// Gets or sets whether the NIC has accelerated networking enabled.
         /// </summary>
         [JsonProperty(PropertyName = "enableAcceleratedNetworkingOnRecovery")]
         public bool? EnableAcceleratedNetworkingOnRecovery { get; set; }
 
+        /// <summary>
+        /// Gets or sets the subnet to be used by NIC during test failover.
+        /// </summary>
+        [JsonProperty(PropertyName = "tfoVMSubnetName")]
+        public string TfoVMSubnetName { get; set; }
+
         /// <summary>
         /// Gets or sets the NSG to be used by NIC during test failover.
         /// </summary>
@@ -124,6 +162,13 @@ public VMNicInputDetails()
         [JsonProperty(PropertyName = "enableAcceleratedNetworkingOnTfo")]
         public bool? EnableAcceleratedNetworkingOnTfo { get; set; }
 
+        /// <summary>
+        /// Gets or sets the IP configurations to be used by NIC during test
+        /// failover.
+        /// </summary>
+        [JsonProperty(PropertyName = "tfoIPConfigs")]
+        public IList<IPConfig> TfoIPConfigs { get; set; }
+
         /// <summary>
         /// Gets or sets the name of the NIC to be used when creating target
         /// NICs.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtContainerCreationInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtContainerCreationInput.cs
index f5e6871eeb04..ac3d992f5383 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtContainerCreationInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtContainerCreationInput.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     /// <summary>
     /// VMwareCbt container creation input.
     /// </summary>
-    [Newtonsoft.Json.JsonObject("VMwareCbt")]
+    [Newtonsoft.Json.JsonObject("6c7da455-506f-43ff-a16a-8eb101aebb70")]
     public partial class VMwareCbtContainerCreationInput : ReplicationProviderSpecificContainerCreationInput
     {
         /// <summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtDiskInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtDiskInput.cs
index 24f4143429eb..022d114aa3ee 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtDiskInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtDiskInput.cs
@@ -39,16 +39,13 @@ public VMwareCbtDiskInput()
         /// name of the log storage account.</param>
         /// <param name="diskType">The disk type. Possible values include:
         /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'</param>
-        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
-        /// Id.</param>
-        public VMwareCbtDiskInput(string diskId, string isOSDisk, string logStorageAccountId, string logStorageAccountSasSecretName, string diskType = default(string), string diskEncryptionSetId = default(string))
+        public VMwareCbtDiskInput(string diskId, string isOSDisk, string logStorageAccountId, string logStorageAccountSasSecretName, string diskType = default(string))
         {
             DiskId = diskId;
-            DiskType = diskType;
             IsOSDisk = isOSDisk;
             LogStorageAccountId = logStorageAccountId;
             LogStorageAccountSasSecretName = logStorageAccountSasSecretName;
-            DiskEncryptionSetId = diskEncryptionSetId;
+            DiskType = diskType;
             CustomInit();
         }
 
@@ -63,13 +60,6 @@ public VMwareCbtDiskInput()
         [JsonProperty(PropertyName = "diskId")]
         public string DiskId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the disk type. Possible values include:
-        /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'
-        /// </summary>
-        [JsonProperty(PropertyName = "diskType")]
-        public string DiskType { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether the disk is the OS disk.
         /// </summary>
@@ -89,10 +79,11 @@ public VMwareCbtDiskInput()
         public string LogStorageAccountSasSecretName { get; set; }
 
         /// <summary>
-        /// Gets or sets the DiskEncryptionSet ARM Id.
+        /// Gets or sets the disk type. Possible values include:
+        /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'
         /// </summary>
-        [JsonProperty(PropertyName = "diskEncryptionSetId")]
-        public string DiskEncryptionSetId { get; set; }
+        [JsonProperty(PropertyName = "diskType")]
+        public string DiskType { get; set; }
 
         /// <summary>
         /// Validate the object.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtEnableMigrationInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtEnableMigrationInput.cs
index 9d907c910ef0..f56f563a1290 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtEnableMigrationInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtEnableMigrationInput.cs
@@ -38,41 +38,27 @@ public VMwareCbtEnableMigrationInput()
         /// <param name="vmwareMachineId">The ARM Id of the VM discovered in
         /// VMware.</param>
         /// <param name="disksToInclude">The disks to include list.</param>
-        /// <param name="dataMoverRunAsAccountId">The data mover run as account
+        /// <param name="dataMoverRunAsAccountId">The data mover RunAs account
         /// Id.</param>
-        /// <param name="snapshotRunAsAccountId">The snapshot run as account
+        /// <param name="snapshotRunAsAccountId">The snapshot RunAs account
         /// Id.</param>
         /// <param name="targetResourceGroupId">The target resource group ARM
         /// Id.</param>
         /// <param name="targetNetworkId">The target network ARM Id.</param>
         /// <param name="licenseType">License type. Possible values include:
         /// 'NotSpecified', 'NoLicenseType', 'WindowsServer'</param>
-        /// <param name="sqlServerLicenseType">The SQL Server license type.
-        /// Possible values include: 'NotSpecified', 'NoLicenseType', 'PAYG',
-        /// 'AHUB'</param>
         /// <param name="targetVmName">The target VM name.</param>
         /// <param name="targetVmSize">The target VM size.</param>
         /// <param name="targetSubnetName">The target subnet name.</param>
         /// <param name="targetAvailabilitySetId">The target availability set
         /// ARM Id.</param>
-        /// <param name="targetAvailabilityZone">The target availability
-        /// zone.</param>
-        /// <param name="targetProximityPlacementGroupId">The target proximity
-        /// placement group ARM Id.</param>
         /// <param name="targetBootDiagnosticsStorageAccountId">The target boot
         /// diagnostics storage account ARM Id.</param>
-        /// <param name="performAutoResync">A value indicating whether auto
-        /// resync is to be done.</param>
-        /// <param name="targetVmTags">The target VM tags.</param>
-        /// <param name="seedDiskTags">The tags for the seed disks.</param>
-        /// <param name="targetDiskTags">The tags for the target disks.</param>
-        /// <param name="targetNicTags">The tags for the target NICs.</param>
-        public VMwareCbtEnableMigrationInput(string vmwareMachineId, IList<VMwareCbtDiskInput> disksToInclude, string dataMoverRunAsAccountId, string snapshotRunAsAccountId, string targetResourceGroupId, string targetNetworkId, string licenseType = default(string), string sqlServerLicenseType = default(string), string targetVmName = default(string), string targetVmSize = default(string), string targetSubnetName = default(string), string targetAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string targetBootDiagnosticsStorageAccountId = default(string), string performAutoResync = default(string), IDictionary<string, string> targetVmTags = default(IDictionary<string, string>), IDictionary<string, string> seedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetNicTags = default(IDictionary<string, string>))
+        public VMwareCbtEnableMigrationInput(string vmwareMachineId, IList<VMwareCbtDiskInput> disksToInclude, string dataMoverRunAsAccountId, string snapshotRunAsAccountId, string targetResourceGroupId, string targetNetworkId, string licenseType = default(string), string targetVmName = default(string), string targetVmSize = default(string), string targetSubnetName = default(string), string targetAvailabilitySetId = default(string), string targetBootDiagnosticsStorageAccountId = default(string))
         {
             VmwareMachineId = vmwareMachineId;
             DisksToInclude = disksToInclude;
             LicenseType = licenseType;
-            SqlServerLicenseType = sqlServerLicenseType;
             DataMoverRunAsAccountId = dataMoverRunAsAccountId;
             SnapshotRunAsAccountId = snapshotRunAsAccountId;
             TargetVmName = targetVmName;
@@ -81,14 +67,7 @@ public VMwareCbtEnableMigrationInput()
             TargetNetworkId = targetNetworkId;
             TargetSubnetName = targetSubnetName;
             TargetAvailabilitySetId = targetAvailabilitySetId;
-            TargetAvailabilityZone = targetAvailabilityZone;
-            TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
             TargetBootDiagnosticsStorageAccountId = targetBootDiagnosticsStorageAccountId;
-            PerformAutoResync = performAutoResync;
-            TargetVmTags = targetVmTags;
-            SeedDiskTags = seedDiskTags;
-            TargetDiskTags = targetDiskTags;
-            TargetNicTags = targetNicTags;
             CustomInit();
         }
 
@@ -117,20 +96,13 @@ public VMwareCbtEnableMigrationInput()
         public string LicenseType { get; set; }
 
         /// <summary>
-        /// Gets or sets the SQL Server license type. Possible values include:
-        /// 'NotSpecified', 'NoLicenseType', 'PAYG', 'AHUB'
-        /// </summary>
-        [JsonProperty(PropertyName = "sqlServerLicenseType")]
-        public string SqlServerLicenseType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the data mover run as account Id.
+        /// Gets or sets the data mover RunAs account Id.
         /// </summary>
         [JsonProperty(PropertyName = "dataMoverRunAsAccountId")]
         public string DataMoverRunAsAccountId { get; set; }
 
         /// <summary>
-        /// Gets or sets the snapshot run as account Id.
+        /// Gets or sets the snapshot RunAs account Id.
         /// </summary>
         [JsonProperty(PropertyName = "snapshotRunAsAccountId")]
         public string SnapshotRunAsAccountId { get; set; }
@@ -171,54 +143,12 @@ public VMwareCbtEnableMigrationInput()
         [JsonProperty(PropertyName = "targetAvailabilitySetId")]
         public string TargetAvailabilitySetId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the target availability zone.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetAvailabilityZone")]
-        public string TargetAvailabilityZone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target proximity placement group ARM Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetProximityPlacementGroupId")]
-        public string TargetProximityPlacementGroupId { get; set; }
-
         /// <summary>
         /// Gets or sets the target boot diagnostics storage account ARM Id.
         /// </summary>
         [JsonProperty(PropertyName = "targetBootDiagnosticsStorageAccountId")]
         public string TargetBootDiagnosticsStorageAccountId { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether auto resync is to be done.
-        /// </summary>
-        [JsonProperty(PropertyName = "performAutoResync")]
-        public string PerformAutoResync { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target VM tags.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmTags")]
-        public IDictionary<string, string> TargetVmTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the seed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "seedDiskTags")]
-        public IDictionary<string, string> SeedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetDiskTags")]
-        public IDictionary<string, string> TargetDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target NICs.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicTags")]
-        public IDictionary<string, string> TargetNicTags { get; set; }
-
         /// <summary>
         /// Validate the object.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtEventDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtEventDetails.cs
deleted file mode 100644
index cc8787ca5d2c..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtEventDetails.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Event details for VMwareCbt provider.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("VMwareCbt")]
-    public partial class VMwareCbtEventDetails : EventProviderSpecificDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the VMwareCbtEventDetails class.
-        /// </summary>
-        public VMwareCbtEventDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the VMwareCbtEventDetails class.
-        /// </summary>
-        /// <param name="migrationItemName">The migration item name.</param>
-        public VMwareCbtEventDetails(string migrationItemName = default(string))
-        {
-            MigrationItemName = migrationItemName;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the migration item name.
-        /// </summary>
-        [JsonProperty(PropertyName = "migrationItemName")]
-        public string MigrationItemName { get; private set; }
-
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtMigrationDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtMigrationDetails.cs
index fb39dec32905..61c23edef270 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtMigrationDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtMigrationDetails.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// VMwareCbt provider specific settings.
+    /// VMwareCbt provider specific settings
     /// </summary>
     [Newtonsoft.Json.JsonObject("VMwareCbt")]
     public partial class VMwareCbtMigrationDetails : MigrationProviderSpecificSettings
@@ -35,15 +35,11 @@ public VMwareCbtMigrationDetails()
         /// <param name="vmwareMachineId">The ARM Id of the VM discovered in
         /// VMware.</param>
         /// <param name="osType">The type of the OS on the VM.</param>
-        /// <param name="firmwareType">The firmware type.</param>
-        /// <param name="targetGeneration">The target generation.</param>
         /// <param name="licenseType">License Type of the VM to be
         /// used.</param>
-        /// <param name="sqlServerLicenseType">The SQL Server license
-        /// type.</param>
-        /// <param name="dataMoverRunAsAccountId">The data mover run as account
+        /// <param name="dataMoverRunAsAccountId">The data mover RunAs account
         /// Id.</param>
-        /// <param name="snapshotRunAsAccountId">The snapshot run as account
+        /// <param name="snapshotRunAsAccountId">The snapshot RunAs account
         /// Id.</param>
         /// <param name="targetVmName">Target VM name.</param>
         /// <param name="targetVmSize">The target VM size.</param>
@@ -52,49 +48,20 @@ public VMwareCbtMigrationDetails()
         /// Id.</param>
         /// <param name="targetAvailabilitySetId">The target availability set
         /// Id.</param>
-        /// <param name="targetAvailabilityZone">The target availability
-        /// zone.</param>
-        /// <param name="targetProximityPlacementGroupId">The target proximity
-        /// placement group Id.</param>
         /// <param name="targetBootDiagnosticsStorageAccountId">The target boot
         /// diagnostics storage account ARM Id.</param>
-        /// <param name="targetVmTags">The target VM tags.</param>
         /// <param name="protectedDisks">The list of protected disks.</param>
         /// <param name="targetNetworkId">The target network Id.</param>
         /// <param name="vmNics">The network details.</param>
-        /// <param name="targetNicTags">The tags for the target NICs.</param>
         /// <param name="migrationRecoveryPointId">The recovery point Id to
         /// which the VM was migrated.</param>
         /// <param name="lastRecoveryPointReceived">The last recovery point
         /// received time.</param>
-        /// <param name="lastRecoveryPointId">The last recovery point
-        /// Id.</param>
-        /// <param name="initialSeedingProgressPercentage">The initial seeding
-        /// progress percentage.</param>
-        /// <param name="migrationProgressPercentage">The migration progress
-        /// percentage.</param>
-        /// <param name="resyncProgressPercentage">The resync progress
-        /// percentage.</param>
-        /// <param name="initialSeedingRetryCount">The initial seeding retry
-        /// count.</param>
-        /// <param name="resyncRetryCount">The resync retry count.</param>
-        /// <param name="resyncRequired">A value indicating whether resync is
-        /// required.</param>
-        /// <param name="resyncState">The resync state. Possible values
-        /// include: 'None', 'PreparedForResynchronization',
-        /// 'StartedResynchronization'</param>
-        /// <param name="performAutoResync">A value indicating whether auto
-        /// resync is to be done.</param>
-        /// <param name="seedDiskTags">The tags for the seed disks.</param>
-        /// <param name="targetDiskTags">The tags for the target disks.</param>
-        public VMwareCbtMigrationDetails(string vmwareMachineId = default(string), string osType = default(string), string firmwareType = default(string), string targetGeneration = default(string), string licenseType = default(string), string sqlServerLicenseType = default(string), string dataMoverRunAsAccountId = default(string), string snapshotRunAsAccountId = default(string), string targetVmName = default(string), string targetVmSize = default(string), string targetLocation = default(string), string targetResourceGroupId = default(string), string targetAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string targetBootDiagnosticsStorageAccountId = default(string), IDictionary<string, string> targetVmTags = default(IDictionary<string, string>), IList<VMwareCbtProtectedDiskDetails> protectedDisks = default(IList<VMwareCbtProtectedDiskDetails>), string targetNetworkId = default(string), IList<VMwareCbtNicDetails> vmNics = default(IList<VMwareCbtNicDetails>), IDictionary<string, string> targetNicTags = default(IDictionary<string, string>), string migrationRecoveryPointId = default(string), System.DateTime? lastRecoveryPointReceived = default(System.DateTime?), string lastRecoveryPointId = default(string), int? initialSeedingProgressPercentage = default(int?), int? migrationProgressPercentage = default(int?), int? resyncProgressPercentage = default(int?), long? initialSeedingRetryCount = default(long?), long? resyncRetryCount = default(long?), string resyncRequired = default(string), string resyncState = default(string), string performAutoResync = default(string), IDictionary<string, string> seedDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetDiskTags = default(IDictionary<string, string>))
+        public VMwareCbtMigrationDetails(string vmwareMachineId = default(string), string osType = default(string), string licenseType = default(string), string dataMoverRunAsAccountId = default(string), string snapshotRunAsAccountId = default(string), string targetVmName = default(string), string targetVmSize = default(string), string targetLocation = default(string), string targetResourceGroupId = default(string), string targetAvailabilitySetId = default(string), string targetBootDiagnosticsStorageAccountId = default(string), IList<VMwareCbtProtectedDiskDetails> protectedDisks = default(IList<VMwareCbtProtectedDiskDetails>), string targetNetworkId = default(string), IList<VMwareCbtNicDetails> vmNics = default(IList<VMwareCbtNicDetails>), string migrationRecoveryPointId = default(string), System.DateTime? lastRecoveryPointReceived = default(System.DateTime?))
         {
             VmwareMachineId = vmwareMachineId;
             OsType = osType;
-            FirmwareType = firmwareType;
-            TargetGeneration = targetGeneration;
             LicenseType = licenseType;
-            SqlServerLicenseType = sqlServerLicenseType;
             DataMoverRunAsAccountId = dataMoverRunAsAccountId;
             SnapshotRunAsAccountId = snapshotRunAsAccountId;
             TargetVmName = targetVmName;
@@ -102,27 +69,12 @@ public VMwareCbtMigrationDetails()
             TargetLocation = targetLocation;
             TargetResourceGroupId = targetResourceGroupId;
             TargetAvailabilitySetId = targetAvailabilitySetId;
-            TargetAvailabilityZone = targetAvailabilityZone;
-            TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
             TargetBootDiagnosticsStorageAccountId = targetBootDiagnosticsStorageAccountId;
-            TargetVmTags = targetVmTags;
             ProtectedDisks = protectedDisks;
             TargetNetworkId = targetNetworkId;
             VmNics = vmNics;
-            TargetNicTags = targetNicTags;
             MigrationRecoveryPointId = migrationRecoveryPointId;
             LastRecoveryPointReceived = lastRecoveryPointReceived;
-            LastRecoveryPointId = lastRecoveryPointId;
-            InitialSeedingProgressPercentage = initialSeedingProgressPercentage;
-            MigrationProgressPercentage = migrationProgressPercentage;
-            ResyncProgressPercentage = resyncProgressPercentage;
-            InitialSeedingRetryCount = initialSeedingRetryCount;
-            ResyncRetryCount = resyncRetryCount;
-            ResyncRequired = resyncRequired;
-            ResyncState = resyncState;
-            PerformAutoResync = performAutoResync;
-            SeedDiskTags = seedDiskTags;
-            TargetDiskTags = targetDiskTags;
             CustomInit();
         }
 
@@ -143,18 +95,6 @@ public VMwareCbtMigrationDetails()
         [JsonProperty(PropertyName = "osType")]
         public string OsType { get; private set; }
 
-        /// <summary>
-        /// Gets the firmware type.
-        /// </summary>
-        [JsonProperty(PropertyName = "firmwareType")]
-        public string FirmwareType { get; private set; }
-
-        /// <summary>
-        /// Gets the target generation.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetGeneration")]
-        public string TargetGeneration { get; private set; }
-
         /// <summary>
         /// Gets or sets license Type of the VM to be used.
         /// </summary>
@@ -162,19 +102,13 @@ public VMwareCbtMigrationDetails()
         public string LicenseType { get; set; }
 
         /// <summary>
-        /// Gets or sets the SQL Server license type.
-        /// </summary>
-        [JsonProperty(PropertyName = "sqlServerLicenseType")]
-        public string SqlServerLicenseType { get; set; }
-
-        /// <summary>
-        /// Gets the data mover run as account Id.
+        /// Gets the data mover RunAs account Id.
         /// </summary>
         [JsonProperty(PropertyName = "dataMoverRunAsAccountId")]
         public string DataMoverRunAsAccountId { get; private set; }
 
         /// <summary>
-        /// Gets the snapshot run as account Id.
+        /// Gets the snapshot RunAs account Id.
         /// </summary>
         [JsonProperty(PropertyName = "snapshotRunAsAccountId")]
         public string SnapshotRunAsAccountId { get; private set; }
@@ -209,30 +143,12 @@ public VMwareCbtMigrationDetails()
         [JsonProperty(PropertyName = "targetAvailabilitySetId")]
         public string TargetAvailabilitySetId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the target availability zone.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetAvailabilityZone")]
-        public string TargetAvailabilityZone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target proximity placement group Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetProximityPlacementGroupId")]
-        public string TargetProximityPlacementGroupId { get; set; }
-
         /// <summary>
         /// Gets or sets the target boot diagnostics storage account ARM Id.
         /// </summary>
         [JsonProperty(PropertyName = "targetBootDiagnosticsStorageAccountId")]
         public string TargetBootDiagnosticsStorageAccountId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the target VM tags.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmTags")]
-        public IDictionary<string, string> TargetVmTags { get; set; }
-
         /// <summary>
         /// Gets or sets the list of protected disks.
         /// </summary>
@@ -251,12 +167,6 @@ public VMwareCbtMigrationDetails()
         [JsonProperty(PropertyName = "vmNics")]
         public IList<VMwareCbtNicDetails> VmNics { get; set; }
 
-        /// <summary>
-        /// Gets or sets the tags for the target NICs.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicTags")]
-        public IDictionary<string, string> TargetNicTags { get; set; }
-
         /// <summary>
         /// Gets the recovery point Id to which the VM was migrated.
         /// </summary>
@@ -269,72 +179,5 @@ public VMwareCbtMigrationDetails()
         [JsonProperty(PropertyName = "lastRecoveryPointReceived")]
         public System.DateTime? LastRecoveryPointReceived { get; private set; }
 
-        /// <summary>
-        /// Gets the last recovery point Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "lastRecoveryPointId")]
-        public string LastRecoveryPointId { get; private set; }
-
-        /// <summary>
-        /// Gets the initial seeding progress percentage.
-        /// </summary>
-        [JsonProperty(PropertyName = "initialSeedingProgressPercentage")]
-        public int? InitialSeedingProgressPercentage { get; private set; }
-
-        /// <summary>
-        /// Gets the migration progress percentage.
-        /// </summary>
-        [JsonProperty(PropertyName = "migrationProgressPercentage")]
-        public int? MigrationProgressPercentage { get; private set; }
-
-        /// <summary>
-        /// Gets the resync progress percentage.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncProgressPercentage")]
-        public int? ResyncProgressPercentage { get; private set; }
-
-        /// <summary>
-        /// Gets the initial seeding retry count.
-        /// </summary>
-        [JsonProperty(PropertyName = "initialSeedingRetryCount")]
-        public long? InitialSeedingRetryCount { get; private set; }
-
-        /// <summary>
-        /// Gets the resync retry count.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncRetryCount")]
-        public long? ResyncRetryCount { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether resync is required.
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncRequired")]
-        public string ResyncRequired { get; private set; }
-
-        /// <summary>
-        /// Gets the resync state. Possible values include: 'None',
-        /// 'PreparedForResynchronization', 'StartedResynchronization'
-        /// </summary>
-        [JsonProperty(PropertyName = "resyncState")]
-        public string ResyncState { get; private set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether auto resync is to be done.
-        /// </summary>
-        [JsonProperty(PropertyName = "performAutoResync")]
-        public string PerformAutoResync { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the seed disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "seedDiskTags")]
-        public IDictionary<string, string> SeedDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetDiskTags")]
-        public IDictionary<string, string> TargetDiskTags { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtNicDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtNicDetails.cs
index bef342154e0d..dd5c2ef7b5e5 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtNicDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtNicDetails.cs
@@ -40,10 +40,9 @@ public VMwareCbtNicDetails()
         /// <param name="targetIPAddressType">The target IP address type.
         /// Possible values include: 'Dynamic', 'Static'</param>
         /// <param name="targetSubnetName">Target subnet name.</param>
-        /// <param name="targetNicName">Target NIC name.</param>
         /// <param name="isSelectedForMigration">A value indicating whether
         /// this NIC is selected for migration.</param>
-        public VMwareCbtNicDetails(string nicId = default(string), string isPrimaryNic = default(string), string sourceIPAddress = default(string), string sourceIPAddressType = default(string), string sourceNetworkId = default(string), string targetIPAddress = default(string), string targetIPAddressType = default(string), string targetSubnetName = default(string), string targetNicName = default(string), string isSelectedForMigration = default(string))
+        public VMwareCbtNicDetails(string nicId = default(string), string isPrimaryNic = default(string), string sourceIPAddress = default(string), string sourceIPAddressType = default(string), string sourceNetworkId = default(string), string targetIPAddress = default(string), string targetIPAddressType = default(string), string targetSubnetName = default(string), string isSelectedForMigration = default(string))
         {
             NicId = nicId;
             IsPrimaryNic = isPrimaryNic;
@@ -53,7 +52,6 @@ public VMwareCbtNicDetails()
             TargetIPAddress = targetIPAddress;
             TargetIPAddressType = targetIPAddressType;
             TargetSubnetName = targetSubnetName;
-            TargetNicName = targetNicName;
             IsSelectedForMigration = isSelectedForMigration;
             CustomInit();
         }
@@ -113,12 +111,6 @@ public VMwareCbtNicDetails()
         [JsonProperty(PropertyName = "targetSubnetName")]
         public string TargetSubnetName { get; set; }
 
-        /// <summary>
-        /// Gets or sets target NIC name.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicName")]
-        public string TargetNicName { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether this NIC is selected for
         /// migration.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtNicInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtNicInput.cs
index 449c682d6f8b..3c9c27db3e04 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtNicInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtNicInput.cs
@@ -37,15 +37,13 @@ public VMwareCbtNicInput()
         /// <param name="targetStaticIPAddress">The static IP address.</param>
         /// <param name="isSelectedForMigration">A value indicating whether
         /// this NIC is selected for migration.</param>
-        /// <param name="targetNicName">Target NIC name.</param>
-        public VMwareCbtNicInput(string nicId, string isPrimaryNic, string targetSubnetName = default(string), string targetStaticIPAddress = default(string), string isSelectedForMigration = default(string), string targetNicName = default(string))
+        public VMwareCbtNicInput(string nicId, string isPrimaryNic, string targetSubnetName = default(string), string targetStaticIPAddress = default(string), string isSelectedForMigration = default(string))
         {
             NicId = nicId;
             IsPrimaryNic = isPrimaryNic;
             TargetSubnetName = targetSubnetName;
             TargetStaticIPAddress = targetStaticIPAddress;
             IsSelectedForMigration = isSelectedForMigration;
-            TargetNicName = targetNicName;
             CustomInit();
         }
 
@@ -85,12 +83,6 @@ public VMwareCbtNicInput()
         [JsonProperty(PropertyName = "isSelectedForMigration")]
         public string IsSelectedForMigration { get; set; }
 
-        /// <summary>
-        /// Gets or sets target NIC name.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicName")]
-        public string TargetNicName { get; set; }
-
         /// <summary>
         /// Validate the object.
         /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtProtectedDiskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtProtectedDiskDetails.cs
index fb8934910df4..f9478fd9a77c 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtProtectedDiskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtProtectedDiskDetails.cs
@@ -33,8 +33,6 @@ public VMwareCbtProtectedDiskDetails()
         /// </summary>
         /// <param name="diskId">The disk id.</param>
         /// <param name="diskName">The disk name.</param>
-        /// <param name="diskType">The disk type. Possible values include:
-        /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'</param>
         /// <param name="diskPath">The disk path.</param>
         /// <param name="isOSDisk">A value indicating whether the disk is the
         /// OS disk.</param>
@@ -43,28 +41,24 @@ public VMwareCbtProtectedDiskDetails()
         /// Id.</param>
         /// <param name="logStorageAccountSasSecretName">The key vault secret
         /// name of the log storage account.</param>
-        /// <param name="diskEncryptionSetId">The DiskEncryptionSet ARM
-        /// Id.</param>
         /// <param name="seedManagedDiskId">The ARM Id of the seed managed
         /// disk.</param>
         /// <param name="targetManagedDiskId">The ARM Id of the target managed
         /// disk.</param>
-        /// <param name="targetDiskName">The name for the target managed
-        /// disk.</param>
-        public VMwareCbtProtectedDiskDetails(string diskId = default(string), string diskName = default(string), string diskType = default(string), string diskPath = default(string), string isOSDisk = default(string), long? capacityInBytes = default(long?), string logStorageAccountId = default(string), string logStorageAccountSasSecretName = default(string), string diskEncryptionSetId = default(string), string seedManagedDiskId = default(string), string targetManagedDiskId = default(string), string targetDiskName = default(string))
+        /// <param name="diskType">The disk type. Possible values include:
+        /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'</param>
+        public VMwareCbtProtectedDiskDetails(string diskId = default(string), string diskName = default(string), string diskPath = default(string), string isOSDisk = default(string), long? capacityInBytes = default(long?), string logStorageAccountId = default(string), string logStorageAccountSasSecretName = default(string), string seedManagedDiskId = default(string), string targetManagedDiskId = default(string), string diskType = default(string))
         {
             DiskId = diskId;
             DiskName = diskName;
-            DiskType = diskType;
             DiskPath = diskPath;
             IsOSDisk = isOSDisk;
             CapacityInBytes = capacityInBytes;
             LogStorageAccountId = logStorageAccountId;
             LogStorageAccountSasSecretName = logStorageAccountSasSecretName;
-            DiskEncryptionSetId = diskEncryptionSetId;
             SeedManagedDiskId = seedManagedDiskId;
             TargetManagedDiskId = targetManagedDiskId;
-            TargetDiskName = targetDiskName;
+            DiskType = diskType;
             CustomInit();
         }
 
@@ -85,13 +79,6 @@ public VMwareCbtProtectedDiskDetails()
         [JsonProperty(PropertyName = "diskName")]
         public string DiskName { get; private set; }
 
-        /// <summary>
-        /// Gets or sets the disk type. Possible values include:
-        /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'
-        /// </summary>
-        [JsonProperty(PropertyName = "diskType")]
-        public string DiskType { get; set; }
-
         /// <summary>
         /// Gets the disk path.
         /// </summary>
@@ -122,12 +109,6 @@ public VMwareCbtProtectedDiskDetails()
         [JsonProperty(PropertyName = "logStorageAccountSasSecretName")]
         public string LogStorageAccountSasSecretName { get; private set; }
 
-        /// <summary>
-        /// Gets the DiskEncryptionSet ARM Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskEncryptionSetId")]
-        public string DiskEncryptionSetId { get; private set; }
-
         /// <summary>
         /// Gets the ARM Id of the seed managed disk.
         /// </summary>
@@ -141,10 +122,11 @@ public VMwareCbtProtectedDiskDetails()
         public string TargetManagedDiskId { get; private set; }
 
         /// <summary>
-        /// Gets or sets the name for the target managed disk.
+        /// Gets or sets the disk type. Possible values include:
+        /// 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'
         /// </summary>
-        [JsonProperty(PropertyName = "targetDiskName")]
-        public string TargetDiskName { get; set; }
+        [JsonProperty(PropertyName = "diskType")]
+        public string DiskType { get; set; }
 
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtResyncInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtResyncInput.cs
deleted file mode 100644
index 0fba4b74014a..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtResyncInput.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Microsoft.Rest;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// VMwareCbt specific resync input.
-    /// </summary>
-    [Newtonsoft.Json.JsonObject("VMwareCbt")]
-    public partial class VMwareCbtResyncInput : ResyncProviderSpecificInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the VMwareCbtResyncInput class.
-        /// </summary>
-        public VMwareCbtResyncInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the VMwareCbtResyncInput class.
-        /// </summary>
-        /// <param name="skipCbtReset">A value indicating whether CBT is to be
-        /// reset.</param>
-        public VMwareCbtResyncInput(string skipCbtReset)
-        {
-            SkipCbtReset = skipCbtReset;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets a value indicating whether CBT is to be reset.
-        /// </summary>
-        [JsonProperty(PropertyName = "skipCbtReset")]
-        public string SkipCbtReset { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (SkipCbtReset == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "SkipCbtReset");
-            }
-        }
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtUpdateDiskInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtUpdateDiskInput.cs
deleted file mode 100644
index 95e6bc91cd48..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtUpdateDiskInput.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-    using Microsoft.Rest;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// VMwareCbt disk input for update.
-    /// </summary>
-    public partial class VMwareCbtUpdateDiskInput
-    {
-        /// <summary>
-        /// Initializes a new instance of the VMwareCbtUpdateDiskInput class.
-        /// </summary>
-        public VMwareCbtUpdateDiskInput()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the VMwareCbtUpdateDiskInput class.
-        /// </summary>
-        /// <param name="diskId">The disk Id.</param>
-        /// <param name="targetDiskName">The target disk name.</param>
-        public VMwareCbtUpdateDiskInput(string diskId, string targetDiskName = default(string))
-        {
-            DiskId = diskId;
-            TargetDiskName = targetDiskName;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the disk Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "diskId")]
-        public string DiskId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target disk name.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetDiskName")]
-        public string TargetDiskName { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        /// <exception cref="ValidationException">
-        /// Thrown if validation fails
-        /// </exception>
-        public virtual void Validate()
-        {
-            if (DiskId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "DiskId");
-            }
-        }
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtUpdateMigrationItemInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtUpdateMigrationItemInput.cs
index 49d9ceeb008d..16b7dc7af593 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtUpdateMigrationItemInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareCbtUpdateMigrationItemInput.cs
@@ -40,43 +40,22 @@ public VMwareCbtUpdateMigrationItemInput()
         /// Id.</param>
         /// <param name="targetAvailabilitySetId">The target availability set
         /// ARM Id.</param>
-        /// <param name="targetAvailabilityZone">The target availability
-        /// zone.</param>
-        /// <param name="targetProximityPlacementGroupId">The target proximity
-        /// placement group ARM Id.</param>
         /// <param name="targetBootDiagnosticsStorageAccountId">The target boot
         /// diagnostics storage account ARM Id.</param>
         /// <param name="targetNetworkId">The target network ARM Id.</param>
         /// <param name="vmNics">The list of NIC details.</param>
-        /// <param name="vmDisks">The list of disk update properties.</param>
         /// <param name="licenseType">The license type. Possible values
         /// include: 'NotSpecified', 'NoLicenseType', 'WindowsServer'</param>
-        /// <param name="sqlServerLicenseType">The SQL Server license type.
-        /// Possible values include: 'NotSpecified', 'NoLicenseType', 'PAYG',
-        /// 'AHUB'</param>
-        /// <param name="performAutoResync">A value indicating whether auto
-        /// resync is to be done.</param>
-        /// <param name="targetVmTags">The target VM tags.</param>
-        /// <param name="targetDiskTags">The tags for the target disks.</param>
-        /// <param name="targetNicTags">The tags for the target NICs.</param>
-        public VMwareCbtUpdateMigrationItemInput(string targetVmName = default(string), string targetVmSize = default(string), string targetResourceGroupId = default(string), string targetAvailabilitySetId = default(string), string targetAvailabilityZone = default(string), string targetProximityPlacementGroupId = default(string), string targetBootDiagnosticsStorageAccountId = default(string), string targetNetworkId = default(string), IList<VMwareCbtNicInput> vmNics = default(IList<VMwareCbtNicInput>), IList<VMwareCbtUpdateDiskInput> vmDisks = default(IList<VMwareCbtUpdateDiskInput>), string licenseType = default(string), string sqlServerLicenseType = default(string), string performAutoResync = default(string), IDictionary<string, string> targetVmTags = default(IDictionary<string, string>), IDictionary<string, string> targetDiskTags = default(IDictionary<string, string>), IDictionary<string, string> targetNicTags = default(IDictionary<string, string>))
+        public VMwareCbtUpdateMigrationItemInput(string targetVmName = default(string), string targetVmSize = default(string), string targetResourceGroupId = default(string), string targetAvailabilitySetId = default(string), string targetBootDiagnosticsStorageAccountId = default(string), string targetNetworkId = default(string), IList<VMwareCbtNicInput> vmNics = default(IList<VMwareCbtNicInput>), string licenseType = default(string))
         {
             TargetVmName = targetVmName;
             TargetVmSize = targetVmSize;
             TargetResourceGroupId = targetResourceGroupId;
             TargetAvailabilitySetId = targetAvailabilitySetId;
-            TargetAvailabilityZone = targetAvailabilityZone;
-            TargetProximityPlacementGroupId = targetProximityPlacementGroupId;
             TargetBootDiagnosticsStorageAccountId = targetBootDiagnosticsStorageAccountId;
             TargetNetworkId = targetNetworkId;
             VmNics = vmNics;
-            VmDisks = vmDisks;
             LicenseType = licenseType;
-            SqlServerLicenseType = sqlServerLicenseType;
-            PerformAutoResync = performAutoResync;
-            TargetVmTags = targetVmTags;
-            TargetDiskTags = targetDiskTags;
-            TargetNicTags = targetNicTags;
             CustomInit();
         }
 
@@ -109,18 +88,6 @@ public VMwareCbtUpdateMigrationItemInput()
         [JsonProperty(PropertyName = "targetAvailabilitySetId")]
         public string TargetAvailabilitySetId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the target availability zone.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetAvailabilityZone")]
-        public string TargetAvailabilityZone { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target proximity placement group ARM Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetProximityPlacementGroupId")]
-        public string TargetProximityPlacementGroupId { get; set; }
-
         /// <summary>
         /// Gets or sets the target boot diagnostics storage account ARM Id.
         /// </summary>
@@ -139,12 +106,6 @@ public VMwareCbtUpdateMigrationItemInput()
         [JsonProperty(PropertyName = "vmNics")]
         public IList<VMwareCbtNicInput> VmNics { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list of disk update properties.
-        /// </summary>
-        [JsonProperty(PropertyName = "vmDisks")]
-        public IList<VMwareCbtUpdateDiskInput> VmDisks { get; set; }
-
         /// <summary>
         /// Gets or sets the license type. Possible values include:
         /// 'NotSpecified', 'NoLicenseType', 'WindowsServer'
@@ -152,36 +113,5 @@ public VMwareCbtUpdateMigrationItemInput()
         [JsonProperty(PropertyName = "licenseType")]
         public string LicenseType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the SQL Server license type. Possible values include:
-        /// 'NotSpecified', 'NoLicenseType', 'PAYG', 'AHUB'
-        /// </summary>
-        [JsonProperty(PropertyName = "sqlServerLicenseType")]
-        public string SqlServerLicenseType { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether auto resync is to be done.
-        /// </summary>
-        [JsonProperty(PropertyName = "performAutoResync")]
-        public string PerformAutoResync { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target VM tags.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetVmTags")]
-        public IDictionary<string, string> TargetVmTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target disks.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetDiskTags")]
-        public IDictionary<string, string> TargetDiskTags { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tags for the target NICs.
-        /// </summary>
-        [JsonProperty(PropertyName = "targetNicTags")]
-        public IDictionary<string, string> TargetNicTags { get; set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareDetails.cs
index 8934fe5f6bac..6fc6c44d9e18 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareDetails.cs
@@ -67,7 +67,7 @@ public VMwareDetails()
         /// <param name="hostName">The host name.</param>
         /// <param name="lastHeartbeat">The last heartbeat received from CS
         /// server.</param>
-        /// <param name="versionStatus">Version status.</param>
+        /// <param name="versionStatus">Version status</param>
         /// <param name="sslCertExpiryDate">CS SSL cert expiry date.</param>
         /// <param name="sslCertExpiryRemainingDays">CS SSL cert expiry
         /// date.</param>
@@ -277,7 +277,7 @@ public VMwareDetails()
         public System.DateTime? LastHeartbeat { get; set; }
 
         /// <summary>
-        /// Gets or sets version status.
+        /// Gets or sets version status
         /// </summary>
         [JsonProperty(PropertyName = "versionStatus")]
         public string VersionStatus { get; set; }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareV2FabricCreationInput.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareV2FabricCreationInput.cs
index ca5eb6b78585..59e48ba8314f 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareV2FabricCreationInput.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareV2FabricCreationInput.cs
@@ -33,15 +33,12 @@ public VMwareV2FabricCreationInput()
         /// Initializes a new instance of the VMwareV2FabricCreationInput
         /// class.
         /// </summary>
+        /// <param name="vmwareSiteId">The ARM Id of the VMware site.</param>
         /// <param name="migrationSolutionId">The ARM Id of the migration
         /// solution.</param>
-        /// <param name="vmwareSiteId">The ARM Id of the VMware site.</param>
-        /// <param name="physicalSiteId">The ARM Id of the physical
-        /// site.</param>
-        public VMwareV2FabricCreationInput(string migrationSolutionId, string vmwareSiteId = default(string), string physicalSiteId = default(string))
+        public VMwareV2FabricCreationInput(string vmwareSiteId, string migrationSolutionId)
         {
             VmwareSiteId = vmwareSiteId;
-            PhysicalSiteId = physicalSiteId;
             MigrationSolutionId = migrationSolutionId;
             CustomInit();
         }
@@ -57,12 +54,6 @@ public VMwareV2FabricCreationInput()
         [JsonProperty(PropertyName = "vmwareSiteId")]
         public string VmwareSiteId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ARM Id of the physical site.
-        /// </summary>
-        [JsonProperty(PropertyName = "physicalSiteId")]
-        public string PhysicalSiteId { get; set; }
-
         /// <summary>
         /// Gets or sets the ARM Id of the migration solution.
         /// </summary>
@@ -77,6 +68,10 @@ public VMwareV2FabricCreationInput()
         /// </exception>
         public virtual void Validate()
         {
+            if (VmwareSiteId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "VmwareSiteId");
+            }
             if (MigrationSolutionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "MigrationSolutionId");
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareV2FabricSpecificDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareV2FabricSpecificDetails.cs
index 4f67ad5cf76b..bedfb8ea76d2 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareV2FabricSpecificDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareV2FabricSpecificDetails.cs
@@ -11,8 +11,6 @@
 namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
 {
     using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
     using System.Linq;
 
     /// <summary>
@@ -35,23 +33,16 @@ public VMwareV2FabricSpecificDetails()
         /// class.
         /// </summary>
         /// <param name="vmwareSiteId">The ARM Id of the VMware site.</param>
-        /// <param name="physicalSiteId">The ARM Id of the physical
-        /// site.</param>
         /// <param name="migrationSolutionId">The Migration solution ARM
         /// Id.</param>
         /// <param name="serviceEndpoint">The service endpoint.</param>
         /// <param name="serviceResourceId">The service resource Id.</param>
-        /// <param name="serviceContainerId">The service container Id.</param>
-        /// <param name="processServers">The list of process servers.</param>
-        public VMwareV2FabricSpecificDetails(string vmwareSiteId = default(string), string physicalSiteId = default(string), string migrationSolutionId = default(string), string serviceEndpoint = default(string), string serviceResourceId = default(string), string serviceContainerId = default(string), IList<ProcessServerDetails> processServers = default(IList<ProcessServerDetails>))
+        public VMwareV2FabricSpecificDetails(string vmwareSiteId = default(string), string migrationSolutionId = default(string), string serviceEndpoint = default(string), string serviceResourceId = default(string))
         {
             VmwareSiteId = vmwareSiteId;
-            PhysicalSiteId = physicalSiteId;
             MigrationSolutionId = migrationSolutionId;
             ServiceEndpoint = serviceEndpoint;
             ServiceResourceId = serviceResourceId;
-            ServiceContainerId = serviceContainerId;
-            ProcessServers = processServers;
             CustomInit();
         }
 
@@ -66,12 +57,6 @@ public VMwareV2FabricSpecificDetails()
         [JsonProperty(PropertyName = "vmwareSiteId")]
         public string VmwareSiteId { get; private set; }
 
-        /// <summary>
-        /// Gets the ARM Id of the physical site.
-        /// </summary>
-        [JsonProperty(PropertyName = "physicalSiteId")]
-        public string PhysicalSiteId { get; private set; }
-
         /// <summary>
         /// Gets the Migration solution ARM Id.
         /// </summary>
@@ -90,17 +75,5 @@ public VMwareV2FabricSpecificDetails()
         [JsonProperty(PropertyName = "serviceResourceId")]
         public string ServiceResourceId { get; private set; }
 
-        /// <summary>
-        /// Gets the service container Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "serviceContainerId")]
-        public string ServiceContainerId { get; private set; }
-
-        /// <summary>
-        /// Gets the list of process servers.
-        /// </summary>
-        [JsonProperty(PropertyName = "processServers")]
-        public IList<ProcessServerDetails> ProcessServers { get; private set; }
-
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareVirtualMachineDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareVirtualMachineDetails.cs
index 81280d067154..29574f7130e9 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareVirtualMachineDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VMwareVirtualMachineDetails.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     using System.Linq;
 
     /// <summary>
-    /// VMware provider specific settings.
+    /// VMware provider specific settings
     /// </summary>
     [Newtonsoft.Json.JsonObject("VMwareVirtualMachine")]
     public partial class VMwareVirtualMachineDetails : ConfigurationSettings
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VirtualMachineTaskDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VirtualMachineTaskDetails.cs
index 43c809140786..6a8954ffa6b1 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VirtualMachineTaskDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VirtualMachineTaskDetails.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     /// <summary>
     /// This class represents the virtual machine task details.
     /// </summary>
-    public partial class VirtualMachineTaskDetails : JobTaskDetails
+    public partial class VirtualMachineTaskDetails : TaskTypeDetails
     {
         /// <summary>
         /// Initializes a new instance of the VirtualMachineTaskDetails class.
@@ -29,15 +29,15 @@ public VirtualMachineTaskDetails()
         /// <summary>
         /// Initializes a new instance of the VirtualMachineTaskDetails class.
         /// </summary>
-        /// <param name="jobTask">The job entity.</param>
         /// <param name="skippedReason">The skipped reason.</param>
         /// <param name="skippedReasonString">The skipped reason
         /// string.</param>
-        public VirtualMachineTaskDetails(JobEntity jobTask = default(JobEntity), string skippedReason = default(string), string skippedReasonString = default(string))
-            : base(jobTask)
+        /// <param name="jobTask">The job entity.</param>
+        public VirtualMachineTaskDetails(string skippedReason = default(string), string skippedReasonString = default(string), JobEntity jobTask = default(JobEntity))
         {
             SkippedReason = skippedReason;
             SkippedReasonString = skippedReasonString;
+            JobTask = jobTask;
             CustomInit();
         }
 
@@ -58,5 +58,11 @@ public VirtualMachineTaskDetails()
         [JsonProperty(PropertyName = "skippedReasonString")]
         public string SkippedReasonString { get; set; }
 
+        /// <summary>
+        /// Gets or sets the job entity.
+        /// </summary>
+        [JsonProperty(PropertyName = "jobTask")]
+        public JobEntity JobTask { get; set; }
+
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VmReplicationProgressHealth.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VmReplicationProgressHealth.cs
deleted file mode 100644
index 1f6b319aeb50..000000000000
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VmReplicationProgressHealth.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
-{
-
-    /// <summary>
-    /// Defines values for VmReplicationProgressHealth.
-    /// </summary>
-    public static class VmReplicationProgressHealth
-    {
-        public const string None = "None";
-        public const string InProgress = "InProgress";
-        public const string SlowProgress = "SlowProgress";
-        public const string NoProgress = "NoProgress";
-    }
-}
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VmmVirtualMachineDetails.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VmmVirtualMachineDetails.cs
index ddea52187010..55a75851cb32 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VmmVirtualMachineDetails.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/VmmVirtualMachineDetails.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery.Models
     /// VMM fabric provider specific VM settings.
     /// </summary>
     [Newtonsoft.Json.JsonObject("VmmVirtualMachine")]
-    public partial class VmmVirtualMachineDetails : HyperVVirtualMachineDetails
+    public partial class VmmVirtualMachineDetails : ConfigurationSettings
     {
         /// <summary>
         /// Initializes a new instance of the VmmVirtualMachineDetails class.
@@ -39,19 +39,25 @@ public VmmVirtualMachineDetails()
         /// time.</param>
         /// <param name="hasPhysicalDisk">A value indicating whether the VM has
         /// a physical disk attached. String value of
-        /// SrsDataContract.PresenceStatus enum. Possible values include:
+        /// {SrsDataContract.PresenceStatus} enum. Possible values include:
         /// 'Unknown', 'Present', 'NotPresent'</param>
         /// <param name="hasFibreChannelAdapter">A value indicating whether the
         /// VM has a fibre channel adapter attached. String value of
-        /// SrsDataContract.PresenceStatus enum. Possible values include:
+        /// {SrsDataContract.PresenceStatus} enum. Possible values include:
         /// 'Unknown', 'Present', 'NotPresent'</param>
         /// <param name="hasSharedVhd">A value indicating whether the VM has a
-        /// shared VHD attached. String value of SrsDataContract.PresenceStatus
-        /// enum. Possible values include: 'Unknown', 'Present',
-        /// 'NotPresent'</param>
+        /// shared VHD attached. String value of
+        /// {SrsDataContract.PresenceStatus} enum. Possible values include:
+        /// 'Unknown', 'Present', 'NotPresent'</param>
         public VmmVirtualMachineDetails(string sourceItemId = default(string), string generation = default(string), OSDetails osDetails = default(OSDetails), IList<DiskDetails> diskDetails = default(IList<DiskDetails>), string hasPhysicalDisk = default(string), string hasFibreChannelAdapter = default(string), string hasSharedVhd = default(string))
-            : base(sourceItemId, generation, osDetails, diskDetails, hasPhysicalDisk, hasFibreChannelAdapter, hasSharedVhd)
         {
+            SourceItemId = sourceItemId;
+            Generation = generation;
+            OsDetails = osDetails;
+            DiskDetails = diskDetails;
+            HasPhysicalDisk = hasPhysicalDisk;
+            HasFibreChannelAdapter = hasFibreChannelAdapter;
+            HasSharedVhd = hasSharedVhd;
             CustomInit();
         }
 
@@ -60,5 +66,53 @@ public VmmVirtualMachineDetails()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets the source id of the object.
+        /// </summary>
+        [JsonProperty(PropertyName = "sourceItemId")]
+        public string SourceItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id of the object in fabric.
+        /// </summary>
+        [JsonProperty(PropertyName = "generation")]
+        public string Generation { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Last replication time.
+        /// </summary>
+        [JsonProperty(PropertyName = "osDetails")]
+        public OSDetails OsDetails { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Last successful failover time.
+        /// </summary>
+        [JsonProperty(PropertyName = "diskDetails")]
+        public IList<DiskDetails> DiskDetails { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the VM has a physical disk
+        /// attached. String value of {SrsDataContract.PresenceStatus} enum.
+        /// Possible values include: 'Unknown', 'Present', 'NotPresent'
+        /// </summary>
+        [JsonProperty(PropertyName = "hasPhysicalDisk")]
+        public string HasPhysicalDisk { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the VM has a fibre channel
+        /// adapter attached. String value of {SrsDataContract.PresenceStatus}
+        /// enum. Possible values include: 'Unknown', 'Present', 'NotPresent'
+        /// </summary>
+        [JsonProperty(PropertyName = "hasFibreChannelAdapter")]
+        public string HasFibreChannelAdapter { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the VM has a shared VHD
+        /// attached. String value of {SrsDataContract.PresenceStatus} enum.
+        /// Possible values include: 'Unknown', 'Present', 'NotPresent'
+        /// </summary>
+        [JsonProperty(PropertyName = "hasSharedVhd")]
+        public string HasSharedVhd { get; set; }
+
     }
 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Operations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Operations.cs
index 15fda7bee3e2..9fe5a266bed5 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Operations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Operations.cs
@@ -103,7 +103,7 @@ internal Operations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/operations").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/operations").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/RecoveryPointsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/RecoveryPointsOperations.cs
index 000abc04b7fe..274de0cad04a 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/RecoveryPointsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/RecoveryPointsOperations.cs
@@ -51,7 +51,7 @@ internal RecoveryPointsOperations(SiteRecoveryManagementClient client)
         public SiteRecoveryManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Gets the list of recovery points for a replication protected item.
+        /// Get recovery points for a replication protected item.
         /// </summary>
         /// <remarks>
         /// Lists the available recovery points for a replication protected item.
@@ -63,7 +63,7 @@ internal RecoveryPointsOperations(SiteRecoveryManagementClient client)
         /// The protection container name.
         /// </param>
         /// <param name='replicatedProtectedItemName'>
-        /// The replication protected item name.
+        /// The replication protected item's name.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -131,7 +131,7 @@ internal RecoveryPointsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/recoveryPoints").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/recoveryPoints").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -269,7 +269,7 @@ internal RecoveryPointsOperations(SiteRecoveryManagementClient client)
         }
 
         /// <summary>
-        /// Gets a recovery point.
+        /// Get a recovery point.
         /// </summary>
         /// <remarks>
         /// Get the details of specified recovery point.
@@ -281,7 +281,7 @@ internal RecoveryPointsOperations(SiteRecoveryManagementClient client)
         /// The protection container name.
         /// </param>
         /// <param name='replicatedProtectedItemName'>
-        /// The replication protected item name.
+        /// The replication protected item's name.
         /// </param>
         /// <param name='recoveryPointName'>
         /// The recovery point name.
@@ -357,7 +357,7 @@ internal RecoveryPointsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/recoveryPoints/{recoveryPointName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/recoveryPoints/{recoveryPointName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -496,7 +496,7 @@ internal RecoveryPointsOperations(SiteRecoveryManagementClient client)
         }
 
         /// <summary>
-        /// Gets the list of recovery points for a replication protected item.
+        /// Get recovery points for a replication protected item.
         /// </summary>
         /// <remarks>
         /// Lists the available recovery points for a replication protected item.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/RecoveryPointsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/RecoveryPointsOperationsExtensions.cs
index 6a8979683dfc..ae13105d38cc 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/RecoveryPointsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/RecoveryPointsOperationsExtensions.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
     public static partial class RecoveryPointsOperationsExtensions
     {
             /// <summary>
-            /// Gets the list of recovery points for a replication protected item.
+            /// Get recovery points for a replication protected item.
             /// </summary>
             /// <remarks>
             /// Lists the available recovery points for a replication protected item.
@@ -37,7 +37,7 @@ public static partial class RecoveryPointsOperationsExtensions
             /// The protection container name.
             /// </param>
             /// <param name='replicatedProtectedItemName'>
-            /// The replication protected item name.
+            /// The replication protected item's name.
             /// </param>
             public static IPage<RecoveryPoint> ListByReplicationProtectedItems(this IRecoveryPointsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName)
             {
@@ -45,7 +45,7 @@ public static IPage<RecoveryPoint> ListByReplicationProtectedItems(this IRecover
             }
 
             /// <summary>
-            /// Gets the list of recovery points for a replication protected item.
+            /// Get recovery points for a replication protected item.
             /// </summary>
             /// <remarks>
             /// Lists the available recovery points for a replication protected item.
@@ -60,7 +60,7 @@ public static IPage<RecoveryPoint> ListByReplicationProtectedItems(this IRecover
             /// The protection container name.
             /// </param>
             /// <param name='replicatedProtectedItemName'>
-            /// The replication protected item name.
+            /// The replication protected item's name.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -74,7 +74,7 @@ public static IPage<RecoveryPoint> ListByReplicationProtectedItems(this IRecover
             }
 
             /// <summary>
-            /// Gets a recovery point.
+            /// Get a recovery point.
             /// </summary>
             /// <remarks>
             /// Get the details of specified recovery point.
@@ -89,7 +89,7 @@ public static IPage<RecoveryPoint> ListByReplicationProtectedItems(this IRecover
             /// The protection container name.
             /// </param>
             /// <param name='replicatedProtectedItemName'>
-            /// The replication protected item name.
+            /// The replication protected item's name.
             /// </param>
             /// <param name='recoveryPointName'>
             /// The recovery point name.
@@ -100,7 +100,7 @@ public static RecoveryPoint Get(this IRecoveryPointsOperations operations, strin
             }
 
             /// <summary>
-            /// Gets a recovery point.
+            /// Get a recovery point.
             /// </summary>
             /// <remarks>
             /// Get the details of specified recovery point.
@@ -115,7 +115,7 @@ public static RecoveryPoint Get(this IRecoveryPointsOperations operations, strin
             /// The protection container name.
             /// </param>
             /// <param name='replicatedProtectedItemName'>
-            /// The replication protected item name.
+            /// The replication protected item's name.
             /// </param>
             /// <param name='recoveryPointName'>
             /// The recovery point name.
@@ -132,7 +132,7 @@ public static RecoveryPoint Get(this IRecoveryPointsOperations operations, strin
             }
 
             /// <summary>
-            /// Gets the list of recovery points for a replication protected item.
+            /// Get recovery points for a replication protected item.
             /// </summary>
             /// <remarks>
             /// Lists the available recovery points for a replication protected item.
@@ -149,7 +149,7 @@ public static IPage<RecoveryPoint> ListByReplicationProtectedItemsNext(this IRec
             }
 
             /// <summary>
-            /// Gets the list of recovery points for a replication protected item.
+            /// Get recovery points for a replication protected item.
             /// </summary>
             /// <remarks>
             /// Lists the available recovery points for a replication protected item.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationAlertSettingsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationAlertSettingsOperations.cs
index 156bc4600560..05f0346ebee9 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationAlertSettingsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationAlertSettingsOperations.cs
@@ -107,7 +107,7 @@ internal ReplicationAlertSettingsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationAlertSettings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationAlertSettings").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -306,7 +306,7 @@ internal ReplicationAlertSettingsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationAlertSettings/{alertSettingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationAlertSettings/{alertSettingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -514,7 +514,7 @@ internal ReplicationAlertSettingsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationAlertSettings/{alertSettingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationAlertSettings/{alertSettingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationEligibilityResultsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationEligibilityResultsOperations.cs
index 18cae8d5ab1a..ada748e1ef93 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationEligibilityResultsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationEligibilityResultsOperations.cs
@@ -112,7 +112,7 @@ internal ReplicationEligibilityResultsOperations(SiteRecoveryManagementClient cl
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{virtualMachineName}/providers/Microsoft.RecoveryServices/replicationEligibilityResults").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{virtualMachineName}/providers/Microsoft.RecoveryServices/replicationEligibilityResults").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{virtualMachineName}", System.Uri.EscapeDataString(virtualMachineName));
@@ -308,7 +308,7 @@ internal ReplicationEligibilityResultsOperations(SiteRecoveryManagementClient cl
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{virtualMachineName}/providers/Microsoft.RecoveryServices/replicationEligibilityResults/default").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{virtualMachineName}/providers/Microsoft.RecoveryServices/replicationEligibilityResults/default").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{virtualMachineName}", System.Uri.EscapeDataString(virtualMachineName));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationEventsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationEventsOperations.cs
index 38f89393be3d..ae4a94d32647 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationEventsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationEventsOperations.cs
@@ -112,7 +112,7 @@ internal ReplicationEventsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationEvents").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationEvents").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -319,7 +319,7 @@ internal ReplicationEventsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationEvents/{eventName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationEvents/{eventName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationFabricsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationFabricsOperations.cs
index 9464a869293f..6a8d84e9c020 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationFabricsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationFabricsOperations.cs
@@ -12,7 +12,6 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
-    using Microsoft.Rest.Azure.OData;
     using Models;
     using Newtonsoft.Json;
     using System.Collections;
@@ -52,7 +51,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
         public SiteRecoveryManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Gets the list of ASR fabrics.
+        /// Gets the list of ASR fabrics
         /// </summary>
         /// <remarks>
         /// Gets a list of the Azure Site Recovery fabrics in the vault.
@@ -108,7 +107,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -251,9 +250,6 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='odataQuery'>
-        /// OData parameters to apply to the operation.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -275,7 +271,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Fabric>> GetWithHttpMessagesAsync(string fabricName, ODataQuery<FabricQueryParameter> odataQuery = default(ODataQuery<FabricQueryParameter>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Fabric>> GetWithHttpMessagesAsync(string fabricName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -304,27 +300,18 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("odataQuery", odataQuery);
                 tracingParameters.Add("fabricName", fabricName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{fabricName}", System.Uri.EscapeDataString(fabricName));
             List<string> _queryParameters = new List<string>();
-            if (odataQuery != null)
-            {
-                var _odataFilter = odataQuery.ToString();
-                if (!string.IsNullOrEmpty(_odataFilter))
-                {
-                    _queryParameters.Add(_odataFilter);
-                }
-            }
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
@@ -459,7 +446,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
         /// </summary>
         /// <remarks>
         /// The operation to create an Azure Site Recovery fabric (for e.g. Hyper-V
-        /// site).
+        /// site)
         /// </remarks>
         /// <param name='fabricName'>
         /// Name of the ASR fabric.
@@ -579,7 +566,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
         /// The operation to delete or remove an Azure Site Recovery fabric.
         /// </remarks>
         /// <param name='fabricName'>
-        /// ASR fabric to delete.
+        /// ASR fabric to delete
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -624,7 +611,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
         /// </summary>
         /// <remarks>
         /// The operation to create an Azure Site Recovery fabric (for e.g. Hyper-V
-        /// site).
+        /// site)
         /// </remarks>
         /// <param name='fabricName'>
         /// Name of the ASR fabric.
@@ -693,7 +680,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -896,7 +883,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1078,7 +1065,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/checkConsistency").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/checkConsistency").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1275,7 +1262,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/migratetoaad").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/migratetoaad").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1466,7 +1453,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/reassociateGateway").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/reassociateGateway").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1614,7 +1601,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
         /// The operation to delete or remove an Azure Site Recovery fabric.
         /// </remarks>
         /// <param name='fabricName'>
-        /// ASR fabric to delete.
+        /// ASR fabric to delete
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1669,7 +1656,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/remove").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/remove").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1859,7 +1846,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/renewCertificate").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/renewCertificate").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -2001,7 +1988,7 @@ internal ReplicationFabricsOperations(SiteRecoveryManagementClient client)
         }
 
         /// <summary>
-        /// Gets the list of ASR fabrics.
+        /// Gets the list of ASR fabrics
         /// </summary>
         /// <remarks>
         /// Gets a list of the Azure Site Recovery fabrics in the vault.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationFabricsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationFabricsOperationsExtensions.cs
index f6cb2e90a0e1..4fd2ce26b571 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationFabricsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationFabricsOperationsExtensions.cs
@@ -12,7 +12,6 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
 {
     using Microsoft.Rest;
     using Microsoft.Rest.Azure;
-    using Microsoft.Rest.Azure.OData;
     using Models;
     using System.Threading;
     using System.Threading.Tasks;
@@ -23,7 +22,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
     public static partial class ReplicationFabricsOperationsExtensions
     {
             /// <summary>
-            /// Gets the list of ASR fabrics.
+            /// Gets the list of ASR fabrics
             /// </summary>
             /// <remarks>
             /// Gets a list of the Azure Site Recovery fabrics in the vault.
@@ -37,7 +36,7 @@ public static IPage<Fabric> List(this IReplicationFabricsOperations operations)
             }
 
             /// <summary>
-            /// Gets the list of ASR fabrics.
+            /// Gets the list of ASR fabrics
             /// </summary>
             /// <remarks>
             /// Gets a list of the Azure Site Recovery fabrics in the vault.
@@ -68,12 +67,9 @@ public static IPage<Fabric> List(this IReplicationFabricsOperations operations)
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='odataQuery'>
-            /// OData parameters to apply to the operation.
-            /// </param>
-            public static Fabric Get(this IReplicationFabricsOperations operations, string fabricName, ODataQuery<FabricQueryParameter> odataQuery = default(ODataQuery<FabricQueryParameter>))
+            public static Fabric Get(this IReplicationFabricsOperations operations, string fabricName)
             {
-                return operations.GetAsync(fabricName, odataQuery).GetAwaiter().GetResult();
+                return operations.GetAsync(fabricName).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -88,15 +84,12 @@ public static IPage<Fabric> List(this IReplicationFabricsOperations operations)
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='odataQuery'>
-            /// OData parameters to apply to the operation.
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<Fabric> GetAsync(this IReplicationFabricsOperations operations, string fabricName, ODataQuery<FabricQueryParameter> odataQuery = default(ODataQuery<FabricQueryParameter>), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<Fabric> GetAsync(this IReplicationFabricsOperations operations, string fabricName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetWithHttpMessagesAsync(fabricName, odataQuery, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetWithHttpMessagesAsync(fabricName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -107,7 +100,7 @@ public static IPage<Fabric> List(this IReplicationFabricsOperations operations)
             /// </summary>
             /// <remarks>
             /// The operation to create an Azure Site Recovery fabric (for e.g. Hyper-V
-            /// site).
+            /// site)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -128,7 +121,7 @@ public static Fabric Create(this IReplicationFabricsOperations operations, strin
             /// </summary>
             /// <remarks>
             /// The operation to create an Azure Site Recovery fabric (for e.g. Hyper-V
-            /// site).
+            /// site)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -322,7 +315,7 @@ public static Fabric ReassociateGateway(this IReplicationFabricsOperations opera
             /// The operations group for this extension method.
             /// </param>
             /// <param name='fabricName'>
-            /// ASR fabric to delete.
+            /// ASR fabric to delete
             /// </param>
             public static void Delete(this IReplicationFabricsOperations operations, string fabricName)
             {
@@ -339,7 +332,7 @@ public static void Delete(this IReplicationFabricsOperations operations, string
             /// The operations group for this extension method.
             /// </param>
             /// <param name='fabricName'>
-            /// ASR fabric to delete.
+            /// ASR fabric to delete
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -400,7 +393,7 @@ public static Fabric RenewCertificate(this IReplicationFabricsOperations operati
             /// </summary>
             /// <remarks>
             /// The operation to create an Azure Site Recovery fabric (for e.g. Hyper-V
-            /// site).
+            /// site)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -421,7 +414,7 @@ public static Fabric BeginCreate(this IReplicationFabricsOperations operations,
             /// </summary>
             /// <remarks>
             /// The operation to create an Azure Site Recovery fabric (for e.g. Hyper-V
-            /// site).
+            /// site)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -615,7 +608,7 @@ public static Fabric BeginReassociateGateway(this IReplicationFabricsOperations
             /// The operations group for this extension method.
             /// </param>
             /// <param name='fabricName'>
-            /// ASR fabric to delete.
+            /// ASR fabric to delete
             /// </param>
             public static void BeginDelete(this IReplicationFabricsOperations operations, string fabricName)
             {
@@ -632,7 +625,7 @@ public static void BeginDelete(this IReplicationFabricsOperations operations, st
             /// The operations group for this extension method.
             /// </param>
             /// <param name='fabricName'>
-            /// ASR fabric to delete.
+            /// ASR fabric to delete
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -689,7 +682,7 @@ public static Fabric BeginRenewCertificate(this IReplicationFabricsOperations op
             }
 
             /// <summary>
-            /// Gets the list of ASR fabrics.
+            /// Gets the list of ASR fabrics
             /// </summary>
             /// <remarks>
             /// Gets a list of the Azure Site Recovery fabrics in the vault.
@@ -706,7 +699,7 @@ public static IPage<Fabric> ListNext(this IReplicationFabricsOperations operatio
             }
 
             /// <summary>
-            /// Gets the list of ASR fabrics.
+            /// Gets the list of ASR fabrics
             /// </summary>
             /// <remarks>
             /// Gets a list of the Azure Site Recovery fabrics in the vault.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationJobsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationJobsOperations.cs
index 618127bcd40f..acd608ed5015 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationJobsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationJobsOperations.cs
@@ -112,7 +112,7 @@ internal ReplicationJobsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -261,7 +261,7 @@ internal ReplicationJobsOperations(SiteRecoveryManagementClient client)
         /// Get the details of an Azure Site Recovery job.
         /// </remarks>
         /// <param name='jobName'>
-        /// Job identifier.
+        /// Job identifier
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -319,7 +319,7 @@ internal ReplicationJobsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/{jobName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/{jobName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -502,7 +502,7 @@ internal ReplicationJobsOperations(SiteRecoveryManagementClient client)
         /// Resumes the specified job.
         /// </summary>
         /// <remarks>
-        /// The operation to resume an Azure Site Recovery job.
+        /// The operation to resume an Azure Site Recovery job
         /// </remarks>
         /// <param name='jobName'>
         /// Job identifier.
@@ -611,7 +611,7 @@ internal ReplicationJobsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/{jobName}/cancel").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/{jobName}/cancel").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -811,7 +811,7 @@ internal ReplicationJobsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/{jobName}/restart").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/{jobName}/restart").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -950,7 +950,7 @@ internal ReplicationJobsOperations(SiteRecoveryManagementClient client)
         /// Resumes the specified job.
         /// </summary>
         /// <remarks>
-        /// The operation to resume an Azure Site Recovery job.
+        /// The operation to resume an Azure Site Recovery job
         /// </remarks>
         /// <param name='jobName'>
         /// Job identifier.
@@ -1019,7 +1019,7 @@ internal ReplicationJobsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/{jobName}/resume").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/{jobName}/resume").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1226,7 +1226,7 @@ internal ReplicationJobsOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/export").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationJobs/export").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationJobsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationJobsOperationsExtensions.cs
index 4f6ac61fa451..4b9816d871b5 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationJobsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationJobsOperationsExtensions.cs
@@ -72,7 +72,7 @@ public static partial class ReplicationJobsOperationsExtensions
             /// The operations group for this extension method.
             /// </param>
             /// <param name='jobName'>
-            /// Job identifier.
+            /// Job identifier
             /// </param>
             public static Job Get(this IReplicationJobsOperations operations, string jobName)
             {
@@ -89,7 +89,7 @@ public static Job Get(this IReplicationJobsOperations operations, string jobName
             /// The operations group for this extension method.
             /// </param>
             /// <param name='jobName'>
-            /// Job identifier.
+            /// Job identifier
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -186,7 +186,7 @@ public static Job Restart(this IReplicationJobsOperations operations, string job
             /// Resumes the specified job.
             /// </summary>
             /// <remarks>
-            /// The operation to resume an Azure Site Recovery job.
+            /// The operation to resume an Azure Site Recovery job
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -206,7 +206,7 @@ public static Job Resume(this IReplicationJobsOperations operations, string jobN
             /// Resumes the specified job.
             /// </summary>
             /// <remarks>
-            /// The operation to resume an Azure Site Recovery job.
+            /// The operation to resume an Azure Site Recovery job
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -354,7 +354,7 @@ public static Job BeginRestart(this IReplicationJobsOperations operations, strin
             /// Resumes the specified job.
             /// </summary>
             /// <remarks>
-            /// The operation to resume an Azure Site Recovery job.
+            /// The operation to resume an Azure Site Recovery job
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -374,7 +374,7 @@ public static Job BeginResume(this IReplicationJobsOperations operations, string
             /// Resumes the specified job.
             /// </summary>
             /// <remarks>
-            /// The operation to resume an Azure Site Recovery job.
+            /// The operation to resume an Azure Site Recovery job
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationLogicalNetworksOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationLogicalNetworksOperations.cs
index fbbcadf2cb67..8048e17c90d8 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationLogicalNetworksOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationLogicalNetworksOperations.cs
@@ -54,7 +54,7 @@ internal ReplicationLogicalNetworksOperations(SiteRecoveryManagementClient clien
         /// Gets the list of logical networks under a fabric.
         /// </summary>
         /// <remarks>
-        /// Lists all the logical networks of the Azure Site Recovery fabric.
+        /// Lists all the logical networks of the Azure Site Recovery fabric
         /// </remarks>
         /// <param name='fabricName'>
         /// Server Id.
@@ -115,7 +115,7 @@ internal ReplicationLogicalNetworksOperations(SiteRecoveryManagementClient clien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationLogicalNetworks").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationLogicalNetworks").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -323,7 +323,7 @@ internal ReplicationLogicalNetworksOperations(SiteRecoveryManagementClient clien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationLogicalNetworks/{logicalNetworkName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationLogicalNetworks/{logicalNetworkName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -463,7 +463,7 @@ internal ReplicationLogicalNetworksOperations(SiteRecoveryManagementClient clien
         /// Gets the list of logical networks under a fabric.
         /// </summary>
         /// <remarks>
-        /// Lists all the logical networks of the Azure Site Recovery fabric.
+        /// Lists all the logical networks of the Azure Site Recovery fabric
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationLogicalNetworksOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationLogicalNetworksOperationsExtensions.cs
index b399ec952da5..3b5cc82463c2 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationLogicalNetworksOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationLogicalNetworksOperationsExtensions.cs
@@ -25,7 +25,7 @@ public static partial class ReplicationLogicalNetworksOperationsExtensions
             /// Gets the list of logical networks under a fabric.
             /// </summary>
             /// <remarks>
-            /// Lists all the logical networks of the Azure Site Recovery fabric.
+            /// Lists all the logical networks of the Azure Site Recovery fabric
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -42,7 +42,7 @@ public static IPage<LogicalNetwork> ListByReplicationFabrics(this IReplicationLo
             /// Gets the list of logical networks under a fabric.
             /// </summary>
             /// <remarks>
-            /// Lists all the logical networks of the Azure Site Recovery fabric.
+            /// Lists all the logical networks of the Azure Site Recovery fabric
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -111,7 +111,7 @@ public static LogicalNetwork Get(this IReplicationLogicalNetworksOperations oper
             /// Gets the list of logical networks under a fabric.
             /// </summary>
             /// <remarks>
-            /// Lists all the logical networks of the Azure Site Recovery fabric.
+            /// Lists all the logical networks of the Azure Site Recovery fabric
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -128,7 +128,7 @@ public static IPage<LogicalNetwork> ListByReplicationFabricsNext(this IReplicati
             /// Gets the list of logical networks under a fabric.
             /// </summary>
             /// <remarks>
-            /// Lists all the logical networks of the Azure Site Recovery fabric.
+            /// Lists all the logical networks of the Azure Site Recovery fabric
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationMigrationItemsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationMigrationItemsOperations.cs
index 62943495cf9a..7f4952b965d6 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationMigrationItemsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationMigrationItemsOperations.cs
@@ -63,15 +63,6 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
         /// <param name='protectionContainerName'>
         /// Protection container name.
         /// </param>
-        /// <param name='odataQuery'>
-        /// OData parameters to apply to the operation.
-        /// </param>
-        /// <param name='skipToken'>
-        /// The pagination token.
-        /// </param>
-        /// <param name='takeToken'>
-        /// The page size.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -93,7 +84,7 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<MigrationItem>>> ListByReplicationProtectionContainersWithHttpMessagesAsync(string fabricName, string protectionContainerName, ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), string takeToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<MigrationItem>>> ListByReplicationProtectionContainersWithHttpMessagesAsync(string fabricName, string protectionContainerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -126,43 +117,24 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("odataQuery", odataQuery);
                 tracingParameters.Add("fabricName", fabricName);
                 tracingParameters.Add("protectionContainerName", protectionContainerName);
-                tracingParameters.Add("skipToken", skipToken);
-                tracingParameters.Add("takeToken", takeToken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByReplicationProtectionContainers", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{fabricName}", System.Uri.EscapeDataString(fabricName));
             _url = _url.Replace("{protectionContainerName}", System.Uri.EscapeDataString(protectionContainerName));
             List<string> _queryParameters = new List<string>();
-            if (odataQuery != null)
-            {
-                var _odataFilter = odataQuery.ToString();
-                if (!string.IsNullOrEmpty(_odataFilter))
-                {
-                    _queryParameters.Add(_odataFilter);
-                }
-            }
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
-            if (takeToken != null)
-            {
-                _queryParameters.Add(string.Format("takeToken={0}", System.Uri.EscapeDataString(takeToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -366,7 +338,7 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -627,37 +599,6 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
-        /// <summary>
-        /// Resynchronizes replication.
-        /// </summary>
-        /// <remarks>
-        /// The operation to resynchronize replication of an ASR migration item.
-        /// </remarks>
-        /// <param name='fabricName'>
-        /// Fabric name.
-        /// </param>
-        /// <param name='protectionContainerName'>
-        /// Protection container name.
-        /// </param>
-        /// <param name='migrationItemName'>
-        /// Migration item name.
-        /// </param>
-        /// <param name='input'>
-        /// Resync input.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<MigrationItem>> ResyncWithHttpMessagesAsync(string fabricName, string protectionContainerName, string migrationItemName, ResyncInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<MigrationItem> _response = await BeginResyncWithHttpMessagesAsync(fabricName, protectionContainerName, migrationItemName, input, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
         /// <summary>
         /// Test migrate item.
         /// </summary>
@@ -729,9 +670,6 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
         /// <param name='skipToken'>
         /// The pagination token.
         /// </param>
-        /// <param name='takeToken'>
-        /// The page size.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -753,7 +691,7 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<MigrationItem>>> ListWithHttpMessagesAsync(ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), string takeToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<MigrationItem>>> ListWithHttpMessagesAsync(ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -780,13 +718,12 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("odataQuery", odataQuery);
                 tracingParameters.Add("skipToken", skipToken);
-                tracingParameters.Add("takeToken", takeToken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationMigrationItems").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationMigrationItems").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -807,10 +744,6 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             {
                 _queryParameters.Add(string.Format("skipToken={0}", System.Uri.EscapeDataString(skipToken)));
             }
-            if (takeToken != null)
-            {
-                _queryParameters.Add(string.Format("takeToken={0}", System.Uri.EscapeDataString(takeToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -1029,7 +962,7 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1254,7 +1187,7 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1466,7 +1399,7 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1702,7 +1635,7 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/migrate").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/migrate").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1845,242 +1778,6 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             return _result;
         }
 
-        /// <summary>
-        /// Resynchronizes replication.
-        /// </summary>
-        /// <remarks>
-        /// The operation to resynchronize replication of an ASR migration item.
-        /// </remarks>
-        /// <param name='fabricName'>
-        /// Fabric name.
-        /// </param>
-        /// <param name='protectionContainerName'>
-        /// Protection container name.
-        /// </param>
-        /// <param name='migrationItemName'>
-        /// Migration item name.
-        /// </param>
-        /// <param name='input'>
-        /// Resync input.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<MigrationItem>> BeginResyncWithHttpMessagesAsync(string fabricName, string protectionContainerName, string migrationItemName, ResyncInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (Client.ResourceName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ResourceName");
-            }
-            if (Client.ResourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ResourceGroupName");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (fabricName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "fabricName");
-            }
-            if (protectionContainerName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "protectionContainerName");
-            }
-            if (migrationItemName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "migrationItemName");
-            }
-            if (input == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "input");
-            }
-            if (input != null)
-            {
-                input.Validate();
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("fabricName", fabricName);
-                tracingParameters.Add("protectionContainerName", protectionContainerName);
-                tracingParameters.Add("migrationItemName", migrationItemName);
-                tracingParameters.Add("input", input);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginResync", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/resync").ToString();
-            _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{fabricName}", System.Uri.EscapeDataString(fabricName));
-            _url = _url.Replace("{protectionContainerName}", System.Uri.EscapeDataString(protectionContainerName));
-            _url = _url.Replace("{migrationItemName}", System.Uri.EscapeDataString(migrationItemName));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(input != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(input, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<MigrationItem>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<MigrationItem>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
         /// <summary>
         /// Test migrate item.
         /// </summary>
@@ -2174,7 +1871,7 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/testMigrate").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/testMigrate").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -2410,7 +2107,7 @@ internal ReplicationMigrationItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/testMigrateCleanup").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationMigrationItems/{migrationItemName}/testMigrateCleanup").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationMigrationItemsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationMigrationItemsOperationsExtensions.cs
index ed1bd14984db..21bc59b78678 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationMigrationItemsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationMigrationItemsOperationsExtensions.cs
@@ -37,18 +37,9 @@ public static partial class ReplicationMigrationItemsOperationsExtensions
             /// <param name='protectionContainerName'>
             /// Protection container name.
             /// </param>
-            /// <param name='odataQuery'>
-            /// OData parameters to apply to the operation.
-            /// </param>
-            /// <param name='skipToken'>
-            /// The pagination token.
-            /// </param>
-            /// <param name='takeToken'>
-            /// The page size.
-            /// </param>
-            public static IPage<MigrationItem> ListByReplicationProtectionContainers(this IReplicationMigrationItemsOperations operations, string fabricName, string protectionContainerName, ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), string takeToken = default(string))
+            public static IPage<MigrationItem> ListByReplicationProtectionContainers(this IReplicationMigrationItemsOperations operations, string fabricName, string protectionContainerName)
             {
-                return operations.ListByReplicationProtectionContainersAsync(fabricName, protectionContainerName, odataQuery, skipToken, takeToken).GetAwaiter().GetResult();
+                return operations.ListByReplicationProtectionContainersAsync(fabricName, protectionContainerName).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -66,21 +57,12 @@ public static partial class ReplicationMigrationItemsOperationsExtensions
             /// <param name='protectionContainerName'>
             /// Protection container name.
             /// </param>
-            /// <param name='odataQuery'>
-            /// OData parameters to apply to the operation.
-            /// </param>
-            /// <param name='skipToken'>
-            /// The pagination token.
-            /// </param>
-            /// <param name='takeToken'>
-            /// The page size.
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<MigrationItem>> ListByReplicationProtectionContainersAsync(this IReplicationMigrationItemsOperations operations, string fabricName, string protectionContainerName, ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), string takeToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<MigrationItem>> ListByReplicationProtectionContainersAsync(this IReplicationMigrationItemsOperations operations, string fabricName, string protectionContainerName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByReplicationProtectionContainersWithHttpMessagesAsync(fabricName, protectionContainerName, odataQuery, skipToken, takeToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByReplicationProtectionContainersWithHttpMessagesAsync(fabricName, protectionContainerName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -361,64 +343,6 @@ public static MigrationItem Migrate(this IReplicationMigrationItemsOperations op
                 }
             }
 
-            /// <summary>
-            /// Resynchronizes replication.
-            /// </summary>
-            /// <remarks>
-            /// The operation to resynchronize replication of an ASR migration item.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='fabricName'>
-            /// Fabric name.
-            /// </param>
-            /// <param name='protectionContainerName'>
-            /// Protection container name.
-            /// </param>
-            /// <param name='migrationItemName'>
-            /// Migration item name.
-            /// </param>
-            /// <param name='input'>
-            /// Resync input.
-            /// </param>
-            public static MigrationItem Resync(this IReplicationMigrationItemsOperations operations, string fabricName, string protectionContainerName, string migrationItemName, ResyncInput input)
-            {
-                return operations.ResyncAsync(fabricName, protectionContainerName, migrationItemName, input).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Resynchronizes replication.
-            /// </summary>
-            /// <remarks>
-            /// The operation to resynchronize replication of an ASR migration item.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='fabricName'>
-            /// Fabric name.
-            /// </param>
-            /// <param name='protectionContainerName'>
-            /// Protection container name.
-            /// </param>
-            /// <param name='migrationItemName'>
-            /// Migration item name.
-            /// </param>
-            /// <param name='input'>
-            /// Resync input.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<MigrationItem> ResyncAsync(this IReplicationMigrationItemsOperations operations, string fabricName, string protectionContainerName, string migrationItemName, ResyncInput input, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ResyncWithHttpMessagesAsync(fabricName, protectionContainerName, migrationItemName, input, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Test migrate item.
             /// </summary>
@@ -547,12 +471,9 @@ public static MigrationItem TestMigrateCleanup(this IReplicationMigrationItemsOp
             /// <param name='skipToken'>
             /// The pagination token.
             /// </param>
-            /// <param name='takeToken'>
-            /// The page size.
-            /// </param>
-            public static IPage<MigrationItem> List(this IReplicationMigrationItemsOperations operations, ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), string takeToken = default(string))
+            public static IPage<MigrationItem> List(this IReplicationMigrationItemsOperations operations, ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string))
             {
-                return operations.ListAsync(odataQuery, skipToken, takeToken).GetAwaiter().GetResult();
+                return operations.ListAsync(odataQuery, skipToken).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -567,15 +488,12 @@ public static MigrationItem TestMigrateCleanup(this IReplicationMigrationItemsOp
             /// <param name='skipToken'>
             /// The pagination token.
             /// </param>
-            /// <param name='takeToken'>
-            /// The page size.
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<MigrationItem>> ListAsync(this IReplicationMigrationItemsOperations operations, ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), string takeToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<MigrationItem>> ListAsync(this IReplicationMigrationItemsOperations operations, ODataQuery<MigrationItemsQueryParameter> odataQuery = default(ODataQuery<MigrationItemsQueryParameter>), string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListWithHttpMessagesAsync(odataQuery, skipToken, takeToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListWithHttpMessagesAsync(odataQuery, skipToken, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -810,64 +728,6 @@ public static MigrationItem BeginMigrate(this IReplicationMigrationItemsOperatio
                 }
             }
 
-            /// <summary>
-            /// Resynchronizes replication.
-            /// </summary>
-            /// <remarks>
-            /// The operation to resynchronize replication of an ASR migration item.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='fabricName'>
-            /// Fabric name.
-            /// </param>
-            /// <param name='protectionContainerName'>
-            /// Protection container name.
-            /// </param>
-            /// <param name='migrationItemName'>
-            /// Migration item name.
-            /// </param>
-            /// <param name='input'>
-            /// Resync input.
-            /// </param>
-            public static MigrationItem BeginResync(this IReplicationMigrationItemsOperations operations, string fabricName, string protectionContainerName, string migrationItemName, ResyncInput input)
-            {
-                return operations.BeginResyncAsync(fabricName, protectionContainerName, migrationItemName, input).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Resynchronizes replication.
-            /// </summary>
-            /// <remarks>
-            /// The operation to resynchronize replication of an ASR migration item.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='fabricName'>
-            /// Fabric name.
-            /// </param>
-            /// <param name='protectionContainerName'>
-            /// Protection container name.
-            /// </param>
-            /// <param name='migrationItemName'>
-            /// Migration item name.
-            /// </param>
-            /// <param name='input'>
-            /// Resync input.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<MigrationItem> BeginResyncAsync(this IReplicationMigrationItemsOperations operations, string fabricName, string protectionContainerName, string migrationItemName, ResyncInput input, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.BeginResyncWithHttpMessagesAsync(fabricName, protectionContainerName, migrationItemName, input, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Test migrate item.
             /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworkMappingsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworkMappingsOperations.cs
index b9fd0c430b75..361a53cadd86 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworkMappingsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworkMappingsOperations.cs
@@ -123,7 +123,7 @@ internal ReplicationNetworkMappingsOperations(SiteRecoveryManagementClient clien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -263,7 +263,7 @@ internal ReplicationNetworkMappingsOperations(SiteRecoveryManagementClient clien
         /// Gets network mapping by name.
         /// </summary>
         /// <remarks>
-        /// Gets the details of an ASR network mapping.
+        /// Gets the details of an ASR network mapping
         /// </remarks>
         /// <param name='fabricName'>
         /// Primary fabric name.
@@ -340,7 +340,7 @@ internal ReplicationNetworkMappingsOperations(SiteRecoveryManagementClient clien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings/{networkMappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings/{networkMappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -624,7 +624,7 @@ internal ReplicationNetworkMappingsOperations(SiteRecoveryManagementClient clien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationNetworkMappings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationNetworkMappings").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -831,10 +831,6 @@ internal ReplicationNetworkMappingsOperations(SiteRecoveryManagementClient clien
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "input");
             }
-            if (input != null)
-            {
-                input.Validate();
-            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -851,7 +847,7 @@ internal ReplicationNetworkMappingsOperations(SiteRecoveryManagementClient clien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings/{networkMappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings/{networkMappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1072,7 +1068,7 @@ internal ReplicationNetworkMappingsOperations(SiteRecoveryManagementClient clien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings/{networkMappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings/{networkMappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1280,7 +1276,7 @@ internal ReplicationNetworkMappingsOperations(SiteRecoveryManagementClient clien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings/{networkMappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}/replicationNetworkMappings/{networkMappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworkMappingsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworkMappingsOperationsExtensions.cs
index 4cab6b1aee78..26af45aa5752 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworkMappingsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworkMappingsOperationsExtensions.cs
@@ -71,7 +71,7 @@ public static IPage<NetworkMapping> ListByReplicationNetworks(this IReplicationN
             /// Gets network mapping by name.
             /// </summary>
             /// <remarks>
-            /// Gets the details of an ASR network mapping.
+            /// Gets the details of an ASR network mapping
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -94,7 +94,7 @@ public static NetworkMapping Get(this IReplicationNetworkMappingsOperations oper
             /// Gets network mapping by name.
             /// </summary>
             /// <remarks>
-            /// Gets the details of an ASR network mapping.
+            /// Gets the details of an ASR network mapping
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworksOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworksOperations.cs
index c9ab1748d20a..cbc93447e1b6 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworksOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworksOperations.cs
@@ -57,7 +57,7 @@ internal ReplicationNetworksOperations(SiteRecoveryManagementClient client)
         /// Lists the networks available for a fabric.
         /// </remarks>
         /// <param name='fabricName'>
-        /// Fabric name.
+        /// Fabric name
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -115,7 +115,7 @@ internal ReplicationNetworksOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -323,7 +323,7 @@ internal ReplicationNetworksOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationNetworks/{networkName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -463,7 +463,7 @@ internal ReplicationNetworksOperations(SiteRecoveryManagementClient client)
         /// Gets the list of networks. View-only API.
         /// </summary>
         /// <remarks>
-        /// Lists the networks available in a vault.
+        /// Lists the networks available in a vault
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -516,7 +516,7 @@ internal ReplicationNetworksOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationNetworks").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationNetworks").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -830,7 +830,7 @@ internal ReplicationNetworksOperations(SiteRecoveryManagementClient client)
         /// Gets the list of networks. View-only API.
         /// </summary>
         /// <remarks>
-        /// Lists the networks available in a vault.
+        /// Lists the networks available in a vault
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworksOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworksOperationsExtensions.cs
index 96b9df0dabf3..25706d34a3a7 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworksOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationNetworksOperationsExtensions.cs
@@ -31,7 +31,7 @@ public static partial class ReplicationNetworksOperationsExtensions
             /// The operations group for this extension method.
             /// </param>
             /// <param name='fabricName'>
-            /// Fabric name.
+            /// Fabric name
             /// </param>
             public static IPage<Network> ListByReplicationFabrics(this IReplicationNetworksOperations operations, string fabricName)
             {
@@ -48,7 +48,7 @@ public static IPage<Network> ListByReplicationFabrics(this IReplicationNetworksO
             /// The operations group for this extension method.
             /// </param>
             /// <param name='fabricName'>
-            /// Fabric name.
+            /// Fabric name
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -111,7 +111,7 @@ public static Network Get(this IReplicationNetworksOperations operations, string
             /// Gets the list of networks. View-only API.
             /// </summary>
             /// <remarks>
-            /// Lists the networks available in a vault.
+            /// Lists the networks available in a vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -125,7 +125,7 @@ public static IPage<Network> List(this IReplicationNetworksOperations operations
             /// Gets the list of networks. View-only API.
             /// </summary>
             /// <remarks>
-            /// Lists the networks available in a vault.
+            /// Lists the networks available in a vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -185,7 +185,7 @@ public static IPage<Network> ListByReplicationFabricsNext(this IReplicationNetwo
             /// Gets the list of networks. View-only API.
             /// </summary>
             /// <remarks>
-            /// Lists the networks available in a vault.
+            /// Lists the networks available in a vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -202,7 +202,7 @@ public static IPage<Network> ListNext(this IReplicationNetworksOperations operat
             /// Gets the list of networks. View-only API.
             /// </summary>
             /// <remarks>
-            /// Lists the networks available in a vault.
+            /// Lists the networks available in a vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationPoliciesOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationPoliciesOperations.cs
index 5ec93341541f..7400cfb8d8b6 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationPoliciesOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationPoliciesOperations.cs
@@ -51,7 +51,7 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
         public SiteRecoveryManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Gets the list of replication policies.
+        /// Gets the list of replication policies
         /// </summary>
         /// <remarks>
         /// Lists the replication policies for a vault.
@@ -107,7 +107,7 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -306,7 +306,7 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies/{policyName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies/{policyName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -445,13 +445,13 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
         /// Creates the policy.
         /// </summary>
         /// <remarks>
-        /// The operation to create a replication policy.
+        /// The operation to create a replication policy
         /// </remarks>
         /// <param name='policyName'>
-        /// Replication policy name.
+        /// Replication policy name
         /// </param>
         /// <param name='input'>
-        /// Create policy input.
+        /// Create policy input
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -498,7 +498,7 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
         /// Policy Id.
         /// </param>
         /// <param name='input'>
-        /// Update Policy Input.
+        /// Update Policy Input
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -517,13 +517,13 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
         /// Creates the policy.
         /// </summary>
         /// <remarks>
-        /// The operation to create a replication policy.
+        /// The operation to create a replication policy
         /// </remarks>
         /// <param name='policyName'>
-        /// Replication policy name.
+        /// Replication policy name
         /// </param>
         /// <param name='input'>
-        /// Create policy input.
+        /// Create policy input
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -586,7 +586,7 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies/{policyName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies/{policyName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -789,7 +789,7 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies/{policyName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies/{policyName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -916,7 +916,7 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
         /// Policy Id.
         /// </param>
         /// <param name='input'>
-        /// Update Policy Input.
+        /// Update Policy Input
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -979,7 +979,7 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies/{policyName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationPolicies/{policyName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1121,7 +1121,7 @@ internal ReplicationPoliciesOperations(SiteRecoveryManagementClient client)
         }
 
         /// <summary>
-        /// Gets the list of replication policies.
+        /// Gets the list of replication policies
         /// </summary>
         /// <remarks>
         /// Lists the replication policies for a vault.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationPoliciesOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationPoliciesOperationsExtensions.cs
index 93ab6eaeb852..9793cd20ad06 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationPoliciesOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationPoliciesOperationsExtensions.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
     public static partial class ReplicationPoliciesOperationsExtensions
     {
             /// <summary>
-            /// Gets the list of replication policies.
+            /// Gets the list of replication policies
             /// </summary>
             /// <remarks>
             /// Lists the replication policies for a vault.
@@ -36,7 +36,7 @@ public static IPage<Policy> List(this IReplicationPoliciesOperations operations)
             }
 
             /// <summary>
-            /// Gets the list of replication policies.
+            /// Gets the list of replication policies
             /// </summary>
             /// <remarks>
             /// Lists the replication policies for a vault.
@@ -99,16 +99,16 @@ public static Policy Get(this IReplicationPoliciesOperations operations, string
             /// Creates the policy.
             /// </summary>
             /// <remarks>
-            /// The operation to create a replication policy.
+            /// The operation to create a replication policy
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='policyName'>
-            /// Replication policy name.
+            /// Replication policy name
             /// </param>
             /// <param name='input'>
-            /// Create policy input.
+            /// Create policy input
             /// </param>
             public static Policy Create(this IReplicationPoliciesOperations operations, string policyName, CreatePolicyInput input)
             {
@@ -119,16 +119,16 @@ public static Policy Create(this IReplicationPoliciesOperations operations, stri
             /// Creates the policy.
             /// </summary>
             /// <remarks>
-            /// The operation to create a replication policy.
+            /// The operation to create a replication policy
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='policyName'>
-            /// Replication policy name.
+            /// Replication policy name
             /// </param>
             /// <param name='input'>
-            /// Create policy input.
+            /// Create policy input
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -191,7 +191,7 @@ public static void Delete(this IReplicationPoliciesOperations operations, string
             /// Policy Id.
             /// </param>
             /// <param name='input'>
-            /// Update Policy Input.
+            /// Update Policy Input
             /// </param>
             public static Policy Update(this IReplicationPoliciesOperations operations, string policyName, UpdatePolicyInput input)
             {
@@ -211,7 +211,7 @@ public static Policy Update(this IReplicationPoliciesOperations operations, stri
             /// Policy Id.
             /// </param>
             /// <param name='input'>
-            /// Update Policy Input.
+            /// Update Policy Input
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -228,16 +228,16 @@ public static Policy Update(this IReplicationPoliciesOperations operations, stri
             /// Creates the policy.
             /// </summary>
             /// <remarks>
-            /// The operation to create a replication policy.
+            /// The operation to create a replication policy
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='policyName'>
-            /// Replication policy name.
+            /// Replication policy name
             /// </param>
             /// <param name='input'>
-            /// Create policy input.
+            /// Create policy input
             /// </param>
             public static Policy BeginCreate(this IReplicationPoliciesOperations operations, string policyName, CreatePolicyInput input)
             {
@@ -248,16 +248,16 @@ public static Policy BeginCreate(this IReplicationPoliciesOperations operations,
             /// Creates the policy.
             /// </summary>
             /// <remarks>
-            /// The operation to create a replication policy.
+            /// The operation to create a replication policy
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='policyName'>
-            /// Replication policy name.
+            /// Replication policy name
             /// </param>
             /// <param name='input'>
-            /// Create policy input.
+            /// Create policy input
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -320,7 +320,7 @@ public static void BeginDelete(this IReplicationPoliciesOperations operations, s
             /// Policy Id.
             /// </param>
             /// <param name='input'>
-            /// Update Policy Input.
+            /// Update Policy Input
             /// </param>
             public static Policy BeginUpdate(this IReplicationPoliciesOperations operations, string policyName, UpdatePolicyInput input)
             {
@@ -340,7 +340,7 @@ public static Policy BeginUpdate(this IReplicationPoliciesOperations operations,
             /// Policy Id.
             /// </param>
             /// <param name='input'>
-            /// Update Policy Input.
+            /// Update Policy Input
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -354,7 +354,7 @@ public static Policy BeginUpdate(this IReplicationPoliciesOperations operations,
             }
 
             /// <summary>
-            /// Gets the list of replication policies.
+            /// Gets the list of replication policies
             /// </summary>
             /// <remarks>
             /// Lists the replication policies for a vault.
@@ -371,7 +371,7 @@ public static IPage<Policy> ListNext(this IReplicationPoliciesOperations operati
             }
 
             /// <summary>
-            /// Gets the list of replication policies.
+            /// Gets the list of replication policies
             /// </summary>
             /// <remarks>
             /// Lists the replication policies for a vault.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectableItemsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectableItemsOperations.cs
index f2fce88cc59b..1b75f648e2cf 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectableItemsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectableItemsOperations.cs
@@ -66,12 +66,6 @@ internal ReplicationProtectableItemsOperations(SiteRecoveryManagementClient clie
         /// <param name='odataQuery'>
         /// OData parameters to apply to the operation.
         /// </param>
-        /// <param name='take'>
-        /// take OData query parameter.
-        /// </param>
-        /// <param name='skipToken'>
-        /// skipToken OData query parameter.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -93,7 +87,7 @@ internal ReplicationProtectableItemsOperations(SiteRecoveryManagementClient clie
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProtectableItem>>> ListByReplicationProtectionContainersWithHttpMessagesAsync(string fabricName, string protectionContainerName, ODataQuery<ProtectableItemQueryParameter> odataQuery = default(ODataQuery<ProtectableItemQueryParameter>), string take = default(string), string skipToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProtectableItem>>> ListByReplicationProtectionContainersWithHttpMessagesAsync(string fabricName, string protectionContainerName, ODataQuery<ProtectableItemQueryParameter> odataQuery = default(ODataQuery<ProtectableItemQueryParameter>), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -129,14 +123,12 @@ internal ReplicationProtectableItemsOperations(SiteRecoveryManagementClient clie
                 tracingParameters.Add("odataQuery", odataQuery);
                 tracingParameters.Add("fabricName", fabricName);
                 tracingParameters.Add("protectionContainerName", protectionContainerName);
-                tracingParameters.Add("take", take);
-                tracingParameters.Add("skipToken", skipToken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByReplicationProtectionContainers", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectableItems").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectableItems").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -155,14 +147,6 @@ internal ReplicationProtectableItemsOperations(SiteRecoveryManagementClient clie
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (take != null)
-            {
-                _queryParameters.Add(string.Format("$take={0}", System.Uri.EscapeDataString(take)));
-            }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -369,7 +353,7 @@ internal ReplicationProtectableItemsOperations(SiteRecoveryManagementClient clie
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectableItems/{protectableItemName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectableItems/{protectableItemName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectableItemsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectableItemsOperationsExtensions.cs
index 8be3bcfd5ecb..cc712b2cf07b 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectableItemsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectableItemsOperationsExtensions.cs
@@ -40,15 +40,9 @@ public static partial class ReplicationProtectableItemsOperationsExtensions
             /// <param name='odataQuery'>
             /// OData parameters to apply to the operation.
             /// </param>
-            /// <param name='take'>
-            /// take OData query parameter.
-            /// </param>
-            /// <param name='skipToken'>
-            /// skipToken OData query parameter.
-            /// </param>
-            public static IPage<ProtectableItem> ListByReplicationProtectionContainers(this IReplicationProtectableItemsOperations operations, string fabricName, string protectionContainerName, ODataQuery<ProtectableItemQueryParameter> odataQuery = default(ODataQuery<ProtectableItemQueryParameter>), string take = default(string), string skipToken = default(string))
+            public static IPage<ProtectableItem> ListByReplicationProtectionContainers(this IReplicationProtectableItemsOperations operations, string fabricName, string protectionContainerName, ODataQuery<ProtectableItemQueryParameter> odataQuery = default(ODataQuery<ProtectableItemQueryParameter>))
             {
-                return operations.ListByReplicationProtectionContainersAsync(fabricName, protectionContainerName, odataQuery, take, skipToken).GetAwaiter().GetResult();
+                return operations.ListByReplicationProtectionContainersAsync(fabricName, protectionContainerName, odataQuery).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -69,18 +63,12 @@ public static partial class ReplicationProtectableItemsOperationsExtensions
             /// <param name='odataQuery'>
             /// OData parameters to apply to the operation.
             /// </param>
-            /// <param name='take'>
-            /// take OData query parameter.
-            /// </param>
-            /// <param name='skipToken'>
-            /// skipToken OData query parameter.
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ProtectableItem>> ListByReplicationProtectionContainersAsync(this IReplicationProtectableItemsOperations operations, string fabricName, string protectionContainerName, ODataQuery<ProtectableItemQueryParameter> odataQuery = default(ODataQuery<ProtectableItemQueryParameter>), string take = default(string), string skipToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ProtectableItem>> ListByReplicationProtectionContainersAsync(this IReplicationProtectableItemsOperations operations, string fabricName, string protectionContainerName, ODataQuery<ProtectableItemQueryParameter> odataQuery = default(ODataQuery<ProtectableItemQueryParameter>), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByReplicationProtectionContainersWithHttpMessagesAsync(fabricName, protectionContainerName, odataQuery, take, skipToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByReplicationProtectionContainersWithHttpMessagesAsync(fabricName, protectionContainerName, odataQuery, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectedItemsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectedItemsOperations.cs
index 8ddcf039c7cc..f36b05bdaec0 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectedItemsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectedItemsOperations.cs
@@ -125,7 +125,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -342,7 +342,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -543,7 +543,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Updates the replication protected item settings.
+        /// Updates protection.
         /// </summary>
         /// <remarks>
         /// The operation to update the recovery settings of an ASR replication
@@ -619,7 +619,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// The protection container name.
         /// </param>
         /// <param name='replicatedProtectedItemName'>
-        /// The replicated protected item name.
+        /// The replicated protected item's name.
         /// </param>
         /// <param name='applyRecoveryPointInput'>
         /// The ApplyRecoveryPointInput.
@@ -638,35 +638,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute cancel failover.
-        /// </summary>
-        /// <remarks>
-        /// Operation to cancel the failover of the replication protected item.
-        /// </remarks>
-        /// <param name='fabricName'>
-        /// Unique fabric name.
-        /// </param>
-        /// <param name='protectionContainerName'>
-        /// Protection container name.
-        /// </param>
-        /// <param name='replicatedProtectedItemName'>
-        /// Replication protected item name.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<ReplicationProtectedItem>> FailoverCancelWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<ReplicationProtectedItem> _response = await BeginFailoverCancelWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Execute commit failover.
+        /// Execute commit failover
         /// </summary>
         /// <remarks>
         /// Operation to commit the failover of the replication protected item.
@@ -694,7 +666,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute planned failover.
+        /// Execute planned failover
         /// </summary>
         /// <remarks>
         /// Operation to initiate a planned failover of the replication protected item.
@@ -709,7 +681,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// Replication protected item name.
         /// </param>
         /// <param name='failoverInput'>
-        /// Planned failover input.
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -817,7 +789,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute Reverse Replication\Reprotect.
+        /// Execute Reverse Replication\Reprotect
         /// </summary>
         /// <remarks>
         /// Operation to reprotect or reverse replicate a failed over replication
@@ -832,8 +804,8 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// <param name='replicatedProtectedItemName'>
         /// Replication protected item name.
         /// </param>
-        /// <param name='reprotectInput'>
-        /// Reverse replication input.
+        /// <param name='rrInput'>
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -841,10 +813,10 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async Task<AzureOperationResponse<ReplicationProtectedItem>> ReprotectWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput reprotectInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ReplicationProtectedItem>> ReprotectWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput rrInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Send request
-            AzureOperationResponse<ReplicationProtectedItem> _response = await BeginReprotectWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, reprotectInput, customHeaders, cancellationToken).ConfigureAwait(false);
+            AzureOperationResponse<ReplicationProtectedItem> _response = await BeginReprotectWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, rrInput, customHeaders, cancellationToken).ConfigureAwait(false);
             return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
@@ -880,7 +852,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute test failover.
+        /// Execute test failover
         /// </summary>
         /// <remarks>
         /// Operation to perform a test failover of the replication protected item.
@@ -894,7 +866,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// <param name='replicatedProtectedItemName'>
         /// Replication protected item name.
         /// </param>
-        /// <param name='testfailoverInput'>
+        /// <param name='failoverInput'>
         /// Test failover input.
         /// </param>
         /// <param name='customHeaders'>
@@ -903,10 +875,10 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async Task<AzureOperationResponse<ReplicationProtectedItem>> TestFailoverWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput testfailoverInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ReplicationProtectedItem>> TestFailoverWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput failoverInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Send request
-            AzureOperationResponse<ReplicationProtectedItem> _response = await BeginTestFailoverWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, testfailoverInput, customHeaders, cancellationToken).ConfigureAwait(false);
+            AzureOperationResponse<ReplicationProtectedItem> _response = await BeginTestFailoverWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, failoverInput, customHeaders, cancellationToken).ConfigureAwait(false);
             return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
@@ -942,7 +914,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute unplanned failover.
+        /// Execute unplanned failover
         /// </summary>
         /// <remarks>
         /// Operation to initiate a failover of the replication protected item.
@@ -957,7 +929,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// Replication protected item name.
         /// </param>
         /// <param name='failoverInput'>
-        /// Failover input.
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -1015,7 +987,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// </param>
         /// <param name='skipToken'>
         /// The pagination token. Possible values: "FabricId" or "FabricId_CloudId" or
-        /// null.
+        /// null
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1070,7 +1042,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationProtectedItems").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationProtectedItems").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1306,7 +1278,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1530,7 +1502,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1650,7 +1622,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Updates the replication protected item settings.
+        /// Updates protection.
         /// </summary>
         /// <remarks>
         /// The operation to update the recovery settings of an ASR replication
@@ -1739,7 +1711,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1955,10 +1927,6 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "addDisksInput");
             }
-            if (addDisksInput != null)
-            {
-                addDisksInput.Validate();
-            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1975,7 +1943,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/addDisks").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/addDisks").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -2132,7 +2100,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// The protection container name.
         /// </param>
         /// <param name='replicatedProtectedItemName'>
-        /// The replicated protected item name.
+        /// The replicated protected item's name.
         /// </param>
         /// <param name='applyRecoveryPointInput'>
         /// The ApplyRecoveryPointInput.
@@ -2192,10 +2160,6 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "applyRecoveryPointInput");
             }
-            if (applyRecoveryPointInput != null)
-            {
-                applyRecoveryPointInput.Validate();
-            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2212,7 +2176,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/applyRecoveryPoint").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/applyRecoveryPoint").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -2356,225 +2320,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute cancel failover.
-        /// </summary>
-        /// <remarks>
-        /// Operation to cancel the failover of the replication protected item.
-        /// </remarks>
-        /// <param name='fabricName'>
-        /// Unique fabric name.
-        /// </param>
-        /// <param name='protectionContainerName'>
-        /// Protection container name.
-        /// </param>
-        /// <param name='replicatedProtectedItemName'>
-        /// Replication protected item name.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<ReplicationProtectedItem>> BeginFailoverCancelWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (Client.ResourceName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ResourceName");
-            }
-            if (Client.ResourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ResourceGroupName");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (fabricName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "fabricName");
-            }
-            if (protectionContainerName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "protectionContainerName");
-            }
-            if (replicatedProtectedItemName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "replicatedProtectedItemName");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("fabricName", fabricName);
-                tracingParameters.Add("protectionContainerName", protectionContainerName);
-                tracingParameters.Add("replicatedProtectedItemName", replicatedProtectedItemName);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginFailoverCancel", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/failoverCancel").ToString();
-            _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{fabricName}", System.Uri.EscapeDataString(fabricName));
-            _url = _url.Replace("{protectionContainerName}", System.Uri.EscapeDataString(protectionContainerName));
-            _url = _url.Replace("{replicatedProtectedItemName}", System.Uri.EscapeDataString(replicatedProtectedItemName));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<ReplicationProtectedItem>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ReplicationProtectedItem>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Execute commit failover.
+        /// Execute commit failover
         /// </summary>
         /// <remarks>
         /// Operation to commit the failover of the replication protected item.
@@ -2654,7 +2400,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/failoverCommit").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/failoverCommit").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -2792,7 +2538,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute planned failover.
+        /// Execute planned failover
         /// </summary>
         /// <remarks>
         /// Operation to initiate a planned failover of the replication protected item.
@@ -2807,7 +2553,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// Replication protected item name.
         /// </param>
         /// <param name='failoverInput'>
-        /// Planned failover input.
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2880,7 +2626,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/plannedFailover").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/plannedFailover").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -3094,10 +2840,6 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "disableProtectionInput");
             }
-            if (disableProtectionInput != null)
-            {
-                disableProtectionInput.Validate();
-            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3114,7 +2856,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/remove").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/remove").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -3328,7 +3070,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/removeDisks").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/removeDisks").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -3553,7 +3295,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/repairReplication").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/repairReplication").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -3691,7 +3433,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute Reverse Replication\Reprotect.
+        /// Execute Reverse Replication\Reprotect
         /// </summary>
         /// <remarks>
         /// Operation to reprotect or reverse replicate a failed over replication
@@ -3706,8 +3448,8 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// <param name='replicatedProtectedItemName'>
         /// Replication protected item name.
         /// </param>
-        /// <param name='reprotectInput'>
-        /// Reverse replication input.
+        /// <param name='rrInput'>
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -3730,7 +3472,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ReplicationProtectedItem>> BeginReprotectWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput reprotectInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ReplicationProtectedItem>> BeginReprotectWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput rrInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -3760,9 +3502,9 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "replicatedProtectedItemName");
             }
-            if (reprotectInput == null)
+            if (rrInput == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "reprotectInput");
+                throw new ValidationException(ValidationRules.CannotBeNull, "rrInput");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -3774,13 +3516,13 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
                 tracingParameters.Add("fabricName", fabricName);
                 tracingParameters.Add("protectionContainerName", protectionContainerName);
                 tracingParameters.Add("replicatedProtectedItemName", replicatedProtectedItemName);
-                tracingParameters.Add("reprotectInput", reprotectInput);
+                tracingParameters.Add("rrInput", rrInput);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginReprotect", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/reProtect").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/reProtect").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -3830,9 +3572,9 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
 
             // Serialize Request
             string _requestContent = null;
-            if(reprotectInput != null)
+            if(rrInput != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(reprotectInput, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(rrInput, Client.SerializationSettings);
                 _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
                 _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
@@ -4012,7 +3754,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/resolveHealthErrors").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/ResolveHealthErrors").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -4156,7 +3898,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute test failover.
+        /// Execute test failover
         /// </summary>
         /// <remarks>
         /// Operation to perform a test failover of the replication protected item.
@@ -4170,7 +3912,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// <param name='replicatedProtectedItemName'>
         /// Replication protected item name.
         /// </param>
-        /// <param name='testfailoverInput'>
+        /// <param name='failoverInput'>
         /// Test failover input.
         /// </param>
         /// <param name='customHeaders'>
@@ -4194,7 +3936,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ReplicationProtectedItem>> BeginTestFailoverWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput testfailoverInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ReplicationProtectedItem>> BeginTestFailoverWithHttpMessagesAsync(string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput failoverInput, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -4224,13 +3966,9 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "replicatedProtectedItemName");
             }
-            if (testfailoverInput == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "testfailoverInput");
-            }
-            if (testfailoverInput != null)
+            if (failoverInput == null)
             {
-                testfailoverInput.Validate();
+                throw new ValidationException(ValidationRules.CannotBeNull, "failoverInput");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -4242,13 +3980,13 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
                 tracingParameters.Add("fabricName", fabricName);
                 tracingParameters.Add("protectionContainerName", protectionContainerName);
                 tracingParameters.Add("replicatedProtectedItemName", replicatedProtectedItemName);
-                tracingParameters.Add("testfailoverInput", testfailoverInput);
+                tracingParameters.Add("failoverInput", failoverInput);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginTestFailover", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/testFailover").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/testFailover").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -4298,9 +4036,9 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
 
             // Serialize Request
             string _requestContent = null;
-            if(testfailoverInput != null)
+            if(failoverInput != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(testfailoverInput, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(failoverInput, Client.SerializationSettings);
                 _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
                 _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
@@ -4484,7 +4222,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/testFailoverCleanup").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/testFailoverCleanup").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -4628,7 +4366,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         }
 
         /// <summary>
-        /// Execute unplanned failover.
+        /// Execute unplanned failover
         /// </summary>
         /// <remarks>
         /// Operation to initiate a failover of the replication protected item.
@@ -4643,7 +4381,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
         /// Replication protected item name.
         /// </param>
         /// <param name='failoverInput'>
-        /// Failover input.
+        /// Disable protection input.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -4700,10 +4438,6 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "failoverInput");
             }
-            if (failoverInput != null)
-            {
-                failoverInput.Validate();
-            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4720,7 +4454,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/unplannedFailover").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/unplannedFailover").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -4953,7 +4687,7 @@ internal ReplicationProtectedItemsOperations(SiteRecoveryManagementClient client
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicationProtectedItemName}/updateMobilityService").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicationProtectedItemName}/updateMobilityService").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectedItemsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectedItemsOperationsExtensions.cs
index 8df0e6575051..d4fb526124c8 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectedItemsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectedItemsOperationsExtensions.cs
@@ -238,7 +238,7 @@ public static void Purge(this IReplicationProtectedItemsOperations operations, s
             }
 
             /// <summary>
-            /// Updates the replication protected item settings.
+            /// Updates protection.
             /// </summary>
             /// <remarks>
             /// The operation to update the recovery settings of an ASR replication
@@ -265,7 +265,7 @@ public static ReplicationProtectedItem Update(this IReplicationProtectedItemsOpe
             }
 
             /// <summary>
-            /// Updates the replication protected item settings.
+            /// Updates protection.
             /// </summary>
             /// <remarks>
             /// The operation to update the recovery settings of an ASR replication
@@ -372,7 +372,7 @@ public static ReplicationProtectedItem AddDisks(this IReplicationProtectedItemsO
             /// The protection container name.
             /// </param>
             /// <param name='replicatedProtectedItemName'>
-            /// The replicated protected item name.
+            /// The replicated protected item's name.
             /// </param>
             /// <param name='applyRecoveryPointInput'>
             /// The ApplyRecoveryPointInput.
@@ -399,7 +399,7 @@ public static ReplicationProtectedItem ApplyRecoveryPoint(this IReplicationProte
             /// The protection container name.
             /// </param>
             /// <param name='replicatedProtectedItemName'>
-            /// The replicated protected item name.
+            /// The replicated protected item's name.
             /// </param>
             /// <param name='applyRecoveryPointInput'>
             /// The ApplyRecoveryPointInput.
@@ -416,59 +416,7 @@ public static ReplicationProtectedItem ApplyRecoveryPoint(this IReplicationProte
             }
 
             /// <summary>
-            /// Execute cancel failover.
-            /// </summary>
-            /// <remarks>
-            /// Operation to cancel the failover of the replication protected item.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='fabricName'>
-            /// Unique fabric name.
-            /// </param>
-            /// <param name='protectionContainerName'>
-            /// Protection container name.
-            /// </param>
-            /// <param name='replicatedProtectedItemName'>
-            /// Replication protected item name.
-            /// </param>
-            public static ReplicationProtectedItem FailoverCancel(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName)
-            {
-                return operations.FailoverCancelAsync(fabricName, protectionContainerName, replicatedProtectedItemName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Execute cancel failover.
-            /// </summary>
-            /// <remarks>
-            /// Operation to cancel the failover of the replication protected item.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='fabricName'>
-            /// Unique fabric name.
-            /// </param>
-            /// <param name='protectionContainerName'>
-            /// Protection container name.
-            /// </param>
-            /// <param name='replicatedProtectedItemName'>
-            /// Replication protected item name.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<ReplicationProtectedItem> FailoverCancelAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.FailoverCancelWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Execute commit failover.
+            /// Execute commit failover
             /// </summary>
             /// <remarks>
             /// Operation to commit the failover of the replication protected item.
@@ -491,7 +439,7 @@ public static ReplicationProtectedItem FailoverCommit(this IReplicationProtected
             }
 
             /// <summary>
-            /// Execute commit failover.
+            /// Execute commit failover
             /// </summary>
             /// <remarks>
             /// Operation to commit the failover of the replication protected item.
@@ -520,7 +468,7 @@ public static ReplicationProtectedItem FailoverCommit(this IReplicationProtected
             }
 
             /// <summary>
-            /// Execute planned failover.
+            /// Execute planned failover
             /// </summary>
             /// <remarks>
             /// Operation to initiate a planned failover of the replication protected item.
@@ -538,7 +486,7 @@ public static ReplicationProtectedItem FailoverCommit(this IReplicationProtected
             /// Replication protected item name.
             /// </param>
             /// <param name='failoverInput'>
-            /// Planned failover input.
+            /// Disable protection input.
             /// </param>
             public static ReplicationProtectedItem PlannedFailover(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, PlannedFailoverInput failoverInput)
             {
@@ -546,7 +494,7 @@ public static ReplicationProtectedItem PlannedFailover(this IReplicationProtecte
             }
 
             /// <summary>
-            /// Execute planned failover.
+            /// Execute planned failover
             /// </summary>
             /// <remarks>
             /// Operation to initiate a planned failover of the replication protected item.
@@ -564,7 +512,7 @@ public static ReplicationProtectedItem PlannedFailover(this IReplicationProtecte
             /// Replication protected item name.
             /// </param>
             /// <param name='failoverInput'>
-            /// Planned failover input.
+            /// Disable protection input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -747,7 +695,7 @@ public static ReplicationProtectedItem RepairReplication(this IReplicationProtec
             }
 
             /// <summary>
-            /// Execute Reverse Replication\Reprotect.
+            /// Execute Reverse Replication\Reprotect
             /// </summary>
             /// <remarks>
             /// Operation to reprotect or reverse replicate a failed over replication
@@ -765,16 +713,16 @@ public static ReplicationProtectedItem RepairReplication(this IReplicationProtec
             /// <param name='replicatedProtectedItemName'>
             /// Replication protected item name.
             /// </param>
-            /// <param name='reprotectInput'>
-            /// Reverse replication input.
+            /// <param name='rrInput'>
+            /// Disable protection input.
             /// </param>
-            public static ReplicationProtectedItem Reprotect(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput reprotectInput)
+            public static ReplicationProtectedItem Reprotect(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput rrInput)
             {
-                return operations.ReprotectAsync(fabricName, protectionContainerName, replicatedProtectedItemName, reprotectInput).GetAwaiter().GetResult();
+                return operations.ReprotectAsync(fabricName, protectionContainerName, replicatedProtectedItemName, rrInput).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Execute Reverse Replication\Reprotect.
+            /// Execute Reverse Replication\Reprotect
             /// </summary>
             /// <remarks>
             /// Operation to reprotect or reverse replicate a failed over replication
@@ -792,15 +740,15 @@ public static ReplicationProtectedItem Reprotect(this IReplicationProtectedItems
             /// <param name='replicatedProtectedItemName'>
             /// Replication protected item name.
             /// </param>
-            /// <param name='reprotectInput'>
-            /// Reverse replication input.
+            /// <param name='rrInput'>
+            /// Disable protection input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ReplicationProtectedItem> ReprotectAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput reprotectInput, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ReplicationProtectedItem> ReprotectAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput rrInput, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ReprotectWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, reprotectInput, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ReprotectWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, rrInput, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -865,7 +813,7 @@ public static ReplicationProtectedItem ResolveHealthErrors(this IReplicationProt
             }
 
             /// <summary>
-            /// Execute test failover.
+            /// Execute test failover
             /// </summary>
             /// <remarks>
             /// Operation to perform a test failover of the replication protected item.
@@ -882,16 +830,16 @@ public static ReplicationProtectedItem ResolveHealthErrors(this IReplicationProt
             /// <param name='replicatedProtectedItemName'>
             /// Replication protected item name.
             /// </param>
-            /// <param name='testfailoverInput'>
+            /// <param name='failoverInput'>
             /// Test failover input.
             /// </param>
-            public static ReplicationProtectedItem TestFailover(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput testfailoverInput)
+            public static ReplicationProtectedItem TestFailover(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput failoverInput)
             {
-                return operations.TestFailoverAsync(fabricName, protectionContainerName, replicatedProtectedItemName, testfailoverInput).GetAwaiter().GetResult();
+                return operations.TestFailoverAsync(fabricName, protectionContainerName, replicatedProtectedItemName, failoverInput).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Execute test failover.
+            /// Execute test failover
             /// </summary>
             /// <remarks>
             /// Operation to perform a test failover of the replication protected item.
@@ -908,15 +856,15 @@ public static ReplicationProtectedItem TestFailover(this IReplicationProtectedIt
             /// <param name='replicatedProtectedItemName'>
             /// Replication protected item name.
             /// </param>
-            /// <param name='testfailoverInput'>
+            /// <param name='failoverInput'>
             /// Test failover input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ReplicationProtectedItem> TestFailoverAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput testfailoverInput, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ReplicationProtectedItem> TestFailoverAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput failoverInput, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.TestFailoverWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, testfailoverInput, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.TestFailoverWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, failoverInput, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -981,7 +929,7 @@ public static ReplicationProtectedItem TestFailoverCleanup(this IReplicationProt
             }
 
             /// <summary>
-            /// Execute unplanned failover.
+            /// Execute unplanned failover
             /// </summary>
             /// <remarks>
             /// Operation to initiate a failover of the replication protected item.
@@ -999,7 +947,7 @@ public static ReplicationProtectedItem TestFailoverCleanup(this IReplicationProt
             /// Replication protected item name.
             /// </param>
             /// <param name='failoverInput'>
-            /// Failover input.
+            /// Disable protection input.
             /// </param>
             public static ReplicationProtectedItem UnplannedFailover(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, UnplannedFailoverInput failoverInput)
             {
@@ -1007,7 +955,7 @@ public static ReplicationProtectedItem UnplannedFailover(this IReplicationProtec
             }
 
             /// <summary>
-            /// Execute unplanned failover.
+            /// Execute unplanned failover
             /// </summary>
             /// <remarks>
             /// Operation to initiate a failover of the replication protected item.
@@ -1025,7 +973,7 @@ public static ReplicationProtectedItem UnplannedFailover(this IReplicationProtec
             /// Replication protected item name.
             /// </param>
             /// <param name='failoverInput'>
-            /// Failover input.
+            /// Disable protection input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -1112,7 +1060,7 @@ public static ReplicationProtectedItem UpdateMobilityService(this IReplicationPr
             /// </param>
             /// <param name='skipToken'>
             /// The pagination token. Possible values: "FabricId" or "FabricId_CloudId" or
-            /// null.
+            /// null
             /// </param>
             public static IPage<ReplicationProtectedItem> List(this IReplicationProtectedItemsOperations operations, ODataQuery<ProtectedItemsQueryParameter> odataQuery = default(ODataQuery<ProtectedItemsQueryParameter>), string skipToken = default(string))
             {
@@ -1133,7 +1081,7 @@ public static ReplicationProtectedItem UpdateMobilityService(this IReplicationPr
             /// </param>
             /// <param name='skipToken'>
             /// The pagination token. Possible values: "FabricId" or "FabricId_CloudId" or
-            /// null.
+            /// null
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -1262,7 +1210,7 @@ public static void BeginPurge(this IReplicationProtectedItemsOperations operatio
             }
 
             /// <summary>
-            /// Updates the replication protected item settings.
+            /// Updates protection.
             /// </summary>
             /// <remarks>
             /// The operation to update the recovery settings of an ASR replication
@@ -1289,7 +1237,7 @@ public static ReplicationProtectedItem BeginUpdate(this IReplicationProtectedIte
             }
 
             /// <summary>
-            /// Updates the replication protected item settings.
+            /// Updates protection.
             /// </summary>
             /// <remarks>
             /// The operation to update the recovery settings of an ASR replication
@@ -1396,7 +1344,7 @@ public static ReplicationProtectedItem BeginAddDisks(this IReplicationProtectedI
             /// The protection container name.
             /// </param>
             /// <param name='replicatedProtectedItemName'>
-            /// The replicated protected item name.
+            /// The replicated protected item's name.
             /// </param>
             /// <param name='applyRecoveryPointInput'>
             /// The ApplyRecoveryPointInput.
@@ -1423,7 +1371,7 @@ public static ReplicationProtectedItem BeginApplyRecoveryPoint(this IReplication
             /// The protection container name.
             /// </param>
             /// <param name='replicatedProtectedItemName'>
-            /// The replicated protected item name.
+            /// The replicated protected item's name.
             /// </param>
             /// <param name='applyRecoveryPointInput'>
             /// The ApplyRecoveryPointInput.
@@ -1440,59 +1388,7 @@ public static ReplicationProtectedItem BeginApplyRecoveryPoint(this IReplication
             }
 
             /// <summary>
-            /// Execute cancel failover.
-            /// </summary>
-            /// <remarks>
-            /// Operation to cancel the failover of the replication protected item.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='fabricName'>
-            /// Unique fabric name.
-            /// </param>
-            /// <param name='protectionContainerName'>
-            /// Protection container name.
-            /// </param>
-            /// <param name='replicatedProtectedItemName'>
-            /// Replication protected item name.
-            /// </param>
-            public static ReplicationProtectedItem BeginFailoverCancel(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName)
-            {
-                return operations.BeginFailoverCancelAsync(fabricName, protectionContainerName, replicatedProtectedItemName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Execute cancel failover.
-            /// </summary>
-            /// <remarks>
-            /// Operation to cancel the failover of the replication protected item.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='fabricName'>
-            /// Unique fabric name.
-            /// </param>
-            /// <param name='protectionContainerName'>
-            /// Protection container name.
-            /// </param>
-            /// <param name='replicatedProtectedItemName'>
-            /// Replication protected item name.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<ReplicationProtectedItem> BeginFailoverCancelAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.BeginFailoverCancelWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Execute commit failover.
+            /// Execute commit failover
             /// </summary>
             /// <remarks>
             /// Operation to commit the failover of the replication protected item.
@@ -1515,7 +1411,7 @@ public static ReplicationProtectedItem BeginFailoverCommit(this IReplicationProt
             }
 
             /// <summary>
-            /// Execute commit failover.
+            /// Execute commit failover
             /// </summary>
             /// <remarks>
             /// Operation to commit the failover of the replication protected item.
@@ -1544,7 +1440,7 @@ public static ReplicationProtectedItem BeginFailoverCommit(this IReplicationProt
             }
 
             /// <summary>
-            /// Execute planned failover.
+            /// Execute planned failover
             /// </summary>
             /// <remarks>
             /// Operation to initiate a planned failover of the replication protected item.
@@ -1562,7 +1458,7 @@ public static ReplicationProtectedItem BeginFailoverCommit(this IReplicationProt
             /// Replication protected item name.
             /// </param>
             /// <param name='failoverInput'>
-            /// Planned failover input.
+            /// Disable protection input.
             /// </param>
             public static ReplicationProtectedItem BeginPlannedFailover(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, PlannedFailoverInput failoverInput)
             {
@@ -1570,7 +1466,7 @@ public static ReplicationProtectedItem BeginPlannedFailover(this IReplicationPro
             }
 
             /// <summary>
-            /// Execute planned failover.
+            /// Execute planned failover
             /// </summary>
             /// <remarks>
             /// Operation to initiate a planned failover of the replication protected item.
@@ -1588,7 +1484,7 @@ public static ReplicationProtectedItem BeginPlannedFailover(this IReplicationPro
             /// Replication protected item name.
             /// </param>
             /// <param name='failoverInput'>
-            /// Planned failover input.
+            /// Disable protection input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -1771,7 +1667,7 @@ public static ReplicationProtectedItem BeginRepairReplication(this IReplicationP
             }
 
             /// <summary>
-            /// Execute Reverse Replication\Reprotect.
+            /// Execute Reverse Replication\Reprotect
             /// </summary>
             /// <remarks>
             /// Operation to reprotect or reverse replicate a failed over replication
@@ -1789,16 +1685,16 @@ public static ReplicationProtectedItem BeginRepairReplication(this IReplicationP
             /// <param name='replicatedProtectedItemName'>
             /// Replication protected item name.
             /// </param>
-            /// <param name='reprotectInput'>
-            /// Reverse replication input.
+            /// <param name='rrInput'>
+            /// Disable protection input.
             /// </param>
-            public static ReplicationProtectedItem BeginReprotect(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput reprotectInput)
+            public static ReplicationProtectedItem BeginReprotect(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput rrInput)
             {
-                return operations.BeginReprotectAsync(fabricName, protectionContainerName, replicatedProtectedItemName, reprotectInput).GetAwaiter().GetResult();
+                return operations.BeginReprotectAsync(fabricName, protectionContainerName, replicatedProtectedItemName, rrInput).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Execute Reverse Replication\Reprotect.
+            /// Execute Reverse Replication\Reprotect
             /// </summary>
             /// <remarks>
             /// Operation to reprotect or reverse replicate a failed over replication
@@ -1816,15 +1712,15 @@ public static ReplicationProtectedItem BeginReprotect(this IReplicationProtected
             /// <param name='replicatedProtectedItemName'>
             /// Replication protected item name.
             /// </param>
-            /// <param name='reprotectInput'>
-            /// Reverse replication input.
+            /// <param name='rrInput'>
+            /// Disable protection input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ReplicationProtectedItem> BeginReprotectAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput reprotectInput, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ReplicationProtectedItem> BeginReprotectAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, ReverseReplicationInput rrInput, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.BeginReprotectWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, reprotectInput, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.BeginReprotectWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, rrInput, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -1889,7 +1785,7 @@ public static ReplicationProtectedItem BeginResolveHealthErrors(this IReplicatio
             }
 
             /// <summary>
-            /// Execute test failover.
+            /// Execute test failover
             /// </summary>
             /// <remarks>
             /// Operation to perform a test failover of the replication protected item.
@@ -1906,16 +1802,16 @@ public static ReplicationProtectedItem BeginResolveHealthErrors(this IReplicatio
             /// <param name='replicatedProtectedItemName'>
             /// Replication protected item name.
             /// </param>
-            /// <param name='testfailoverInput'>
+            /// <param name='failoverInput'>
             /// Test failover input.
             /// </param>
-            public static ReplicationProtectedItem BeginTestFailover(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput testfailoverInput)
+            public static ReplicationProtectedItem BeginTestFailover(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput failoverInput)
             {
-                return operations.BeginTestFailoverAsync(fabricName, protectionContainerName, replicatedProtectedItemName, testfailoverInput).GetAwaiter().GetResult();
+                return operations.BeginTestFailoverAsync(fabricName, protectionContainerName, replicatedProtectedItemName, failoverInput).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Execute test failover.
+            /// Execute test failover
             /// </summary>
             /// <remarks>
             /// Operation to perform a test failover of the replication protected item.
@@ -1932,15 +1828,15 @@ public static ReplicationProtectedItem BeginTestFailover(this IReplicationProtec
             /// <param name='replicatedProtectedItemName'>
             /// Replication protected item name.
             /// </param>
-            /// <param name='testfailoverInput'>
+            /// <param name='failoverInput'>
             /// Test failover input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ReplicationProtectedItem> BeginTestFailoverAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput testfailoverInput, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ReplicationProtectedItem> BeginTestFailoverAsync(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, TestFailoverInput failoverInput, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.BeginTestFailoverWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, testfailoverInput, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.BeginTestFailoverWithHttpMessagesAsync(fabricName, protectionContainerName, replicatedProtectedItemName, failoverInput, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -2005,7 +1901,7 @@ public static ReplicationProtectedItem BeginTestFailoverCleanup(this IReplicatio
             }
 
             /// <summary>
-            /// Execute unplanned failover.
+            /// Execute unplanned failover
             /// </summary>
             /// <remarks>
             /// Operation to initiate a failover of the replication protected item.
@@ -2023,7 +1919,7 @@ public static ReplicationProtectedItem BeginTestFailoverCleanup(this IReplicatio
             /// Replication protected item name.
             /// </param>
             /// <param name='failoverInput'>
-            /// Failover input.
+            /// Disable protection input.
             /// </param>
             public static ReplicationProtectedItem BeginUnplannedFailover(this IReplicationProtectedItemsOperations operations, string fabricName, string protectionContainerName, string replicatedProtectedItemName, UnplannedFailoverInput failoverInput)
             {
@@ -2031,7 +1927,7 @@ public static ReplicationProtectedItem BeginUnplannedFailover(this IReplicationP
             }
 
             /// <summary>
-            /// Execute unplanned failover.
+            /// Execute unplanned failover
             /// </summary>
             /// <remarks>
             /// Operation to initiate a failover of the replication protected item.
@@ -2049,7 +1945,7 @@ public static ReplicationProtectedItem BeginUnplannedFailover(this IReplicationP
             /// Replication protected item name.
             /// </param>
             /// <param name='failoverInput'>
-            /// Failover input.
+            /// Disable protection input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainerMappingsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainerMappingsOperations.cs
index 452c6f8a64c5..4d11c13e45b0 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainerMappingsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainerMappingsOperations.cs
@@ -123,7 +123,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -260,7 +260,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
         }
 
         /// <summary>
-        /// Gets a protection container mapping.
+        /// Gets a protection container mapping/
         /// </summary>
         /// <remarks>
         /// Gets the details of a protection container mapping.
@@ -340,7 +340,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -512,7 +512,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
         /// Purge protection container mapping.
         /// </summary>
         /// <remarks>
-        /// The operation to purge(force delete) a protection container mapping.
+        /// The operation to purge(force delete) a protection container mapping
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
@@ -655,7 +655,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationProtectionContainerMappings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationProtectionContainerMappings").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -878,7 +878,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1025,7 +1025,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
         /// Purge protection container mapping.
         /// </summary>
         /// <remarks>
-        /// The operation to purge(force delete) a protection container mapping.
+        /// The operation to purge(force delete) a protection container mapping
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
@@ -1099,7 +1099,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1307,7 +1307,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1536,7 +1536,7 @@ internal ReplicationProtectionContainerMappingsOperations(SiteRecoveryManagement
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}/remove").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectionContainerMappings/{mappingName}/remove").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainerMappingsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainerMappingsOperationsExtensions.cs
index 7e6c780dac1a..c938338175e9 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainerMappingsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainerMappingsOperationsExtensions.cs
@@ -68,7 +68,7 @@ public static IPage<ProtectionContainerMapping> ListByReplicationProtectionConta
             }
 
             /// <summary>
-            /// Gets a protection container mapping.
+            /// Gets a protection container mapping/
             /// </summary>
             /// <remarks>
             /// Gets the details of a protection container mapping.
@@ -91,7 +91,7 @@ public static ProtectionContainerMapping Get(this IReplicationProtectionContaine
             }
 
             /// <summary>
-            /// Gets a protection container mapping.
+            /// Gets a protection container mapping/
             /// </summary>
             /// <remarks>
             /// Gets the details of a protection container mapping.
@@ -181,7 +181,7 @@ public static ProtectionContainerMapping Create(this IReplicationProtectionConta
             /// Purge protection container mapping.
             /// </summary>
             /// <remarks>
-            /// The operation to purge(force delete) a protection container mapping.
+            /// The operation to purge(force delete) a protection container mapping
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -204,7 +204,7 @@ public static void Purge(this IReplicationProtectionContainerMappingsOperations
             /// Purge protection container mapping.
             /// </summary>
             /// <remarks>
-            /// The operation to purge(force delete) a protection container mapping.
+            /// The operation to purge(force delete) a protection container mapping
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -435,7 +435,7 @@ public static ProtectionContainerMapping BeginCreate(this IReplicationProtection
             /// Purge protection container mapping.
             /// </summary>
             /// <remarks>
-            /// The operation to purge(force delete) a protection container mapping.
+            /// The operation to purge(force delete) a protection container mapping
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -458,7 +458,7 @@ public static void BeginPurge(this IReplicationProtectionContainerMappingsOperat
             /// Purge protection container mapping.
             /// </summary>
             /// <remarks>
-            /// The operation to purge(force delete) a protection container mapping.
+            /// The operation to purge(force delete) a protection container mapping
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainersOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainersOperations.cs
index 3ec981a78b00..2bce3b9c0012 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainersOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainersOperations.cs
@@ -115,7 +115,7 @@ internal ReplicationProtectionContainersOperations(SiteRecoveryManagementClient
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -323,7 +323,7 @@ internal ReplicationProtectionContainersOperations(SiteRecoveryManagementClient
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -492,7 +492,7 @@ internal ReplicationProtectionContainersOperations(SiteRecoveryManagementClient
         /// </summary>
         /// <remarks>
         /// The operation to a add a protectable item to a protection container(Add
-        /// physical server).
+        /// physical server.)
         /// </remarks>
         /// <param name='fabricName'>
         /// The name of the fabric.
@@ -628,7 +628,7 @@ internal ReplicationProtectionContainersOperations(SiteRecoveryManagementClient
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationProtectionContainers").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationProtectionContainers").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -843,7 +843,7 @@ internal ReplicationProtectionContainersOperations(SiteRecoveryManagementClient
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -990,7 +990,7 @@ internal ReplicationProtectionContainersOperations(SiteRecoveryManagementClient
         /// </summary>
         /// <remarks>
         /// The operation to a add a protectable item to a protection container(Add
-        /// physical server).
+        /// physical server.)
         /// </remarks>
         /// <param name='fabricName'>
         /// The name of the fabric.
@@ -1067,7 +1067,7 @@ internal ReplicationProtectionContainersOperations(SiteRecoveryManagementClient
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/discoverProtectableItem").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/discoverProtectableItem").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1279,7 +1279,7 @@ internal ReplicationProtectionContainersOperations(SiteRecoveryManagementClient
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/remove").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/remove").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1480,7 +1480,7 @@ internal ReplicationProtectionContainersOperations(SiteRecoveryManagementClient
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/switchprotection").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/switchprotection").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainersOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainersOperationsExtensions.cs
index 49cf35c9265b..3cf4004a316f 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainersOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionContainersOperationsExtensions.cs
@@ -164,7 +164,7 @@ public static ProtectionContainer Create(this IReplicationProtectionContainersOp
             /// </summary>
             /// <remarks>
             /// The operation to a add a protectable item to a protection container(Add
-            /// physical server).
+            /// physical server.)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -188,7 +188,7 @@ public static ProtectionContainer DiscoverProtectableItem(this IReplicationProte
             /// </summary>
             /// <remarks>
             /// The operation to a add a protectable item to a protection container(Add
-            /// physical server).
+            /// physical server.)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -403,7 +403,7 @@ public static ProtectionContainer BeginCreate(this IReplicationProtectionContain
             /// </summary>
             /// <remarks>
             /// The operation to a add a protectable item to a protection container(Add
-            /// physical server).
+            /// physical server.)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -427,7 +427,7 @@ public static ProtectionContainer BeginDiscoverProtectableItem(this IReplication
             /// </summary>
             /// <remarks>
             /// The operation to a add a protectable item to a protection container(Add
-            /// physical server).
+            /// physical server.)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionIntentsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionIntentsOperations.cs
index 84a3abae6ea7..61dbd1bf01da 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionIntentsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionIntentsOperations.cs
@@ -56,12 +56,6 @@ internal ReplicationProtectionIntentsOperations(SiteRecoveryManagementClient cli
         /// <remarks>
         /// Gets the list of ASR replication protection intent objects in the vault.
         /// </remarks>
-        /// <param name='skipToken'>
-        /// The pagination token.
-        /// </param>
-        /// <param name='takeToken'>
-        /// The page size.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -83,7 +77,7 @@ internal ReplicationProtectionIntentsOperations(SiteRecoveryManagementClient cli
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ReplicationProtectionIntent>>> ListWithHttpMessagesAsync(string skipToken = default(string), string takeToken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ReplicationProtectionIntent>>> ListWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -108,8 +102,6 @@ internal ReplicationProtectionIntentsOperations(SiteRecoveryManagementClient cli
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("skipToken", skipToken);
-                tracingParameters.Add("takeToken", takeToken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -124,14 +116,6 @@ internal ReplicationProtectionIntentsOperations(SiteRecoveryManagementClient cli
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
-            if (takeToken != null)
-            {
-                _queryParameters.Add(string.Format("takeToken={0}", System.Uri.EscapeDataString(takeToken)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionIntentsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionIntentsOperationsExtensions.cs
index 0c8cf245ea2e..3c0addbd0e38 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionIntentsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationProtectionIntentsOperationsExtensions.cs
@@ -30,15 +30,9 @@ public static partial class ReplicationProtectionIntentsOperationsExtensions
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='skipToken'>
-            /// The pagination token.
-            /// </param>
-            /// <param name='takeToken'>
-            /// The page size.
-            /// </param>
-            public static IPage<ReplicationProtectionIntent> List(this IReplicationProtectionIntentsOperations operations, string skipToken = default(string), string takeToken = default(string))
+            public static IPage<ReplicationProtectionIntent> List(this IReplicationProtectionIntentsOperations operations)
             {
-                return operations.ListAsync(skipToken, takeToken).GetAwaiter().GetResult();
+                return operations.ListAsync().GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -50,18 +44,12 @@ public static partial class ReplicationProtectionIntentsOperationsExtensions
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='skipToken'>
-            /// The pagination token.
-            /// </param>
-            /// <param name='takeToken'>
-            /// The page size.
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ReplicationProtectionIntent>> ListAsync(this IReplicationProtectionIntentsOperations operations, string skipToken = default(string), string takeToken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ReplicationProtectionIntent>> ListAsync(this IReplicationProtectionIntentsOperations operations, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListWithHttpMessagesAsync(skipToken, takeToken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryPlansOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryPlansOperations.cs
index d141ba2b692a..bbd47beb211c 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryPlansOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryPlansOperations.cs
@@ -107,7 +107,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -306,7 +306,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -498,7 +498,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Update recovery plan input.
+        /// Update recovery plan input
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -513,33 +513,11 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
-        /// <summary>
-        /// Execute cancel failover of the recovery plan.
-        /// </summary>
-        /// <remarks>
-        /// The operation to cancel the failover of a recovery plan.
-        /// </remarks>
-        /// <param name='recoveryPlanName'>
-        /// Recovery plan name.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<RecoveryPlan>> FailoverCancelWithHttpMessagesAsync(string recoveryPlanName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<RecoveryPlan> _response = await BeginFailoverCancelWithHttpMessagesAsync(recoveryPlanName, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
         /// <summary>
         /// Execute commit failover of the recovery plan.
         /// </summary>
         /// <remarks>
-        /// The operation to commit the failover of a recovery plan.
+        /// The operation to commit the fail over of a recovery plan.
         /// </remarks>
         /// <param name='recoveryPlanName'>
         /// Recovery plan name.
@@ -614,7 +592,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan test failover input.
+        /// Failover input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -639,7 +617,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan test failover cleanup input.
+        /// Test failover cleanup input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -658,13 +636,13 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
         /// Execute unplanned failover of the recovery plan.
         /// </summary>
         /// <remarks>
-        /// The operation to start the unplanned failover of a recovery plan.
+        /// The operation to start the failover of a recovery plan.
         /// </remarks>
         /// <param name='recoveryPlanName'>
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan unplanned failover input.
+        /// Failover input.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -756,7 +734,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -959,7 +937,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1086,7 +1064,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Update recovery plan input.
+        /// Update recovery plan input
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1149,7 +1127,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1290,211 +1268,11 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             return _result;
         }
 
-        /// <summary>
-        /// Execute cancel failover of the recovery plan.
-        /// </summary>
-        /// <remarks>
-        /// The operation to cancel the failover of a recovery plan.
-        /// </remarks>
-        /// <param name='recoveryPlanName'>
-        /// Recovery plan name.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<RecoveryPlan>> BeginFailoverCancelWithHttpMessagesAsync(string recoveryPlanName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (Client.ResourceName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ResourceName");
-            }
-            if (Client.ResourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ResourceGroupName");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (recoveryPlanName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "recoveryPlanName");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("recoveryPlanName", recoveryPlanName);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginFailoverCancel", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/failoverCancel").ToString();
-            _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{recoveryPlanName}", System.Uri.EscapeDataString(recoveryPlanName));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<RecoveryPlan>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<RecoveryPlan>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
         /// <summary>
         /// Execute commit failover of the recovery plan.
         /// </summary>
         /// <remarks>
-        /// The operation to commit the failover of a recovery plan.
+        /// The operation to commit the fail over of a recovery plan.
         /// </remarks>
         /// <param name='recoveryPlanName'>
         /// Recovery plan name.
@@ -1555,7 +1333,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/failoverCommit").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/failoverCommit").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1767,7 +1545,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/plannedFailover").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/plannedFailover").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1973,7 +1751,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/reProtect").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/reProtect").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -2118,7 +1896,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan test failover input.
+        /// Failover input.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2185,7 +1963,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/testFailover").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/testFailover").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -2336,7 +2114,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan test failover cleanup input.
+        /// Test failover cleanup input.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2403,7 +2181,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/testFailoverCleanup").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/testFailoverCleanup").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -2548,13 +2326,13 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
         /// Execute unplanned failover of the recovery plan.
         /// </summary>
         /// <remarks>
-        /// The operation to start the unplanned failover of a recovery plan.
+        /// The operation to start the failover of a recovery plan.
         /// </remarks>
         /// <param name='recoveryPlanName'>
         /// Recovery plan name.
         /// </param>
         /// <param name='input'>
-        /// Recovery plan unplanned failover input.
+        /// Failover input.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2621,7 +2399,7 @@ internal ReplicationRecoveryPlansOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/unplannedFailover").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryPlans/{recoveryPlanName}/unplannedFailover").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryPlansOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryPlansOperationsExtensions.cs
index 5dcd1e3848ae..be3bc8457e26 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryPlansOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryPlansOperationsExtensions.cs
@@ -191,7 +191,7 @@ public static void Delete(this IReplicationRecoveryPlansOperations operations, s
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Update recovery plan input.
+            /// Update recovery plan input
             /// </param>
             public static RecoveryPlan Update(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, UpdateRecoveryPlanInput input)
             {
@@ -211,7 +211,7 @@ public static RecoveryPlan Update(this IReplicationRecoveryPlansOperations opera
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Update recovery plan input.
+            /// Update recovery plan input
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -224,51 +224,11 @@ public static RecoveryPlan Update(this IReplicationRecoveryPlansOperations opera
                 }
             }
 
-            /// <summary>
-            /// Execute cancel failover of the recovery plan.
-            /// </summary>
-            /// <remarks>
-            /// The operation to cancel the failover of a recovery plan.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='recoveryPlanName'>
-            /// Recovery plan name.
-            /// </param>
-            public static RecoveryPlan FailoverCancel(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName)
-            {
-                return operations.FailoverCancelAsync(recoveryPlanName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Execute cancel failover of the recovery plan.
-            /// </summary>
-            /// <remarks>
-            /// The operation to cancel the failover of a recovery plan.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='recoveryPlanName'>
-            /// Recovery plan name.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<RecoveryPlan> FailoverCancelAsync(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.FailoverCancelWithHttpMessagesAsync(recoveryPlanName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Execute commit failover of the recovery plan.
             /// </summary>
             /// <remarks>
-            /// The operation to commit the failover of a recovery plan.
+            /// The operation to commit the fail over of a recovery plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -285,7 +245,7 @@ public static RecoveryPlan FailoverCommit(this IReplicationRecoveryPlansOperatio
             /// Execute commit failover of the recovery plan.
             /// </summary>
             /// <remarks>
-            /// The operation to commit the failover of a recovery plan.
+            /// The operation to commit the fail over of a recovery plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -403,7 +363,7 @@ public static RecoveryPlan Reprotect(this IReplicationRecoveryPlansOperations op
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan test failover input.
+            /// Failover input.
             /// </param>
             public static RecoveryPlan TestFailover(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, RecoveryPlanTestFailoverInput input)
             {
@@ -423,7 +383,7 @@ public static RecoveryPlan TestFailover(this IReplicationRecoveryPlansOperations
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan test failover input.
+            /// Failover input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -449,7 +409,7 @@ public static RecoveryPlan TestFailover(this IReplicationRecoveryPlansOperations
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan test failover cleanup input.
+            /// Test failover cleanup input.
             /// </param>
             public static RecoveryPlan TestFailoverCleanup(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, RecoveryPlanTestFailoverCleanupInput input)
             {
@@ -469,7 +429,7 @@ public static RecoveryPlan TestFailoverCleanup(this IReplicationRecoveryPlansOpe
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan test failover cleanup input.
+            /// Test failover cleanup input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -486,7 +446,7 @@ public static RecoveryPlan TestFailoverCleanup(this IReplicationRecoveryPlansOpe
             /// Execute unplanned failover of the recovery plan.
             /// </summary>
             /// <remarks>
-            /// The operation to start the unplanned failover of a recovery plan.
+            /// The operation to start the failover of a recovery plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -495,7 +455,7 @@ public static RecoveryPlan TestFailoverCleanup(this IReplicationRecoveryPlansOpe
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan unplanned failover input.
+            /// Failover input.
             /// </param>
             public static RecoveryPlan UnplannedFailover(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, RecoveryPlanUnplannedFailoverInput input)
             {
@@ -506,7 +466,7 @@ public static RecoveryPlan UnplannedFailover(this IReplicationRecoveryPlansOpera
             /// Execute unplanned failover of the recovery plan.
             /// </summary>
             /// <remarks>
-            /// The operation to start the unplanned failover of a recovery plan.
+            /// The operation to start the failover of a recovery plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -515,7 +475,7 @@ public static RecoveryPlan UnplannedFailover(this IReplicationRecoveryPlansOpera
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan unplanned failover input.
+            /// Failover input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -624,7 +584,7 @@ public static void BeginDelete(this IReplicationRecoveryPlansOperations operatio
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Update recovery plan input.
+            /// Update recovery plan input
             /// </param>
             public static RecoveryPlan BeginUpdate(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, UpdateRecoveryPlanInput input)
             {
@@ -644,7 +604,7 @@ public static RecoveryPlan BeginUpdate(this IReplicationRecoveryPlansOperations
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Update recovery plan input.
+            /// Update recovery plan input
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -657,51 +617,11 @@ public static RecoveryPlan BeginUpdate(this IReplicationRecoveryPlansOperations
                 }
             }
 
-            /// <summary>
-            /// Execute cancel failover of the recovery plan.
-            /// </summary>
-            /// <remarks>
-            /// The operation to cancel the failover of a recovery plan.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='recoveryPlanName'>
-            /// Recovery plan name.
-            /// </param>
-            public static RecoveryPlan BeginFailoverCancel(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName)
-            {
-                return operations.BeginFailoverCancelAsync(recoveryPlanName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Execute cancel failover of the recovery plan.
-            /// </summary>
-            /// <remarks>
-            /// The operation to cancel the failover of a recovery plan.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='recoveryPlanName'>
-            /// Recovery plan name.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<RecoveryPlan> BeginFailoverCancelAsync(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.BeginFailoverCancelWithHttpMessagesAsync(recoveryPlanName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Execute commit failover of the recovery plan.
             /// </summary>
             /// <remarks>
-            /// The operation to commit the failover of a recovery plan.
+            /// The operation to commit the fail over of a recovery plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -718,7 +638,7 @@ public static RecoveryPlan BeginFailoverCommit(this IReplicationRecoveryPlansOpe
             /// Execute commit failover of the recovery plan.
             /// </summary>
             /// <remarks>
-            /// The operation to commit the failover of a recovery plan.
+            /// The operation to commit the fail over of a recovery plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -836,7 +756,7 @@ public static RecoveryPlan BeginReprotect(this IReplicationRecoveryPlansOperatio
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan test failover input.
+            /// Failover input.
             /// </param>
             public static RecoveryPlan BeginTestFailover(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, RecoveryPlanTestFailoverInput input)
             {
@@ -856,7 +776,7 @@ public static RecoveryPlan BeginTestFailover(this IReplicationRecoveryPlansOpera
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan test failover input.
+            /// Failover input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -882,7 +802,7 @@ public static RecoveryPlan BeginTestFailover(this IReplicationRecoveryPlansOpera
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan test failover cleanup input.
+            /// Test failover cleanup input.
             /// </param>
             public static RecoveryPlan BeginTestFailoverCleanup(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, RecoveryPlanTestFailoverCleanupInput input)
             {
@@ -902,7 +822,7 @@ public static RecoveryPlan BeginTestFailoverCleanup(this IReplicationRecoveryPla
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan test failover cleanup input.
+            /// Test failover cleanup input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -919,7 +839,7 @@ public static RecoveryPlan BeginTestFailoverCleanup(this IReplicationRecoveryPla
             /// Execute unplanned failover of the recovery plan.
             /// </summary>
             /// <remarks>
-            /// The operation to start the unplanned failover of a recovery plan.
+            /// The operation to start the failover of a recovery plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -928,7 +848,7 @@ public static RecoveryPlan BeginTestFailoverCleanup(this IReplicationRecoveryPla
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan unplanned failover input.
+            /// Failover input.
             /// </param>
             public static RecoveryPlan BeginUnplannedFailover(this IReplicationRecoveryPlansOperations operations, string recoveryPlanName, RecoveryPlanUnplannedFailoverInput input)
             {
@@ -939,7 +859,7 @@ public static RecoveryPlan BeginUnplannedFailover(this IReplicationRecoveryPlans
             /// Execute unplanned failover of the recovery plan.
             /// </summary>
             /// <remarks>
-            /// The operation to start the unplanned failover of a recovery plan.
+            /// The operation to start the failover of a recovery plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -948,7 +868,7 @@ public static RecoveryPlan BeginUnplannedFailover(this IReplicationRecoveryPlans
             /// Recovery plan name.
             /// </param>
             /// <param name='input'>
-            /// Recovery plan unplanned failover input.
+            /// Failover input.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryServicesProvidersOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryServicesProvidersOperations.cs
index b3dac9958681..e46be782520d 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryServicesProvidersOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryServicesProvidersOperations.cs
@@ -57,7 +57,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
         /// Lists the registered recovery services providers for the specified fabric.
         /// </remarks>
         /// <param name='fabricName'>
-        /// Fabric name.
+        /// Fabric name
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -115,7 +115,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -260,7 +260,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
         /// Fabric name.
         /// </param>
         /// <param name='providerName'>
-        /// Recovery services provider name.
+        /// Recovery services provider name
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -323,7 +323,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -488,7 +488,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
         }
 
         /// <summary>
-        /// Purges recovery service provider from fabric.
+        /// Purges recovery service provider from fabric
         /// </summary>
         /// <remarks>
         /// The operation to purge(force delete) a recovery services provider from the
@@ -547,7 +547,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
         /// </summary>
         /// <remarks>
         /// The operation to removes/delete(unregister) a recovery services provider
-        /// from the vault.
+        /// from the vault
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
@@ -573,7 +573,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
         /// is a view only api.
         /// </summary>
         /// <remarks>
-        /// Lists the registered recovery services providers in the vault.
+        /// Lists the registered recovery services providers in the vault
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -626,7 +626,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryServicesProviders").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationRecoveryServicesProviders").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -845,7 +845,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -988,7 +988,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
         }
 
         /// <summary>
-        /// Purges recovery service provider from fabric.
+        /// Purges recovery service provider from fabric
         /// </summary>
         /// <remarks>
         /// The operation to purge(force delete) a recovery services provider from the
@@ -1058,7 +1058,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1250,7 +1250,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}/refreshProvider").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}/refreshProvider").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1394,7 +1394,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
         /// </summary>
         /// <remarks>
         /// The operation to removes/delete(unregister) a recovery services provider
-        /// from the vault.
+        /// from the vault
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
@@ -1460,7 +1460,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}/remove").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationRecoveryServicesProviders/{providerName}/remove").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1759,7 +1759,7 @@ internal ReplicationRecoveryServicesProvidersOperations(SiteRecoveryManagementCl
         /// is a view only api.
         /// </summary>
         /// <remarks>
-        /// Lists the registered recovery services providers in the vault.
+        /// Lists the registered recovery services providers in the vault
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryServicesProvidersOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryServicesProvidersOperationsExtensions.cs
index 43f6feea9953..6a84572d61cf 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryServicesProvidersOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationRecoveryServicesProvidersOperationsExtensions.cs
@@ -31,7 +31,7 @@ public static partial class ReplicationRecoveryServicesProvidersOperationsExtens
             /// The operations group for this extension method.
             /// </param>
             /// <param name='fabricName'>
-            /// Fabric name.
+            /// Fabric name
             /// </param>
             public static IPage<RecoveryServicesProvider> ListByReplicationFabrics(this IReplicationRecoveryServicesProvidersOperations operations, string fabricName)
             {
@@ -48,7 +48,7 @@ public static IPage<RecoveryServicesProvider> ListByReplicationFabrics(this IRep
             /// The operations group for this extension method.
             /// </param>
             /// <param name='fabricName'>
-            /// Fabric name.
+            /// Fabric name
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -74,7 +74,7 @@ public static IPage<RecoveryServicesProvider> ListByReplicationFabrics(this IRep
             /// Fabric name.
             /// </param>
             /// <param name='providerName'>
-            /// Recovery services provider name.
+            /// Recovery services provider name
             /// </param>
             public static RecoveryServicesProvider Get(this IReplicationRecoveryServicesProvidersOperations operations, string fabricName, string providerName)
             {
@@ -94,7 +94,7 @@ public static RecoveryServicesProvider Get(this IReplicationRecoveryServicesProv
             /// Fabric name.
             /// </param>
             /// <param name='providerName'>
-            /// Recovery services provider name.
+            /// Recovery services provider name
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -160,7 +160,7 @@ public static RecoveryServicesProvider Create(this IReplicationRecoveryServicesP
             }
 
             /// <summary>
-            /// Purges recovery service provider from fabric.
+            /// Purges recovery service provider from fabric
             /// </summary>
             /// <remarks>
             /// The operation to purge(force delete) a recovery services provider from the
@@ -181,7 +181,7 @@ public static void Purge(this IReplicationRecoveryServicesProvidersOperations op
             }
 
             /// <summary>
-            /// Purges recovery service provider from fabric.
+            /// Purges recovery service provider from fabric
             /// </summary>
             /// <remarks>
             /// The operation to purge(force delete) a recovery services provider from the
@@ -260,7 +260,7 @@ public static RecoveryServicesProvider RefreshProvider(this IReplicationRecovery
             /// </summary>
             /// <remarks>
             /// The operation to removes/delete(unregister) a recovery services provider
-            /// from the vault.
+            /// from the vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -284,7 +284,7 @@ public static void Delete(this IReplicationRecoveryServicesProvidersOperations o
             /// </summary>
             /// <remarks>
             /// The operation to removes/delete(unregister) a recovery services provider
-            /// from the vault.
+            /// from the vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -308,7 +308,7 @@ public static void Delete(this IReplicationRecoveryServicesProvidersOperations o
             /// is a view only api.
             /// </summary>
             /// <remarks>
-            /// Lists the registered recovery services providers in the vault.
+            /// Lists the registered recovery services providers in the vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -323,7 +323,7 @@ public static IPage<RecoveryServicesProvider> List(this IReplicationRecoveryServ
             /// is a view only api.
             /// </summary>
             /// <remarks>
-            /// Lists the registered recovery services providers in the vault.
+            /// Lists the registered recovery services providers in the vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -392,7 +392,7 @@ public static RecoveryServicesProvider BeginCreate(this IReplicationRecoveryServ
             }
 
             /// <summary>
-            /// Purges recovery service provider from fabric.
+            /// Purges recovery service provider from fabric
             /// </summary>
             /// <remarks>
             /// The operation to purge(force delete) a recovery services provider from the
@@ -413,7 +413,7 @@ public static void BeginPurge(this IReplicationRecoveryServicesProvidersOperatio
             }
 
             /// <summary>
-            /// Purges recovery service provider from fabric.
+            /// Purges recovery service provider from fabric
             /// </summary>
             /// <remarks>
             /// The operation to purge(force delete) a recovery services provider from the
@@ -492,7 +492,7 @@ public static RecoveryServicesProvider BeginRefreshProvider(this IReplicationRec
             /// </summary>
             /// <remarks>
             /// The operation to removes/delete(unregister) a recovery services provider
-            /// from the vault.
+            /// from the vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -516,7 +516,7 @@ public static void BeginDelete(this IReplicationRecoveryServicesProvidersOperati
             /// </summary>
             /// <remarks>
             /// The operation to removes/delete(unregister) a recovery services provider
-            /// from the vault.
+            /// from the vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -580,7 +580,7 @@ public static IPage<RecoveryServicesProvider> ListByReplicationFabricsNext(this
             /// is a view only api.
             /// </summary>
             /// <remarks>
-            /// Lists the registered recovery services providers in the vault.
+            /// Lists the registered recovery services providers in the vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -598,7 +598,7 @@ public static IPage<RecoveryServicesProvider> ListNext(this IReplicationRecovery
             /// is a view only api.
             /// </summary>
             /// <remarks>
-            /// Lists the registered recovery services providers in the vault.
+            /// Lists the registered recovery services providers in the vault
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationStorageClassificationMappingsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationStorageClassificationMappingsOperations.cs
index cb1f364b1dd3..e2ee201eb437 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationStorageClassificationMappingsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationStorageClassificationMappingsOperations.cs
@@ -123,7 +123,7 @@ internal ReplicationStorageClassificationMappingsOperations(SiteRecoveryManageme
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}/replicationStorageClassificationMappings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}/replicationStorageClassificationMappings").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -340,7 +340,7 @@ internal ReplicationStorageClassificationMappingsOperations(SiteRecoveryManageme
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}/replicationStorageClassificationMappings/{storageClassificationMappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}/replicationStorageClassificationMappings/{storageClassificationMappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -593,7 +593,7 @@ internal ReplicationStorageClassificationMappingsOperations(SiteRecoveryManageme
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationStorageClassificationMappings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationStorageClassificationMappings").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -816,7 +816,7 @@ internal ReplicationStorageClassificationMappingsOperations(SiteRecoveryManageme
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}/replicationStorageClassificationMappings/{storageClassificationMappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}/replicationStorageClassificationMappings/{storageClassificationMappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -1037,7 +1037,7 @@ internal ReplicationStorageClassificationMappingsOperations(SiteRecoveryManageme
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}/replicationStorageClassificationMappings/{storageClassificationMappingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}/replicationStorageClassificationMappings/{storageClassificationMappingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationStorageClassificationsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationStorageClassificationsOperations.cs
index 5ee06c98c5e3..10c902f3f812 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationStorageClassificationsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationStorageClassificationsOperations.cs
@@ -115,7 +115,7 @@ internal ReplicationStorageClassificationsOperations(SiteRecoveryManagementClien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -323,7 +323,7 @@ internal ReplicationStorageClassificationsOperations(SiteRecoveryManagementClien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationStorageClassifications/{storageClassificationName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -516,7 +516,7 @@ internal ReplicationStorageClassificationsOperations(SiteRecoveryManagementClien
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationStorageClassifications").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationStorageClassifications").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultHealthOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultHealthOperations.cs
index 82fa84fecade..84570a72245a 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultHealthOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultHealthOperations.cs
@@ -107,7 +107,7 @@ internal ReplicationVaultHealthOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultHealth").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultHealth").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -311,7 +311,7 @@ internal ReplicationVaultHealthOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultHealth/default/refresh").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultHealth/default/refresh").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultSettingOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultSettingOperations.cs
index 0e7f6d540948..f8a683edadbf 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultSettingOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultSettingOperations.cs
@@ -108,7 +108,7 @@ internal ReplicationVaultSettingOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultSettings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultSettings").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -308,7 +308,7 @@ internal ReplicationVaultSettingOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultSettings/{vaultSettingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultSettings/{vaultSettingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -443,32 +443,6 @@ internal ReplicationVaultSettingOperations(SiteRecoveryManagementClient client)
             return _result;
         }
 
-        /// <summary>
-        /// Updates vault setting. A vault setting object is a singleton per vault and
-        /// it is always present by default.
-        /// </summary>
-        /// <remarks>
-        /// The operation to configure vault setting.
-        /// </remarks>
-        /// <param name='vaultSettingName'>
-        /// Vault setting name.
-        /// </param>
-        /// <param name='input'>
-        /// Vault setting creation input.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<VaultSetting>> CreateWithHttpMessagesAsync(string vaultSettingName, VaultSettingCreationInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send Request
-            AzureOperationResponse<VaultSetting> _response = await BeginCreateWithHttpMessagesAsync(vaultSettingName, input, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
         /// <summary>
         /// Updates vault setting. A vault setting object is a singleton per vault and
         /// it is always present by default.
@@ -503,7 +477,7 @@ internal ReplicationVaultSettingOperations(SiteRecoveryManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<VaultSetting>> BeginCreateWithHttpMessagesAsync(string vaultSettingName, VaultSettingCreationInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VaultSetting>> CreateWithHttpMessagesAsync(string vaultSettingName, VaultSettingCreationInput input, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -543,11 +517,11 @@ internal ReplicationVaultSettingOperations(SiteRecoveryManagementClient client)
                 tracingParameters.Add("vaultSettingName", vaultSettingName);
                 tracingParameters.Add("input", input);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginCreate", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Create", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultSettings/{vaultSettingName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationVaultSettings/{vaultSettingName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultSettingOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultSettingOperationsExtensions.cs
index ff01736c08ee..5872a91840a5 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultSettingOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationVaultSettingOperationsExtensions.cs
@@ -147,54 +147,6 @@ public static VaultSetting Create(this IReplicationVaultSettingOperations operat
                 }
             }
 
-            /// <summary>
-            /// Updates vault setting. A vault setting object is a singleton per vault and
-            /// it is always present by default.
-            /// </summary>
-            /// <remarks>
-            /// The operation to configure vault setting.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='vaultSettingName'>
-            /// Vault setting name.
-            /// </param>
-            /// <param name='input'>
-            /// Vault setting creation input.
-            /// </param>
-            public static VaultSetting BeginCreate(this IReplicationVaultSettingOperations operations, string vaultSettingName, VaultSettingCreationInput input)
-            {
-                return operations.BeginCreateAsync(vaultSettingName, input).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Updates vault setting. A vault setting object is a singleton per vault and
-            /// it is always present by default.
-            /// </summary>
-            /// <remarks>
-            /// The operation to configure vault setting.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='vaultSettingName'>
-            /// Vault setting name.
-            /// </param>
-            /// <param name='input'>
-            /// Vault setting creation input.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<VaultSetting> BeginCreateAsync(this IReplicationVaultSettingOperations operations, string vaultSettingName, VaultSettingCreationInput input, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.BeginCreateWithHttpMessagesAsync(vaultSettingName, input, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Gets the list of vault setting.
             /// </summary>
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationvCentersOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationvCentersOperations.cs
index 66d12fea5135..1588f6500123 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationvCentersOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationvCentersOperations.cs
@@ -115,7 +115,7 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -254,13 +254,13 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// Gets the details of a vCenter.
         /// </summary>
         /// <remarks>
-        /// Gets the details of a registered vCenter server(Add vCenter server).
+        /// Gets the details of a registered vCenter server(Add vCenter server.)
         /// </remarks>
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -283,7 +283,7 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<VCenter>> GetWithHttpMessagesAsync(string fabricName, string vcenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VCenter>> GetWithHttpMessagesAsync(string fabricName, string vCenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -305,9 +305,9 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "fabricName");
             }
-            if (vcenterName == null)
+            if (vCenterName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "vcenterName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "vCenterName");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -317,18 +317,18 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("fabricName", fabricName);
-                tracingParameters.Add("vcenterName", vcenterName);
+                tracingParameters.Add("vCenterName", vCenterName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters/{vcenterName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters/{vCenterName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{fabricName}", System.Uri.EscapeDataString(fabricName));
-            _url = _url.Replace("{vcenterName}", System.Uri.EscapeDataString(vcenterName));
+            _url = _url.Replace("{vCenterName}", System.Uri.EscapeDataString(vCenterName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -468,8 +468,8 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='addVCenterRequest'>
         /// The input to the add vCenter operation.
@@ -480,15 +480,15 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async Task<AzureOperationResponse<VCenter>> CreateWithHttpMessagesAsync(string fabricName, string vcenterName, AddVCenterRequest addVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VCenter>> CreateWithHttpMessagesAsync(string fabricName, string vCenterName, AddVCenterRequest addVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Send Request
-            AzureOperationResponse<VCenter> _response = await BeginCreateWithHttpMessagesAsync(fabricName, vcenterName, addVCenterRequest, customHeaders, cancellationToken).ConfigureAwait(false);
+            AzureOperationResponse<VCenter> _response = await BeginCreateWithHttpMessagesAsync(fabricName, vCenterName, addVCenterRequest, customHeaders, cancellationToken).ConfigureAwait(false);
             return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
-        /// Remove vcenter operation.
+        /// Remove vCenter operation.
         /// </summary>
         /// <remarks>
         /// The operation to remove(unregister) a registered vCenter server from the
@@ -497,8 +497,8 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -506,10 +506,10 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async Task<AzureOperationResponse> DeleteWithHttpMessagesAsync(string fabricName, string vcenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> DeleteWithHttpMessagesAsync(string fabricName, string vCenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Send request
-            AzureOperationResponse _response = await BeginDeleteWithHttpMessagesAsync(fabricName, vcenterName, customHeaders, cancellationToken).ConfigureAwait(false);
+            AzureOperationResponse _response = await BeginDeleteWithHttpMessagesAsync(fabricName, vCenterName, customHeaders, cancellationToken).ConfigureAwait(false);
             return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
@@ -522,8 +522,8 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name
         /// </param>
         /// <param name='updateVCenterRequest'>
         /// The input to the update vCenter operation.
@@ -534,10 +534,10 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async Task<AzureOperationResponse<VCenter>> UpdateWithHttpMessagesAsync(string fabricName, string vcenterName, UpdateVCenterRequest updateVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VCenter>> UpdateWithHttpMessagesAsync(string fabricName, string vCenterName, UpdateVCenterRequest updateVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Send Request
-            AzureOperationResponse<VCenter> _response = await BeginUpdateWithHttpMessagesAsync(fabricName, vcenterName, updateVCenterRequest, customHeaders, cancellationToken).ConfigureAwait(false);
+            AzureOperationResponse<VCenter> _response = await BeginUpdateWithHttpMessagesAsync(fabricName, vCenterName, updateVCenterRequest, customHeaders, cancellationToken).ConfigureAwait(false);
             return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
@@ -598,7 +598,7 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationvCenters").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationvCenters").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -741,8 +741,8 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='addVCenterRequest'>
         /// The input to the add vCenter operation.
@@ -768,7 +768,7 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<VCenter>> BeginCreateWithHttpMessagesAsync(string fabricName, string vcenterName, AddVCenterRequest addVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VCenter>> BeginCreateWithHttpMessagesAsync(string fabricName, string vCenterName, AddVCenterRequest addVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -790,9 +790,9 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "fabricName");
             }
-            if (vcenterName == null)
+            if (vCenterName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "vcenterName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "vCenterName");
             }
             if (addVCenterRequest == null)
             {
@@ -806,19 +806,19 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("fabricName", fabricName);
-                tracingParameters.Add("vcenterName", vcenterName);
+                tracingParameters.Add("vCenterName", vCenterName);
                 tracingParameters.Add("addVCenterRequest", addVCenterRequest);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreate", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters/{vcenterName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters/{vCenterName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{fabricName}", System.Uri.EscapeDataString(fabricName));
-            _url = _url.Replace("{vcenterName}", System.Uri.EscapeDataString(vcenterName));
+            _url = _url.Replace("{vCenterName}", System.Uri.EscapeDataString(vCenterName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -956,7 +956,7 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         }
 
         /// <summary>
-        /// Remove vcenter operation.
+        /// Remove vCenter operation.
         /// </summary>
         /// <remarks>
         /// The operation to remove(unregister) a registered vCenter server from the
@@ -965,8 +965,8 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -986,7 +986,7 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> BeginDeleteWithHttpMessagesAsync(string fabricName, string vcenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> BeginDeleteWithHttpMessagesAsync(string fabricName, string vCenterName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -1008,9 +1008,9 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "fabricName");
             }
-            if (vcenterName == null)
+            if (vCenterName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "vcenterName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "vCenterName");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -1020,18 +1020,18 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("fabricName", fabricName);
-                tracingParameters.Add("vcenterName", vcenterName);
+                tracingParameters.Add("vCenterName", vCenterName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters/{vcenterName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters/{vCenterName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{fabricName}", System.Uri.EscapeDataString(fabricName));
-            _url = _url.Replace("{vcenterName}", System.Uri.EscapeDataString(vcenterName));
+            _url = _url.Replace("{vCenterName}", System.Uri.EscapeDataString(vCenterName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -1153,8 +1153,8 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <param name='fabricName'>
         /// Fabric name.
         /// </param>
-        /// <param name='vcenterName'>
-        /// vcenter name.
+        /// <param name='vCenterName'>
+        /// vCenter name
         /// </param>
         /// <param name='updateVCenterRequest'>
         /// The input to the update vCenter operation.
@@ -1180,7 +1180,7 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<VCenter>> BeginUpdateWithHttpMessagesAsync(string fabricName, string vcenterName, UpdateVCenterRequest updateVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VCenter>> BeginUpdateWithHttpMessagesAsync(string fabricName, string vCenterName, UpdateVCenterRequest updateVCenterRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -1202,9 +1202,9 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "fabricName");
             }
-            if (vcenterName == null)
+            if (vCenterName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "vcenterName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "vCenterName");
             }
             if (updateVCenterRequest == null)
             {
@@ -1218,19 +1218,19 @@ internal ReplicationvCentersOperations(SiteRecoveryManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("fabricName", fabricName);
-                tracingParameters.Add("vcenterName", vcenterName);
+                tracingParameters.Add("vCenterName", vCenterName);
                 tracingParameters.Add("updateVCenterRequest", updateVCenterRequest);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginUpdate", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters/{vcenterName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationvCenters/{vCenterName}").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{fabricName}", System.Uri.EscapeDataString(fabricName));
-            _url = _url.Replace("{vcenterName}", System.Uri.EscapeDataString(vcenterName));
+            _url = _url.Replace("{vCenterName}", System.Uri.EscapeDataString(vCenterName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationvCentersOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationvCentersOperationsExtensions.cs
index f528a91c73ca..8b58b9d1224a 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationvCentersOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/ReplicationvCentersOperationsExtensions.cs
@@ -65,7 +65,7 @@ public static IPage<VCenter> ListByReplicationFabrics(this IReplicationvCentersO
             /// Gets the details of a vCenter.
             /// </summary>
             /// <remarks>
-            /// Gets the details of a registered vCenter server(Add vCenter server).
+            /// Gets the details of a registered vCenter server(Add vCenter server.)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -73,19 +73,19 @@ public static IPage<VCenter> ListByReplicationFabrics(this IReplicationvCentersO
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
-            public static VCenter Get(this IReplicationvCentersOperations operations, string fabricName, string vcenterName)
+            public static VCenter Get(this IReplicationvCentersOperations operations, string fabricName, string vCenterName)
             {
-                return operations.GetAsync(fabricName, vcenterName).GetAwaiter().GetResult();
+                return operations.GetAsync(fabricName, vCenterName).GetAwaiter().GetResult();
             }
 
             /// <summary>
             /// Gets the details of a vCenter.
             /// </summary>
             /// <remarks>
-            /// Gets the details of a registered vCenter server(Add vCenter server).
+            /// Gets the details of a registered vCenter server(Add vCenter server.)
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -93,15 +93,15 @@ public static VCenter Get(this IReplicationvCentersOperations operations, string
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<VCenter> GetAsync(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<VCenter> GetAsync(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetWithHttpMessagesAsync(fabricName, vcenterName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetWithHttpMessagesAsync(fabricName, vCenterName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -119,15 +119,15 @@ public static VCenter Get(this IReplicationvCentersOperations operations, string
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
             /// <param name='addVCenterRequest'>
             /// The input to the add vCenter operation.
             /// </param>
-            public static VCenter Create(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, AddVCenterRequest addVCenterRequest)
+            public static VCenter Create(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, AddVCenterRequest addVCenterRequest)
             {
-                return operations.CreateAsync(fabricName, vcenterName, addVCenterRequest).GetAwaiter().GetResult();
+                return operations.CreateAsync(fabricName, vCenterName, addVCenterRequest).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -142,8 +142,8 @@ public static VCenter Create(this IReplicationvCentersOperations operations, str
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
             /// <param name='addVCenterRequest'>
             /// The input to the add vCenter operation.
@@ -151,16 +151,16 @@ public static VCenter Create(this IReplicationvCentersOperations operations, str
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<VCenter> CreateAsync(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, AddVCenterRequest addVCenterRequest, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<VCenter> CreateAsync(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, AddVCenterRequest addVCenterRequest, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.CreateWithHttpMessagesAsync(fabricName, vcenterName, addVCenterRequest, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.CreateWithHttpMessagesAsync(fabricName, vCenterName, addVCenterRequest, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Remove vcenter operation.
+            /// Remove vCenter operation.
             /// </summary>
             /// <remarks>
             /// The operation to remove(unregister) a registered vCenter server from the
@@ -172,16 +172,16 @@ public static VCenter Create(this IReplicationvCentersOperations operations, str
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
-            public static void Delete(this IReplicationvCentersOperations operations, string fabricName, string vcenterName)
+            public static void Delete(this IReplicationvCentersOperations operations, string fabricName, string vCenterName)
             {
-                operations.DeleteAsync(fabricName, vcenterName).GetAwaiter().GetResult();
+                operations.DeleteAsync(fabricName, vCenterName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Remove vcenter operation.
+            /// Remove vCenter operation.
             /// </summary>
             /// <remarks>
             /// The operation to remove(unregister) a registered vCenter server from the
@@ -193,15 +193,15 @@ public static void Delete(this IReplicationvCentersOperations operations, string
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task DeleteAsync(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task DeleteAsync(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                (await operations.DeleteWithHttpMessagesAsync(fabricName, vcenterName, null, cancellationToken).ConfigureAwait(false)).Dispose();
+                (await operations.DeleteWithHttpMessagesAsync(fabricName, vCenterName, null, cancellationToken).ConfigureAwait(false)).Dispose();
             }
 
             /// <summary>
@@ -216,15 +216,15 @@ public static void Delete(this IReplicationvCentersOperations operations, string
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name
             /// </param>
             /// <param name='updateVCenterRequest'>
             /// The input to the update vCenter operation.
             /// </param>
-            public static VCenter Update(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, UpdateVCenterRequest updateVCenterRequest)
+            public static VCenter Update(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, UpdateVCenterRequest updateVCenterRequest)
             {
-                return operations.UpdateAsync(fabricName, vcenterName, updateVCenterRequest).GetAwaiter().GetResult();
+                return operations.UpdateAsync(fabricName, vCenterName, updateVCenterRequest).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -239,8 +239,8 @@ public static VCenter Update(this IReplicationvCentersOperations operations, str
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name
             /// </param>
             /// <param name='updateVCenterRequest'>
             /// The input to the update vCenter operation.
@@ -248,9 +248,9 @@ public static VCenter Update(this IReplicationvCentersOperations operations, str
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<VCenter> UpdateAsync(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, UpdateVCenterRequest updateVCenterRequest, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<VCenter> UpdateAsync(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, UpdateVCenterRequest updateVCenterRequest, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.UpdateWithHttpMessagesAsync(fabricName, vcenterName, updateVCenterRequest, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.UpdateWithHttpMessagesAsync(fabricName, vCenterName, updateVCenterRequest, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -302,15 +302,15 @@ public static IPage<VCenter> List(this IReplicationvCentersOperations operations
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
             /// <param name='addVCenterRequest'>
             /// The input to the add vCenter operation.
             /// </param>
-            public static VCenter BeginCreate(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, AddVCenterRequest addVCenterRequest)
+            public static VCenter BeginCreate(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, AddVCenterRequest addVCenterRequest)
             {
-                return operations.BeginCreateAsync(fabricName, vcenterName, addVCenterRequest).GetAwaiter().GetResult();
+                return operations.BeginCreateAsync(fabricName, vCenterName, addVCenterRequest).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -325,8 +325,8 @@ public static VCenter BeginCreate(this IReplicationvCentersOperations operations
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
             /// <param name='addVCenterRequest'>
             /// The input to the add vCenter operation.
@@ -334,16 +334,16 @@ public static VCenter BeginCreate(this IReplicationvCentersOperations operations
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<VCenter> BeginCreateAsync(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, AddVCenterRequest addVCenterRequest, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<VCenter> BeginCreateAsync(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, AddVCenterRequest addVCenterRequest, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.BeginCreateWithHttpMessagesAsync(fabricName, vcenterName, addVCenterRequest, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.BeginCreateWithHttpMessagesAsync(fabricName, vCenterName, addVCenterRequest, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Remove vcenter operation.
+            /// Remove vCenter operation.
             /// </summary>
             /// <remarks>
             /// The operation to remove(unregister) a registered vCenter server from the
@@ -355,16 +355,16 @@ public static VCenter BeginCreate(this IReplicationvCentersOperations operations
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
-            public static void BeginDelete(this IReplicationvCentersOperations operations, string fabricName, string vcenterName)
+            public static void BeginDelete(this IReplicationvCentersOperations operations, string fabricName, string vCenterName)
             {
-                operations.BeginDeleteAsync(fabricName, vcenterName).GetAwaiter().GetResult();
+                operations.BeginDeleteAsync(fabricName, vCenterName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Remove vcenter operation.
+            /// Remove vCenter operation.
             /// </summary>
             /// <remarks>
             /// The operation to remove(unregister) a registered vCenter server from the
@@ -376,15 +376,15 @@ public static void BeginDelete(this IReplicationvCentersOperations operations, s
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task BeginDeleteAsync(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task BeginDeleteAsync(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                (await operations.BeginDeleteWithHttpMessagesAsync(fabricName, vcenterName, null, cancellationToken).ConfigureAwait(false)).Dispose();
+                (await operations.BeginDeleteWithHttpMessagesAsync(fabricName, vCenterName, null, cancellationToken).ConfigureAwait(false)).Dispose();
             }
 
             /// <summary>
@@ -399,15 +399,15 @@ public static void BeginDelete(this IReplicationvCentersOperations operations, s
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name
             /// </param>
             /// <param name='updateVCenterRequest'>
             /// The input to the update vCenter operation.
             /// </param>
-            public static VCenter BeginUpdate(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, UpdateVCenterRequest updateVCenterRequest)
+            public static VCenter BeginUpdate(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, UpdateVCenterRequest updateVCenterRequest)
             {
-                return operations.BeginUpdateAsync(fabricName, vcenterName, updateVCenterRequest).GetAwaiter().GetResult();
+                return operations.BeginUpdateAsync(fabricName, vCenterName, updateVCenterRequest).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -422,8 +422,8 @@ public static VCenter BeginUpdate(this IReplicationvCentersOperations operations
             /// <param name='fabricName'>
             /// Fabric name.
             /// </param>
-            /// <param name='vcenterName'>
-            /// vcenter name.
+            /// <param name='vCenterName'>
+            /// vCenter name
             /// </param>
             /// <param name='updateVCenterRequest'>
             /// The input to the update vCenter operation.
@@ -431,9 +431,9 @@ public static VCenter BeginUpdate(this IReplicationvCentersOperations operations
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<VCenter> BeginUpdateAsync(this IReplicationvCentersOperations operations, string fabricName, string vcenterName, UpdateVCenterRequest updateVCenterRequest, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<VCenter> BeginUpdateAsync(this IReplicationvCentersOperations operations, string fabricName, string vCenterName, UpdateVCenterRequest updateVCenterRequest, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(fabricName, vcenterName, updateVCenterRequest, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(fabricName, vCenterName, updateVCenterRequest, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SdkInfo_SiteRecoveryManagementClient.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SdkInfo_SiteRecoveryManagementClient.cs
index d91816b61baa..0922d04b8215 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SdkInfo_SiteRecoveryManagementClient.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SdkInfo_SiteRecoveryManagementClient.cs
@@ -19,46 +19,35 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_SiteRecoveryMan
           {
               return new Tuple<string, string, string>[]
               {
-                new Tuple<string, string, string>("Compute", "ReplicationEligibilityResults", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "MigrationRecoveryPoints", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "Operations", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "RecoveryPoints", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationAlertSettings", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationEvents", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationFabrics", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationJobs", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationLogicalNetworks", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationMigrationItems", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationNetworkMappings", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationNetworks", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationPolicies", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectableItems", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectedItems", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectionContainerMappings", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectionContainers", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectionIntents", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationRecoveryPlans", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationRecoveryServicesProviders", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationStorageClassificationMappings", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationStorageClassifications", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationVaultHealth", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationVaultSetting", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "ReplicationvCenters", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "SupportedOperatingSystems", "2021-02-10"),
-                new Tuple<string, string, string>("RecoveryServices", "TargetComputeSizes", "2021-02-10"),
+                new Tuple<string, string, string>("Compute", "ReplicationEligibilityResults", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "MigrationRecoveryPoints", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "Operations", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "RecoveryPoints", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationAlertSettings", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationEvents", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationFabrics", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationJobs", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationLogicalNetworks", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationMigrationItems", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationNetworkMappings", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationNetworks", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationPolicies", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectableItems", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectedItems", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectionContainerMappings", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectionContainers", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationProtectionIntents", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationRecoveryPlans", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationRecoveryServicesProviders", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationStorageClassificationMappings", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationStorageClassifications", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationVaultHealth", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationVaultSetting", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "ReplicationvCenters", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "SupportedOperatingSystems", "2021-03-01"),
+                new Tuple<string, string, string>("RecoveryServices", "TargetComputeSizes", "2021-03-01"),
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "v2";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/recoveryservicessiterecovery/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=D:\\repos\\azure-sdk-for-net\\sdk";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "64e122e05a8ff184be8a6d185edfab4e9c3c237e";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SiteRecoveryManagementClient.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SiteRecoveryManagementClient.cs
index 763b72909d43..c62f87dafbed 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SiteRecoveryManagementClient.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SiteRecoveryManagementClient.cs
@@ -162,6 +162,11 @@ public partial class SiteRecoveryManagementClient : ServiceClient<SiteRecoveryMa
         /// </summary>
         public virtual IReplicationProtectionContainerMappingsOperations ReplicationProtectionContainerMappings { get; private set; }
 
+        /// <summary>
+        /// Gets the IReplicationProtectionIntentsOperations.
+        /// </summary>
+        public virtual IReplicationProtectionIntentsOperations ReplicationProtectionIntents { get; private set; }
+
         /// <summary>
         /// Gets the IReplicationRecoveryServicesProvidersOperations.
         /// </summary>
@@ -192,11 +197,6 @@ public partial class SiteRecoveryManagementClient : ServiceClient<SiteRecoveryMa
         /// </summary>
         public virtual IReplicationPoliciesOperations ReplicationPolicies { get; private set; }
 
-        /// <summary>
-        /// Gets the IReplicationProtectionIntentsOperations.
-        /// </summary>
-        public virtual IReplicationProtectionIntentsOperations ReplicationProtectionIntents { get; private set; }
-
         /// <summary>
         /// Gets the IReplicationRecoveryPlansOperations.
         /// </summary>
@@ -474,19 +474,19 @@ private void Initialize()
             RecoveryPoints = new RecoveryPointsOperations(this);
             TargetComputeSizes = new TargetComputeSizesOperations(this);
             ReplicationProtectionContainerMappings = new ReplicationProtectionContainerMappingsOperations(this);
+            ReplicationProtectionIntents = new ReplicationProtectionIntentsOperations(this);
             ReplicationRecoveryServicesProviders = new ReplicationRecoveryServicesProvidersOperations(this);
             ReplicationStorageClassifications = new ReplicationStorageClassificationsOperations(this);
             ReplicationStorageClassificationMappings = new ReplicationStorageClassificationMappingsOperations(this);
             ReplicationvCenters = new ReplicationvCentersOperations(this);
             ReplicationJobs = new ReplicationJobsOperations(this);
             ReplicationPolicies = new ReplicationPoliciesOperations(this);
-            ReplicationProtectionIntents = new ReplicationProtectionIntentsOperations(this);
             ReplicationRecoveryPlans = new ReplicationRecoveryPlansOperations(this);
             SupportedOperatingSystems = new SupportedOperatingSystemsOperations(this);
             ReplicationVaultHealth = new ReplicationVaultHealthOperations(this);
             ReplicationVaultSetting = new ReplicationVaultSettingOperations(this);
             BaseUri = new System.Uri("https://management.azure.com");
-            ApiVersion = "2021-02-10";
+            ApiVersion = "2021-03-01";
             AcceptLanguage = "en-US";
             LongRunningOperationRetryTimeout = 30;
             GenerateClientRequestId = true;
@@ -575,8 +575,8 @@ private void Initialize()
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<MigrationProviderSpecificSettings>("instanceType"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<NetworkMappingFabricSpecificSettings>("instanceType"));
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<NetworkMappingFabricSpecificSettings>("instanceType"));
-            SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<PlannedFailoverProviderSpecificFailoverInput>("instanceType"));
-            DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<PlannedFailoverProviderSpecificFailoverInput>("instanceType"));
+            SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<ProviderSpecificFailoverInput>("instanceType"));
+            DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<ProviderSpecificFailoverInput>("instanceType"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<PolicyProviderSpecificDetails>("instanceType"));
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<PolicyProviderSpecificDetails>("instanceType"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<ProtectionContainerMappingProviderSpecificDetails>("instanceType"));
@@ -595,8 +595,6 @@ private void Initialize()
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<ReplicationProtectionIntentProviderSpecificSettings>("instanceType"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<ReplicationProviderSpecificUpdateContainerMappingInput>("instanceType"));
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<ReplicationProviderSpecificUpdateContainerMappingInput>("instanceType"));
-            SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<ResyncProviderSpecificInput>("instanceType"));
-            DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<ResyncProviderSpecificInput>("instanceType"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<ReverseReplicationProviderSpecificInput>("instanceType"));
             DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<ReverseReplicationProviderSpecificInput>("instanceType"));
             SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<SwitchProtectionProviderSpecificInput>("instanceType"));
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SupportedOperatingSystemsOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SupportedOperatingSystemsOperations.cs
index 394b9b00c28d..16a3fcf31ab2 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SupportedOperatingSystemsOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SupportedOperatingSystemsOperations.cs
@@ -51,11 +51,8 @@ internal SupportedOperatingSystemsOperations(SiteRecoveryManagementClient client
         public SiteRecoveryManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Gets the data of supported operating systems by SRS.
+        /// Gets the data of supported OSes by SRS.
         /// </summary>
-        /// <param name='instanceType'>
-        /// The instance type.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -77,7 +74,7 @@ internal SupportedOperatingSystemsOperations(SiteRecoveryManagementClient client
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SupportedOperatingSystems>> GetWithHttpMessagesAsync(string instanceType = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SupportedOperatingSystems>> GetWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -102,13 +99,12 @@ internal SupportedOperatingSystemsOperations(SiteRecoveryManagementClient client
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("instanceType", instanceType);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationSupportedOperatingSystems").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationSupportedOperatingSystems").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
@@ -117,10 +113,6 @@ internal SupportedOperatingSystemsOperations(SiteRecoveryManagementClient client
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (instanceType != null)
-            {
-                _queryParameters.Add(string.Format("instanceType={0}", System.Uri.EscapeDataString(instanceType)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SupportedOperatingSystemsOperationsExtensions.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SupportedOperatingSystemsOperationsExtensions.cs
index 5e742c4bcf3e..da96f4013369 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SupportedOperatingSystemsOperationsExtensions.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/SupportedOperatingSystemsOperationsExtensions.cs
@@ -22,34 +22,28 @@ namespace Microsoft.Azure.Management.RecoveryServices.SiteRecovery
     public static partial class SupportedOperatingSystemsOperationsExtensions
     {
             /// <summary>
-            /// Gets the data of supported operating systems by SRS.
+            /// Gets the data of supported OSes by SRS.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='instanceType'>
-            /// The instance type.
-            /// </param>
-            public static SupportedOperatingSystems Get(this ISupportedOperatingSystemsOperations operations, string instanceType = default(string))
+            public static SupportedOperatingSystems Get(this ISupportedOperatingSystemsOperations operations)
             {
-                return operations.GetAsync(instanceType).GetAwaiter().GetResult();
+                return operations.GetAsync().GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Gets the data of supported operating systems by SRS.
+            /// Gets the data of supported OSes by SRS.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='instanceType'>
-            /// The instance type.
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<SupportedOperatingSystems> GetAsync(this ISupportedOperatingSystemsOperations operations, string instanceType = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<SupportedOperatingSystems> GetAsync(this ISupportedOperatingSystemsOperations operations, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetWithHttpMessagesAsync(instanceType, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/TargetComputeSizesOperations.cs b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/TargetComputeSizesOperations.cs
index fb9208657188..d429cc8d28fa 100644
--- a/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/TargetComputeSizesOperations.cs
+++ b/sdk/recoveryservices-siterecovery/Microsoft.Azure.Management.RecoveryServices.SiteRecovery/src/Generated/TargetComputeSizesOperations.cs
@@ -131,7 +131,7 @@ internal TargetComputeSizesOperations(SiteRecoveryManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/targetComputeSizes").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{resourceName}/replicationFabrics/{fabricName}/replicationProtectionContainers/{protectionContainerName}/replicationProtectedItems/{replicatedProtectedItemName}/targetComputeSizes").ToString();
             _url = _url.Replace("{resourceName}", System.Uri.EscapeDataString(Client.ResourceName));
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(Client.ResourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));