Skip to content

Commit e825309

Browse files
huangpfhuangpf
committed
Merge branch 'crp2' of https://github.com/AzureRT/azure-powershell-pr into crp2
2 parents 5ba34c6 + af58849 commit e825309

32 files changed

+4628
-6905
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -768,9 +768,6 @@
768768
<Component Id="cmp02282C55620BE455F3DA6F0140F930DB" Guid="*">
769769
<File Id="filB27ECB158FA6C96FB8A9BE6403FEE113" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\NetworkResourceProvider\Microsoft.Azure.Management.Network.dll" />
770770
</Component>
771-
<Component Id="cmp376056F5367B9E5C189D8A246AFA0C97" Guid="*">
772-
<File Id="filB9CCFF18187D11B090CC1D2F8C043600" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\NetworkResourceProvider\Microsoft.Azure.Management.Storage.dll" />
773-
</Component>
774771
<Component Id="cmp143934D4D6CF1D6494CCBEAB5587D90C" Guid="*">
775772
<File Id="filAC769B36278D851238820D0CA032D9C0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\NetworkResourceProvider\Microsoft.Azure.ResourceManager.dll" />
776773
</Component>
@@ -3261,7 +3258,6 @@
32613258
<ComponentRef Id="cmp7ADB55DC274F3EAC0A57EF6D74270CF1" />
32623259
<ComponentRef Id="cmpA51A23FDB8743E3EE5338D2FBA1CBD59" />
32633260
<ComponentRef Id="cmp02282C55620BE455F3DA6F0140F930DB" />
3264-
<ComponentRef Id="cmp376056F5367B9E5C189D8A246AFA0C97" />
32653261
<ComponentRef Id="cmp143934D4D6CF1D6494CCBEAB5587D90C" />
32663262
<ComponentRef Id="cmp705C423CD334C3C2D04EF72EF593B26B" />
32673263
<ComponentRef Id="cmp143F53256F23DC7DFAE70795CA1FFA11" />

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,15 @@
6262
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Management.Authorization">
65-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.1-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
65+
<SpecificVersion>False</SpecificVersion>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6667
</Reference>
6768
<Reference Include="Microsoft.Azure.Management.Compute">
6869
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.3.4.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
6970
</Reference>
71+
<Reference Include="Microsoft.Azure.Management.Storage">
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.1.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
73+
</Reference>
7074
<Reference Include="Microsoft.Azure.ResourceManager">
7175
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7276
</Reference>
@@ -99,10 +103,6 @@
99103
<Reference Include="Microsoft.Azure.Management.Network">
100104
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Network.dll</HintPath>
101105
</Reference>
102-
<Reference Include="Microsoft.Azure.Management.Storage">
103-
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Storage.dll</HintPath>
105-
</Reference>
106106
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
107107
<SpecificVersion>False</SpecificVersion>
108108
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestController.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public sealed class ComputeTestController
5252
public AuthorizationManagementClient AuthorizationManagementClient { get; private set; }
5353

5454

55-
public SrpManagementClient StorageClient { get; private set; }
55+
public StorageManagementClient StorageClient { get; private set; }
5656

5757
public NetworkResourceProviderClient NetworkResourceProviderClient { get; private set; }
5858

@@ -208,11 +208,11 @@ private SubscriptionClient GetSubscriptionClient()
208208
return TestBase.GetServiceClient<SubscriptionClient>(this.csmTestFactory);
209209
}
210210

211-
private SrpManagementClient GetStorageManagementClient()
211+
private StorageManagementClient GetStorageManagementClient()
212212
{
213213
return testViaCsm
214-
? TestBase.GetServiceClient<SrpManagementClient>(this.csmTestFactory)
215-
: TestBase.GetServiceClient<SrpManagementClient>(new RDFETestEnvironmentFactory());
214+
? TestBase.GetServiceClient<StorageManagementClient>(this.csmTestFactory)
215+
: TestBase.GetServiceClient<StorageManagementClient>(new RDFETestEnvironmentFactory());
216216
}
217217

218218
private GalleryClient GetGalleryClient()

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StorageAccountTests.ps1

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,37 @@ function Test-StorageAccount
3333
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
3434
$stos = Get-AzureStorageAccount -ResourceGroupName $rgname;
3535

36+
$stotype = 'StandardGRS';
3637
Retry-IfException { $global:sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
3738
Assert-AreEqual $sto.Name $stoname;
38-
Assert-AreEqual $sto.Properties.AccountType $stotype;
39+
Assert-AreEqual $sto.AccountType $stotype;
3940
Assert-AreEqual $sto.Location $loc;
4041

4142
$stotype = 'Standard_LRS';
4243
# TODO: Still need to do retry for Set-, even after Get- returns it.
4344
Retry-IfException { $global:sto = Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype; }
4445
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
46+
$stotype = 'StandardLRS';
4547
Assert-AreEqual $sto.Name $stoname;
46-
Assert-AreEqual $sto.Properties.AccountType $stotype;
48+
Assert-AreEqual $sto.AccountType $stotype;
4749
Assert-AreEqual $sto.Location $loc;
4850

4951
$stotype = 'Standard_RAGRS';
5052
Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;
5153

5254
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
55+
$stotype = 'StandardRAGRS';
5356
Assert-AreEqual $sto.Name $stoname;
54-
Assert-AreEqual $sto.Properties.AccountType $stotype;
57+
Assert-AreEqual $sto.AccountType $stotype;
5558
Assert-AreEqual $sto.Location $loc;
5659

5760
$stotype = 'Standard_GRS';
5861
Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;
5962

6063
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
64+
$stotype = 'StandardGRS';
6165
Assert-AreEqual $sto.Name $stoname;
62-
Assert-AreEqual $sto.Properties.AccountType $stotype;
66+
Assert-AreEqual $sto.AccountType $stotype;
6367
Assert-AreEqual $sto.Location $loc;
6468

6569
$stokey1 = Get-AzureStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
@@ -136,13 +140,14 @@ function Test-GetAzureStorageAccount
136140
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
137141

138142
Retry-IfException { $global:sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
143+
$stotype = 'StandardGRS';
139144
Assert-AreEqual $sto.Name $stoname;
140-
Assert-AreEqual $sto.Properties.AccountType $stotype;
145+
Assert-AreEqual $sto.AccountType $stotype;
141146
Assert-AreEqual $sto.Location $loc;
142147

143148
$stos = Get-AzureStorageAccount -ResourceGroupName $rgname;
144149
Assert-AreEqual $stos[0].Name $stoname;
145-
Assert-AreEqual $stos[0].Properties.AccountType $stotype;
150+
Assert-AreEqual $stos[0].AccountType $stotype;
146151
Assert-AreEqual $stos[0].Location $loc;
147152

148153
Remove-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
@@ -174,13 +179,14 @@ function Test-SetAzureStorageAccount
174179
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
175180

176181
Retry-IfException { $global:sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
182+
$stotype = 'StandardGRS';
177183
Assert-AreEqual $sto.Name $stoname;
178-
Assert-AreEqual $sto.Properties.AccountType $stotype;
184+
Assert-AreEqual $sto.AccountType $stotype;
179185
Assert-AreEqual $sto.Location $loc;
180186

181187
$stos = Get-AzureStorageAccount -ResourceGroupName $rgname;
182188
Assert-AreEqual $stos[0].Name $stoname;
183-
Assert-AreEqual $stos[0].Properties.AccountType $stotype;
189+
Assert-AreEqual $stos[0].AccountType $stotype;
184190
Assert-AreEqual $stos[0].Location $loc;
185191

186192
$stotype = 'Standard_LRS';
@@ -190,8 +196,9 @@ function Test-SetAzureStorageAccount
190196
Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;
191197

192198
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
199+
$stotype = 'StandardRAGRS';
193200
Assert-AreEqual $sto.Name $stoname;
194-
Assert-AreEqual $sto.Properties.AccountType $stotype;
201+
Assert-AreEqual $sto.AccountType $stotype;
195202
Assert-AreEqual $sto.Location $loc;
196203

197204
Remove-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;

0 commit comments

Comments
 (0)