Skip to content

Commit 5fe49e1

Browse files
authored
Merge pull request #9332 from wastoresh/filestorage
[Storage] Support Account Kind FileStorage, and Skuname Premium_ZRS
2 parents 0f549a6 + 6d71951 commit 5fe49e1

File tree

7 files changed

+865
-5
lines changed

7 files changed

+865
-5
lines changed

src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,13 @@ public void TestGetAzureStorageLocationUsage()
121121
TestRunner.RunTestScript("Test-GetAzureStorageLocationUsage");
122122
}
123123

124+
[Fact]
125+
[Trait(Category.AcceptanceType, Category.CheckIn)]
126+
public void TestNewAzureStorageAccountFileStorage()
127+
{
128+
TestRunner.RunTestScript("Test-NewAzureStorageAccountFileStorage");
129+
}
130+
124131
[Fact]
125132
[Trait(Category.AcceptanceType, Category.CheckIn)]
126133
public void TestPipingNewUpdateAccount()

src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,43 @@ function Test-GetAzureStorageLocationUsage
668668
Assert-AreNotEqual 0 $usage.CurrentValue;
669669
}
670670

671+
<#
672+
.SYNOPSIS
673+
Test New-AzStorageAccountFileStorage
674+
.DESCRIPTION
675+
Smoke[Broken]Test
676+
#>
677+
function Test-NewAzureStorageAccountFileStorage
678+
{
679+
# Setup
680+
$rgname = Get-StorageManagementTestResourceName;
681+
682+
try
683+
{
684+
# Test
685+
$stoname = 'sto' + $rgname;
686+
$stotype = 'Premium_LRS';
687+
$kind = 'FileStorage'
688+
689+
$loc = Get-ProviderLocation ResourceManagement;
690+
New-AzResourceGroup -Name $rgname -Location $loc;
691+
692+
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
693+
$sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname;
694+
Assert-AreEqual $stoname $sto.StorageAccountName;
695+
Assert-AreEqual $stotype $sto.Sku.Name;
696+
Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
697+
Assert-AreEqual $kind $sto.Kind;
698+
699+
Retry-IfException { Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname; }
700+
}
701+
finally
702+
{
703+
# Cleanup
704+
Clean-ResourceGroup $rgname
705+
}
706+
}
707+
671708
<#
672709
.SYNOPSIS
673710
Test Get-AzStorageAccount | New/Set-AzStorageAccount

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccountFileStorage.json

Lines changed: 807 additions & 0 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Support Kind FileStorage and SkuName Premium_ZRS when create Storage account
22+
- New-AzStorageAccount
2123
* Clarified description of blob immutability cmdlet
2224
- Remove-AzRmStorageContainerImmutabilityPolicy
2325

src/Storage/Storage.Management/StorageAccount/NewAzureStorageAccount.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class NewAzureStorageAccountCommand : StorageAccountBaseCmdlet
5656
StorageModels.SkuName.StandardGRS,
5757
StorageModels.SkuName.StandardRAGRS,
5858
StorageModels.SkuName.PremiumLRS,
59+
StorageModels.SkuName.PremiumZRS,
5960
IgnoreCase = true)]
6061
public string SkuName { get; set; }
6162

@@ -75,6 +76,7 @@ public class NewAzureStorageAccountCommand : StorageAccountBaseCmdlet
7576
StorageModels.Kind.StorageV2,
7677
StorageModels.Kind.BlobStorage,
7778
StorageModels.Kind.BlockBlobStorage,
79+
StorageModels.Kind.FileStorage,
7880
IgnoreCase = true)]
7981
public string Kind
8082
{

src/Storage/Storage.Management/help/New-AzStorageAccount.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,15 @@ The acceptable values for this parameter are:
185185
- Storage. General purpose Storage account that supports storage of Blobs, Tables, Queues, Files and Disks.
186186
- StorageV2. General Purpose Version 2 (GPv2) Storage account that supports Blobs, Tables, Queues, Files, and Disks, with advanced features like data tiering.
187187
- BlobStorage. Blob Storage account which supports storage of Blobs only.
188-
The default value is Storage.
188+
- BlockBlobStorage. Block Blob Storage account which supports storage of Block Blobs only.
189+
- FileStorage. File Storage account which supports storage of Files only.
190+
The default value is StorageV2.
189191
190192
```yaml
191193
Type: System.String
192194
Parameter Sets: (All)
193195
Aliases:
194-
Accepted values: Storage, StorageV2, BlobStorage, BlockBlobStorage
196+
Accepted values: Storage, StorageV2, BlobStorage, BlockBlobStorage, FileStorage
195197

196198
Required: False
197199
Position: Named
@@ -268,12 +270,13 @@ The acceptable values for this parameter are:
268270
- Standard_GRS. Geo-redundant storage.
269271
- Standard_RAGRS. Read access geo-redundant storage.
270272
- Premium_LRS. Premium locally-redundant storage.
273+
- Premium_ZRS. Premium zone-redundant storage.
271274
272275
```yaml
273276
Type: System.String
274277
Parameter Sets: (All)
275278
Aliases: StorageAccountType, AccountType, Type
276-
Accepted values: Standard_LRS, Standard_ZRS, Standard_GRS, Standard_RAGRS, Premium_LRS
279+
Accepted values: Standard_LRS, Standard_ZRS, Standard_GRS, Standard_RAGRS, Premium_LRS, Premium_ZRS
277280

278281
Required: True
279282
Position: 2

src/Storage/Storage.Management/help/New-AzStorageContext.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ New-AzStorageContext [-Local] [<CommonParameters>]
7373

7474
## DESCRIPTION
7575
The **New-AzStorageContext** cmdlet creates an Azure Storage context.
76+
The default Authentication of a Storage Context is OAuth (Azure AD), if only input Storage account name.
77+
See details of authentication of the Storage Service in https://docs.microsoft.com/en-us/rest/api/storageservices/authorization-for-the-azure-storage-services.
7678

7779
## EXAMPLES
7880

@@ -159,7 +161,7 @@ PS C:\>Connect-AzAccount
159161
PS C:\> $Context = New-AzStorageContext -StorageAccountName "myaccountname" -UseConnectedAccount
160162
```
161163

162-
This command creates a context by using the OAuth Authentication.
164+
This command creates a context by using the OAuth (Azure AD) Authentication.
163165

164166
## PARAMETERS
165167

@@ -316,7 +318,7 @@ Accept wildcard characters: False
316318
```
317319

318320
### -UseConnectedAccount
319-
Indicates that this cmdlet creates an Azure Storage context with OAuth Authentication.
321+
Indicates that this cmdlet creates an Azure Storage context with OAuth (Azure AD) Authentication.
320322
The cmdlet will use OAuth Authentication by default, when other anthentication not specified.
321323

322324
```yaml

0 commit comments

Comments
 (0)