Merge pull request #2844 from RecoveryServicesOneSDK/dev

markcowl · web-flow · commit eefe2ec87220 · 2016-08-30T14:34:00.000-07:00
Issue 2838: Enabled xunit test automation for RecoveryServicesManagement
diff --git a/AzurePowershell.Test.targets b/AzurePowershell.Test.targets
@@ -100,8 +100,8 @@
       <XUnitTests Include=".\src\ResourceManager\AzureStackStorage\Commands.AzureStackStorage.Tests\bin\Debug\Microsoft.AzureStack.Commands.StorageAdmin.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\DevTestLabs\Commands.DevTestLabs.Test\bin\Debug\Microsoft.Azure.Commands.DevTestLabs.Test.dll"/> 
       <XUnitTests Include=".\src\ResourceManager\HDInsight\Commands.HDInsight.Test\bin\Debug\Commands.HDInsight.Test.dll"/>
-      <XUnitTests Include=".\src\ResourceManager\Insights\Commands.Insights.Test\bin\Debug\Microsoft.Azure.Commands.Insights.Test.dll"/> 
-      <XUnitTests Include=".\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"/> -->
+      <XUnitTests Include=".\src\ResourceManager\Insights\Commands.Insights.Test\bin\Debug\Microsoft.Azure.Commands.Insights.Test.dll"/> -->
+      <XUnitTests Include=".\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\RecoveryServices.Backup\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\RedisCache\Commands.RedisCache.Test\bin\Debug\Microsoft.Azure.Commands.RedisCache.Test.dll"/>
       <!--<XUnitTests Include=".\src\ResourceManager\ServerManagement\Commands.ServerManagement.Test\bin\Debug\Microsoft.Azure.Commands.ServerManagement.Test.dll"/>
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1 b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1
@@ -27,7 +27,7 @@ function Test-RecoveryServicesVaultCRUDTests
 	Assert-NotNull($vaultCreationResponse.Type)
 
 	# Enumerate Vaults
-	$vaults = Get-AzureRmRecoveryServicesVault
+	$vaults = Get-AzureRmRecoveryServicesVault -Name rsv1 -ResourceGroupName RsvTestRG
 	Assert-True { $vaults.Count -gt 0 }
 	Assert-NotNull($vaults)
 	foreach($vault in $vaults)
@@ -48,14 +48,6 @@ function Test-RecoveryServicesVaultCRUDTests
 	Assert-NotNull($vaultToBeProcessed.ID)
 	Assert-NotNull($vaultToBeProcessed.Type)
 
-	# Download vault settings file
-	$vaultFile = Get-AzureRmRecoveryServicesVaultSettingsFile -Vault $vaultToBeProcessed
-	Assert-NotNull($vaultFile.Filepath)
-
-	# Read file and check for data
-	[xml]$xmlDocument = Get-Content -Path $vaultFile.Filepath
-	Assert-NotNull($xmlDocument.ASRVaultCreds.Location)
-
 	# Remove Vault
 	Remove-AzureRmRecoveryServicesVault -Vault $vaultToBeProcessed
 	$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName RsvTestRG -Name rsv1
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs
@@ -97,14 +97,14 @@ public static T GetServiceClient<T>() where T : class
             if (testEnvironment.UsesCustomUri())
             {
                 client = new RecoveryServicesManagementClient(
-                    "Microsoft.RecoveryServicesBVTD",
+                    "Microsoft.RecoveryServicesBVTD2",
                     credentials,
                     testEnvironment.BaseUri);
             }
             else
             {
                 client = new RecoveryServicesManagementClient(
-                    "Microsoft.RecoveryServicesBVTD",
+                    "Microsoft.RecoveryServicesBVTD2",
                     credentials);
             }
             return GetServiceClient<T>(factory, client);
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests/VaultCRUDTests.json b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests/VaultCRUDTests.json
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultExtendedInfoClient.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultExtendedInfoClient.cs
@@ -102,7 +102,7 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AS
             // Update vault settings with the working vault to generate file
             Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
             {
-                ResourceGroupName = vault.ResouceGroupName,
+                ResourceGroupName = vault.ResourceGroupName,
                 ResourceName = vault.Name,
                 ResourceNamespace = resourceProviderNamespace,
                 ARMResourceType = resourceType
@@ -149,7 +149,7 @@ public ASRVaultCreds ChangeVaultContext(ASRVault vault)
             Utilities.GetResourceProviderNamespaceAndType(vault.ID, out resourceProviderNamespace, out resourceType);
             Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
             {
-                ResourceGroupName = vault.ResouceGroupName,
+                ResourceGroupName = vault.ResourceGroupName,
                 ResourceName = vault.Name,
                 ResourceNamespace = resourceProviderNamespace,
                 ARMResourceType = resourceType
@@ -162,7 +162,7 @@ public ASRVaultCreds ChangeVaultContext(ASRVault vault)
             // Update vault settings along with Channel integrity key
             Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
             {
-                ResourceGroupName = vault.ResouceGroupName,
+                ResourceGroupName = vault.ResourceGroupName,
                 ResourceName = vault.Name,
                 ChannelIntegrityKey = getChannelIntegrityKey.Result,
                 ResourceNamespace = resourceProviderNamespace,
@@ -274,7 +274,7 @@ private ASRVaultCreds GenerateCredentialObject(X509Certificate2 managementCert,
                                             serializedCertifivate,
                                             acsNamespace,
                                             channelIntegrityKey,
-                                            vault.ResouceGroupName,
+                                            vault.ResourceGroupName,
                                             site.ID,
                                             site.Name,
                                             resourceProviderNamespace,
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSObjects.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSObjects.cs
@@ -43,7 +43,7 @@ public ASRVaultSettings()
         public ASRVaultSettings(ASRVaultCreds asrVaultCreds)
         {
             this.ResourceName = asrVaultCreds.ResourceName;
-            this.ResouceGroupName = asrVaultCreds.ResourceGroupName;
+            this.ResourceGroupName = asrVaultCreds.ResourceGroupName;
             this.ResourceNamespace = asrVaultCreds.ResourceNamespace;
             this.ResouceType = asrVaultCreds.ARMResourceType;
         }
@@ -57,7 +57,7 @@ public ASRVaultSettings(ASRVaultCreds asrVaultCreds)
         /// <summary>
         /// Gets or sets Resource Group Name.
         /// </summary>
-        public string ResouceGroupName { get; set; }
+        public string ResourceGroupName { get; set; }
 
         /// <summary>
         /// Gets or sets Resource Provider Namespace.
@@ -1117,7 +1117,7 @@ public ASRVault(Vault vault)
             this.Name = vault.Name;
             this.Type = vault.Type;
             this.Location = vault.Location;
-            this.ResouceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
+            this.ResourceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
             this.SubscriptionId = PSRecoveryServicesClient.GetSubscriptionId(vault.Id);
             this.Properties = new ASRVaultProperties();
             this.Properties.ProvisioningState = vault.Properties.ProvisioningState;
@@ -1133,7 +1133,7 @@ public ASRVault(VaultCreateResponse vault)
             this.Name = vault.Name;
             this.Type = vault.Type;
             this.Location = vault.Location;
-            this.ResouceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
+            this.ResourceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
             this.SubscriptionId = PSRecoveryServicesClient.GetSubscriptionId(vault.Id);
             this.Properties = new ASRVaultProperties();
             this.Properties.ProvisioningState = vault.Properties.ProvisioningState;
@@ -1163,9 +1163,9 @@ public ASRVault(VaultCreateResponse vault)
         public string Location { get; set; }
 
         /// <summary>
-        /// Gets or sets Resouce group name.
+        /// Gets or sets Resource group name.
         /// </summary>
-        public string ResouceGroupName { get; set; }
+        public string ResourceGroupName { get; set; }
 
         /// <summary>
         /// Gets or sets Subscription.
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/RemoveAzureSiteRecoveryVault.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/RemoveAzureSiteRecoveryVault.cs
@@ -43,7 +43,7 @@ public override void ExecuteSiteRecoveryCmdlet()
         {
             base.ExecuteSiteRecoveryCmdlet();
 
-            RecoveryServicesOperationStatusResponse response = RecoveryServicesClient.DeleteVault(this.Vault.ResouceGroupName, this.Vault.Name);
+            RecoveryServicesOperationStatusResponse response = RecoveryServicesClient.DeleteVault(this.Vault.ResourceGroupName, this.Vault.Name);
 
             VaultOperationOutput output = new VaultOperationOutput()
             {
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/SetAzureSiteRecoveryVaultSettings.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/SetAzureSiteRecoveryVaultSettings.cs
@@ -75,7 +75,7 @@ private void SetASRVaultContext(ASRVault asrVault)
             // Validate the Vault
             RecoveryServicesClient.ValidateVaultSettings(
                 asrVault.Name,
-                asrVault.ResouceGroupName);
+                asrVault.ResourceGroupName);
 
             this.WriteObject(new ASRVaultSettings(PSRecoveryServicesClient.asrVaultCreds));
         }

Original file line number	Diff line number	Diff line change
`@@ -97,14 +97,14 @@ public static T GetServiceClient<T>() where T : class`
`97`	`97`	`if (testEnvironment.UsesCustomUri())`
`98`	`98`	`{`
`99`	`99`	`client = new RecoveryServicesManagementClient(`
`100`		`- "Microsoft.RecoveryServicesBVTD",`
	`100`	`+ "Microsoft.RecoveryServicesBVTD2",`
`101`	`101`	`credentials,`
`102`	`102`	`testEnvironment.BaseUri);`
`103`	`103`	`}`
`104`	`104`	`else`
`105`	`105`	`{`
`106`	`106`	`client = new RecoveryServicesManagementClient(`
`107`		`- "Microsoft.RecoveryServicesBVTD",`
	`107`	`+ "Microsoft.RecoveryServicesBVTD2",`
`108`	`108`	`credentials);`
`109`	`109`	`}`
`110`	`110`	`return GetServiceClient<T>(factory, client);`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public override void ExecuteSiteRecoveryCmdlet()`
`43`	`43`	`{`
`44`	`44`	`base.ExecuteSiteRecoveryCmdlet();`
`45`	`45`
`46`		`- RecoveryServicesOperationStatusResponse response = RecoveryServicesClient.DeleteVault(this.Vault.ResouceGroupName, this.Vault.Name);`
	`46`	`+ RecoveryServicesOperationStatusResponse response = RecoveryServicesClient.DeleteVault(this.Vault.ResourceGroupName, this.Vault.Name);`
`47`	`47`
`48`	`48`	`VaultOperationOutput output = new VaultOperationOutput()`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ private void SetASRVaultContext(ASRVault asrVault)`
`75`	`75`	`// Validate the Vault`
`76`	`76`	`RecoveryServicesClient.ValidateVaultSettings(`
`77`	`77`	`asrVault.Name,`
`78`		`- asrVault.ResouceGroupName);`
	`78`	`+ asrVault.ResourceGroupName);`
`79`	`79`
`80`	`80`	`this.WriteObject(new ASRVaultSettings(PSRecoveryServicesClient.asrVaultCreds));`
`81`	`81`	`}`