Skip to content

Commit 37292b4

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#8088 from MabOneSdk/rs_breaking
[RecoveryServices.Backup] Removing name param from container
2 parents 587c52e + 4eb7928 commit 37292b4

File tree

22 files changed

+45
-107
lines changed

22 files changed

+45
-107
lines changed

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -194,23 +194,12 @@ public List<ProtectedItemResource> ListProtectedItemsByContainer(
194194
{
195195
string vaultName = (string)providerData[CmdletModel.VaultParams.VaultName];
196196
string vaultResourceGroupName = (string)providerData[CmdletModel.VaultParams.ResourceGroupName];
197-
string name = (string)providerData[CmdletModel.ContainerParams.Name];
198197
string friendlyName = (string)providerData[CmdletModel.ContainerParams.FriendlyName];
199198
CmdletModel.ContainerRegistrationStatus status =
200199
(CmdletModel.ContainerRegistrationStatus)providerData[CmdletModel.ContainerParams.Status];
201200

202201
string nameQueryFilter = friendlyName;
203202

204-
if (!string.IsNullOrEmpty(name))
205-
{
206-
Logger.Instance.WriteWarning(Resources.GetContainerNameParamDeprecated);
207-
208-
if (string.IsNullOrEmpty(friendlyName))
209-
{
210-
nameQueryFilter = name;
211-
}
212-
}
213-
214203
ODataQuery<ServiceClientModel.BMSContainerQueryObject> queryParams = null;
215204
if (status == 0)
216205
{

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public List<ContainerBase> ListProtectionContainers()
286286
{
287287
string vaultName = (string)ProviderData[VaultParams.VaultName];
288288
string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
289-
string name = (string)ProviderData[ContainerParams.Name];
289+
string name = (string)ProviderData[ContainerParams.FriendlyName];
290290

291291
ODataQuery<BMSContainerQueryObject> queryParams =
292292
new ODataQuery<BMSContainerQueryObject>(

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public List<ContainerBase> ListProtectionContainers()
111111
{
112112
string vaultName = (string)ProviderData[VaultParams.VaultName];
113113
string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
114-
string name = (string)ProviderData[ContainerParams.Name];
114+
string name = (string)ProviderData[ContainerParams.FriendlyName];
115115

116116
ODataQuery<BMSContainerQueryObject> queryParams =
117117
new ODataQuery<BMSContainerQueryObject>(

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ContainerTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function Test-AzureFSContainer
6262
-VaultId $vault.ID `
6363
-ContainerType AzureStorage `
6464
-Status Registered `
65-
-Name $saName;
65+
-FriendlyName $saName;
6666
Assert-True { $containers.FriendlyName -contains $saName }
6767

6868
# VARIATION-3: Get Containers with resource group filter
@@ -78,7 +78,7 @@ function Test-AzureFSContainer
7878
-VaultId $vault.ID `
7979
-ContainerType AzureStorage `
8080
-Status Registered `
81-
-Name $saName `
81+
-FriendlyName $saName `
8282
-ResourceGroupName $resourceGroupName;
8383
Assert-True { $containers.FriendlyName -contains $saName }
8484
}

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ItemTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function Test-AzureFSItem
6565
-VaultId $vault.ID `
6666
-ContainerType AzureStorage `
6767
-Status Registered `
68-
-Name $saName
68+
-FriendlyName $saName
6969

7070
# VARIATION-1: Get all items for container
7171
$items = Get-AzureRmRecoveryServicesBackupItem `
@@ -149,7 +149,7 @@ function Test-AzureFSBackup
149149
-VaultId $vault.ID `
150150
-ContainerType AzureStorage `
151151
-Status Registered `
152-
-Name $saName
152+
-FriendlyName $saName
153153

154154
# Trigger backup and wait for completion
155155
$backupJob = Backup-AzureRmRecoveryServicesBackupItem `
@@ -230,7 +230,7 @@ function Test-AzureFSGetRPs
230230
-VaultId $vault.ID `
231231
-ContainerType AzureStorage `
232232
-Status Registered `
233-
-Name $saName
233+
-FriendlyName $saName
234234
$backupJob = Backup-Item $vault $item
235235

236236
$backupStartTime = $backupJob.StartTime.AddMinutes(-1);
@@ -269,7 +269,7 @@ function Test-AzureFSFullRestore
269269
-VaultId $vault.ID `
270270
-ContainerType AzureStorage `
271271
-Status Registered `
272-
-Name $saName
272+
-FriendlyName $saName
273273
$backupJob = Backup-Item $vault $item
274274

275275
$backupStartTime = $backupJob.StartTime.AddMinutes(-1);

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/JobTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function Test-AzureFSGetJob
7070
-VaultId $vault.ID `
7171
-ContainerType AzureStorage `
7272
-Status Registered `
73-
-Name $saName
73+
-FriendlyName $saName
7474
}
7575
finally
7676
{
@@ -100,7 +100,7 @@ function Test-AzureFSWaitJob
100100
-VaultId $vault.ID `
101101
-ContainerType AzureStorage `
102102
-Status Registered `
103-
-Name $saName
103+
-FriendlyName $saName
104104
}
105105
finally
106106
{
@@ -128,7 +128,7 @@ function Test-AzureFSCancelJob
128128
-VaultId $vault.ID `
129129
-ContainerType AzureStorage `
130130
-Status Registered `
131-
-Name $saName
131+
-FriendlyName $saName
132132
}
133133
finally
134134
{

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ProtectionCheckTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function Test-AzureFSProtectionCheck
7171
-VaultId $vault.ID `
7272
-ContainerType AzureStorage `
7373
-Status Registered `
74-
-Name $saName
74+
-FriendlyName $saName
7575
}
7676
finally
7777
{

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureSql/ContainerTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public ContainerTests(Xunit.Abstractions.ITestOutputHelper output)
3030
XunitTracingInterceptor.AddToContext(_logger);
3131
}
3232

33-
[Fact]
33+
[Fact(Skip = "This workload is not supported anymore")]
3434
[Trait(Category.AcceptanceType, Category.CheckIn)]
3535
[Trait(TestConstants.Workload, TestConstants.AzureSql)]
3636
public void TestAzureSqlGetContainers()
@@ -39,7 +39,7 @@ public void TestAzureSqlGetContainers()
3939
_logger, PsBackupProviderTypes.AzureSql, "Test-AzureSqlGetContainers");
4040
}
4141

42-
[Fact]
42+
[Fact(Skip = "This workload is not supported anymore")]
4343
[Trait(Category.AcceptanceType, Category.CheckIn)]
4444
[Trait(TestConstants.Workload, TestConstants.AzureSql)]
4545
public void TestAzureSqlUnregisterContainer()

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureSql/ItemTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public ItemTests(Xunit.Abstractions.ITestOutputHelper output)
3030
XunitTracingInterceptor.AddToContext(_logger);
3131
}
3232

33-
[Fact]
33+
[Fact(Skip = "This workload is not supported anymore")]
3434
[Trait(Category.AcceptanceType, Category.CheckIn)]
3535
[Trait(TestConstants.Workload, TestConstants.AzureSql)]
3636
public void TestAzureSqlGetItems()
@@ -39,7 +39,7 @@ public void TestAzureSqlGetItems()
3939
_logger, PsBackupProviderTypes.AzureSql, "Test-AzureSqlGetItems");
4040
}
4141

42-
[Fact]
42+
[Fact(Skip = "This workload is not supported anymore")]
4343
[Trait(Category.AcceptanceType, Category.CheckIn)]
4444
[Trait(TestConstants.Workload, TestConstants.AzureSql)]
4545
public void TestAzureSqlDisableProtection()
@@ -48,7 +48,7 @@ public void TestAzureSqlDisableProtection()
4848
_logger, PsBackupProviderTypes.AzureSql, "Test-AzureSqlDisableProtection");
4949
}
5050

51-
[Fact]
51+
[Fact(Skip = "This workload is not supported anymore")]
5252
[Trait(Category.AcceptanceType, Category.CheckIn)]
5353
[Trait(TestConstants.Workload, TestConstants.AzureSql)]
5454
public void TestAzureSqlGetRPs()

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureSql/PolicyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2222
{
2323
public partial class PolicyTests : RMTestBase
2424
{
25-
[Fact]
25+
[Fact(Skip = "This workload is not supported anymore")]
2626
[Trait(Category.AcceptanceType, Category.CheckIn)]
2727
[Trait(TestConstants.Workload, TestConstants.AzureSql)]
2828
public void TestAzureSqlPolicy()

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/Common.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ function Enable-Protection(
171171
$container = Get-AzureRmRecoveryServicesBackupContainer `
172172
-VaultId $vault.ID `
173173
-ContainerType AzureVM `
174-
-Name $vm.Name;
174+
-FriendlyName $vm.Name;
175175

176176
if ($container -eq $null)
177177
{
@@ -188,7 +188,7 @@ function Enable-Protection(
188188
$container = Get-AzureRmRecoveryServicesBackupContainer `
189189
-VaultId $vault.ID `
190190
-ContainerType AzureVM `
191-
-Name $vm.Name;
191+
-FriendlyName $vm.Name;
192192
}
193193

194194
$item = Get-AzureRmRecoveryServicesBackupItem `

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ContainerTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ function Test-AzureVMGetContainers
4141
-VaultId $vault.ID `
4242
-ContainerType AzureVM `
4343
-Status Registered `
44-
-Name $vm.Name;
44+
-FriendlyName $vm.Name;
4545
Assert-True { $containers.FriendlyName -contains $vm.Name }
4646

4747
# VARIATION-3: Get Containers with friendly name and resource group filters
4848
$containers = Get-AzureRmRecoveryServicesBackupContainer `
4949
-VaultId $vault.ID `
5050
-ContainerType AzureVM `
5151
-Status Registered `
52-
-Name $vm.Name `
52+
-FriendlyName $vm.Name `
5353
-ResourceGroupName $vm.ResourceGroupName;
5454
Assert-True { $containers.FriendlyName -contains $vm.Name }
5555

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void TestAzureVMRPMountScript()
109109
}
110110

111111
#if NETSTANDARD
112-
[Fact(Skip = "Needs investigation, TestManagementClientHelper class wasn't initialized with the ResourceManagementClient client.")]
112+
[Fact(Skip = "Needs investigation, TestManagementClientHelper class wasn't initialized with the ResourceManagementClient client.")]
113113
#else
114114
[Fact]
115115
#endif

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.ps1

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function Test-AzureVMGetItems
3333
-VaultId $vault.ID `
3434
-ContainerType AzureVM `
3535
-Status Registered `
36-
-Name $vm.Name
36+
-FriendlyName $vm.Name
3737

3838
# VARIATION-1: Get all items for container
3939
$items = Get-AzureRmRecoveryServicesBackupItem `
@@ -360,10 +360,9 @@ function Test-AzureVMSetVaultContext
360360
# Setup
361361
$vm = Create-VM $resourceGroupName $location
362362
$vault = Create-RecoveryServicesVault $resourceGroupName $location
363-
$saName = Create-SA $resourceGroupName $location
364363

365364
# Sleep to give the service time to add the default policy to the vault
366-
Start-TestSleep 5000
365+
Start-TestSleep 5000
367366

368367
Set-AzureRmRecoveryServicesVaultContext -Vault $vault
369368

@@ -385,29 +384,6 @@ function Test-AzureVMSetVaultContext
385384
-Container $container `
386385
-WorkloadType AzureVM
387386

388-
$job = Backup-AzureRmRecoveryServicesBackupItem `
389-
-Item $item
390-
391-
Wait-AzureRmRecoveryServicesBackupJob -Job $job
392-
393-
$backupJob = Get-AzureRmRecoveryServicesBackupJobDetails -Job $job
394-
395-
# Get Recovery Point
396-
$backupStartTime = $backupJob.StartTime.AddMinutes(-1);
397-
$backupEndTime = $backupJob.EndTime.AddMinutes(1);
398-
$rps = Get-AzureRmRecoveryServicesBackupRecoveryPoint `
399-
-Item $item `
400-
-StartDate $backupStartTime `
401-
-EndDate $backupEndTime
402-
403-
# Restore item
404-
$restoreJob1 = Restore-AzureRmRecoveryServicesBackupItem `
405-
-RecoveryPoint $rps[0] `
406-
-StorageAccountName $saName `
407-
-StorageAccountResourceGroupName $resourceGroupName
408-
409-
Wait-AzureRmRecoveryServicesBackupJob -Job $restoreJob1
410-
411387
# Disable protection
412388
Disable-AzureRmRecoveryServicesBackupProtection `
413389
-Item $item `

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/Mab/ContainerTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Test-MabGetContainers
2626
-VaultId $vault.ID `
2727
-ContainerType "Windows" `
2828
-BackupManagementType "MARS" `
29-
-Name "ADIT-PC.FAREAST.CORP.MICROSOFT.COM";
29+
-FriendlyName "ADIT-PC.FAREAST.CORP.MICROSOFT.COM";
3030
Assert-AreEqual $namedContainer.FriendlyName "ADIT-PC.FAREAST.CORP.MICROSOFT.COM";
3131
}
3232

@@ -38,14 +38,14 @@ function Test-MabUnregisterContainer
3838
-VaultId $vault.ID `
3939
-ContainerType "Windows" `
4040
-BackupManagementType "MARS" `
41-
-Name "ADIT-PC.FAREAST.CORP.MICROSOFT.COM";
41+
-FriendlyName "ADIT-PC.FAREAST.CORP.MICROSOFT.COM";
4242
Assert-AreEqual $container.FriendlyName "ADIT-PC.FAREAST.CORP.MICROSOFT.COM";
4343

4444
Unregister-AzureRmRecoveryServicesBackupContainer -VaultId $vault.ID -Container $container;
4545
$container = Get-AzureRmRecoveryServicesBackupContainer `
4646
-VaultId $vault.ID `
4747
-ContainerType "Windows" `
4848
-BackupManagementType "MARS" `
49-
-Name "ADIT-PC.FAREAST.CORP.MICROSOFT.COM";
49+
-FriendlyName "ADIT-PC.FAREAST.CORP.MICROSOFT.COM";
5050
Assert-Null $container;
5151
}

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/ChangeLog.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* Overview of change #1
1818
- Additional information about change #1
1919
-->
20-
## Current Release
21-
2220
## Version 1.0.0
23-
* General availability of `Az.RecoveryServices` module
21+
* General availability of `Az.RecoveryServices` module
22+
* Removed Name Parameter in Get-Container cmdlet.

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupContainer.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2525
/// <summary>
2626
/// Fetches containers registered to the vault according to the filters passed via the cmdlet parameters.
2727
/// </summary>
28-
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RecoveryServicesBackupContainer"),OutputType(typeof(ContainerBase))]
28+
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RecoveryServicesBackupContainer"), OutputType(typeof(ContainerBase))]
2929
public class GetAzureRmRecoveryServicesBackupContainer : RSBackupVaultCmdletBase
3030
{
3131
/// <summary>
@@ -44,14 +44,6 @@ public class GetAzureRmRecoveryServicesBackupContainer : RSBackupVaultCmdletBase
4444
[ValidateSet("AzureVM", "MARS", "AzureSQL", "AzureStorage")]
4545
public string BackupManagementType { get; set; }
4646

47-
/// <summary>
48-
/// Friendly name of the container(s) to be fetched. This will be deprecated.
49-
/// </summary>
50-
[Parameter(Mandatory = false, Position = 3,
51-
HelpMessage = ParamHelpMsgs.Container.Name)]
52-
[ValidateNotNullOrEmpty]
53-
public string Name { get; set; }
54-
5547
/// <summary>
5648
/// Friendly name of the container(s) to be fetched.
5749
/// </summary>
@@ -106,7 +98,6 @@ public override void ExecuteCmdlet()
10698
{ VaultParams.ResourceGroupName, resourceGroupName },
10799
{ ContainerParams.ContainerType, ContainerType },
108100
{ ContainerParams.BackupManagementType, backupManagementTypeNullable },
109-
{ ContainerParams.Name, Name },
110101
{ ContainerParams.FriendlyName, FriendlyName },
111102
{ ContainerParams.ResourceGroupName, ResourceGroupName },
112103
{ ContainerParams.Status, Status },

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<TableControl>
4040
<TableHeaders>
4141
<TableColumnHeader>
42-
<Label>Name</Label>
42+
<Label>FriendlyName</Label>
4343
<Width>40</Width>
4444
</TableColumnHeader>
4545
<TableColumnHeader>
@@ -287,7 +287,7 @@
287287
<TableControl>
288288
<TableHeaders>
289289
<TableColumnHeader>
290-
<Label>Name</Label>
290+
<Label>FriendlyName</Label>
291291
<Width>40</Width>
292292
</TableColumnHeader>
293293
<TableColumnHeader>
@@ -331,7 +331,7 @@
331331
<TableControl>
332332
<TableHeaders>
333333
<TableColumnHeader>
334-
<Label>Name</Label>
334+
<Label>FriendlyName</Label>
335335
<Width>40</Width>
336336
</TableColumnHeader>
337337
<TableColumnHeader>

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ function Test-RecoveryServicesVaultCRUD
108108
Assert-NotNull($vault1.ID)
109109
Assert-NotNull($vault1.Type)
110110

111-
# 2. Set-AzureRmRecoveryServicesVaultContext
111+
# 2. Set-AzureRmRecoveryServicesVault
112112
Set-AzureRmRecoveryServicesVaultContext -Vault $vault1
113-
113+
114114
# 3. Get-AzureRmRecoveryServicesVault
115115
$vaults = Get-AzureRmRecoveryServicesVault -Name $name -ResourceGroupName $resourceGroupName
116116

0 commit comments

Comments
 (0)