{ARM} Fix some test issues for live test

src/azure-cli/azure/cli/command_modules/resource/tests/latest/management_group_level_parameters.json

@@ -3,7 +3,7 @@
   "contentVersion": "1.0.0.0",
   "parameters": {
     "nestedsubId": {
-      "value": "a1bfa635-f2bf-42f1-86b5-848c674fc321az"
+      "value": "0b1f6471-1bf0-4dda-aec3-cb9272f09590"
     }
   }
 }

src/azure-cli/azure/cli/command_modules/resource/tests/latest/recordings/test_tenant_level_what_if.yaml

@@ -15,8 +15,8 @@ interactions:
       ParameterSetName:
       - --name
       User-Agent:
-      - python/3.8.6 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
-        azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.16.0
+      - python/3.8.0 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3
+        azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.21.0
       accept-language:
       - en-US
     method: POST
@@ -32,7 +32,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 16 Dec 2020 22:11:59 GMT
+      - Mon, 22 Mar 2021 06:20:04 GMT
       expires:
       - '-1'
       pragma:
@@ -46,7 +46,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-ms-ratelimit-remaining-subscription-writes:
-      - '1199'
+      - '1198'
     status:
       code: 200
       message: OK
@@ -64,8 +64,8 @@ interactions:
       ParameterSetName:
       - --name
       User-Agent:
-      - python/3.8.6 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
-        azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.16.0
+      - python/3.8.0 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3
+        azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.21.0
       accept-language:
       - en-US
     method: GET
@@ -81,7 +81,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 16 Dec 2020 22:12:09 GMT
+      - Mon, 22 Mar 2021 06:20:14 GMT
       expires:
       - '-1'
       pragma:
@@ -116,8 +116,8 @@ interactions:
       ParameterSetName:
       - --name
       User-Agent:
-      - python/3.8.6 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
-        azure-mgmt-managementgroups/0.2.0 Azure-SDK-For-Python AZURECLI/2.16.0
+      - python/3.8.0 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3
+        azure-mgmt-managementgroups/0.2.0 Azure-SDK-For-Python AZURECLI/2.21.0
       accept-language:
       - en-US
     method: PUT
@@ -133,19 +133,19 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 16 Dec 2020 22:12:10 GMT
+      - Mon, 22 Mar 2021 06:20:16 GMT
       expires:
       - '-1'
       location:
       - https://management.azure.com/providers/Microsoft.Management/operationResults/create/managementGroups/azure-cli-management-group000002?api-version=2018-03-01-preview
       pragma:
       - no-cache
       request-id:
-      - 4014dfcb-3a58-48eb-99b2-ec551d594da8
+      - 9689eb97-e52f-4f4c-83a2-32bfbe3d2d0e
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       x-ba-restapi:
-      - 1.0.3.1589
+      - 1.0.3.1608
       x-content-type-options:
       - nosniff
       x-ms-ratelimit-remaining-tenant-writes:
@@ -167,8 +167,8 @@ interactions:
       ParameterSetName:
       - --name
       User-Agent:
-      - python/3.8.6 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
-        azure-mgmt-managementgroups/0.2.0 Azure-SDK-For-Python AZURECLI/2.16.0
+      - python/3.8.0 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3
+        azure-mgmt-managementgroups/0.2.0 Azure-SDK-For-Python AZURECLI/2.21.0
     method: GET
     uri: https://management.azure.com/providers/Microsoft.Management/operationResults/create/managementGroups/azure-cli-management-group000002?api-version=2018-03-01-preview
   response:
@@ -182,19 +182,19 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 16 Dec 2020 22:12:20 GMT
+      - Mon, 22 Mar 2021 06:20:27 GMT
       expires:
       - '-1'
       location:
       - https://management.azure.com/providers/Microsoft.Management/operationResults/create/managementGroups/azure-cli-management-group000002?api-version=2018-03-01-preview
       pragma:
       - no-cache
       request-id:
-      - 27592d2b-b9cb-423a-9417-8d8cc3eae400
+      - 5e903c91-63e2-4f98-8f32-2b5cf097e72f
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       x-ba-restapi:
-      - 1.0.3.1589
+      - 1.0.3.1608
       x-content-type-options:
       - nosniff
     status:
@@ -214,8 +214,8 @@ interactions:
       ParameterSetName:
       - --name
       User-Agent:
-      - python/3.8.6 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
-        azure-mgmt-managementgroups/0.2.0 Azure-SDK-For-Python AZURECLI/2.16.0
+      - python/3.8.0 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3
+        azure-mgmt-managementgroups/0.2.0 Azure-SDK-For-Python AZURECLI/2.21.0
     method: GET
     uri: https://management.azure.com/providers/Microsoft.Management/operationResults/create/managementGroups/azure-cli-management-group000002?api-version=2018-03-01-preview
   response:
@@ -229,19 +229,19 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 16 Dec 2020 22:12:31 GMT
+      - Mon, 22 Mar 2021 06:20:37 GMT
       expires:
       - '-1'
       location:
       - https://management.azure.com/providers/Microsoft.Management/operationResults/create/managementGroups/azure-cli-management-group000002?api-version=2018-03-01-preview
       pragma:
       - no-cache
       request-id:
-      - a85de0a4-b245-47a7-838b-e331e588b5bc
+      - c7d39c70-59e0-49af-9b2c-c6683cc0acef
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       x-ba-restapi:
-      - 1.0.3.1589
+      - 1.0.3.1608
       x-content-type-options:
       - nosniff
     status:
@@ -261,37 +261,36 @@ interactions:
       ParameterSetName:
       - --name
       User-Agent:
-      - python/3.8.6 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
-        azure-mgmt-managementgroups/0.2.0 Azure-SDK-For-Python AZURECLI/2.16.0
+      - python/3.8.0 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3
+        azure-mgmt-managementgroups/0.2.0 Azure-SDK-For-Python AZURECLI/2.21.0
     method: GET
     uri: https://management.azure.com/providers/Microsoft.Management/operationResults/create/managementGroups/azure-cli-management-group000002?api-version=2018-03-01-preview
   response:
     body:
-      string: '{"id":"/providers/Microsoft.Management/managementGroups/azure-cli-management-group000002","type":"/providers/Microsoft.Management/managementGroups","name":"azure-cli-management-group000002","status":"Succeeded","properties":{"tenantId":"01a4073e-87c8-47cd-aafc-1439b4b5ea2c","displayName":"azure-cli-management-group000002","details":{"version":1,"updatedTime":"2020-12-16T22:12:20.1767976Z","updatedBy":"5310aa29-9a44-4cbc-adb3-6347a539537e","parent":{"id":"/providers/Microsoft.Management/managementGroups/01a4073e-87c8-47cd-aafc-1439b4b5ea2c","name":"01a4073e-87c8-47cd-aafc-1439b4b5ea2c","displayName":"Tenant
-        Root Group"}}}}'
+      string: '{"id":"/providers/Microsoft.Management/managementGroups/azure-cli-management-group000002","type":"/providers/Microsoft.Management/managementGroups","name":"azure-cli-management-group000002","status":"Succeeded","properties":{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","displayName":"azure-cli-management-group000002","details":{"version":1,"updatedTime":"2021-03-22T06:20:27.6539833Z","updatedBy":"9ac534f1-d577-4034-a32d-48de400dacbf","parent":{"id":"/providers/Microsoft.Management/managementGroups/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","name":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","displayName":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a"}}}}'
     headers:
       cache-control:
       - no-cache
       content-length:
-      - '653'
+      - '672'
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 16 Dec 2020 22:12:41 GMT
+      - Mon, 22 Mar 2021 06:20:50 GMT
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - c8168aae-bdb4-40ff-86db-bafb86833e8c
+      - 789baaa6-5ed6-43c2-97fe-9e1bc57e4363
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       vary:
       - Accept-Encoding,Accept-Encoding
       x-ba-restapi:
-      - 1.0.3.1589
+      - 1.0.3.1608
       x-content-type-options:
       - nosniff
     status:
@@ -305,10 +304,10 @@ interactions:
       \ \"contentVersion\": \"1.0.0.0\",\r\n  \"parameters\": {\r\n    \"targetMG\":
       {\r\n      \"type\": \"string\",\r\n      \"defaultValue\": \"cli_tenant_level_deployment_mg\"\r\n
       \   },\r\n    \"nestedSubId\": {\r\n      \"type\": \"string\",\r\n      \"defaultValue\":
-      \"6898adc8-5045-473d-a1bf-7012564f43cb\"\r\n    },\r\n    \"nestedRG\": {\r\n
+      \"0b1f6471-1bf0-4dda-aec3-cb9272f09590\"\r\n    },\r\n    \"nestedRG\": {\r\n
       \     \"type\": \"string\",\r\n      \"defaultValue\": \"cli_tenant_level_deployment\"\r\n
       \   },\r\n    \"roleDefinitionId\": {\r\n      \"type\": \"string\",\r\n      \"defaultValue\":
-      \"79d53de5-0a64-4f79-8c63-229ea4e90b45\"\r\n    }\r\n  },\r\n  \"variables\":
+      \"0cb07228-4614-4814-ac1a-c4e39793ce58\"\r\n    }\r\n  },\r\n  \"variables\":
       {\r\n    \"managementGroupScope\": \"[concat('Microsoft.Management/managementGroups/',
       parameters('targetMG'))]\",\r\n    \"managementGroupFullyQualifiedId\": \"[concat('/providers/',
       variables('managementGroupScope'))]\"\r\n  },\r\n  \"resources\": [\r\n    {\r\n
@@ -364,8 +363,8 @@ interactions:
       ParameterSetName:
       - --location --template-file --parameters --no-pretty-print
       User-Agent:
-      - python/3.8.6 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
-        azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.16.0
+      - python/3.8.0 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3
+        azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.21.0
       accept-language:
       - en-US
     method: POST
@@ -379,11 +378,11 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 16 Dec 2020 22:12:44 GMT
+      - Mon, 22 Mar 2021 06:20:53 GMT
       expires:
       - '-1'
       location:
-      - https://management.azure.com/providers/Microsoft.Resources/operationResults/eyJqb2JJZCI6IkRlcGxveW1lbnRXaGF0SWZKb2ItLVRFTkFOVDo1RkxFVkVMOjVGVEVNUExBVEUtNjNDOTE5OTM6MkREQUQzOjJENEEzNDoyREE4NDM6MkRFRTlDODZDMzc0QTciLCJqb2JMb2NhdGlvbiI6Ildlc3RVUyJ9?api-version=2020-10-01
+      - https://management.azure.com/providers/Microsoft.Resources/operationResults/eyJqb2JJZCI6IkRlcGxveW1lbnRXaGF0SWZKb2ItLVRFTkFOVDo1RkxFVkVMOjVGVEVNUExBVEUtNTkxRkVGMzA6MkQxODE3OjJENEQzMDoyRDgzNzk6MkQxRUJFQTQ2NEU3MTUiLCJqb2JMb2NhdGlvbiI6Ildlc3RVUyJ9?api-version=2020-10-01
       pragma:
       - no-cache
       strict-transport-security:
@@ -409,13 +408,13 @@ interactions:
       ParameterSetName:
       - --location --template-file --parameters --no-pretty-print
       User-Agent:
-      - python/3.8.6 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
-        azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.16.0
+      - python/3.8.0 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3
+        azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.21.0
     method: GET
-    uri: https://management.azure.com/providers/Microsoft.Resources/operationResults/eyJqb2JJZCI6IkRlcGxveW1lbnRXaGF0SWZKb2ItLVRFTkFOVDo1RkxFVkVMOjVGVEVNUExBVEUtNjNDOTE5OTM6MkREQUQzOjJENEEzNDoyREE4NDM6MkRFRTlDODZDMzc0QTciLCJqb2JMb2NhdGlvbiI6Ildlc3RVUyJ9?api-version=2020-10-01
+    uri: https://management.azure.com/providers/Microsoft.Resources/operationResults/eyJqb2JJZCI6IkRlcGxveW1lbnRXaGF0SWZKb2ItLVRFTkFOVDo1RkxFVkVMOjVGVEVNUExBVEUtNTkxRkVGMzA6MkQxODE3OjJENEQzMDoyRDgzNzk6MkQxRUJFQTQ2NEU3MTUiLCJqb2JMb2NhdGlvbiI6Ildlc3RVUyJ9?api-version=2020-10-01
   response:
     body:
-      string: '{"status":"Succeeded","properties":{"correlationId":"63c91993-dad3-4a34-a843-ee9c86c374a7","changes":[{"resourceId":"/providers/Microsoft.Authorization/roleDefinitions/79d53de5-0a64-4f79-8c63-229ea4e90b45","changeType":"Create","after":{"apiVersion":"2018-07-01","id":"/providers/Microsoft.Authorization/roleDefinitions/79d53de5-0a64-4f79-8c63-229ea4e90b45","name":"79d53de5-0a64-4f79-8c63-229ea4e90b45","properties":{"assignableScopes":["/providers/Microsoft.Management/managementGroups/azure-cli-management-group000002"],"description":"something","permissions":[{"actions":["Microsoft.Storage/*/read"]}],"roleName":"Tiano
+      string: '{"status":"Succeeded","properties":{"correlationId":"591fef30-1817-4d30-8379-1ebea464e715","changes":[{"resourceId":"/providers/Microsoft.Authorization/roleDefinitions/0cb07228-4614-4814-ac1a-c4e39793ce58","changeType":"Create","after":{"apiVersion":"2018-07-01","id":"/providers/Microsoft.Authorization/roleDefinitions/0cb07228-4614-4814-ac1a-c4e39793ce58","name":"0cb07228-4614-4814-ac1a-c4e39793ce58","properties":{"assignableScopes":["/providers/Microsoft.Management/managementGroups/azure-cli-management-group000002"],"description":"something","permissions":[{"actions":["Microsoft.Storage/*/read"]}],"roleName":"Tiano
         SDK Test Role","type":"CustomRole"},"type":"Microsoft.Authorization/roleDefinitions"}},{"resourceId":"/providers/Microsoft.Management/managementGroups/azure-cli-management-group000002/providers/Microsoft.Authorization/policyDefinitions/policy2","changeType":"Create","after":{"apiVersion":"2016-12-01","id":"/providers/Microsoft.Management/managementGroups/azure-cli-management-group000002/providers/Microsoft.Authorization/policyDefinitions/policy2","name":"policy2","properties":{"policyRule":{"if":{"equals":"northeurope","field":"location"},"then":{"effect":"deny"}},"policyType":"Custom"},"type":"Microsoft.Authorization/policyDefinitions"}},{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_tenant_level_deployment","changeType":"Create","after":{"apiVersion":"2019-07-01","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_tenant_level_deployment","location":"East
         US 2","name":"cli_tenant_level_deployment","type":"Microsoft.Resources/resourceGroups"}}]}}'
     headers:
@@ -426,7 +425,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Wed, 16 Dec 2020 22:12:59 GMT
+      - Mon, 22 Mar 2021 06:21:09 GMT
       expires:
       - '-1'
       pragma:

src/azure-cli/azure/cli/command_modules/resource/tests/latest/sample_policy_set.json

@@ -1 +1 @@
-[{"policyDefinitionId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/policyDefinitions/azure-cli-test-policy000002", "parameters": {"allowedLocations": {"value": ["australiaeast", "eastus", "japaneast", "westus"]}}}, {"policyDefinitionId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/policyDefinitions/azure-cli-test-data-policy000004"}]
+[{"policyDefinitionId": "/providers/Microsoft.Management/managementgroups/cli-test-mgmt-group000002/providers/Microsoft.Authorization/policyDefinitions/azure-cli-test-policy000003", "parameters": {"allowedLocations": {"value": ["australiaeast", "eastus", "japaneast", "westus"]}}}, {"policyDefinitionId": "/providers/Microsoft.Management/managementgroups/cli-test-mgmt-group000002/providers/Microsoft.Authorization/policyDefinitions/azure-cli-test-data-policy000005"}]

src/azure-cli/azure/cli/command_modules/resource/tests/latest/sample_policy_set_parameterized.json

@@ -1 +1 @@
-[{"policyDefinitionId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/policyDefinitions/azure-cli-test-policy000002", "parameters": {"allowedLocations": {"value": "[parameters('allowedLocations')]"}}}, {"policyDefinitionId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/policyDefinitions/azure-cli-test-data-policy000004"}]
+[{"policyDefinitionId": "/providers/Microsoft.Management/managementgroups/cli-test-mgmt-group000002/providers/Microsoft.Authorization/policyDefinitions/azure-cli-test-policy000003", "parameters": {"allowedLocations": {"value": "[parameters('allowedLocations')]"}}}, {"policyDefinitionId": "/providers/Microsoft.Management/managementgroups/cli-test-mgmt-group000002/providers/Microsoft.Authorization/policyDefinitions/azure-cli-test-data-policy000005"}]

src/azure-cli/azure/cli/command_modules/resource/tests/latest/tenant_level_template.json

@@ -8,7 +8,7 @@
     },
     "nestedSubId": {
       "type": "string",
-      "defaultValue": "6898adc8-5045-473d-a1bf-7012564f43cb"
+      "defaultValue": "0b1f6471-1bf0-4dda-aec3-cb9272f09590"
     },
     "nestedRG": {
       "type": "string",

src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource.py

@@ -1034,7 +1034,8 @@ def test_template_spec_export_error_handling(self, resource_group, resource_grou
             'template_spec_name': 'CLITestTemplateSpecExport',
             'output_folder': os.path.dirname(os.path.realpath(__file__)).replace('\\', '\\\\')
         })
-        with self.assertRaises(IncorrectUsageError) as err:
+        # Because exit_code is 1, so the exception caught should be an AssertionError
+        with self.assertRaises(AssertionError) as err:
             self.cmd('ts export -g {rg} --name {template_spec_name} --output-folder {output_folder}')
             self.assertTrue('Please specify the template spec version for export' in str(err.exception))
 
@@ -1187,6 +1188,8 @@ def test_subscription_level_deployment(self):
 
         self.cmd('deployment sub cancel -n {dn2}')
 
+        self.cmd('deployment sub wait -n {dn2} --custom "provisioningState==Canceled"')
+
         self.cmd('deployment sub show -n {dn2}', checks=[
             self.check('properties.provisioningState', 'Canceled')
         ])