Merge pull request #5110 from wastoresh/storage-v2

Support Set-AzureRMstorageAccount with Kind StorageV2

Author: markcowl

src/ResourceManager/Storage/AzureRM.Storage.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '4.0.1'
+ModuleVersion = '4.1.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -122,7 +122,10 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Fixed assembly loading issue that caused some cmdlets to fail when executing'
+        ReleaseNotes = '* Upgrade SRP SDK to 7.1.0
+* Add StorageV2 account kind to resource mode storage account cmdlets
+    - New-AzureRmStorageAccount
+    - Set-AzureRmStorageAccount'
 
         # External dependent modules of this module
         # ExternalModuleDependencies = ''

src/ResourceManager/Storage/ChangeLog.md

@@ -21,6 +21,7 @@
 * Upgrade SRP SDK to 7.1.0
 * Add StorageV2 account kind to resource mode storage account cmdlets
     - New-AzureRmStorageAccount
+    - Set-AzureRmStorageAccount
 
 ## Version 4.0.1
 * Fixed assembly loading issue that caused some cmdlets to fail when executing

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

@@ -200,6 +200,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestStorageAccount.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureStorageAccountStorageV2.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

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

@@ -112,5 +112,11 @@ public void TestNetworkRule()
             TestController.NewInstance.RunPsTest("Test-NetworkRule");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSetAzureStorageAccountStorageV2()
+        {
+            TestController.NewInstance.RunPsTest("Test-SetAzureStorageAccountStorageV2");
+        }
     }
 }

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

@@ -520,7 +520,6 @@ function Test-SetAzureRmCurrentStorageAccount
     }
 }
 
-
 <#
 .SYNOPSIS
 Test NetworkRule
@@ -611,3 +610,50 @@ function Test-NetworkRule
         Clean-ResourceGroup $rgname
     }
 }
+
+<#
+.SYNOPSIS
+Test SetAzureStorageAccount with Kind as StorageV2
+.Description
+AzureAutomationTest
+#>
+function Test-SetAzureStorageAccountStorageV2
+{
+    # Setup
+    $rgname = Get-StorageManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $stoname = 'sto' + $rgname;
+        $stotype = 'Standard_GRS';
+        $loc = Get-ProviderLocation ResourceManagement;
+		$kind = 'Storage'
+
+        New-AzureRmResourceGroup -Name $rgname -Location $loc;
+        $loc = Get-ProviderLocation_Stage ResourceManagement;
+        New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
+
+        Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
+        $stotype = 'StandardGRS';
+        Assert-AreEqual $sto.StorageAccountName $stoname;
+        Assert-AreEqual $sto.Sku.Name $stotype;
+        Assert-AreEqual $sto.Location $loc;
+        Assert-AreEqual $sto.Kind $kind;        
+      				
+		$kind = 'StorageV2'
+        Set-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -UpgradeToStorageV2;
+        $sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname  -Name $stoname;
+        Assert-AreEqual $sto.StorageAccountName $stoname;
+        Assert-AreEqual $sto.Sku.Name $stotype;
+        Assert-AreEqual $sto.Location $loc;
+        Assert-AreEqual $sto.Kind $kind;
+
+        Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}