Skip to content

Commit 04f0fe4

Browse files
bganapabganapa
committed
AzureRm.Storage module consuming api-version 2016-01-01 and common runtime
1 parent bb9a4ea commit 04f0fe4

File tree

99 files changed

+9451
-16528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+9451
-16528
lines changed

‎src/ResourceManager/Storage/Stack/AzureRM.Storage.psd1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.0.5.4'
15+
ModuleVersion = '1.1.0.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,8 +51,8 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.1.1'; },
55-
@{ModuleName = 'Azure.Storage'; ModuleVersion = '1.0.5.4'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.3.4'; },
55+
@{ModuleName = 'Azure.Storage'; ModuleVersion = '4.1.1'; })
5656

5757
# Assemblies that must be loaded prior to importing this module
5858
# RequiredAssemblies = @()

‎src/ResourceManager/Storage/Stack/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@
6868
<HintPath>..\..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.12\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
71+
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.11\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
7272
</Reference>
7373
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.13\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
74+
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.12\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
7575
</Reference>
7676
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7777
<HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.9-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
@@ -181,9 +181,6 @@
181181
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestRemoveAzureStorageAccount.json">
182182
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
183183
</None>
184-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureRmStorageAccountKeySource.json">
185-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
186-
</None>
187184
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureStorageAccount.json">
188185
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
189186
</None>

‎src/ResourceManager/Storage/Stack/Commands.Management.Storage.Test/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@
4747
// You can specify all the values or you can default the Build and Revision Numbers
4848
// by using the '*' as shown below:
4949

50-
[assembly: AssemblyVersion("1.0.4")]
51-
[assembly: AssemblyFileVersion("1.0.4")]
50+
[assembly: AssemblyVersion("1.0.6")]
51+
[assembly: AssemblyFileVersion("1.0.6")]
52+
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/Storage/Stack/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,21 @@
1313
// ----------------------------------------------------------------------------------
1414

1515

16+
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1617
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1718
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1819
using Xunit;
20+
using Xunit.Abstractions;
1921

2022
namespace Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests
2123
{
2224
public class StorageAccountTests : RMTestBase
2325
{
26+
public StorageAccountTests(ITestOutputHelper output)
27+
{
28+
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
29+
}
30+
2431
[Fact]
2532
[Trait(Category.AcceptanceType, Category.CheckIn)]
2633
public void TestStorageAccount()
@@ -76,7 +83,7 @@ public void TestPipingGetAccountToGetKey()
7683
{
7784
TestController.NewInstance.RunPsTest("Test-PipingGetAccountToGetKey");
7885
}
79-
86+
8087
[Fact]
8188
[Trait(Category.AcceptanceType, Category.CheckIn)]
8289
public void TestPipingSetStorageAccount()

‎src/ResourceManager/Storage/Stack/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.ps1

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Test-StorageAccount
2626
# Test
2727
$stoname = 'sto' + $rgname;
2828
$stotype = 'Standard_GRS';
29-
$loc = 'West US';
29+
$loc = 'westus';
3030

3131
New-AzureRmResourceGroup -Name $rgname -Location $loc;
3232

@@ -36,7 +36,7 @@ function Test-StorageAccount
3636
$stotype = 'StandardGRS';
3737
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
3838
Assert-AreEqual $sto.StorageAccountName $stoname;
39-
Assert-AreEqual $sto.AccountType $stotype;
39+
Assert-AreEqual $sto.Sku.Name $stotype;
4040
Assert-AreEqual $sto.Location $loc;
4141

4242
$stotype = 'Standard_LRS';
@@ -45,7 +45,7 @@ function Test-StorageAccount
4545
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
4646
$stotype = 'StandardLRS';
4747
Assert-AreEqual $sto.StorageAccountName $stoname;
48-
Assert-AreEqual $sto.AccountType $stotype;
48+
Assert-AreEqual $sto.Sku.Name $stotype;
4949
Assert-AreEqual $sto.Location $loc;
5050

5151
$stotype = 'Standard_RAGRS';
@@ -54,7 +54,7 @@ function Test-StorageAccount
5454
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
5555
$stotype = 'StandardRAGRS';
5656
Assert-AreEqual $sto.StorageAccountName $stoname;
57-
Assert-AreEqual $sto.AccountType $stotype;
57+
Assert-AreEqual $sto.Sku.Name $stotype;
5858
Assert-AreEqual $sto.Location $loc;
5959

6060
$stotype = 'Standard_GRS';
@@ -63,25 +63,25 @@ function Test-StorageAccount
6363
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
6464
$stotype = 'StandardGRS';
6565
Assert-AreEqual $sto.StorageAccountName $stoname;
66-
Assert-AreEqual $sto.AccountType $stotype;
66+
Assert-AreEqual $sto.Sku.Name $stotype;
6767
Assert-AreEqual $sto.Location $loc;
6868

6969
$stokey1 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
7070

7171
New-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key1;
7272

7373
$stokey2 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
74-
Assert-AreNotEqual $stokey1.Key1 $stokey2.Key1;
75-
Assert-AreEqual $stokey1.Key2 $stokey2.Key2;
74+
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
75+
Assert-AreEqual $stokey1[1].Value $stokey2[1].Value;
7676

7777
New-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key2;
7878

7979
$stokey3 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
80-
Assert-AreNotEqual $stokey1.Key1 $stokey2.Key1;
81-
Assert-AreEqual $stokey2.Key1 $stokey3.Key1;
82-
Assert-AreNotEqual $stokey2.Key2 $stokey3.Key2;
80+
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
81+
Assert-AreEqual $stokey2[0].Value $stokey3[0].Value;
82+
Assert-AreNotEqual $stokey2[1].Value $stokey3[1].Value;
8383

84-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
84+
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
8585
}
8686
finally
8787
{
@@ -104,13 +104,13 @@ function Test-NewAzureStorageAccount
104104
# Test
105105
$stoname = 'sto' + $rgname;
106106
$stotype = 'Standard_GRS';
107-
$loc = 'West US';
107+
$loc = 'westus';
108108

109109
New-AzureRmResourceGroup -Name $rgname -Location $loc;
110110

111111
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
112112

113-
Retry-IfException { Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
113+
Retry-IfException { Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
114114
}
115115
finally
116116
{
@@ -133,7 +133,7 @@ function Test-GetAzureStorageAccount
133133
# Test
134134
$stoname = 'sto' + $rgname;
135135
$stotype = 'Standard_GRS';
136-
$loc = 'West US';
136+
$loc = 'westus';
137137

138138
New-AzureRmResourceGroup -Name $rgname -Location $loc;
139139

@@ -142,15 +142,15 @@ function Test-GetAzureStorageAccount
142142
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
143143
$stotype = 'StandardGRS';
144144
Assert-AreEqual $sto.StorageAccountName $stoname;
145-
Assert-AreEqual $sto.AccountType $stotype;
145+
Assert-AreEqual $sto.Sku.Name $stotype;
146146
Assert-AreEqual $sto.Location $loc;
147147

148148
$stos = Get-AzureRmStorageAccount -ResourceGroupName $rgname;
149149
Assert-AreEqual $stos[0].StorageAccountName $stoname;
150-
Assert-AreEqual $stos[0].AccountType $stotype;
150+
Assert-AreEqual $stos[0].Sku.Name $stotype;
151151
Assert-AreEqual $stos[0].Location $loc;
152152

153-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
153+
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
154154
}
155155
finally
156156
{
@@ -173,20 +173,20 @@ function Test-SetAzureStorageAccount
173173
# Test
174174
$stoname = 'sto' + $rgname;
175175
$stotype = 'Standard_GRS';
176-
$loc = 'West US';
176+
$loc = 'westus';
177177

178178
New-AzureRmResourceGroup -Name $rgname -Location $loc;
179179
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
180180

181181
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
182182
$stotype = 'StandardGRS';
183183
Assert-AreEqual $sto.StorageAccountName $stoname;
184-
Assert-AreEqual $sto.AccountType $stotype;
184+
Assert-AreEqual $sto.Sku.Name $stotype;
185185
Assert-AreEqual $sto.Location $loc;
186186

187187
$stos = Get-AzureRmStorageAccount -ResourceGroupName $rgname;
188188
Assert-AreEqual $stos[0].StorageAccountName $stoname;
189-
Assert-AreEqual $stos[0].AccountType $stotype;
189+
Assert-AreEqual $stos[0].Sku.Name $stotype;
190190
Assert-AreEqual $stos[0].Location $loc;
191191

192192
$stotype = 'Standard_LRS';
@@ -198,10 +198,10 @@ function Test-SetAzureStorageAccount
198198
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
199199
$stotype = 'StandardRAGRS';
200200
Assert-AreEqual $sto.StorageAccountName $stoname;
201-
Assert-AreEqual $sto.AccountType $stotype;
201+
Assert-AreEqual $sto.Sku.Name $stotype;
202202
Assert-AreEqual $sto.Location $loc;
203203

204-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
204+
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
205205
}
206206
finally
207207
{
@@ -212,7 +212,7 @@ function Test-SetAzureStorageAccount
212212

213213
<#
214214
.SYNOPSIS
215-
Test Remove-AzureRmStorageAccount
215+
Test Remove-AzureRmStorageAccount
216216
#>
217217
function Test-RemoveAzureStorageAccount
218218
{
@@ -224,13 +224,13 @@ function Test-RemoveAzureStorageAccount
224224
# Test
225225
$stoname = 'sto' + $rgname;
226226
$stotype = 'Standard_GRS';
227-
$loc = 'West US';
227+
$loc = 'westus';
228228

229229
New-AzureRmResourceGroup -Name $rgname -Location $loc;
230230

231231
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
232232

233-
Retry-IfException { Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
233+
Retry-IfException { Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
234234
}
235235
finally
236236
{
@@ -253,16 +253,16 @@ function Test-GetAzureStorageAccountKey
253253
# Test
254254
$stoname = 'sto' + $rgname;
255255
$stotype = 'Standard_GRS';
256-
$loc = 'West US';
256+
$loc = 'westus';
257257

258258
New-AzureRmResourceGroup -Name $rgname -Location $loc;
259259

260260
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
261261

262262
Retry-IfException { $global:stokeys = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname; }
263-
Assert-AreNotEqual $stokeys.Key1 $stokeys.Key2;
263+
Assert-AreNotEqual $stokeys[0].Value $stokeys[1].Value;
264264

265-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
265+
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
266266
}
267267
finally
268268
{
@@ -285,7 +285,7 @@ function Test-NewAzureStorageAccountKey
285285
# Test
286286
$stoname = 'sto' + $rgname;
287287
$stotype = 'Standard_GRS';
288-
$loc = 'West US';
288+
$loc = 'westus';
289289

290290
New-AzureRmResourceGroup -Name $rgname -Location $loc;
291291

@@ -296,17 +296,17 @@ function Test-NewAzureStorageAccountKey
296296
New-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key1;
297297

298298
$stokey2 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
299-
Assert-AreNotEqual $stokey1.Key1 $stokey2.Key1;
300-
Assert-AreEqual $stokey1.Key2 $stokey2.Key2;
299+
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
300+
Assert-AreEqual $stokey1[1].Value $stokey2[1].Value;
301301

302302
New-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key2;
303303

304304
$stokey3 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
305-
Assert-AreNotEqual $stokey1.Key1 $stokey2.Key1;
306-
Assert-AreEqual $stokey2.Key1 $stokey3.Key1;
307-
Assert-AreNotEqual $stokey2.Key2 $stokey3.Key2;
305+
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
306+
Assert-AreEqual $stokey2[0].Value $stokey3[0].Value;
307+
Assert-AreNotEqual $stokey2[1].Value $stokey3[1].Value;
308308

309-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
309+
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
310310
}
311311
finally
312312
{
@@ -329,16 +329,16 @@ function Test-PipingGetAccountToGetKey
329329
# Test
330330
$stoname = 'sto' + $rgname;
331331
$stotype = 'Standard_GRS';
332-
$loc = 'West US';
332+
$loc = 'westus';
333333

334334
New-AzureRmResourceGroup -Name $rgname -Location $loc;
335335

336336
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
337337

338338
Retry-IfException { $global:stokeys = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname | Get-AzureRmStorageAccountKey -ResourceGroupName $rgname; }
339-
Assert-AreNotEqual $stokeys.Key1 $stokeys.Key2;
339+
Assert-AreNotEqual $stokeys[0].Value $stokeys[1].Value;
340340

341-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
341+
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
342342
}
343343
finally
344344
{
@@ -361,15 +361,15 @@ function Test-PipingToSetAzureRmCurrentStorageAccount
361361
# Test
362362
$stoname = 'sto' + $rgname
363363
$stotype = 'Standard_GRS'
364-
$loc = 'West US'
364+
$loc = 'westus'
365365

366366
New-AzureRmResourceGroup -Name $rgname -Location $loc
367367
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype
368368
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname }
369369
$global:sto | Set-AzureRmCurrentStorageAccount
370370
$context = Get-AzureRmContext
371371
Assert-AreEqual $stoname $context.Subscription.CurrentStorageAccountName
372-
$global:sto | Remove-AzureRmStorageAccount
372+
$global:sto | Remove-AzureRmStorageAccount
373373
}
374374
finally
375375
{
@@ -392,15 +392,15 @@ function Test-SetAzureRmCurrentStorageAccount
392392
# Test
393393
$stoname = 'sto' + $rgname
394394
$stotype = 'Standard_GRS'
395-
$loc = 'West US'
395+
$loc = 'westus'
396396

397397
New-AzureRmResourceGroup -Name $rgname -Location $loc
398398
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype
399399
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname }
400400
Set-AzureRmCurrentStorageAccount -ResourceGroupName $rgname -StorageAccountName $stoname
401401
$context = Get-AzureRmContext
402402
Assert-AreEqual $stoname $context.Subscription.CurrentStorageAccountName
403-
$global:sto | Remove-AzureRmStorageAccount
403+
$global:sto | Remove-AzureRmStorageAccount
404404
}
405405
finally
406406
{

0 commit comments

Comments
 (0)