Merge branch 'main' into cplat-SIGCMKBug

Author: wyunchi-ms

src/Compute/Compute/ChangeLog.md

@@ -21,7 +21,7 @@
 -->
 ## Upcoming Release
 * Updated New-AzGalleryImageVersion to take in the 'Encryption' property correctly from '-TagetRegion' parameter. 
-* Update Set-AzVmBootDiagnostic to default to managed storage account if not provided.
+* Updated Set-AzVmBootDiagnostic to default to managed storage account if not provided.
 * Update Compute .NET SDK package reference to version 49.1.0
 * Fixed a bug in `Get-AzVM` that caused incorrect power status output.
 

src/DataShare/DataShare/help/Get-AzDataShare.md

@@ -24,7 +24,7 @@ Get-AzDataShare -ResourceId <String> [-DefaultProfile <IAzureContextContainer>]
 ```
 
 ## DESCRIPTION
-The **Get-AzDataShare** cmdlet gets information about data shares in an Azure data share accoount.
+The **Get-AzDataShare** cmdlet gets information about data shares in an Azure data share account.
 If you specify the name of a data share, this cmdlet gets information about that data share.
 If you do not specify a name, this cmdlet gets information about all of the data shares in an Azure data share account.
 

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

@@ -84,9 +84,11 @@ public class AzureRmAsrAzureToAzureDiskReplicationConfig : SiteRecoveryCmdletBas
         [ValidateNotNullOrEmpty]
         [ValidateSet(
             Constants.Premium_LRS,
+            Constants.Premium_ZRS,
             Constants.Standard_LRS,
             Constants.Standard_SSD,
-            Constants.StandardSSD_LRS)]
+            Constants.StandardSSD_LRS,
+            Constants.StandardSSD_ZRS)]
         public string RecoveryReplicaDiskAccountType { get; set; }
 
         /// <summary>
@@ -96,9 +98,11 @@ public class AzureRmAsrAzureToAzureDiskReplicationConfig : SiteRecoveryCmdletBas
         [ValidateNotNullOrEmpty]
         [ValidateSet(
             Constants.Premium_LRS,
+            Constants.Premium_ZRS,
             Constants.Standard_LRS,
             Constants.Standard_SSD,
-            Constants.StandardSSD_LRS)]
+            Constants.StandardSSD_LRS,
+            Constants.StandardSSD_ZRS)]
         public string RecoveryTargetDiskAccountType { get; set; }
 
         /// <summary>

src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSConstants.cs

@@ -362,6 +362,11 @@ public static class Constants
         /// </summary>
         public const string Premium_LRS = "Premium_LRS";
 
+        /// <summary>
+        ///     Represents Premium_ZRS storage account.
+        /// </summary>
+        public const string Premium_ZRS = "Premium_ZRS";
+
         /// <summary>
         ///     Represents primary location.
         /// </summary>
@@ -519,6 +524,11 @@ public static class Constants
         /// </summary>
         public const string StandardSSD_LRS = "StandardSSD_LRS";
 
+        /// <summary>
+        ///     Represents StandardSSD_ZRS storage account.
+        /// </summary>
+        public const string StandardSSD_ZRS = "StandardSSD_ZRS";
+
         /// <summary>
         ///     Represents Standard_SSD storage account.
         /// </summary>

src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs

@@ -2120,6 +2120,8 @@ public ASRAzureToAzureSpecificRPIDetails(A2AReplicationDetails details)
             this.InitialRecoveryFabricLocation = details.InitialRecoveryFabricLocation;
             this.InitialPrimaryZone = details.InitialPrimaryZone;
             this.InitialRecoveryZone = details.InitialRecoveryZone;
+            this.RecoveryAvailabilityZone = details.RecoveryAvailabilityZone;
+            this.PrimaryAvailabilityZone = details.PrimaryAvailabilityZone;
             this.LifecycleId = details.LifecycleId;
 
             if (details.LastHeartbeat != null)
@@ -2307,6 +2309,16 @@ public ASRAzureToAzureSpecificRPIDetails(A2AReplicationDetails details)
         /// </summary>
         public string InitialRecoveryZone { get; set; }
 
+        /// <summary>
+        /// Gets or sets the recovery availability zone.
+        /// </summary>
+        public string RecoveryAvailabilityZone { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary availability zone.
+        /// </summary>
+        public string PrimaryAvailabilityZone { get; set; }
+
         /// <summary>
         /// Gets or sets the only constant ID throught out the enable disable cycle.
         /// (with multiple switch protections in the middle) - Recovery Plans refer this ID.

src/RecoveryServices/RecoveryServices.sln

@@ -60,6 +60,10 @@ Global
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}.Release|Any CPU.Build.0 = Release|Any CPU
 		{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/RecoveryServices/RecoveryServices/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added support for ZRS disk type for Azure to Azure replication.
+* Added Availability zone information in replicated protected item response for Azure to Azure replication.
 * Azure Site Recovery bug fixes for VMware to Azure Reprotect, Update policy and Disable scenarios.
 * Azure Backup added the support for UserAssigned MSI in RecoveryServices Vault.
 

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

@@ -240,7 +240,7 @@ Specifies the account type of replicated managed disk.
 Type: System.String
 Parameter Sets: AzureToAzureManagedDisk
 Aliases:
-Accepted values: Premium_LRS, Standard_LRS, StandardSSD_LRS
+Accepted values: Premium_LRS, Premium_ZRS, Standard_LRS, StandardSSD_LRS, StandardSSD_ZRS
 
 Required: True
 Position: Named
@@ -271,7 +271,7 @@ Specifies the recovery target disk for replicated managed disk.
 Type: System.String
 Parameter Sets: AzureToAzureManagedDisk
 Aliases:
-Accepted values: Premium_LRS, Standard_LRS, StandardSSD_LRS
+Accepted values: Premium_LRS, Premium_ZRS, Standard_LRS, StandardSSD_LRS, StandardSSD_ZRS
 
 Required: True
 Position: Named