Skip to content

ASR: Adding support for ZRS disk types, and adding fields in protected item response #16002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2021
Merged

ASR: Adding support for ZRS disk types, and adding fields in protected item response #16002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2219160
ZRS disk support
ayfathim Oct 3, 2021
c26aad2
Updated changelog
ayfathim Oct 3, 2021
36567f8
Updated as per comments
ayfathim Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ....SiteRecovery/DiskReplicationConfiguration/AzureRmAsrAzureToAzureDiskReplicationConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 12 additions & 0 deletions src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions src/RecoveryServices/RecoveryServices.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/RecoveryServices/RecoveryServices/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions ...veryServices/help/New-AzRecoveryServicesAsrAzureToAzureDiskReplicationConfig.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down