diff --git a/src/command_modules/azure-cli-maps/HISTORY.rst b/src/command_modules/azure-cli-maps/HISTORY.rst index 4ce7d393cd6..232b389fe54 100644 --- a/src/command_modules/azure-cli-maps/HISTORY.rst +++ b/src/command_modules/azure-cli-maps/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +0.3.3 ++++++ +* Add support for the S1 SKU: `maps account create | update`: now supports `S1` as a valid value for the `--sku | -s` parameter. + 0.3.2 +++++ * Minor fixes diff --git a/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/_params.py b/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/_params.py index e8be429a257..36e4702a2b7 100644 --- a/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/_params.py +++ b/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/_params.py @@ -34,7 +34,7 @@ def load_arguments(self, _): c.argument('sku_name', options_list=['--sku', '-s'], help='The name of the SKU.', - arg_type=get_enum_type(['S0'])) + arg_type=get_enum_type(['S0', 'S1'])) c.argument('tags', arg_type=tags_type) diff --git a/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/tests/latest/recordings/test_create_maps_account.yaml b/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/tests/latest/recordings/test_create_maps_account.yaml index 5f823dd1c8c..408bb682326 100644 --- a/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/tests/latest/recordings/test_create_maps_account.yaml +++ b/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/tests/latest/recordings/test_create_maps_account.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-06-12T18:20:47Z"}}' + "date": "2018-12-07T00:54:59Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -9,19 +9,19 @@ interactions: Connection: [keep-alive] Content-Length: ['110'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 resourcemanagementclient/1.2.1 Azure-SDK-For-Python - AZURECLI/2.0.37] + ParameterSetName: [--location --name --tag] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-06-12T18:20:47Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-12-07T00:54:59Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:20:48 GMT'] + date: ['Fri, 07 Dec 2018 00:55:01 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -30,7 +30,7 @@ interactions: status: {code: 201, message: Created} - request: body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation", - "date": "2018-06-12T18:20:48Z"}}' + "date": "2018-12-07T00:55:01Z"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -38,19 +38,19 @@ interactions: Connection: [keep-alive] Content-Length: ['110'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 resourcemanagementclient/1.2.1 Azure-SDK-For-Python - AZURECLI/2.0.37] + ParameterSetName: [--location --name --tag] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000002?api-version=2018-05-01 response: - body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002","name":"clitest.rg000002","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-06-12T18:20:48Z"},"properties":{"provisioningState":"Succeeded"}}'} + body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002","name":"clitest.rg000002","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-12-07T00:55:01Z"},"properties":{"provisioningState":"Succeeded"}}'} headers: cache-control: [no-cache] content-length: ['384'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:20:48 GMT'] + date: ['Fri, 07 Dec 2018 00:55:02 GMT'] expires: ['-1'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] @@ -66,21 +66,23 @@ interactions: Connection: [keep-alive] Content-Length: ['45'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g --sku --accept-tos] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"S0\",\r\ - \n \"tier\": \"Standard\"\r\n }\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s0\",\r\n \"tier\": + \"Standard\"\r\n },\r\n \"properties\": {\r\n \"x-ms-client-id\": \"af5f6549-78e4-4359-b7dc-b5ef7f922cd6\"\r\n + \ }\r\n}"} headers: cache-control: [no-cache] - content-length: ['372'] + content-length: ['459'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:20:53 GMT'] + date: ['Fri, 07 Dec 2018 00:55:06 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -97,21 +99,23 @@ interactions: Connection: [keep-alive] Content-Length: ['45'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g --sku --accept-tos] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"S0\",\r\ - \n \"tier\": \"Standard\"\r\n }\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s0\",\r\n \"tier\": + \"Standard\"\r\n },\r\n \"properties\": {\r\n \"x-ms-client-id\": \"af5f6549-78e4-4359-b7dc-b5ef7f922cd6\"\r\n + \ }\r\n}"} headers: cache-control: [no-cache] - content-length: ['372'] + content-length: ['459'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:20:54 GMT'] + date: ['Fri, 07 Dec 2018 00:55:09 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -119,8 +123,41 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] status: {code: 200, message: OK} +- request: + body: '{"location": "global", "sku": {"name": "S1"}}' + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [maps account create] + Connection: [keep-alive] + Content-Length: ['45'] + Content-Type: [application/json; charset=utf-8] + ParameterSetName: [-n -g --sku --accept-tos] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] + accept-language: [en-US] + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/clis1-000008?api-version=2018-05-01 + response: + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/clis1-000008\",\r\n + \ \"name\": \"clis1-000008\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s1\",\r\n \"tier\": + \"Standard\"\r\n },\r\n \"properties\": {\r\n \"x-ms-client-id\": \"4cf75485-8744-4270-bde7-86315e7d2a40\"\r\n + \ }\r\n}"} + headers: + cache-control: [no-cache] + content-length: ['459'] + content-type: [application/json; charset=utf-8] + date: ['Fri, 07 Dec 2018 00:55:12 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] + status: {code: 201, message: Created} - request: body: null headers: @@ -129,21 +166,23 @@ interactions: CommandName: [maps account update] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g --sku --tags] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"S0\",\r\ - \n \"tier\": \"Standard\"\r\n }\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s0\",\r\n \"tier\": + \"Standard\"\r\n },\r\n \"properties\": {\r\n \"x-ms-client-id\": \"af5f6549-78e4-4359-b7dc-b5ef7f922cd6\"\r\n + \ }\r\n}"} headers: cache-control: [no-cache] - content-length: ['372'] + content-length: ['459'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:20:54 GMT'] + date: ['Fri, 07 Dec 2018 00:55:13 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -154,7 +193,7 @@ interactions: status: {code: 200, message: OK} - request: body: 'b''b\''{"location": "global", "tags": {"key-000003": "val-000004"}, "sku": - {"name": "S0"}}\''''' + {"name": "S1"}}\''''' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] @@ -162,22 +201,24 @@ interactions: Connection: [keep-alive] Content-Length: ['83'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g --sku --tags] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\": \"\ - val-000004\"\r\n },\r\n \"sku\": {\r\n \"name\": \"S0\",\r\n \"tier\"\ - : \"Standard\"\r\n }\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\": \"val-000004\"\r\n + \ },\r\n \"sku\": {\r\n \"name\": \"s1\",\r\n \"tier\": \"Standard\"\r\n + \ },\r\n \"properties\": {\r\n \"x-ms-client-id\": \"af5f6549-78e4-4359-b7dc-b5ef7f922cd6\"\r\n + \ }\r\n}"} headers: cache-control: [no-cache] - content-length: ['423'] + content-length: ['510'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:20:56 GMT'] + date: ['Fri, 07 Dec 2018 00:55:16 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -195,22 +236,24 @@ interactions: CommandName: [maps account show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\": \"\ - val-000004\"\r\n },\r\n \"sku\": {\r\n \"name\": \"S0\",\r\n \"tier\"\ - : \"Standard\"\r\n }\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\": \"val-000004\"\r\n + \ },\r\n \"sku\": {\r\n \"name\": \"s1\",\r\n \"tier\": \"Standard\"\r\n + \ },\r\n \"properties\": {\r\n \"x-ms-client-id\": \"af5f6549-78e4-4359-b7dc-b5ef7f922cd6\"\r\n + \ }\r\n}"} headers: cache-control: [no-cache] - content-length: ['423'] + content-length: ['510'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:20:56 GMT'] + date: ['Fri, 07 Dec 2018 00:55:16 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -227,22 +270,24 @@ interactions: CommandName: [maps account show] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [--ids] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\": \"\ - val-000004\"\r\n },\r\n \"sku\": {\r\n \"name\": \"S0\",\r\n \"tier\"\ - : \"Standard\"\r\n }\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\": \"val-000004\"\r\n + \ },\r\n \"sku\": {\r\n \"name\": \"s1\",\r\n \"tier\": \"Standard\"\r\n + \ },\r\n \"properties\": {\r\n \"x-ms-client-id\": \"af5f6549-78e4-4359-b7dc-b5ef7f922cd6\"\r\n + \ }\r\n}"} headers: cache-control: [no-cache] - content-length: ['423'] + content-length: ['510'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:20:57 GMT'] + date: ['Fri, 07 Dec 2018 00:55:17 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -259,22 +304,25 @@ interactions: CommandName: [maps account list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts?api-version=2018-05-01 response: - body: {string: "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\"\ - : \"val-000004\"\r\n },\r\n \"sku\": {\r\n \"name\": \"S0\"\ - ,\r\n \"tier\": \"Standard\"\r\n }\r\n }\r\n ]\r\n}"} + body: {string: "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\": + \"val-000004\"\r\n },\r\n \"sku\": {\r\n \"name\": \"s1\",\r\n + \ \"tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n + \ \"x-ms-client-id\": \"af5f6549-78e4-4359-b7dc-b5ef7f922cd6\"\r\n }\r\n + \ }\r\n ]\r\n}"} headers: cache-control: [no-cache] - content-length: ['500'] + content-length: ['599'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:20:58 GMT'] + date: ['Fri, 07 Dec 2018 00:55:18 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -292,27 +340,29 @@ interactions: Connection: [keep-alive] Content-Length: ['45'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g --sku --accept-tos] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/cli-000006?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/cli-000006\"\ - ,\r\n \"name\": \"cli-000006\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"S0\",\r\ - \n \"tier\": \"Standard\"\r\n }\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/cli-000006\",\r\n + \ \"name\": \"cli-000006\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s0\",\r\n \"tier\": + \"Standard\"\r\n },\r\n \"properties\": {\r\n \"x-ms-client-id\": \"bc19bcb5-bbb9-4b0a-a821-cbc385753eb6\"\r\n + \ }\r\n}"} headers: cache-control: [no-cache] - content-length: ['372'] + content-length: ['459'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:00 GMT'] + date: ['Fri, 07 Dec 2018 00:55:22 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-writes: ['1197'] status: {code: 201, message: Created} - request: body: '{"location": "global", "sku": {"name": "S0"}}' @@ -323,21 +373,23 @@ interactions: Connection: [keep-alive] Content-Length: ['45'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g --sku --accept-tos] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000007?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000007\"\ - ,\r\n \"name\": \"cli-000007\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"S0\",\r\ - \n \"tier\": \"Standard\"\r\n }\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000007\",\r\n + \ \"name\": \"cli-000007\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s0\",\r\n \"tier\": + \"Standard\"\r\n },\r\n \"properties\": {\r\n \"x-ms-client-id\": \"34622355-5e2b-447d-a7fb-9a64791e94fe\"\r\n + \ }\r\n}"} headers: cache-control: [no-cache] - content-length: ['372'] + content-length: ['459'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:02 GMT'] + date: ['Fri, 07 Dec 2018 00:55:26 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -353,26 +405,30 @@ interactions: CommandName: [maps account list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts?api-version=2018-05-01 response: - body: {string: "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000007\"\ - ,\r\n \"name\": \"cli-000007\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"sku\": {\r\n \"name\"\ - : \"S0\",\r\n \"tier\": \"Standard\"\r\n }\r\n },\r\n {\r\ - \n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\"\ - : \"val-000004\"\r\n },\r\n \"sku\": {\r\n \"name\": \"S0\"\ - ,\r\n \"tier\": \"Standard\"\r\n }\r\n }\r\n ]\r\n}"} + body: {string: "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000007\",\r\n + \ \"name\": \"cli-000007\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s0\",\r\n + \ \"tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n + \ \"x-ms-client-id\": \"34622355-5e2b-447d-a7fb-9a64791e94fe\"\r\n }\r\n + \ },\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"name\": \"cli-000005\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"tags\": {\r\n \"key-000003\": + \"val-000004\"\r\n },\r\n \"sku\": {\r\n \"name\": \"s1\",\r\n + \ \"tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n + \ \"x-ms-client-id\": \"af5f6549-78e4-4359-b7dc-b5ef7f922cd6\"\r\n }\r\n + \ }\r\n ]\r\n}"} headers: cache-control: [no-cache] - content-length: ['915'] + content-length: ['1113'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:03 GMT'] + date: ['Fri, 07 Dec 2018 00:55:27 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -389,22 +445,29 @@ interactions: CommandName: [maps account list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts?api-version=2018-05-01 response: - body: {string: "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/cli-000006\"\ - ,\r\n \"name\": \"cli-000006\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"sku\": {\r\n \"name\"\ - : \"S0\",\r\n \"tier\": \"Standard\"\r\n }\r\n }\r\n ]\r\n\ - }"} + body: {string: "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/cli-000006\",\r\n + \ \"name\": \"cli-000006\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s0\",\r\n + \ \"tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n + \ \"x-ms-client-id\": \"bc19bcb5-bbb9-4b0a-a821-cbc385753eb6\"\r\n }\r\n + \ },\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/clis1-000008\",\r\n + \ \"name\": \"clis1-000008\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s1\",\r\n + \ \"tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n + \ \"x-ms-client-id\": \"4cf75485-8744-4270-bde7-86315e7d2a40\"\r\n }\r\n + \ }\r\n ]\r\n}"} headers: cache-control: [no-cache] - content-length: ['437'] + content-length: ['1050'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:04 GMT'] + date: ['Fri, 07 Dec 2018 00:55:29 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -422,22 +485,22 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005/listKeys?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"primaryKey\": \"2zi7dWxLN4d8GWAbe8adfTsFuocD5jrxy0ceV3gyH6k\",\r\n\ - \ \"secondaryKey\": \"8hHhx0iLBLj_8yF8P2nrySCUzfZC_vRGUd45qBfPaGk\",\r\n\ - \ \"primaryKeyLastUpdated\": \"2018-06-12T18:20:51.438263Z\",\r\n \"secondaryKeyLastUpdated\"\ - : \"2018-06-12T18:20:51.438263Z\"\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"primaryKey\": \"NyQIpRH3UDnB6bUyVUdwJuSPAY2wD-JWSDvStMbFn38\",\r\n \"secondaryKey\": + \"4feDJhbVvDp0UeR0GoqQ-0U_Wm1BLe0KzqQ-dUERzaE\",\r\n \"primaryKeyLastUpdated\": + \"2018-12-07T00:55:04.7893011Z\",\r\n \"secondaryKeyLastUpdated\": \"2018-12-07T00:55:04.7893011Z\"\r\n}"} headers: cache-control: [no-cache] - content-length: ['463'] + content-length: ['465'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:04 GMT'] + date: ['Fri, 07 Dec 2018 00:55:30 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -445,7 +508,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-writes: ['1196'] status: {code: 200, message: OK} - request: body: '{"keyType": "primary"}' @@ -456,22 +519,22 @@ interactions: Connection: [keep-alive] Content-Length: ['22'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g --key] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005/regenerateKey?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"primaryKey\": \"O-KLUjZA9g-1fIjj0hhssFQ-ouOBmMOQk2lQdZifJ60\",\r\n\ - \ \"secondaryKey\": \"8hHhx0iLBLj_8yF8P2nrySCUzfZC_vRGUd45qBfPaGk\",\r\n\ - \ \"primaryKeyLastUpdated\": \"2018-06-12T18:21:06.1159049Z\",\r\n \"secondaryKeyLastUpdated\"\ - : \"2018-06-12T18:20:51.438263Z\"\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"primaryKey\": \"d-9IJarL84hcM-qO6hRhx7gim7N61FPbHFDgaHBKIKM\",\r\n \"secondaryKey\": + \"4feDJhbVvDp0UeR0GoqQ-0U_Wm1BLe0KzqQ-dUERzaE\",\r\n \"primaryKeyLastUpdated\": + \"2018-12-07T00:55:31.9296669Z\",\r\n \"secondaryKeyLastUpdated\": \"2018-12-07T00:55:04.7893011Z\"\r\n}"} headers: cache-control: [no-cache] - content-length: ['464'] + content-length: ['465'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:06 GMT'] + date: ['Fri, 07 Dec 2018 00:55:32 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -479,7 +542,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] status: {code: 200, message: OK} - request: body: '{"keyType": "secondary"}' @@ -490,22 +553,22 @@ interactions: Connection: [keep-alive] Content-Length: ['24'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g --key] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: POST uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005/regenerateKey?api-version=2018-05-01 response: - body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\"\ - ,\r\n \"primaryKey\": \"O-KLUjZA9g-1fIjj0hhssFQ-ouOBmMOQk2lQdZifJ60\",\r\n\ - \ \"secondaryKey\": \"X0trXCMjKtXRWoUlmXAgmdn2xWEXR9nJFN3aHoEjXsM\",\r\n\ - \ \"primaryKeyLastUpdated\": \"2018-06-12T18:21:06.1159049Z\",\r\n \"secondaryKeyLastUpdated\"\ - : \"2018-06-12T18:21:07.3591266Z\"\r\n}"} + body: {string: "{\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005\",\r\n + \ \"primaryKey\": \"d-9IJarL84hcM-qO6hRhx7gim7N61FPbHFDgaHBKIKM\",\r\n \"secondaryKey\": + \"rfXTnX9K75vdbbRDgkjgddzpij2YQFxrmEGFkYgYz_w\",\r\n \"primaryKeyLastUpdated\": + \"2018-12-07T00:55:31.9296669Z\",\r\n \"secondaryKeyLastUpdated\": \"2018-12-07T00:55:33.1836007Z\"\r\n}"} headers: cache-control: [no-cache] content-length: ['465'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:07 GMT'] + date: ['Fri, 07 Dec 2018 00:55:34 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -513,7 +576,7 @@ interactions: transfer-encoding: [chunked] vary: [Accept-Encoding] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-writes: ['1199'] + x-ms-ratelimit-remaining-subscription-writes: ['1198'] status: {code: 200, message: OK} - request: body: null @@ -524,8 +587,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000005?api-version=2018-05-01 @@ -534,13 +598,13 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 12 Jun 2018 18:21:22 GMT'] + date: ['Fri, 07 Dec 2018 00:55:36 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + x-ms-ratelimit-remaining-subscription-deletes: ['14998'] status: {code: 200, message: OK} - request: body: null @@ -550,22 +614,24 @@ interactions: CommandName: [maps account list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts?api-version=2018-05-01 response: - body: {string: "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000007\"\ - ,\r\n \"name\": \"cli-000007\",\r\n \"type\": \"Microsoft.Maps/accounts\"\ - ,\r\n \"location\": \"global\",\r\n \"sku\": {\r\n \"name\"\ - : \"S0\",\r\n \"tier\": \"Standard\"\r\n }\r\n }\r\n ]\r\n\ - }"} + body: {string: "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000007\",\r\n + \ \"name\": \"cli-000007\",\r\n \"type\": \"Microsoft.Maps/accounts\",\r\n + \ \"location\": \"global\",\r\n \"sku\": {\r\n \"name\": \"s0\",\r\n + \ \"tier\": \"Standard\"\r\n },\r\n \"properties\": {\r\n + \ \"x-ms-client-id\": \"34622355-5e2b-447d-a7fb-9a64791e94fe\"\r\n }\r\n + \ }\r\n ]\r\n}"} headers: cache-control: [no-cache] - content-length: ['437'] + content-length: ['536'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:24 GMT'] + date: ['Fri, 07 Dec 2018 00:55:38 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -583,8 +649,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/cli-000006?api-version=2018-05-01 @@ -593,7 +660,7 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 12 Jun 2018 18:21:26 GMT'] + date: ['Fri, 07 Dec 2018 00:55:39 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -610,8 +677,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-n -g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts/cli-000007?api-version=2018-05-01 @@ -620,7 +688,35 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 12 Jun 2018 18:21:27 GMT'] + date: ['Fri, 07 Dec 2018 00:55:42 GMT'] + expires: ['-1'] + pragma: [no-cache] + server: [Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + x-content-type-options: [nosniff] + x-ms-ratelimit-remaining-subscription-deletes: ['14997'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + CommandName: [maps account delete] + Connection: [keep-alive] + Content-Length: ['0'] + Content-Type: [application/json; charset=utf-8] + ParameterSetName: [-n -g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] + accept-language: [en-US] + method: DELETE + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts/clis1-000008?api-version=2018-05-01 + response: + body: {string: ''} + headers: + cache-control: [no-cache] + content-length: ['0'] + date: ['Fri, 07 Dec 2018 00:55:44 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -636,8 +732,9 @@ interactions: CommandName: [maps account list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Maps/accounts?api-version=2018-05-01 @@ -647,7 +744,7 @@ interactions: cache-control: [no-cache] content-length: ['19'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:28 GMT'] + date: ['Fri, 07 Dec 2018 00:55:46 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -664,8 +761,9 @@ interactions: CommandName: [maps account list] Connection: [keep-alive] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.37] + ParameterSetName: [-g] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + azure-mgmt-maps/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002/providers/Microsoft.Maps/accounts?api-version=2018-05-01 @@ -675,7 +773,7 @@ interactions: cache-control: [no-cache] content-length: ['19'] content-type: [application/json; charset=utf-8] - date: ['Tue, 12 Jun 2018 18:21:29 GMT'] + date: ['Fri, 07 Dec 2018 00:55:47 GMT'] expires: ['-1'] pragma: [no-cache] server: [Microsoft-HTTPAPI/2.0] @@ -693,9 +791,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 resourcemanagementclient/1.2.1 Azure-SDK-For-Python - AZURECLI/2.0.37] + ParameterSetName: [--name --yes --no-wait] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000002?api-version=2018-05-01 @@ -704,9 +802,9 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 12 Jun 2018 18:21:30 GMT'] + date: ['Fri, 07 Dec 2018 00:55:47 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdWRUZLV0RXQ1FSRlBNSklNUDUzNkFNRkoyUTRBQjJJTkFSVXwyMEU5MkY3OTI1MTJFRDFDLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdGTkg1WjJaMldRTDdRV1pZVEZITFRFQkxaSEUyUTNOUzY0NnxEQTVDQ0RGMDIwNjFBQ0U0LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] @@ -721,9 +819,9 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.29 - msrest_azure/0.4.29 resourcemanagementclient/1.2.1 Azure-SDK-For-Python - AZURECLI/2.0.37] + ParameterSetName: [--name --yes --no-wait] + User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.2 msrest_azure/0.4.34 + resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.52] accept-language: [en-US] method: DELETE uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01 @@ -732,12 +830,12 @@ interactions: headers: cache-control: [no-cache] content-length: ['0'] - date: ['Tue, 12 Jun 2018 18:21:30 GMT'] + date: ['Fri, 07 Dec 2018 00:55:49 GMT'] expires: ['-1'] - location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdKN0pMSkxWNks1S1hBMlgzTDNYRVA0NVM0SkZVNjYzWkFTRXwyNUExNDJGQzVBNzI3RDcxLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] + location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkc1Q1g2QlY3MjdLRVA3NlpJTTM0SjVKNEpYTzJGSFVIR1JQM3xGRDVBNzA3NzM1OTNEREM4LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01'] pragma: [no-cache] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] - x-ms-ratelimit-remaining-subscription-deletes: ['14999'] + x-ms-ratelimit-remaining-subscription-deletes: ['14998'] status: {code: 202, message: Accepted} version: 1 diff --git a/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/tests/latest/test_maps_commands.py b/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/tests/latest/test_maps_commands.py index 71e63ecbeb4..b9cf0667483 100644 --- a/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/tests/latest/test_maps_commands.py +++ b/src/command_modules/azure-cli-maps/azure/cli/command_modules/maps/tests/latest/test_maps_commands.py @@ -21,7 +21,9 @@ def test_create_maps_account(self, resource_group): 'name': self.create_random_name(prefix='cli-', length=20), 'name1': self.create_random_name(prefix='cli-', length=20), 'name2': self.create_random_name(prefix='cli-', length=20), - 'sku': 'S0', + 'name3': self.create_random_name(prefix='clis1-', length=20), + 'sku': 's0', + 'skus1': 's1', 'tags': tag_key + '=' + tag_value, 'key_type_primary': KeyType.primary.value, 'key_type_secondary': KeyType.secondary.value @@ -42,14 +44,23 @@ def test_create_maps_account(self, resource_group): 'az maps account create -n {name} -g {rg} --sku {sku} --accept-tos').get_output_in_json() self.assertEqual(account, account_duplicated) + self.cmd('az maps account create -n {name3} -g {rg1} --sku {skus1} --accept-tos', + checks=[ + self.check('name', '{name3}'), + self.check('resourceGroup', '{rg1}'), + self.check('sku.name', '{skus1}'), + self.check('tags', None) + ]).get_output_in_json() + # Test 'az maps account update' # Test to add a new tag to an existing account. - self.cmd('az maps account update -n {name} -g {rg} --sku {sku} --tags {tags}', + # Test to upgrade tier to `S1` + self.cmd('az maps account update -n {name} -g {rg} --sku {skus1} --tags {tags}', checks=[ self.check('id', account['id']), self.check('name', '{name}'), self.check('resourceGroup', '{rg}'), - self.check('sku.name', '{sku}'), + self.check('sku.name', '{skus1}'), self.check('tags', {tag_key: tag_value}) ]) @@ -59,14 +70,14 @@ def test_create_maps_account(self, resource_group): self.check('id', account['id']), self.check('name', '{name}'), self.check('resourceGroup', '{rg}'), - self.check('sku.name', '{sku}') + self.check('sku.name', '{skus1}') ]) # Search by id self.cmd('az maps account show --ids ' + account['id'], checks=[ self.check('id', account['id']), self.check('name', '{name}'), self.check('resourceGroup', '{rg}'), - self.check('sku.name', '{sku}'), + self.check('sku.name', '{skus1}'), self.check('tags', {tag_key: tag_value}) ]) @@ -78,13 +89,15 @@ def test_create_maps_account(self, resource_group): self.check('[0].id', account['id']), self.check('[0].name', '{name}'), self.check('[0].resourceGroup', '{rg}'), - self.check('[0].sku.name', '{sku}'), + self.check('[0].sku.name', '{skus1}'), self.check('[0].tags', {tag_key: tag_value}) ]) # Create two new accounts (One in separate resource group). - self.cmd('az maps account create -n {name1} -g {rg1} --sku {sku} --accept-tos') - self.cmd('az maps account create -n {name2} -g {rg} --sku {sku} --accept-tos') + self.cmd( + 'az maps account create -n {name1} -g {rg1} --sku {sku} --accept-tos') + self.cmd( + 'az maps account create -n {name2} -g {rg} --sku {sku} --accept-tos') # Check that list command now shows two accounts in one resource group, and one in another. self.cmd('az maps account list -g {rg}', checks=[ self.check('length(@)', 2), @@ -96,13 +109,14 @@ def test_create_maps_account(self, resource_group): self.check("length([?resourceGroup == '{rg1}'])", 0) ]) self.cmd('az maps account list -g {rg1}', checks=[ - self.check('length(@)', 1), + self.check('length(@)', 2), self.check('type(@)', 'array'), self.check("length([?name == '{name}'])", 0), self.check("length([?name == '{name1}'])", 1), self.check("length([?name == '{name2}'])", 0), + self.check("length([?name == '{name3}'])", 1), self.check("length([?resourceGroup == '{rg}'])", 0), - self.check("length([?resourceGroup == '{rg1}'])", 1) + self.check("length([?resourceGroup == '{rg1}'])", 2) ]) # Test 'az maps account key list'. @@ -140,15 +154,19 @@ def test_create_maps_account(self, resource_group): # Test 'az maps account delete'. # Test to remove a Maps account. - self.cmd('az maps account delete -n {name} -g {rg}', checks=self.is_empty()) + self.cmd( + 'az maps account delete -n {name} -g {rg}', checks=self.is_empty()) self.cmd('az maps account list -g {rg}', checks=[ self.check('length(@)', 1), self.check("length([?name == '{name}'])", 0) ]) # Remove the rest of Maps accounts. - exit_code = self.cmd('az maps account delete -n {name1} -g {rg1}').exit_code + exit_code = self.cmd( + 'az maps account delete -n {name1} -g {rg1}').exit_code self.assertEqual(exit_code, 0) self.cmd('az maps account delete -n {name2} -g {rg}') + self.cmd('az maps account delete -n {name3} -g {rg1}') + self.cmd('az maps account list -g {rg}', checks=self.is_empty()) self.cmd('az maps account list -g {rg1}', checks=self.is_empty()) diff --git a/src/command_modules/azure-cli-maps/setup.py b/src/command_modules/azure-cli-maps/setup.py index e409bd2ca3c..3b3f6769856 100644 --- a/src/command_modules/azure-cli-maps/setup.py +++ b/src/command_modules/azure-cli-maps/setup.py @@ -13,7 +13,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.3.2" +VERSION = "0.3.3" # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers