Changes related to Azure to Azure scenario are updated.

Azure · Dec 20, 2019 · fa4a29b · fa4a29b
1 parent 1dfab13
commit fa4a29b
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 35 deletions.
diff --git a/eng/mgmt/mgmtmetadata/recoveryservicessiterecovery_resource-manager.txt b/eng/mgmt/mgmtmetadata/recoveryservicessiterecovery_resource-manager.txt
@@ -3,12 +3,12 @@ AutoRest installed successfully.
 Commencing code generation
 Generating CSharp code
 Executing AutoRest command
-cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/recoveryservicessiterecovery/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\sdk1\azure-sdk-for-net\sdk
-2019-10-16 06:50:54 UTC
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/recoveryservicessiterecovery/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\ASROneSDK\azure-sdk-for-net\sdk
+2019-12-20 05:05:29 UTC
 Azure-rest-api-specs repository information
 GitHub fork: Azure
 Branch:      master
-Commit:      2c079a493e904166c7ecc4d1c4dbf2a01ea8059d
+Commit:      cb5fe2f993e08939a712c20f26ff9cbab7e98c82
 AutoRest information
 Requested version: latest
-Bootstrapper version:    autorest@2.0.4283
+Bootstrapper version:    autorest@2.0.4407
diff --git a/...ment.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedManagedDiskDetails.cs b/...ment.RecoveryServices.SiteRecovery/src/Generated/Models/A2AProtectedManagedDiskDetails.cs
@@ -46,6 +46,8 @@ public A2AProtectedManagedDiskDetails()
         /// <param name="recoveryTargetDiskAccountType">The target disk type
         /// after failover. Its an optional value and will be same as source
         /// disk type if not user provided.</param>
+        /// <param name="recoveryDiskEncryptionSetId">The recovery disk
+        /// encryption set Id.</param>
         /// <param name="diskName">The disk name.</param>
         /// <param name="diskCapacityInBytes">The disk capacity in
         /// bytes.</param>
@@ -78,14 +80,15 @@ public A2AProtectedManagedDiskDetails()
         /// <param name="keyIdentifier">The key URL / identifier (KEK).</param>
         /// <param name="kekKeyVaultArmId">The KeyVault resource id for key
         /// (KEK).</param>
-        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 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))
+        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))
         {
             DiskId = diskId;
             RecoveryResourceGroupId = recoveryResourceGroupId;
             RecoveryTargetDiskId = recoveryTargetDiskId;
             RecoveryReplicaDiskId = recoveryReplicaDiskId;
             RecoveryReplicaDiskAccountType = recoveryReplicaDiskAccountType;
             RecoveryTargetDiskAccountType = recoveryTargetDiskAccountType;
+            RecoveryDiskEncryptionSetId = recoveryDiskEncryptionSetId;
             DiskName = diskName;
             DiskCapacityInBytes = diskCapacityInBytes;
             PrimaryStagingAzureStorageAccountId = primaryStagingAzureStorageAccountId;
@@ -149,6 +152,12 @@ public A2AProtectedManagedDiskDetails()
         [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 disk name.
         /// </summary>

diff --git a/...gement.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskInputDetails.cs b/...gement.RecoveryServices.SiteRecovery/src/Generated/Models/A2AVmManagedDiskInputDetails.cs
@@ -42,15 +42,18 @@ public A2AVmManagedDiskInputDetails()
         /// <param name="recoveryTargetDiskAccountType">The target disk type
         /// after failover. Its an optional value and will be same as source
         /// disk type if not user provided.</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 A2AVmManagedDiskInputDetails(string diskId = default(string), string primaryStagingAzureStorageAccountId = default(string), string recoveryResourceGroupId = default(string), string recoveryReplicaDiskAccountType = default(string), string recoveryTargetDiskAccountType = 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;
             RecoveryResourceGroupId = recoveryResourceGroupId;
             RecoveryReplicaDiskAccountType = recoveryReplicaDiskAccountType;
             RecoveryTargetDiskAccountType = recoveryTargetDiskAccountType;
+            RecoveryDiskEncryptionSetId = recoveryDiskEncryptionSetId;
             DiskEncryptionInfo = diskEncryptionInfo;
             CustomInit();
         }
@@ -92,6 +95,12 @@ public A2AVmManagedDiskInputDetails()
         [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).

diff --git a/...Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureVmDiskDetails.cs b/...Azure.Management.RecoveryServices.SiteRecovery/src/Generated/Models/AzureVmDiskDetails.cs
@@ -31,7 +31,7 @@ public AzureVmDiskDetails()
         /// </summary>
         /// <param name="vhdType">VHD type.</param>
         /// <param name="vhdId">The VHD id.</param>
-        /// <param name="diskId">The disk id.</param>
+        /// <param name="diskId">The disk resource id.</param>
         /// <param name="vhdName">VHD name.</param>
         /// <param name="maxSizeMB">Max side in MB.</param>
         /// <param name="targetDiskLocation">Blob uri of the Azure
@@ -73,7 +73,7 @@ public AzureVmDiskDetails()
         public string VhdId { get; set; }
 
         /// <summary>
-        /// Gets or sets the disk id.
+        /// Gets or sets the disk resource id.
         /// </summary>
         [JsonProperty(PropertyName = "diskId")]
         public string DiskId { get; set; }

diff --git a/...iteRecovery/src/Generated/Models/HyperVReplicaAzureUpdateReplicationProtectedItemInput.cs b/...iteRecovery/src/Generated/Models/HyperVReplicaAzureUpdateReplicationProtectedItemInput.cs
@@ -40,8 +40,8 @@ public HyperVReplicaAzureUpdateReplicationProtectedItemInput()
         /// resource group Id for resource manager deployment.</param>
         /// <param name="useManagedDisks">A value indicating whether managed
         /// disks should be used during failover.</param>
-        /// <param name="diskIdToDiskEncryptionMap">The disk Id to disk
-        /// encryption set map.</param>
+        /// <param name="diskIdToDiskEncryptionMap">The dictionary of disk
+        /// resource Id to disk encryption set ARM Id.</param>
         public HyperVReplicaAzureUpdateReplicationProtectedItemInput(string recoveryAzureV1ResourceGroupId = default(string), string recoveryAzureV2ResourceGroupId = default(string), string useManagedDisks = default(string), IDictionary<string, string> diskIdToDiskEncryptionMap = default(IDictionary<string, string>))
         {
             RecoveryAzureV1ResourceGroupId = recoveryAzureV1ResourceGroupId;
@@ -78,7 +78,8 @@ public HyperVReplicaAzureUpdateReplicationProtectedItemInput()
         public string UseManagedDisks { get; set; }
 
         /// <summary>
-        /// Gets or sets the disk Id to disk encryption set map.
+        /// Gets or sets the dictionary of disk resource Id to disk encryption
+        /// set ARM Id.
         /// </summary>
         [JsonProperty(PropertyName = "diskIdToDiskEncryptionMap")]
         public IDictionary<string, string> DiskIdToDiskEncryptionMap { get; set; }

diff --git a/...ement.RecoveryServices.SiteRecovery/src/Generated/SdkInfo_SiteRecoveryManagementClient.cs b/...ement.RecoveryServices.SiteRecovery/src/Generated/SdkInfo_SiteRecoveryManagementClient.cs
@@ -19,6 +19,7 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_SiteRecoveryMan
           {
               return new Tuple<string, string, string>[]
               {
+                new Tuple<string, string, string>("Compute", "ReplicationEligibilityResults", "2018-07-10"),
                 new Tuple<string, string, string>("RecoveryServices", "MigrationRecoveryPoints", "2018-07-10"),
                 new Tuple<string, string, string>("RecoveryServices", "Operations", "2018-07-10"),
                 new Tuple<string, string, string>("RecoveryServices", "RecoveryPoints", "2018-07-10"),
@@ -49,11 +50,11 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_SiteRecoveryMan
       }
       // BEGIN: Code Generation Metadata Section
       public static readonly String AutoRestVersion = "latest";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283";
-      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=latest --reflect-api-versions --csharp-sdks-folder=D:\\sdk1\\azure-sdk-for-net\\sdk";
+      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4407";
+      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=latest --reflect-api-versions --csharp-sdks-folder=D:\\ASROneSDK\\azure-sdk-for-net\\sdk";
       public static readonly String GithubForkName = "Azure";
       public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "2c079a493e904166c7ecc4d1c4dbf2a01ea8059d";
+      public static readonly String GithubCommidId = "cb5fe2f993e08939a712c20f26ff9cbab7e98c82";
       public static readonly String CodeGenerationErrors = "";
       public static readonly String GithubRepoName = "azure-rest-api-specs";
       // END: Code Generation Metadata Section

diff --git a/...Services.SiteRecovery/src/Microsoft.Azure.Management.RecoveryServices.SiteRecovery.csproj b/...Services.SiteRecovery/src/Microsoft.Azure.Management.RecoveryServices.SiteRecovery.csproj
@@ -1,27 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<!-- Please do not move/edit code below this line -->
-	<Import Project="$(RepoEngPath)/mgmt/AzSdk.reference.props" />
-	<!-- Please do not move/edit code below this line -->
+  <!-- Please do not move/edit code below this line -->
+  <Import Project="$(RepoEngPath)/mgmt/AzSdk.reference.props" />
+  <!-- Please do not move/edit code below this line -->
 
-	<PropertyGroup>
-		<PackageId>Microsoft.Azure.Management.RecoveryServices.SiteRecovery</PackageId>
-		<Description>Provides developers with libraries for the updated recovery services site recovery feature under Azure Resource manager.</Description>
-		<Version>2.0.4-preview</Version>
-		<AssemblyName>Microsoft.Azure.Management.RecoveryServices.SiteRecovery</AssemblyName>
-		<PackageTags>Recoveryservices;SiteRecovery;</PackageTags>
-		<PackageReleaseNotes>
-			<![CDATA[
-		  Updates in this release:		     
+  <PropertyGroup>
+    <PackageId>Microsoft.Azure.Management.RecoveryServices.SiteRecovery</PackageId>
+    <Description>Provides developers with libraries for the updated recovery services site recovery feature under Azure Resource manager.</Description>
+    <Version>2.0.4-preview</Version>
+    <AssemblyName>Microsoft.Azure.Management.RecoveryServices.SiteRecovery</AssemblyName>
+    <PackageTags>Recoveryservices;SiteRecovery;</PackageTags>
+    <PackageReleaseNotes>
+      <![CDATA[
+		  Updates in this release:
 			 * Incremental changes:
-			 ** Azure Site Recovery (ASR) service now supports Customer-managed keys for managed disks in VMWare to Azure and HyperV to Azure scenarios.			 
+			 ** Azure Site Recovery (ASR) service now supports Customer-managed keys for managed disks in VMWare to Azure, HyperV to Azure and Azure to Azure scenarios.
 		    ]]>
-		</PackageReleaseNotes>
-	</PropertyGroup>
-	<PropertyGroup>
-		<TargetFrameworks>$(SdkTargetFx)</TargetFrameworks>
-	</PropertyGroup>
+    </PackageReleaseNotes>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>$(SdkTargetFx)</TargetFrameworks>
+  </PropertyGroup>
 
-	<!-- Please do not move/edit code below this line -->
-	<Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
-	<!-- Please do not move/edit code above this line -->
+  <!-- Please do not move/edit code below this line -->
+  <Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
+  <!-- Please do not move/edit code above this line -->
 </Project>