Merge pull request #264 from MabOneSdk/swatim-dev1

swatimadhukargit · swatimadhukargit · commit e32c70aec118 · 2016-04-14T05:22:50.000-07:00
Adding position and test changes for get/unregister
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Dpm/ContainerTests.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Dpm/ContainerTests.cs
@@ -25,11 +25,15 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
 {
     public partial class ContainerTests : RecoveryServicesBackupTestsBase
     {
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetDpmContainerScenario()
         {
             this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUnregisterDpmContainerScenario()
         {
             this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Dpm/ContainerTests.ps1 b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Dpm/ContainerTests.ps1
@@ -14,28 +14,23 @@
 
 function Test-GetContainerScenario
 {
-	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
+	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
-	$containers = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm";
-	foreach ($container in $containers)
-	{
-		echo $container.Name $container.ResourceGroupName;
-	}
-	Assert-AreEqual $containers[0].FriendlyName "swatidpm";
+	$containers = Get-AzureRmRecoveryServicesBackupManagementServer;	
 
-	$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm" -Name "swatidpm";
-	Assert-AreEqual $namedContainer.FriendlyName "swatidpm";
+	$namedContainer = Get-AzureRmRecoveryServicesBackupManagementServer -Name "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
+	Assert-AreEqual $namedContainer.FriendlyName "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
 }
 
 function Test-UnregisterContainerScenario
 {
-	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
+	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
 	
-	$container = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm" -Name "swatidpm";
-	Assert-AreEqual $container.FriendlyName "swatidpm";
+	$container = Get-AzureRmRecoveryServicesBackupManagementServer -Name "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
+	Assert-AreEqual $container.FriendlyName "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
 
-	Unregister-AzureRmRecoveryServicesBackupContainer -Container $container;
-	$contianer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm" -Name "swatidpm";
+	Unregister-AzureRmRecoveryServicesBackupContainer -AzureRmBackupManagementServer $container;
+	$contianer = Get-AzureRmRecoveryServicesBackupManagementServer -Name "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
 	Assert-Null $container;
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Mab/ContainerTests.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Mab/ContainerTests.cs
@@ -25,11 +25,15 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
 {
     public partial class ContainerTests : RecoveryServicesBackupTestsBase
     {
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetMabContainerScenario()
         {
             this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestUnregisterMabContainerScenario()
         {
             this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Mab/ContainerTests.ps1 b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Mab/ContainerTests.ps1
@@ -14,28 +14,25 @@
 
 function Test-GetContainerScenario
 {
-	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
+	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
-	$containers = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Mars";
-	foreach ($container in $containers)
-	{
-		echo $container.Name 
-	}
-	Assert-AreEqual $containers[0].FriendlyName "swatimab";
+	$containers = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "MARS";
+	
+	Assert-AreEqual $containers[0].FriendlyName "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
 
-	$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "swatimab";
-	Assert-AreEqual $namedContainer.FriendlyName "swatimab";
+	$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "MARS" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
+	Assert-AreEqual $namedContainer.FriendlyName "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
 }
 
 function Test-UnregisterContainerScenario
 {
-	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
+	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
 	
-	$container = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "swatimab";
-	Assert-AreEqual $container.FriendlyName "swatimab";
+	$container = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "MARS" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
+	Assert-AreEqual $container.FriendlyName "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
 
 	Unregister-AzureRmRecoveryServicesBackupContainer -Container $container;
-	$contianer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "swatimab";
+	$contianer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
 	Assert-Null $container;
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupContainer.cs
@@ -27,26 +27,26 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// <summary>
     /// Get list of containers
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupContainer"), OutputType(typeof(AzureRmRecoveryServicesBackupContainerBase))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupContainer"), OutputType(typeof(AzureRmRecoveryServicesBackupContainerBase), typeof(List<AzureRmRecoveryServicesBackupContainerBase>))]
     public class GetAzureRmRecoveryServicesBackupContainer : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.ContainerType)]
+        [Parameter(Mandatory = true, Position = 1, HelpMessage = ParamHelpMsg.Container.ContainerType)]
         [ValidateNotNullOrEmpty]
         public ContainerType ContainerType { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.BackupManagementType)]
+        [Parameter(Mandatory = false, Position = 2, HelpMessage = ParamHelpMsg.Container.BackupManagementType)]
         [ValidateNotNullOrEmpty]
         public BackupManagementType BackupManagementType { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.Name)]
+        [Parameter(Mandatory = false, Position = 3, HelpMessage = ParamHelpMsg.Container.Name)]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.ResourceGroupName)]
+        [Parameter(Mandatory = false, Position = 4, HelpMessage = ParamHelpMsg.Container.ResourceGroupName)]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.Status)]
+        [Parameter(Mandatory = false, Position = 5, HelpMessage = ParamHelpMsg.Container.Status)]
         [ValidateNotNullOrEmpty]
         public ContainerRegistrationStatus Status { get; set; }
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupManagementServer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupManagementServer.cs
@@ -27,10 +27,10 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// <summary>
     /// Get list of containers
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesBackupEngineBase))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesBackupEngineBase), typeof(List<AzureRmRecoveryServicesBackupEngineBase>))]
     public class GetAzureRmRecoveryServicesBackupManagementServer : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.Name)]
+        [Parameter(Mandatory = false, Position = 1, HelpMessage = ParamHelpMsg.Container.Name)]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
@@ -49,15 +49,22 @@ public override void ExecuteCmdlet()
 
                 IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.Windows, BackupManagementType.SCDPM);
 
-                var containerModels = psBackupProvider.ListBackupManagementServers();
+                var backupServerModels = psBackupProvider.ListBackupManagementServers();
                 if (!string.IsNullOrEmpty(this.Name))
                 {
-                    if (containerModels != null)
+                    if (backupServerModels != null)
                     {
-                        containerModels = containerModels.Where(x => x.Name == this.Name).ToList();
+                        backupServerModels = backupServerModels.Where(x => x.Name == this.Name).ToList();
                     }
                 }
-                WriteObject(containerModels, enumerateCollection: true);
+                if (backupServerModels.Count == 1)
+                {
+                    WriteObject(backupServerModels.First());
+                }
+                else
+                {
+                    WriteObject(backupServerModels, enumerateCollection: true);
+                }
             });
         }
     }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs
@@ -31,7 +31,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     [Cmdlet(VerbsLifecycle.Unregister, "AzureRmRecoveryServicesBackupContainer")]
     public class UnregisterAzureRmRecoveryServicesBackupContainer : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]
+        [Parameter(Mandatory = true, Position = 1, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]
         [ValidateNotNullOrEmpty]
         public AzureRmRecoveryServicesBackupContainerBase Container { get; set; }        
 
@@ -46,7 +46,7 @@ public override void ExecuteCmdlet()
                     throw new ArgumentException(String.Format(Resources.UnsupportedContainerException, Container.ContainerType, Container.BackupManagementType));
                 }
                 AzureRmRecoveryServicesMabContainer mabContainer = Container as AzureRmRecoveryServicesMabContainer;
-                string containerName = mabContainer.FriendlyName;
+                string containerName = mabContainer.Name;
                 HydraAdapter.UnregisterContainers(containerName);
             });
         }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupManagementServer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupManagementServer.cs
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Container
     [Cmdlet(VerbsLifecycle.Unregister, "AzureRmRecoveryServicesBackupManagementServer")]
     public class UnregisterAzureRmRecoveryServicesBackupManagementServer : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]
+        [Parameter(Mandatory = true, Position = 1, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]
         [ValidateNotNullOrEmpty]
         public AzureRmRecoveryServicesBackupEngineBase AzureRmBackupManagementServer { get; set; }
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj
@@ -82,7 +82,7 @@
   <ItemGroup>
     <Compile Include="Cmdlets\Backup\BackupAzureRmRecoveryServicesItem.cs" />
     <Compile Include="Cmdlets\Container\GetAzureRmRecoveryServicesBackupManagementServer.cs" />
-    <Compile Include="Cmdlets\Container\GetAzureRmRecoveryServicesContainer.cs" />
+    <Compile Include="Cmdlets\Container\GetAzureRmRecoveryServicesBackupContainer.cs" />
     <Compile Include="Cmdlets\Container\UnregisterAzureRmRecoveryServicesBackupManagementServer.cs" />
     <Compile Include="Cmdlets\Container\UnregisterAzureRmRecoveryServicesBackupContainer.cs" />
     <Compile Include="Cmdlets\Item\DisableAzureRmRecoveryServicesProtection.cs" />

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,15 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests`
`25`	`25`	`{`
`26`	`26`	`public partial class ContainerTests : RecoveryServicesBackupTestsBase`
`27`	`27`	`{`
	`28`	`+ [Fact]`
	`29`	`+ [Trait(Category.AcceptanceType, Category.CheckIn)]`
`28`	`30`	`public void TestGetDpmContainerScenario()`
`29`	`31`	`{`
`30`	`32`	`this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");`
`31`	`33`	`}`
`32`	`34`
	`35`	`+ [Fact]`
	`36`	`+ [Trait(Category.AcceptanceType, Category.CheckIn)]`
`33`	`37`	`public void TestUnregisterDpmContainerScenario()`
`34`	`38`	`{`
`35`	`39`	`this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`27`	`27`	`/// <summary>`
`28`	`28`	`/// Get list of containers`
`29`	`29`	`/// </summary>`
`30`		`- [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesBackupEngineBase))]`
	`30`	`+ [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupManagementServer"), OutputType(typeof(AzureRmRecoveryServicesBackupEngineBase), typeof(List<AzureRmRecoveryServicesBackupEngineBase>))]`
`31`	`31`	`public class GetAzureRmRecoveryServicesBackupManagementServer : RecoveryServicesBackupCmdletBase`
`32`	`32`	`{`
`33`		`- [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.Name)]`
	`33`	`+ [Parameter(Mandatory = false, Position = 1, HelpMessage = ParamHelpMsg.Container.Name)]`
`34`	`34`	`[ValidateNotNullOrEmpty]`
`35`	`35`	`public string Name { get; set; }`
`36`	`36`
`@@ -49,15 +49,22 @@ public override void ExecuteCmdlet()`
`49`	`49`
`50`	`50`	`IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.Windows, BackupManagementType.SCDPM);`
`51`	`51`
`52`		`- var containerModels = psBackupProvider.ListBackupManagementServers();`
	`52`	`+ var backupServerModels = psBackupProvider.ListBackupManagementServers();`
`53`	`53`	`if (!string.IsNullOrEmpty(this.Name))`
`54`	`54`	`{`
`55`		`- if (containerModels != null)`
	`55`	`+ if (backupServerModels != null)`
`56`	`56`	`{`
`57`		`- containerModels = containerModels.Where(x => x.Name == this.Name).ToList();`
	`57`	`+ backupServerModels = backupServerModels.Where(x => x.Name == this.Name).ToList();`
`58`	`58`	`}`
`59`	`59`	`}`
`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`	`+ }`
`61`	`68`	`});`
`62`	`69`	`}`
`63`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`31`	`31`	`[Cmdlet(VerbsLifecycle.Unregister, "AzureRmRecoveryServicesBackupContainer")]`
`32`	`32`	`public class UnregisterAzureRmRecoveryServicesBackupContainer : RecoveryServicesBackupCmdletBase`
`33`	`33`	`{`
`34`		`- [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]`
	`34`	`+ [Parameter(Mandatory = true, Position = 1, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]`
`35`	`35`	`[ValidateNotNullOrEmpty]`
`36`	`36`	`public AzureRmRecoveryServicesBackupContainerBase Container { get; set; }`
`37`	`37`
`@@ -46,7 +46,7 @@ public override void ExecuteCmdlet()`
`46`	`46`	`throw new ArgumentException(String.Format(Resources.UnsupportedContainerException, Container.ContainerType, Container.BackupManagementType));`
`47`	`47`	`}`
`48`	`48`	`AzureRmRecoveryServicesMabContainer mabContainer = Container as AzureRmRecoveryServicesMabContainer;`
`49`		`- string containerName = mabContainer.FriendlyName;`
	`49`	`+ string containerName = mabContainer.Name;`
`50`	`50`	`HydraAdapter.UnregisterContainers(containerName);`
`51`	`51`	`});`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Container`
`28`	`28`	`[Cmdlet(VerbsLifecycle.Unregister, "AzureRmRecoveryServicesBackupManagementServer")]`
`29`	`29`	`public class UnregisterAzureRmRecoveryServicesBackupManagementServer : RecoveryServicesBackupCmdletBase`
`30`	`30`	`{`
`31`		`- [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]`
	`31`	`+ [Parameter(Mandatory = true, Position = 1, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]`
`32`	`32`	`[ValidateNotNullOrEmpty]`
`33`	`33`	`public AzureRmRecoveryServicesBackupEngineBase AzureRmBackupManagementServer { get; set; }`
`34`	`34`