merge + rename test usages to new forms

Author: BurtBiel

examples/compute-management/02-VirtualMachineCreation.sh

@@ -9,7 +9,7 @@ printf "\n2. Creating a new storage account '%s' in type '%s'.\n" "$storageAccou
 az storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
 
 printf "\n3. Create virtual network.\n"
-result=`az network vnet new --resourcegroupname "$groupName" --name test --location "$location" --addressprefix "[\"10.0.0.0/16\"]" --subnet "[{\"Name\":\"test\",\"AddressPrefix\":\"10.0.0.0/24\"}]" --force`
+result=`az vnet new --resourcegroupname "$groupName" --name test --location "$location" --addressprefix "[\"10.0.0.0/16\"]" --subnet "[{\"Name\":\"test\",\"AddressPrefix\":\"10.0.0.0/24\"}]" --force`
 
 contextResult=`az context ls`
 
@@ -19,7 +19,7 @@ subnetId="/subscriptions/$subId/resourceGroups/$groupName/providers/Microsoft.Ne
 
 printf "\n4. Create network interface with:\r\nsubId='%s' \r\n& \r\nsubnetId='$subnetId'.\n" "$subId"
 export MSYS_NO_PATHCONV=1
-az network interface new --name test --resourcegroupname "$groupName" --location "$location" --subnetid "$subnetId"
+az networkinterface new --name test --resourcegroupname "$groupName" --location "$location" --subnetid "$subnetId"
 export MSYS_NO_PATHCONV=
 
 nicId="/subscriptions/$subId/resourceGroups/$groupName/providers/Microsoft.Network/networkInterfaces/test"

examples/resource-management/04-RoleAssignments.sh

@@ -10,18 +10,18 @@ export MSYS_NO_PATHCONV=1
 users=$(az activedirectory users ls)
 userId=$(echo $users | cat | jq '.[0].Id' -s --raw-output)
 echo "UserID: $userId"
-roleDefinitions=$(az security role definition ls)
+roleDefinitions=$(az networksecurityrole 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 security role assignment create --ObjectId "$userId" --RoleDefinitionId "$roleDefinitionId" --Scope "$scope"
+az networksecurityrole assignment create --ObjectId "$userId" --RoleDefinitionId "$roleDefinitionId" --Scope "$scope"
 
 printf "\n3. Delete last created Role Assignment.\n"
-assignments=$(az security role assignment ls)
+assignments=$(az networksecurityrole assignment ls)
 assignmentId=$(echo $assignments | cat | jq '.[-1:][0].ObjectId' -s --raw-output)
 echo "Deleting assignment: $assignmentId"
-az security role assignment rm --ObjectId "$assignmentId" --Scope "$scope" --RoleDefinitionId "$roleDefinitionId" -f
+az networksecurityrole assignment rm --ObjectId "$assignmentId" --Scope "$scope" --RoleDefinitionId "$roleDefinitionId" -f
 export MSYS_NO_PATHCONV=

examples/resource-management/05-RoleDefinitions.sh

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

examples/webapp-management/02-WebAppSlot.sh

@@ -24,31 +24,31 @@ printf "\n1. Create a new app service plan %s " "$planName1"
 az appservice plan create -n "$planName1" -g "$groupName" -l "$location" --tier "$tier1"
 
 printf "\n2. Create a new web app %s " "$appName1"
-webappInfo1=`az webapp create -g "$groupName" -n "$appName1" -l "$location" --plan "$planName1"`
+webappInfo1=`az appservice create -g "$groupName" -n "$appName1" -l "$location" --plan "$planName1"`
 
 printf "\nValidating web app name %s " "$appName1"
 [ $(echo $webappInfo1 | jq '.name' --raw-output) == "$appName1" ]
 
 printf "\n3. Create a web app slot %s " "$slotname1"
-slot1=`az webapp slot create -g "$groupName" --plan "$planName1" -n "$appName1" --slot "$slotname1"`
+slot1=`az appservice slot create -g "$groupName" --plan "$planName1" -n "$appName1" --slot "$slotname1"`
 appWithSlotName1="$appName1/$slotname1"
 
 printf "\nValidating web app slot %s " "$slotname1"
 [ $(echo $slot1 | jq '.name' --raw-output) == "$appWithSlotName1" ]
 
 printf "\nValidating web app slot get for %s " "$slotname1"
-slot1=`az webapp slot ls -g "$groupName" -n "$appName1" --slot "$slotname1"`
+slot1=`az appservice slot ls -g "$groupName" -n "$appName1" --slot "$slotname1"`
 [ $(echo $slot1 | jq '.name' --raw-output) == "$appWithSlotName1" ]
 
 printf "\nValidating web app slot via pipline obj for %s " "$slotname1"
-slot1=`echo "$webappInfo1" | az webapp slot ls --slot "$slotname1"`
+slot1=`echo "$webappInfo1" | az appservice slot ls --slot "$slotname1"`
 
 printf "\n4. Create another web app slot %s " "$slotname2"
-slot2=`az webapp slot create -g "$groupName" --plan "$planName1" -n "$appName1" --slot "$slotname2"`
+slot2=`az appservice slot create -g "$groupName" --plan "$planName1" -n "$appName1" --slot "$slotname2"`
 appWithSlotName2="$appName1/$slotname2"
 
 printf "\n5. Get the webapp slots:"
-slots=`az webapp slot ls -g "$groupName" -n "$appName1"`
+slots=`az appservice slot ls -g "$groupName" -n "$appName1"`
 slotN1=`echo $slots | jq '.[0].name'`
 slotN2=`echo $slots | jq '.[1].name'`
 slotNames=`echo $slotN1 $slotN2`
@@ -59,8 +59,8 @@ printf "\nValidating web app slots %s " "$slotname1 and $slotname2"
 
 printf "\n6. Change web app slot %s service plan" "$slotname2"
 servicePlanInfo2=`az app service plan create -n "$planName2" -g "$groupName" -l "$location" --tier "$tier2"`
-# slot3=`az webapp slot create -g "$groupName" --plan "$planName3" -n "$appName" --slot "$slotname2"`
-slot1=`az webapp slot set -g "$groupName" -n "$appName1" --slot "$slotname1" --plan "$planName2"`
+# slot3=`az appservice slot create -g "$groupName" --plan "$planName3" -n "$appName" --slot "$slotname2"`
+slot1=`az appservice slot set -g "$groupName" -n "$appName1" --slot "$slotname1" --plan "$planName2"`
 
 printf "\nValidating web app slots %s " "$slotname1"
 [ $(echo $slot1 | jq '.name' --raw-output) == "$appName1/$slotname1" ]
@@ -72,16 +72,16 @@ printf "\n7. Set web app slot %s config properties"
 printf "\n8. Set web app slot settings and connection strings"
 appsettings="{\"setting1\":\"valueA\",\"setting2\":\"valueB\"}"
 connectionstrings="{ \"connstring1\": { \"Type\": \"MySql\", \"Value\": \"string value 1\" }, \"connstring2\": { \"Type\": \"SqlAzure\", \"Value\": \"string value 2\" } }"
-slot1=`az webapp slot set -g "$groupName" --plan "$planName1" -n "$appName1" --slot "$slotname1" --connectionstrings "$connectionstrings" --appsettings "$appsettings"`
+slot1=`az appservice slot set -g "$groupName" --plan "$planName1" -n "$appName1" --slot "$slotname1" --connectionstrings "$connectionstrings" --appsettings "$appsettings"`
 
 printf "\n9. Get web app slot %s publishing profile" "$slotname1"
 outputFile1="webappslot-profile-1"
 outputFile2="webappslot-profile-2"
-az webapp slot profile get -g "$groupName" -n "$appName1" --slot "$slotname1" --outputfile "$outputFile1"
+az appservice slot profile get -g "$groupName" -n "$appName1" --slot "$slotname1" --outputfile "$outputFile1"
 
 printf "\n10. Get web app slot %s publishing profile via pipline obj" "$slotname1"
 # Unable to test pipline. verity property name and value instead. 
-# echo "$slot1" | az webapp slot profile get --outputfile "$outputFile2"
+# echo "$slot1" | az appservice slot profile get --outputfile "$outputFile2"
 
 printf "\nValidating web app slot profile output file" 
 [ -s "$outputFile1" ]
@@ -96,39 +96,39 @@ done
 endTime=`date +"%A, %B %d, %Y %X"`
 startTime=`date +"%A, %B %d, %Y %X" --date "3 hour ago"`
 metricsNames="[\"CPU\",\"Request\"]"
-metrics=`az webapp slot metrics ls -g "$groupName" -n "$appName1" --slot "$slotname1" --granularity PT1M --starttime "$startTime" --endtime "$endTime" --metrics "$metricsNames"`
+metrics=`az appservice slot metrics ls -g "$groupName" -n "$appName1" --slot "$slotname1" --granularity PT1M --starttime "$startTime" --endtime "$endTime" --metrics "$metricsNames"`
 
 printf "\nValidating web app slot metrics via pipline obj %s " "$slotname1" 
 # Unable to test pipline. verity property name and value instead. 
-# echo "$slot1" | az webapp slot metrics get --metrics "$metricsNames" --starttime "$startTime" --endtime "$endTime" --granularity PT1M
+# echo "$slot1" | az appservice slot metrics get --metrics "$metricsNames" --starttime "$startTime" --endtime "$endTime" --granularity PT1M
 
 printf "\n12. Stop web app slot: %s." "$slotname1"
-slot1=`echo "$slot1" | az webapp slot stop`
+slot1=`echo "$slot1" | az appservice slot stop`
 printf "\nValidating web app slot %s stopped " "$slotname1" 
 [ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Stopped" ]
 
 printf "\n13 Stop web app slot: %s." "$slotname1"
-slot1=`echo "$slot1" | az webapp slot start`
+slot1=`echo "$slot1" | az appservice slot start`
 printf "\nValidating web app slot %s running " "$slotname1" 
 [ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Running" ]
 
 printf "\n14 Stop web app slot: %s." "$slotname1"
-slot1=`echo "$slot1" | az webapp slot stop`
+slot1=`echo "$slot1" | az appservice slot stop`
 printf "\nValidating web app slot %s stopped " "$slotname1" 
 [ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Stopped" ]
 
 printf "\n15 Stop web app slot: %s." "$slotname1"
-slot1=`echo "$slot1" | az webapp slot start`
+slot1=`echo "$slot1" | az appservice slot start`
 printf "\nValidating web app slot %s running " "$slotname1" 
 [ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Running" ]
 
 printf "\n16 Restart web app slot: %s." "$slotname1"
-slot1=`az webapp slot restart -g "$groupName" -n "$appName1" --slot "$slotname1"`
+slot1=`az appservice slot restart -g "$groupName" -n "$appName1" --slot "$slotname1"`
 printf "\nValidating web app slot %s Running " "$slotname1" 
 [ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Running" ]
 
 printf "\n17 Restart web app slot: %s with pipline object." "$slotname1"
-slot1=`echo "$slot1" | az webapp slot restart`
+slot1=`echo "$slot1" | az appservice slot restart`
 printf "\nValidating web app slot %s Running " "$slotname1" 
 [ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Running" ]
 
@@ -137,35 +137,35 @@ printf "\n18. Create a new web app for clone testing"
 location1="eastus"
 
 az app service plan set -n "$planName1" -g "$groupName" --tier "$tier2"
-webappInfo2=`az webapp create -g "$groupName" -n "$appName3" -l "$location" --plan "$planName1"`
+webappInfo2=`az appservice create -g "$groupName" -n "$appName3" -l "$location" --plan "$planName1"`
 
 printf "\n19. Clone web app slot to a slot."
-slotClone=`az webapp slot create -g "$groupName" -n "$appName3" --slot "$slotname3" --sourcewebapp "$webappInfo2"`
+slotClone=`az appservice slot create -g "$groupName" -n "$appName3" --slot "$slotname3" --sourcewebapp "$webappInfo2"`
 appWithSlotNameClone="$appName3/$slotname3"
 
 printf "\nValidating cloned web app slot %s " "$slotname3"
 [ $(echo $slotClone | jq '.name' --raw-output) == "$appWithSlotNameClone" ]
 
 printf "\nValidating web app slot get for %s " "$slotname3"
-slotClone=`az webapp slot get -g "$groupName" -n "$appName3" --slot "$slotname3"`
+slotClone=`az appservice slot get -g "$groupName" -n "$appName3" --slot "$slotname3"`
 [ $(echo $slotClone | jq '.name' --raw-output) == "$appWithSlotNameClone" ]
 
 printf "\n20. Create a new web app for clone testing"
-slot2=`az webapp slot create -g "$groupName" --plan "$planName1" -n "$appName3" --slot "$slotname3"`
+slot2=`az appservice slot create -g "$groupName" --plan "$planName1" -n "$appName3" --slot "$slotname3"`
 
 printf "\n21. Create a new web app for clone testing"
 servicePlan=`az app service plan create -n "$planName3" -g "$groupName" -l "$location1" --tier "$tier2"`
-webappInfo3=`az webapp create -g "$groupName" -n "$appName4" -l "$location1" --plan "$planName3"`
-slot3=`az webapp slot create -g "$groupName" --plan "$planName3" -n "$appName4" --slot "$slotname3" --sourcewebapp "$slot2"`
+webappInfo3=`az appservice create -g "$groupName" -n "$appName4" -l "$location1" --plan "$planName3"`
+slot3=`az appservice slot create -g "$groupName" --plan "$planName3" -n "$appName4" --slot "$slotname3" --sourcewebapp "$slot2"`
 
 printf "\nValidating web app slot get for %s " "$slotname3" 
 appWithSlotName3="$appName4/$slotname3"
 [ $(echo $slot3 | jq '.name' --raw-output) == "$appWithSlotName3" ]
 
 # Cleanup
 printf "\n22. Remove web app slot: %s." "$slotname1"
-az webapp slot rm -g "$groupName" -n "$appName1" --slot "$slotname1" --force
-az webapp slot rm -g "$groupName" -n "$appName1" --slot "$slotname2" --force
+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 group rm --name "$groupName" --force