Updating storage account names and tests

Author: markcowl

examples/storage-management/01-Storage-Accounts.sh

@@ -5,7 +5,7 @@ export BASEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 az reource group get -n $groupName
 if [ $? -ne 0 ]; then
     printf "\n Creating group %s in location %s \n" $groupName $location
-    az group create -n "$groupName" --location "$location"
+    az resource group create -n "$groupName" --location "$location"
 fi
 
 set -e
@@ -16,7 +16,7 @@ printf "\n1. Creating storage account %s in resrouce group %s with type %s in lo
 az storage account create -g "$groupName" -n "$accountName" -t "$accountType" -l "$location"
 
 printf "\n2. Get account info of storage account %s in group %s\n" $accountName $groupName
-az storage account get -g $groupName -n $accountName > $BASEDIR/$accountName.json
+az storage account ls -g $groupName -n $accountName > $BASEDIR/$accountName.json
 [ $(cat $BASEDIR/$accountName.json | jq '.ResourceGroupName' --raw-output) == "$groupName" ]
 [ $(cat $BASEDIR/$accountName.json | jq '.StorageAccountName' --raw-output) == "$accountName" ]
 [ $(cat $BASEDIR/$accountName.json | jq '.AccountType' --raw-output) == "$accountType" ]
@@ -30,23 +30,23 @@ az storage account set -g $groupName -n $accountName -t "$accountType1" > $BASED
 rm -f $BASEDIR/$accountName.json
 
 printf "\n4. Get account key of storage account %s in group %s\n" $accountName $groupName
-az storage account key get -g $groupName -n $accountName > $BASEDIR/$accountName.json
+az storage key ls -g $groupName -n $accountName > $BASEDIR/$accountName.json
 key1=$(cat $BASEDIR/$accountName.json | jq '.key1' --raw-output)
 key2=$(cat $BASEDIR/$accountName.json | jq '.key2' --raw-output)
 [ $key1 != $key2 ]
 rm -f $BASEDIR/$accountName.json
 
 printf "\n5. Renew account key1 of storage account %s in group %s\n" $accountName $groupName
-az storage account key create -g $groupName -n $accountName -k "key1"
-az storage account key get -g $groupName -n $accountName > $BASEDIR/$accountName.json
+az storage key create -g $groupName -n $accountName -k "key1"
+az storage key ls -g $groupName -n $accountName > $BASEDIR/$accountName.json
 [ $(cat $BASEDIR/$accountName.json | jq '.key1' --raw-output) != $key1 ]
 rm -f $BASEDIR/$accountName.json
 
 printf "\n6. Renew account key2 of storage account %s in group %s\n" $accountName $groupName
-az storage account key create -g $groupName -n $accountName -k "key2"
-az storage account key get -g $groupName -n $accountName > $BASEDIR/$accountName.json
+az storage key create -g $groupName -n $accountName -k "key2"
+az storage key ls -g $groupName -n $accountName > $BASEDIR/$accountName.json
 [ $(cat $BASEDIR/$accountName.json | jq '.key2' --raw-output) != $key2 ]
 rm -f $BASEDIR/$accountName.json
 
 printf "\n7. Removing account %s in group %s\n" $accountName $groupName
-az storage account remove -g $groupName -n $accountName
+az storage account rm -g $groupName -n $accountName

src/CLU/Microsoft.Azure.Commands.Compute/StorageServices/AddAzureVhdCommand.cs

@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.Compute.StorageServices
     /// Uploads a vhd as fixed disk format vhd to a blob in Microsoft Azure Storage
     /// </summary>
     [Cmdlet(VerbsCommon.Add, ProfileNouns.Vhd), OutputType(typeof(VhdUploadContext))]
-    [CliCommandAlias("vm;vhd;add")]    public class AddAzureVhdCommand : ComputeClientBaseCmdlet
+    [CliCommandAlias("vm vhd add")]    public class AddAzureVhdCommand : ComputeClientBaseCmdlet
     {
         private const int DefaultNumberOfUploaderThreads = 8;
 

src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/current.storage.account.set.hlp renamed to src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.account.current.set.hlp

@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.Management.Storage
 {
     [Cmdlet(VerbsCommon.Get, StorageAccountNounStr), OutputType(typeof(PSStorageAccount))]
-    [CliCommandAlias("storage;account;ls")]
+    [CliCommandAlias("storage account ls")]
     public class GetAzureStorageAccountCommand : StorageAccountBaseCmdlet
     {
         [Parameter(

src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.account.get.hlp renamed to src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.account.ls.hlp

@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Management.Storage
 {
     [Cmdlet(VerbsCommon.Get, StorageAccountKeyNounStr), OutputType(typeof(StorageAccountKeys))]
-    [CliCommandAlias("storage;key;ls")]
+    [CliCommandAlias("storage key ls")]
     public class GetAzureStorageAccountKeyCommand : StorageAccountBaseCmdlet
     {
         [Parameter(

src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.account.remove.hlp renamed to src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.account.rm.hlp

@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Management.Storage.StorageAccount
 {
     [Cmdlet(VerbsCommon.Get, StorageAccountNameAvailabilityStr), OutputType(typeof(CheckNameAvailabilityResult))]
-    [CliCommandAlias("storage;name;test")]
+    [CliCommandAlias("storage name test")]
     public class GetAzureStorageAccountNameAvailability : StorageAccountBaseCmdlet
     {
         [Parameter(

src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.account.key.create.hlp renamed to src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.key.create.hlp

@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Management.Storage.StorageAccount
 {
     [Cmdlet(VerbsCommon.Get, StorageUsageNounStr), OutputType(typeof(PSUsage))]
-    [CliCommandAlias("storage;usage;ls")]
+    [CliCommandAlias("storage usage ls")]
     public class GetAzureStorageUsageCommand : StorageAccountBaseCmdlet
     {
         protected override void ProcessRecord()

src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.account.key.get.hlp renamed to src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.key.ls.hlp

@@ -23,7 +23,7 @@
 namespace Microsoft.Azure.Commands.Management.Storage
 {
     [Cmdlet(VerbsCommon.New, StorageAccountNounStr), OutputType(typeof(PSStorageAccount))]
-    [CliCommandAlias("storage;account;create")]
+    [CliCommandAlias("storage account create")]
     public class NewAzureStorageAccountCommand : StorageAccountBaseCmdlet
     {
         [Parameter(

src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.account.name.availability.get.hlp renamed to src/CLU/Microsoft.Azure.Commands.Management.Storage/Content/help/storage.name.test.hlp

@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.Management.Storage
 {
     [Cmdlet(VerbsCommon.New, StorageAccountKeyNounStr), OutputType(typeof(StorageAccountKeys))]
-    [CliCommandAlias("storage;key;create")]
+    [CliCommandAlias("storage key create")]
     public class NewAzureStorageAccountKeyCommand : StorageAccountBaseCmdlet
     {
         private const string Key1 = "Key1";

src/CLU/Microsoft.Azure.Commands.Management.Storage/StorageAccount/GetAzureStorageAccount.cs

@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Management.Storage
     /// Lists all storage services underneath the subscription.
     /// </summary>
     [Cmdlet(VerbsCommon.Remove, StorageAccountNounStr)]
-    [CliCommandAlias("storage;account;rm")]
+    [CliCommandAlias("storage account rm")]
     public class RemoveAzureStorageAccountCommand : StorageAccountBaseCmdlet
     {
         [Parameter(

src/CLU/Microsoft.Azure.Commands.Management.Storage/StorageAccount/GetAzureStorageAccountKey.cs

@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.Management.Storage
 {
     [Cmdlet(VerbsCommon.Set, "AzureRmCurrentStorageAccount", DefaultParameterSetName=ResourceNameParameterSet), 
     OutputType(typeof(string))]
-    [CliCommandAlias("storage;account;current;set")]
+    [CliCommandAlias("storage account current set")]
     public class SetAzureRmCurrentStorageAccount : StorageAccountBaseCmdlet
     {
         private const string StorageContextParameterSet = "UsingStorageContext";

src/CLU/Microsoft.Azure.Commands.Management.Storage/StorageAccount/GetAzureStorageAccountNameAvailability.cs

@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.Management.Storage
     /// Lists all storage services underneath the subscription.
     /// </summary>
     [Cmdlet(VerbsCommon.Set, StorageAccountNounStr, DefaultParameterSetName = UpdateAccountTypeParamSet), OutputType(typeof(StorageModels.StorageAccount))]
-    [CliCommandAlias("storage;account;set")]
+    [CliCommandAlias("storage account set")]
     public class SetAzureStorageAccountCommand : StorageAccountBaseCmdlet
     {
         protected const string UpdateAccountTypeParamSet = "UpdateAccountType";