Skip to content

Commit 2abc63f

Browse files
author
dragonfly91
committed
Redoing my changes after the last revert
1 parent 63aee24 commit 2abc63f

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupVaultTests.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ function Test-GetAzureBackupVaultCredentialsReturnsFileNameAndDownloadsCert
2828

2929
function Test-SetAzureBackupVaultStorageTypeWithFreshResourceDoesNotThrowException
3030
{
31-
$freshVault = New-AzureBackupVault -ResourceGroupName $ResourceGroupName -Name "storagetestrn" -Region $Location;
31+
$freshVaultName = "storagetestrn";
32+
33+
Assert-Throws { New-AzureBackupVault -ResourceGroupName $ResourceGroupName -Name $freshVaultName -Region $Location };
34+
35+
$freshVault = Get-AzureBackupVault -Name $freshVaultName;
3236

3337
Set-AzureBackupVaultStorageType $freshVault -Type GeoRedundant
3438

@@ -43,7 +47,6 @@ function Test-SetAzureBackupVaultStorageTypeWithFreshResourceDoesNotThrowExcepti
4347

4448
function Test-SetAzureBackupVaultStorageTypeWithLockedResourceThrowsException
4549
{
46-
# TODO: Check for exception based on current storage type - obtained by vault properties
4750
$vault = Get-AzureBackupVault -Name $ResourceName;
4851

4952
Assert-Throws { Set-AzureBackupVaultStorageType $vault -Type GeoRedundant }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/VaultCredentials.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public VaultCreds(string subscriptionId, string resourceType, string resourceNam
7979
/// Class to define backup vault credentials
8080
/// </summary>
8181
[SuppressMessage("Microsoft.StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleClass", Justification = "Grouping classes based on entity")]
82+
[DataContract]
8283
internal class BackupVaultCreds : VaultCreds
8384
{
8485
/// <summary>
@@ -128,26 +129,31 @@ public BackupVaultCreds(string subscriptionId, string resourceType, string resou
128129
/// <summary>
129130
/// AcsNamespace is where the certificate is uploaded into
130131
/// </summary>
132+
[DataContract]
131133
internal class AcsNamespace
132134
{
133135
/// <summary>
134136
/// Gets or sets the key name for HostName entry
135137
/// </summary>
138+
[DataMember(Order = 0)]
136139
public string HostName { get; set; }
137140

138141
/// <summary>
139142
/// Gets or sets the key name for Namespace entry
140143
/// </summary>
144+
[DataMember(Order = 1)]
141145
public string Namespace { get; set; }
142146

143147
/// <summary>
144148
/// Gets or sets the value for ResourceProviderRealm entry
145149
/// </summary>
150+
[DataMember(Order = 2)]
146151
public string ResourceProviderRealm { get; set; }
147152

148153
/// <summary>
149154
/// Initializes a new instance of the AcsNamespace class
150155
/// </summary>
156+
[DataMember(Order = 3)]
151157
public AcsNamespace() { }
152158

153159
/// <summary>

0 commit comments

Comments
 (0)