Skip to content

Commit daef159

Browse files
swatimadhukargitswatimadhukargit
committed
Test fixes for get/unregister
1 parent 742e789 commit daef159

File tree

7 files changed

+36
-29
lines changed

7 files changed

+36
-29
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2525
{
2626
public partial class ContainerTests : RecoveryServicesBackupTestsBase
2727
{
28+
[Fact]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2830
public void TestGetDpmContainerScenario()
2931
{
3032
this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");
3133
}
3234

35+
[Fact]
36+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3337
public void TestUnregisterDpmContainerScenario()
3438
{
3539
this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,23 @@
1414

1515
function Test-GetContainerScenario
1616
{
17-
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
17+
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
1818
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
19-
$containers = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm";
20-
foreach ($container in $containers)
21-
{
22-
echo $container.Name $container.ResourceGroupName;
23-
}
24-
Assert-AreEqual $containers[0].FriendlyName "swatidpm";
19+
$containers = Get-AzureRmRecoveryServicesBackupManagementServer;
2520

26-
$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm" -Name "swatidpm";
27-
Assert-AreEqual $namedContainer.FriendlyName "swatidpm";
21+
$namedContainer = Get-AzureRmRecoveryServicesBackupManagementServer -Name "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
22+
Assert-AreEqual $namedContainer.FriendlyName "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
2823
}
2924

3025
function Test-UnregisterContainerScenario
3126
{
32-
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
27+
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
3328
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
3429

35-
$container = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm" -Name "swatidpm";
36-
Assert-AreEqual $container.FriendlyName "swatidpm";
30+
$container = Get-AzureRmRecoveryServicesBackupManagementServer -Name "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
31+
Assert-AreEqual $container.FriendlyName "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
3732

38-
Unregister-AzureRmRecoveryServicesBackupContainer -Container $container;
39-
$contianer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm" -Name "swatidpm";
33+
Unregister-AzureRmRecoveryServicesBackupContainer -AzureRmBackupManagementServer $container;
34+
$contianer = Get-AzureRmRecoveryServicesBackupManagementServer -Name "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
4035
Assert-Null $container;
4136
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2525
{
2626
public partial class ContainerTests : RecoveryServicesBackupTestsBase
2727
{
28+
[Fact]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2830
public void TestGetMabContainerScenario()
2931
{
3032
this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");
3133
}
3234

35+
[Fact]
36+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3337
public void TestUnregisterMabContainerScenario()
3438
{
3539
this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,11 @@ function Test-GetContainerScenario
1616
{
1717
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
1818
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
19-
$containers = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "MARS";
20-
foreach ($container in $containers)
21-
{
22-
echo $container.Name
23-
}
19+
$containers = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "MARS";
20+
2421
Assert-AreEqual $containers[0].FriendlyName "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
2522

26-
$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "MARS" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
23+
$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "MARS" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
2724
Assert-AreEqual $namedContainer.FriendlyName "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
2825
}
2926

@@ -32,10 +29,10 @@ function Test-UnregisterContainerScenario
3229
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
3330
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
3431

35-
$container = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "MARS" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
32+
$container = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "MARS" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
3633
Assert-AreEqual $container.FriendlyName "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
3734

3835
Unregister-AzureRmRecoveryServicesBackupContainer -Container $container;
39-
$contianer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
36+
$contianer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
4037
Assert-Null $container;
4138
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2727
/// <summary>
2828
/// Get list of containers
2929
/// </summary>
30-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupContainer"), OutputType(typeof(AzureRmRecoveryServicesBackupContainerBase))]
30+
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupContainer"), OutputType(typeof(AzureRmRecoveryServicesBackupContainerBase), typeof(List<AzureRmRecoveryServicesBackupContainerBase>))]
3131
public class GetAzureRmRecoveryServicesBackupContainer : RecoveryServicesBackupCmdletBase
3232
{
3333
[Parameter(Mandatory = true, Position = 1, HelpMessage = ParamHelpMsg.Container.ContainerType)]

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2727
/// <summary>
2828
/// Get list of containers
2929
/// </summary>
30-
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesBackupEngineBase))]
30+
[Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesBackupEngineBase), typeof(List<AzureRmRecoveryServicesBackupEngineBase>))]
3131
public class GetAzureRmRecoveryServicesBackupManagementServer : RecoveryServicesBackupCmdletBase
3232
{
3333
[Parameter(Mandatory = false, Position = 1, HelpMessage = ParamHelpMsg.Container.Name)]
@@ -49,15 +49,22 @@ public override void ExecuteCmdlet()
4949

5050
IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.Windows, BackupManagementType.SCDPM);
5151

52-
var containerModels = psBackupProvider.ListBackupManagementServers();
52+
var backupServerModels = psBackupProvider.ListBackupManagementServers();
5353
if (!string.IsNullOrEmpty(this.Name))
5454
{
55-
if (containerModels != null)
55+
if (backupServerModels != null)
5656
{
57-
containerModels = containerModels.Where(x => x.Name == this.Name).ToList();
57+
backupServerModels = backupServerModels.Where(x => x.Name == this.Name).ToList();
5858
}
5959
}
60-
WriteObject(containerModels, enumerateCollection: true);
60+
if (backupServerModels.Count == 1)
61+
{
62+
WriteObject(backupServerModels.First());
63+
}
64+
else
65+
{
66+
WriteObject(backupServerModels, enumerateCollection: true);
67+
}
6168
});
6269
}
6370
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public override void ExecuteCmdlet()
4646
throw new ArgumentException(String.Format(Resources.UnsupportedContainerException, Container.ContainerType, Container.BackupManagementType));
4747
}
4848
AzureRmRecoveryServicesMabContainer mabContainer = Container as AzureRmRecoveryServicesMabContainer;
49-
string containerName = mabContainer.FriendlyName;
49+
string containerName = mabContainer.Name;
5050
HydraAdapter.UnregisterContainers(containerName);
5151
});
5252
}

0 commit comments

Comments
 (0)