Merge pull request Azure#8657 from wastoresh/newskind

[Storage] Support new Storage Account Kind BlockBlobStorage

Author: cormacpayne

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

@@ -127,5 +127,12 @@ public void TestPipingNewUpdateAccount()
         {
             TestRunner.RunTestScript("Test-PipingNewUpdateAccount");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewAzureStorageAccountBlockBlobStorage()
+        {
+            TestRunner.RunTestScript("Test-NewAzureStorageAccountBlockBlobStorage");
+        }
     }
 }

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

@@ -718,3 +718,41 @@ function Test-PipingNewUpdateAccount
         Clean-ResourceGroup $rgname
     }
 }
+
+<#
+.SYNOPSIS
+Test New-AzureRmStorageAccountBlockBlobStorage
+.DESCRIPTION
+Smoke[Broken]Test
+#>
+function Test-NewAzureStorageAccountBlockBlobStorage
+{
+    # Setup
+    $rgname = Get-StorageManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $stoname = 'sto' + $rgname;
+        $stotype = 'Premium_LRS';
+        $kind = 'BlockBlobStorage'
+
+        $loc = Get-ProviderLocation ResourceManagement;
+        New-AzureRmResourceGroup -Name $rgname -Location $loc;
+		
+        New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
+        $sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
+        $stotype = 'PremiumLRS';
+        Assert-AreEqual $stoname $sto.StorageAccountName;
+        Assert-AreEqual $stotype $sto.Sku.Name;
+        Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
+        Assert-AreEqual $kind $sto.Kind; 
+        
+        Retry-IfException { Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname; }
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}

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

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Support Kind BlockBlobStorage when create Storage account
+       - New-AzStorageAccount
 
 ## Version 1.0.2
 * Update incorrect online help URLs

src/Storage/Storage.Management/ChangeLog.md

@@ -74,6 +74,7 @@ public class NewAzureStorageAccountCommand : StorageAccountBaseCmdlet
         [ValidateSet(AccountKind.Storage,
             AccountKind.StorageV2,
             AccountKind.BlobStorage,
+            AccountKind.BlockBlobStorage,
             IgnoreCase = true)]
         public string Kind { get; set; }
 

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

@@ -60,6 +60,7 @@ protected struct AccountKind
             internal const string Storage = "Storage";
             internal const string StorageV2 = "StorageV2";
             internal const string BlobStorage = "BlobStorage";
+            internal const string BlockBlobStorage = "BlockBlobStorage";
         }
         protected struct AccountAccessTier
         {

src/Storage/Storage.Management/StorageAccount/StorageAccountBaseCmdlet.cs

@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.PowerShell.Cmdlets.Storage.Management.dll-Help.xml
 Module Name: Az.Storage
 ms.assetid: A3DA1205-B8FB-4B4C-9C40-AD303D038EDF
@@ -191,7 +191,7 @@ The default value is Storage.
 Type: System.String
 Parameter Sets: (All)
 Aliases:
-Accepted values: Storage, StorageV2, BlobStorage
+Accepted values: Storage, StorageV2, BlobStorage, BlockBlobStorage
 
 Required: False
 Position: Named