Skip to content

Issue 2838: Enabled xunit test automation for RecoveryServicesManagement #2844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 30, 2016
Merged

Issue 2838: Enabled xunit test automation for RecoveryServicesManagement #2844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03c78d3
Issue 2838: Enabled xunit test automation for RecoveryServicesManagement
sriramvu Aug 26, 2016
485243d
Updated test to not to have a cmdlet that makes dependency on date in…
sriramvu Aug 26, 2016
d95cff0
Issue 2113: Resource spelling in ResourcGroup under Vault and VaultSe…
sriramvu Aug 27, 2016
b72e2a0
Merge remote-tracking branch 'upstream/dev' into dev
sriramvu Aug 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AzurePowershell.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
10 changes: 1 addition & 9 deletions ...r/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...ecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1,343 changes: 71 additions & 1,272 deletions ...re.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests/VaultCRUDTests.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...anager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultExtendedInfoClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -274,7 +274,7 @@ private ASRVaultCreds GenerateCredentialObject(X509Certificate2 managementCert,
serializedCertifivate,
acsNamespace,
channelIntegrityKey,
vault.ResouceGroupName,
vault.ResourceGroupName,
site.ID,
site.Name,
resourceProviderNamespace,
Expand Down
12 changes: 6 additions & 6 deletions src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSObjects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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.
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/RemoveAzureSiteRecoveryVault.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
2 changes: 1 addition & 1 deletion ...urceManager/SiteRecovery/Commands.SiteRecovery/Vault/SetAzureSiteRecoveryVaultSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down