Merge pull request Azure#335 from Azure/clu

Clu

Author: huangpf

examples/compute-management/02-VirtualMachineCreation.sh

@@ -3,7 +3,7 @@ set -e
 printf "\n=== Managing Virtual Machine Creation in Azure Compute ===\n"
 
 printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
-az resourcemanager group create -n "$groupName" --location "$location"
+az resource group create -n "$groupName" --location "$location"
 
 printf "\n2. Creating a new storage account '%s' in type '%s'.\n" "$storageAccountName" "$storageAccountType"
 az storage account create--resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
@@ -33,4 +33,4 @@ printf "\n5. Create virtual machine with\r\nnicId='%s'\r\nvhdUri='%s'\r\nvmStr='
 az vm create--resourcegroupname "$groupName" --location "$location" --vmprofile "$vmStr"
 
 printf "\n6. Removing resource group: %s.\n" "$groupName"
-az resourcemanager group rm -n "$groupName" -f
+az resource group rm -n "$groupName" -f

examples/resource-management/01-ResourceGroups.sh

@@ -3,19 +3,19 @@ set -e
 printf "\n=== Managing Resource Groups in Azure ===\n"
 
 printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
-az resourcemanager group create -n "$groupName" --location "$location"
+az resource group create -n "$groupName" --location "$location"
 
 printf "\n2. Updating the group %s with tags.\n" "$groupName"
-az resourcemanager group set -n "$groupName" --tags "[{\"Value\":\"testval\",\"Name\":\"testtag\"}]"
+az resource group set -n "$groupName" --tags "[{\"Value\":\"testval\",\"Name\":\"testtag\"}]"
 
 printf "\n3. Get information about resource group : %s.\n" "$groupName"
-resourceGroupInfo=`az resourcemanager group ls -n $groupName`
+resourceGroupInfo=`az resource group ls -n $groupName`
 
 printf "\nValidating resource group name is: %s\n" "$groupName"
 [ $(echo $resourceGroupInfo | jq '.ResourceGroupName' --raw-output) == "$groupName" ]
 
 printf "\n4. Listing all resource groups in the subscription.\n"
-az resourcemanager group ls
+az resource group ls
 
 printf "\n5. Removing resource group: %s.\n" "$groupName"
-az resourcemanager group rm -n "$groupName" -f
+az resource group rm -n "$groupName" -f

examples/resource-management/02-Resource.sh

@@ -3,44 +3,44 @@ set -e
 printf "\n=== Managing Resources in Azure ===\n"
 
 printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
-az resourcemanager group create --name "$groupName" --location "$location"
+az resource group create --name "$groupName" --location "$location"
 destinationGroupName=$groupName"Destination"
 
 printf "\n2. Registering Resource Provider Namespace.\n"
 providerNamespace="Providers.Test"
-az resourcemanager resource provider register --ProviderNamespace $providerNamespace --Force
+az resource provider register --ProviderNamespace $providerNamespace --Force
 
 printf "\n3. Creating a new Resource: %s.\n" "$resourceName"
 resourceType="$providerNamespace/statefulResources"
 tags='[{"Name": "testtag", "Value": "testvalue"}]'
 properties='{"administratorLogin": "adminuser", "administratorLoginPassword": "P@ssword1"}'
 apiversion="2014-04-01"
-az resourcemanager resource create --Name $resourceName --Location $location --Tags "$tags" --ResourceGroupName $groupName --ResourceType $resourceType --PropertyObject "$properties" --ApiVersion $apiversion --Force
+az resource create --Name $resourceName --Location $location --Tags "$tags" --ResourceGroupName $groupName --ResourceType $resourceType --PropertyObject "$properties" --ApiVersion $apiversion --Force
 
 printf "\n4. Get information about Resource : %s.\n" "$resourceName"
-resourceInfo=$(az resourcemanager resource ls -n $resourceName)
+resourceInfo=$(az resource ls -n $resourceName)
 printf "\nValidating Resource name is: %s\n" "$resourceName"
 [ $(echo $resourceInfo | jq '.Name' --raw-output) == "$resourceName" ]
 
 printf "\n5. Find Resource with name '%s' and type '%s'.\n" "$resourceName" "$resourceType"
-foundResource=$(az resourcemanager resource find -n "$resourceName" -t $resourceType)
+foundResource=$(az resource find -n "$resourceName" -t $resourceType)
 printf "\nValidating Resource name is: %s.\n" "$resourceName"
 [ $(echo $foundResource | jq '.Name' --raw-output) == "$resourceName" ]
 
 printf "\n6. Update Resource.\n" 
 tagsUpdate='[{"Name": "testtagUpdated", "Value": "testvalueUpdated"}]'
-az resourcemanager resource set --ResourceGroupName $groupName --ResourceName $resourceName --ResourceType $resourceType --Tags "$tagsUpdate" -f
+az resource set --ResourceGroupName $groupName --ResourceName $resourceName --ResourceType $resourceType --Tags "$tagsUpdate" -f
 
 printf "\n7. Move Resource to resource group: %s.\n" "$destinationGroupName"
-az resourcemanager group create --name "$destinationGroupName" --location "$location"
+az resource group create --name "$destinationGroupName" --location "$location"
 resourceId=$(echo $resourceInfo | jq '.ResourceId')
 arrayId="[$resourceId]"
-az resourcemanager resource move -g "$destinationGroupName" --ResourceId "$arrayId" -f
+az resource move -g "$destinationGroupName" --ResourceId "$arrayId" -f
 
 printf "\n8. Removing resource: %s.\n" "$resourceName"
-foundResource=$(az resourcemanager resource find -n "$resourceName" -t $resourceType)
+foundResource=$(az resource find -n "$resourceName" -t $resourceType)
 resourceId=$(echo $foundResource | jq '.ResourceId' --raw-output)
 echo $resourceId
 export MSYS_NO_PATHCONV=1
-az resourcemanager resource rm --Id "$resourceId" -f
+az resource rm --Id "$resourceId" -f
 export MSYS_NO_PATHCONV=

examples/resource-management/03-Deployments.sh

@@ -3,14 +3,14 @@ set -e
 printf "\n=== Provisioning Deployments in Azure ===\n"
 
 printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
-az resourcemanager group create --name "$groupName" --location "$location"
+az resource group create --name "$groupName" --location "$location"
 
 printf "\n2. Test template with dynamic parameters\n"
-az resourcemanager group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --siteName "$resourceName" --hostingPlanName "$resourceName" --siteLocation "$location" --workerSize "0"
+az resource group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --siteName "$resourceName" --hostingPlanName "$resourceName" --siteLocation "$location" --workerSize "0"
 
 printf "\n3. Test template with JSON parameter object\n"
-az resourcemanager group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$resourceName\",\"hostingPlanName\":\"$resourceName\",\"siteLocation\":\"$location\",\"workerSize\": 0 }"
+az resource group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$resourceName\",\"hostingPlanName\":\"$resourceName\",\"siteLocation\":\"$location\",\"workerSize\": 0 }"
 
 printf "\n4. Provisioning Deployment\n"
-deploymentInfo=`az resourcemanager group deployment create --Name "$resourceName" --ResourceGroupName "$groupName" --TemplateFile $BASEDIR/sampleTemplate.json --TemplateParameterFile $BASEDIR/sampleTemplateParams.json`
+deploymentInfo=`az resource group deployment create --Name "$resourceName" --ResourceGroupName "$groupName" --TemplateFile $BASEDIR/sampleTemplate.json --TemplateParameterFile $BASEDIR/sampleTemplateParams.json`
 echo $deploymentInfo

examples/resource-management/04-RoleAssignments.sh

@@ -3,25 +3,25 @@ set -e
 printf "\n=== Managing Role Assignments in Azure ===\n"
 
 printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
-az resourcemanager group create --name "$groupName" --location "$location"
+az resource group create --name "$groupName" --location "$location"
 
 printf "\n2. Creating a new Role Assignment.\n"
 export MSYS_NO_PATHCONV=1
-users=$(az activedirectory users ls)
+users=$(az ad users ls)
 userId=$(echo $users | cat | jq '.[0].Id' -s --raw-output)
 echo "UserID: $userId"
-roleDefinitions=$(az networksecurityrole definition ls)
+roleDefinitions=$(az resource role definition ls)
 roleDefinitionId=$(echo $roleDefinitions | cat | jq '.[0].Id' -s --raw-output)
 echo "RoleDefinitionId: $roleDefinitionId"
 subsciptions=$(az subscription ls)
 subscriptionId=$(echo $subsciptions | cat | jq '.[0].SubscriptionId' -s --raw-output)
 scope="/subscriptions/$subscriptionId/resourceGroups/$groupName"
 echo "Scope: $scope"
-az networksecurityrole assignment create --ObjectId "$userId" --RoleDefinitionId "$roleDefinitionId" --Scope "$scope"
+az resource role assignment create --ObjectId "$userId" --RoleDefinitionId "$roleDefinitionId" --Scope "$scope"
 
 printf "\n3. Delete last created Role Assignment.\n"
-assignments=$(az networksecurityrole assignment ls)
+assignments=$(az resource role assignment ls)
 assignmentId=$(echo $assignments | cat | jq '.[-1:][0].ObjectId' -s --raw-output)
 echo "Deleting assignment: $assignmentId"
-az networksecurityrole assignment rm --ObjectId "$assignmentId" --Scope "$scope" --RoleDefinitionId "$roleDefinitionId" -f
+az resource role assignment rm --ObjectId "$assignmentId" --Scope "$scope" --RoleDefinitionId "$roleDefinitionId" -f
 export MSYS_NO_PATHCONV=

examples/resource-management/05-RoleDefinitions.sh

@@ -3,21 +3,21 @@ set -e
 printf "\n=== Managing Role Definitions in Azure ===\n"
 
 printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
-az resourcemanager group create --name "$groupName" --location "$location"
+az resource group create --name "$groupName" --location "$location"
 
 printf "\n2. Creating a new Role Definition.\n"
-roleDefinition=$(az networksecurityrole definition create --inputfile $BASEDIR/roleDefinition.json)
+roleDefinition=$(az resource role definition create --inputfile $BASEDIR/roleDefinition.json)
 
 printf "\n3. Get information about Role Definitions.\n"
 roleDefinitionName=$(echo $roleDefinition | jq '.Name' --raw-output)
-az networksecurityrole definition ls -n $roleDefinitionName
+az resource role definition ls -n $roleDefinitionName
 
 printf "\n4. Update Role Definition.\n"
 export MSYS_NO_PATHCONV=1
 updatedRoleDefinition=$(echo $roleDefinition | jq '.Actions |= .+ ["Microsoft.Authorization/*/write"]')
-az networksecurityrole definition set --Role "$updatedRoleDefinition"
+az resource role definition set --Role "$updatedRoleDefinition"
 
 printf "\n5. Delete Role Definition.\n"
 roleDefinitionId=$(echo $roleDefinition | jq '.Id' --raw-output)
-az networksecurityrole definition rm --Id $roleDefinitionId --PassThru -f 
+az resource role definition rm --Id $roleDefinitionId --PassThru -f 
 export MSYS_NO_PATHCONV=

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

@@ -2,21 +2,21 @@
 printf "\n=== Managing Storage Accounts Resources in Azure ===\n"
 export BASEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
-azure group get -n $groupName
+az reource group get -n $groupName
 if [ $? -ne 0 ]; then
     printf "\n Creating group %s in location %s \n" $groupName $location
-    azure group create -n "$groupName" --location "$location"
+    az group create -n "$groupName" --location "$location"
 fi
 
 set -e
 accountName=`randomName $groupName`
 accountType="Standard_GRS"
 
 printf "\n1. Creating storage account %s in resrouce group %s with type %s in location %s \n" $accountName $groupName $accountType $location
-azure storage account new -g "$groupName" -n "$accountName" -t "$accountType" -l "$location"
+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
-azure storage account get -g $groupName -n $accountName > $BASEDIR/$accountName.json
+az storage account get -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" ]
@@ -25,28 +25,28 @@ rm -f $BASEDIR/$accountName.json
 
 accountType1="Standard_RAGRS"
 printf "\n3. Set account type from %s to %s of storage account %s in group %s\n" $accountType $accountType1 $accountName $groupName
-azure storage account set -g $groupName -n $accountName -t "$accountType1" > $BASEDIR/$accountName.json
+az storage account set -g $groupName -n $accountName -t "$accountType1" > $BASEDIR/$accountName.json
 [ $(cat $BASEDIR/$accountName.json | jq '.AccountType' --raw-output) == "$accountType1" ]
 rm -f $BASEDIR/$accountName.json
 
 printf "\n4. Get account key of storage account %s in group %s\n" $accountName $groupName
-azure storage account key get -g $groupName -n $accountName > $BASEDIR/$accountName.json
+az storage account key get -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
-azure storage account key new -g $groupName -n $accountName -k "key1"
-azure storage account key get -g $groupName -n $accountName > $BASEDIR/$accountName.json
+az storage account key create -g $groupName -n $accountName -k "key1"
+az storage account key get -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
-azure storage account key new -g $groupName -n $accountName -k "key2"
-azure storage account key get -g $groupName -n $accountName > $BASEDIR/$accountName.json
+az storage account key create -g $groupName -n $accountName -k "key2"
+az storage account key get -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
-azure storage account remove -g $groupName -n $accountName
+az storage account remove -g $groupName -n $accountName

examples/virtual-hard-disk/01-VirtualHardDisks.sh

@@ -3,10 +3,10 @@ set -e
 printf "\n=== Managing Virtual Hard Disks in Azure Compute ===\n"
 
 printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
-az resourcemanager group create -n "$groupName" --location "$location"
+az resource group create -n "$groupName" --location "$location"
 
 printf "\n2. Creating a new storage account '%s' in type '%s'.\n" "$storageAccountName" "$storageAccountType"
-az storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
+az storage account create --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
 
 printf "\n3. Uploading a virtual hard disk to: %s.\n" "$storageAccountName"
 az vhd add -o --resourcegroupname "$groupName" --destination https://"$storageAccountName".blob.core.windows.net/test/test.vhd --localfilepath $BASEDIR/test.vhd
@@ -25,4 +25,4 @@ else
 fi
 
 printf "\n6. Removing resource group: %s.\n" "$groupName"
-az resourcemanager group rm -n "$groupName" -f
+az resource group rm -n "$groupName" -f

examples/webapp-management/01-AppServicePlan.sh

@@ -9,7 +9,7 @@ tier="Standard"
 size="Medium"
 capacity=2
 skuName="S2"
-az resourcemanager group create --name "$groupName" --location "$location"
+az resource group create --name "$groupName" --location "$location"
 
 printf "\n1. Create a new app service plan %s " "$whpName"
 az appservice plan create -n "$whpName" -g "$groupName" -l "$location" --tier "$tier" --size "$size" --workers "$capacity"

examples/webapp-management/02-WebAppSlot.sh

@@ -18,7 +18,7 @@ tier2="Premium"
 apiversion="2015-08-01"
 resourceType="Microsoft.Web/sites"
 
-az resourcemanager group create --name "$groupName" --location "$location"
+az resource group create --name "$groupName" --location "$location"
 
 printf "\n1. Create a new app service plan %s " "$planName1"
 az appservice plan create -n "$planName1" -g "$groupName" -l "$location" --tier "$tier1"
@@ -168,4 +168,4 @@ az appservice slot rm -g "$groupName" -n "$appName1" --slot "$slotname1" --force
 az appservice slot rm -g "$groupName" -n "$appName1" --slot "$slotname2" --force
 
 printf "\n23. Remove resource group: %s." "$groupName"
-az resourcemanager group rm --name "$groupName" --force
+az resource group rm --name "$groupName" --force

examples/webapp-management/03-WebApp.sh

@@ -2,7 +2,7 @@
 printf "\n=== Managing Web Apps in Azure ===\n"
 
 printf "\nSetup: Creating a new resource group: %s at location: %s.\n" "$groupName" "$location"
-az resourcemanager group create --name "$groupName" --location "$location"
+az resource group create --name "$groupName" --location "$location"
 
 slotname1="staging"
 slotname2="testing"
@@ -175,4 +175,4 @@ az appservice rm -g "$groupName" -n "$appName3" -f
 #az appservice rm -g "$groupName" -n "$appName4" -f
 
 printf "\n30:Remove the resource group: %s.\n" "$groupName"
-deleterg=`az resourcemanager group rm -n "$groupName" --force`
+deleterg=`az resource group rm -n "$groupName" --force`

src/CLU/Commands.ResourceManager.Cmdlets/Implementation/FindAzureResourceGroupCmdlet.cs

@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Finds the resource group.
     /// </summary>
     [Cmdlet(VerbsCommon.Find, "AzureRmResourceGroup"), OutputType(typeof(PSObject))]
-    [CliCommandAlias("resourcemanager group find")]
+    [CliCommandAlias("resource group find")]
     public class FindAzureResourceGroupCmdlet : ResourceManagerCmdletBase
     {
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The tag filter for the OData query. The expected format is @{Name = 'tagName'} or @{Name = 'tagName'; Value = 'tagValue'}.")]

src/CLU/Commands.ResourceManager.Cmdlets/Implementation/GetAzureResourceGroupDeploymentOperationCmdlet.cs

@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Gets the deployment operation.
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "AzureRmResourceGroupDeploymentOperation"), OutputType(typeof(PSResourceObject))]
-    [CliCommandAlias("resourcemanager group deployment operation ls")]
+    [CliCommandAlias("resource group deployment operation ls")]
     public class GetAzureResourceGroupDeploymentOperationCmdlet : ResourceManagerCmdletBase
     {
         /// <summary>

src/CLU/Commands.ResourceManager.Cmdlets/Implementation/InvokeAzureResourceActionCmdlet.cs

@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// </summary>
     [Cmdlet(VerbsLifecycle.Invoke, "AzureRmResourceAction", SupportsShouldProcess = true, DefaultParameterSetName = ResourceManipulationCmdletBase.ResourceIdParameterSet), 
         OutputType(typeof(PSResourceObject))]
-    [CliCommandAlias("resourcemanager resource action invoke")]
+    [CliCommandAlias("resource action invoke")]
     public sealed class InvokAzureResourceActionCmdlet : ResourceManipulationCmdletBase
     {
         /// <summary>

src/CLU/Commands.ResourceManager.Cmdlets/Implementation/Lock/GetAzureResourceLockCmdlet.cs

@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Gets the resource lock.
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "AzureRmResourceLock"), OutputType(typeof(ResourceLock<JToken>))]
-    [CliCommandAlias("resourcemanager resource lock ls")]
+    [CliCommandAlias("resource lock ls")]
     public class GetAzureResourceLockCmdlet : ResourceLockManagementCmdletBase
     {
         /// <summary>

src/CLU/Commands.ResourceManager.Cmdlets/Implementation/Lock/NewAzureResourceLockCmdlet.cs

@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// </summary>
     [Cmdlet(VerbsCommon.New, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.SubscriptionResourceLevelLock), 
         OutputType(typeof(ResourceLock<JToken>))]
-    [CliCommandAlias("resourcemanager resource lock create")]
+    [CliCommandAlias("resource lock create")]
     public class NewAzureResourceLockCmdlet : ResourceLockManagementCmdletBase
     {
         /// <summary>