Skip to content

Commit 326ea18

Browse files
authored
Merge pull request #8094 from maddieclayton/rcbc2
Breaking changes for Az.RecoveryServices.SiteRecovery
2 parents 37292b4 + a559571 commit 326ea18

File tree

7 files changed

+8
-65
lines changed

7 files changed

+8
-65
lines changed

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery.Test/ScenarioTests/B2A/AsrB2ATests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ function Test-CreatePolicy
154154

155155
# Import Azure RecoveryServices Vault Settings File
156156
Import-AzureRmRecoveryServicesAsrVaultSettingsFile -Path $vaultSettingsFilePath
157-
$currentJob = New-AzureRmRecoveryServicesAsrPolicy -Name $ProtectionProfileName -ReplicationProvider HyperVReplicaAzure -ReplicationFrequencyInSeconds 30 -RecoveryPoints 1 -ApplicationConsistentSnapshotFrequencyInHours 0 -RecoveryAzureStorageAccountId $StorageAccountID -Encryption Disable
157+
$currentJob = New-AzureRmRecoveryServicesAsrPolicy -Name $ProtectionProfileName -ReplicationProvider HyperVReplicaAzure -ReplicationFrequencyInSeconds 30 -RecoveryPoints 1 -ApplicationConsistentSnapshotFrequencyInHours 0 -RecoveryAzureStorageAccountId $StorageAccountID
158158
WaitForJobCompletion -JobId $currentJob.Name
159159
$ProtectionProfile = Get-AzureRmRecoveryServicesAsrPolicy -Name $ProtectionProfileName
160160
$ProtectionProfile

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery.Test/ScenarioTests/E2A/AsrE2ATests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function Test-SiteRecoveryCreatePolicy
167167
Import-AzureRmRecoveryServicesAsrVaultSettingsFile -Path $vaultSettingsFilePath
168168

169169
# Create profile
170-
$Job = New-AzureRmRecoveryServicesAsrPolicy -Name $PolicyName -ReplicationProvider HyperVReplicaAzure -ReplicationFrequencyInSeconds 30 -RecoveryPoints 1 -ApplicationConsistentSnapshotFrequencyInHours 0 -Encryption Disable -RecoveryAzureStorageAccountId $RecoveryAzureStorageAccountId
170+
$Job = New-AzureRmRecoveryServicesAsrPolicy -Name $PolicyName -ReplicationProvider HyperVReplicaAzure -ReplicationFrequencyInSeconds 30 -RecoveryPoints 1 -ApplicationConsistentSnapshotFrequencyInHours 0 -RecoveryAzureStorageAccountId $RecoveryAzureStorageAccountId
171171
WaitForJobCompletion -JobId $Job.Name -JobQueryWaitTimeInSeconds $JobQueryWaitTimeInSeconds
172172

173173
# Get a profile created (with name ppAzure)

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery/ChangeLog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@
1919
-->
2020
## Current Release
2121

22+
2223
## Version 1.0.0
23-
* General availability of `Az.RecoveryServices` module
24+
* General availability of `Az.RecoveryServices` module
25+
* Remove -Encryption parameter from New/Set-AzRecoveryServicesAsrPolicy

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery/Policy/NewAzureRmRecoveryServicesAsrPolicy.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,6 @@ public class NewAzureRmRecoveryServicesAsrPolicy : SiteRecoveryCmdletBase
211211
[ValidateNotNullOrEmpty]
212212
public string RecoveryAzureStorageAccountId { get; set; }
213213

214-
/// <summary>
215-
/// Gets or sets if encryption should be enabled or disabled.
216-
/// todo : vipin add in breaking changes list.Mark obsolete for now.
217-
/// </summary>
218-
[Parameter(ParameterSetName = ASRParameterSets.HyperVToAzure)]
219-
[DefaultValue(Constants.Disable)]
220-
[Obsolete("cmdlet parameter will be removed in upcoming breaking release")]
221-
[ValidateSet(
222-
Constants.Enable,
223-
Constants.Disable)]
224-
public string Encryption { get; set; }
225-
226214
/// <summary>
227215
/// Gets or sets the multiVm sync status for the policy.
228216
/// </summary>

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.SiteRecovery/Policy/UpdateAzureRmRecoveryServicesAsrPolicy.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -194,19 +194,6 @@ public class UpdateAzureRmRecoveryServicesAsrPolicy : SiteRecoveryCmdletBase
194194
[ValidateNotNullOrEmpty]
195195
public string RecoveryAzureStorageAccountId { get; set; }
196196

197-
/// <summary>
198-
/// Gets or sets encryption should be enabled or disabled.
199-
/// </summary>
200-
201-
[Parameter(ParameterSetName = ASRParameterSets.HyperVToAzure)]
202-
[Parameter(ParameterSetName = ASRParameterSets.Default)]
203-
[Obsolete("cmdlet parameter will be removed in upcoming breaking release")]
204-
[ValidateNotNullOrEmpty]
205-
[ValidateSet(
206-
Constants.Enable,
207-
Constants.Disable)]
208-
public string Encryption { get; set; }
209-
210197
/// <summary>
211198
/// Gets or sets multiVm sync status for the policy.
212199
/// </summary>
@@ -352,8 +339,6 @@ private void HyperVToAzurePolicyObject()
352339
{
353340
ApplicationConsistentSnapshotFrequencyInHours =
354341
this.applicationConsistentSnapshotFrequencyInHours,
355-
// encryption is removed from latest API . Service is setting the default vault internally.
356-
// todo :: Warning.
357342
OnlineReplicationStartTime = this.replicationStartTime.ToString(),
358343
RecoveryPointHistoryDuration = this.recoveryPoints,
359344
ReplicationInterval = this.replicationFrequencyInSeconds

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/help/New-AzRecoveryServicesAsrPolicy.md

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Creates an Azure Site Recovery replication policy.
1717
New-AzRecoveryServicesAsrPolicy [-HyperVToAzure] -Name <String> -ReplicationProvider <String>
1818
-ReplicationFrequencyInSeconds <String> [-NumberOfRecoveryPointsToRetain <Int32>]
1919
[-ApplicationConsistentSnapshotFrequencyInHours <Int32>] [-ReplicationStartTime <TimeSpan>]
20-
[-RecoveryAzureStorageAccountId <String>] [-Encryption <String>] [-DefaultProfile <IAzureContextContainer>]
20+
[-RecoveryAzureStorageAccountId <String>] [-DefaultProfile <IAzureContextContainer>]
2121
[-WhatIf] [-Confirm] [<CommonParameters>]
2222
```
2323

@@ -219,22 +219,6 @@ Accept pipeline input: False
219219
Accept wildcard characters: False
220220
```
221221
222-
### -Encryption
223-
{{Fill Encryption Description}}
224-
225-
```yaml
226-
Type: System.String
227-
Parameter Sets: HyperVToAzure
228-
Aliases:
229-
Accepted values: Enable, Disable
230-
231-
Required: False
232-
Position: Named
233-
Default value: None
234-
Accept pipeline input: False
235-
Accept wildcard characters: False
236-
```
237-
238222
### -HyperVToAzure
239223
Switch parameter to specify policy is to be used to replicate Hyper-V virtual machines to Azure
240224

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/help/Update-AzRecoveryServicesAsrPolicy.md

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Update-AzRecoveryServicesAsrPolicy -InputObject <ASRPolicy> [-ReplicationMethod
1818
[-ReplicationFrequencyInSeconds <String>] [-NumberOfRecoveryPointsToRetain <Int32>]
1919
[-ApplicationConsistentSnapshotFrequencyInHours <Int32>] [-Compression <String>] [-ReplicationPort <UInt16>]
2020
[-Authentication <String>] [-ReplicationStartTime <TimeSpan>] [-ReplicaDeletion <String>]
21-
[-RecoveryAzureStorageAccountId <String>] [-Encryption <String>] [-DefaultProfile <IAzureContextContainer>]
21+
[-RecoveryAzureStorageAccountId <String>] [-DefaultProfile <IAzureContextContainer>]
2222
[-WhatIf] [-Confirm] [<CommonParameters>]
2323
```
2424

@@ -51,7 +51,7 @@ Update-AzRecoveryServicesAsrPolicy [-AzureToVMware] -InputObject <ASRPolicy>
5151
Update-AzRecoveryServicesAsrPolicy [-HyperVToAzure] -InputObject <ASRPolicy>
5252
[-ReplicationFrequencyInSeconds <String>] [-NumberOfRecoveryPointsToRetain <Int32>]
5353
[-ApplicationConsistentSnapshotFrequencyInHours <Int32>] [-ReplicationStartTime <TimeSpan>]
54-
[-RecoveryAzureStorageAccountId <String>] [-Encryption <String>] [-DefaultProfile <IAzureContextContainer>]
54+
[-RecoveryAzureStorageAccountId <String>] [-DefaultProfile <IAzureContextContainer>]
5555
[-WhatIf] [-Confirm] [<CommonParameters>]
5656
```
5757

@@ -185,22 +185,6 @@ Accept pipeline input: False
185185
Accept wildcard characters: False
186186
```
187187
188-
### -Encryption
189-
{{Fill Encryption Description}}
190-
191-
```yaml
192-
Type: System.String
193-
Parameter Sets: Default, HyperVToAzure
194-
Aliases:
195-
Accepted values: Enable, Disable
196-
197-
Required: False
198-
Position: Named
199-
Default value: None
200-
Accept pipeline input: False
201-
Accept wildcard characters: False
202-
```
203-
204188
### -HyperVToAzure
205189
Switch parameter indicating that the specfied policy is used to replicate Hyper-V virtual machines to Azure.
206190

0 commit comments

Comments
 (0)