diff --git a/src/azure-cli/azure/cli/command_modules/network/_params.py b/src/azure-cli/azure/cli/command_modules/network/_params.py index 45d97d41de8..b020dd0871c 100644 --- a/src/azure-cli/azure/cli/command_modules/network/_params.py +++ b/src/azure-cli/azure/cli/command_modules/network/_params.py @@ -105,6 +105,12 @@ def load_arguments(self, _): app_gateway_name_type = CLIArgumentType(help='Name of the application gateway.', options_list='--gateway-name', completer=get_resource_name_completion_list('Microsoft.Network/applicationGateways'), id_part='name') express_route_link_macsec_cipher_type = CLIArgumentType(get_enum_type(ExpressRouteLinkMacSecCipher)) express_route_link_admin_state_type = CLIArgumentType(get_enum_type(ExpressRouteLinkAdminState)) + zone_compatible_type = CLIArgumentType( + options_list=['--zone', '-z'], + nargs='+', + help='Space-separated list of availability zones into which to provision the resource.', + choices=['1', '2', '3'] + ) # region NetworkRoot with self.argument_context('network') as c: @@ -1670,7 +1676,8 @@ def load_arguments(self, _): c.argument('reverse_fqdn', help='Reverse FQDN (fully qualified domain name).') c.argument('dns_name', help='Globally unique DNS entry.') c.argument('idle_timeout', help='Idle timeout in minutes.') - c.argument('zone', zone_type, min_api='2017-06-01') + c.argument('zone', zone_type, min_api='2017-06-01', max_api='2020-07-01') + c.argument('zone', zone_compatible_type, min_api='2020-08-01') c.argument('ip_tags', nargs='+', min_api='2017-11-01', help="Space-separated list of IP tags in 'TYPE=VAL' format.", validator=validate_ip_tags) with self.argument_context('network public-ip create') as c: diff --git a/src/azure-cli/azure/cli/command_modules/network/_validators.py b/src/azure-cli/azure/cli/command_modules/network/_validators.py index eabd630e3bd..8e42d25f691 100644 --- a/src/azure-cli/azure/cli/command_modules/network/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/network/_validators.py @@ -1019,7 +1019,7 @@ def _inform_coming_breaking_change_for_public_ip(namespace): logger.warning('[Coming breaking change] In the coming release, the default behavior will be changed as follows' ' when sku is Standard and zone is not provided:' ' For zonal regions, you will get a zone-redundant IP indicated by zones:["1","2","3"];' - ' For non-zonal regions, you will get a non zone-redundant IP indicated by zones:[].') + ' For non-zonal regions, you will get a non zone-redundant IP indicated by zones:null.') def process_route_table_create_namespace(cmd, namespace): diff --git a/src/azure-cli/azure/cli/command_modules/network/tests/latest/recordings/test_network_ag_zone.yaml b/src/azure-cli/azure/cli/command_modules/network/tests/latest/recordings/test_network_ag_zone.yaml index 403e5734196..79861754496 100644 --- a/src/azure-cli/azure/cli/command_modules/network/tests/latest/recordings/test_network_ag_zone.yaml +++ b/src/azure-cli/azure/cli/command_modules/network/tests/latest/recordings/test_network_ag_zone.yaml @@ -14,14 +14,14 @@ interactions: - -g -n --sku -z User-Agent: - python/3.7.3 (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.19.0 + azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.19.1 accept-language: - en-US method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_ag_zone000001?api-version=2020-10-01 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001","name":"cli_test_ag_zone000001","type":"Microsoft.Resources/resourceGroups","location":"westus2","tags":{"product":"azurecli","cause":"automation","date":"2021-02-19T07:31:38Z"},"properties":{"provisioningState":"Succeeded"}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001","name":"cli_test_ag_zone000001","type":"Microsoft.Resources/resourceGroups","location":"westus2","tags":{"product":"azurecli","cause":"automation","date":"2021-02-23T08:22:37Z"},"properties":{"provisioningState":"Succeeded"}}' headers: cache-control: - no-cache @@ -30,7 +30,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:31:42 GMT + - Tue, 23 Feb 2021 08:22:40 GMT expires: - '-1' pragma: @@ -45,9 +45,9 @@ interactions: code: 200 message: OK - request: - body: '{"location": "westus2", "sku": {"name": "Standard"}, "zones": ["1"], "properties": - {"publicIPAllocationMethod": "Static", "publicIPAddressVersion": "IPv4", "idleTimeoutInMinutes": - 4}}' + body: '{"location": "westus2", "sku": {"name": "Standard"}, "zones": ["1", "3"], + "properties": {"publicIPAllocationMethod": "Static", "publicIPAddressVersion": + "IPv4", "idleTimeoutInMinutes": 4}}' headers: Accept: - application/json @@ -58,38 +58,39 @@ interactions: Connection: - keep-alive Content-Length: - - '183' + - '188' Content-Type: - application/json ParameterSetName: - -g -n --sku -z User-Agent: - - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) + - AZURECLI/2.19.1 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/publicIPAddresses/pubip1?api-version=2020-08-01 response: body: string: "{\r\n \"name\": \"pubip1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/publicIPAddresses/pubip1\",\r\n - \ \"etag\": \"W/\\\"b4be2340-9852-414b-9ed4-f20e3f11ebbb\\\"\",\r\n \"location\": - \"westus2\",\r\n \"zones\": [\r\n \"1\"\r\n ],\r\n \"properties\": {\r\n - \ \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": \"fc8f9a4d-0c15-4d96-a6fe-c9bae937c807\",\r\n - \ \"publicIPAddressVersion\": \"IPv4\",\r\n \"publicIPAllocationMethod\": - \"Static\",\r\n \"idleTimeoutInMinutes\": 4,\r\n \"ipTags\": []\r\n - \ },\r\n \"type\": \"Microsoft.Network/publicIPAddresses\",\r\n \"sku\": - {\r\n \"name\": \"Standard\",\r\n \"tier\": \"Regional\"\r\n }\r\n}" + \ \"etag\": \"W/\\\"4c2bd7dd-624b-4b8c-b5e4-394ea40bd507\\\"\",\r\n \"location\": + \"westus2\",\r\n \"zones\": [\r\n \"1\",\r\n \"3\",\r\n \"2\"\r\n + \ ],\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n + \ \"resourceGuid\": \"745bdd0a-6404-4be1-9db8-0c185aa2976a\",\r\n \"publicIPAddressVersion\": + \"IPv4\",\r\n \"publicIPAllocationMethod\": \"Static\",\r\n \"idleTimeoutInMinutes\": + 4,\r\n \"ipTags\": []\r\n },\r\n \"type\": \"Microsoft.Network/publicIPAddresses\",\r\n + \ \"sku\": {\r\n \"name\": \"Standard\",\r\n \"tier\": \"Regional\"\r\n + \ }\r\n}" headers: azure-asyncnotification: - Enabled azure-asyncoperation: - - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus2/operations/44c6a17b-6c14-41db-aadd-6439c16d6c60?api-version=2020-08-01 + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus2/operations/521fd6d5-a2d1-424e-932d-8839de34a885?api-version=2020-08-01 cache-control: - no-cache content-length: - - '717' + - '737' content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:31:47 GMT + - Tue, 23 Feb 2021 08:22:46 GMT expires: - '-1' pragma: @@ -102,9 +103,9 @@ interactions: x-content-type-options: - nosniff x-ms-arm-service-request-id: - - 7eabc980-b897-4507-aeed-82540b236520 + - 454fcce4-3fee-4222-be14-dfb6c212a01c x-ms-ratelimit-remaining-subscription-writes: - - '1197' + - '1199' status: code: 201 message: Created @@ -122,9 +123,9 @@ interactions: ParameterSetName: - -g -n --sku -z User-Agent: - - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) + - AZURECLI/2.19.1 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus2/operations/44c6a17b-6c14-41db-aadd-6439c16d6c60?api-version=2020-08-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus2/operations/521fd6d5-a2d1-424e-932d-8839de34a885?api-version=2020-08-01 response: body: string: "{\r\n \"status\": \"Succeeded\"\r\n}" @@ -136,7 +137,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:31:48 GMT + - Tue, 23 Feb 2021 08:22:47 GMT expires: - '-1' pragma: @@ -153,7 +154,7 @@ interactions: x-content-type-options: - nosniff x-ms-arm-service-request-id: - - 9c8ddc63-81c8-4d81-a215-bb9c6a117293 + - ab791a20-4180-458e-8fd8-e4a129e4f9e4 status: code: 200 message: OK @@ -171,31 +172,31 @@ interactions: ParameterSetName: - -g -n --sku -z User-Agent: - - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) + - AZURECLI/2.19.1 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/publicIPAddresses/pubip1?api-version=2020-08-01 response: body: string: "{\r\n \"name\": \"pubip1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/publicIPAddresses/pubip1\",\r\n - \ \"etag\": \"W/\\\"cb367d82-1de4-4255-8a46-e07f2aaf2b32\\\"\",\r\n \"location\": - \"westus2\",\r\n \"zones\": [\r\n \"1\"\r\n ],\r\n \"properties\": {\r\n - \ \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": \"fc8f9a4d-0c15-4d96-a6fe-c9bae937c807\",\r\n - \ \"ipAddress\": \"20.80.170.213\",\r\n \"publicIPAddressVersion\": \"IPv4\",\r\n - \ \"publicIPAllocationMethod\": \"Static\",\r\n \"idleTimeoutInMinutes\": - 4,\r\n \"ipTags\": []\r\n },\r\n \"type\": \"Microsoft.Network/publicIPAddresses\",\r\n - \ \"sku\": {\r\n \"name\": \"Standard\",\r\n \"tier\": \"Regional\"\r\n - \ }\r\n}" + \ \"etag\": \"W/\\\"ca114406-f7fc-4a2d-82c7-83fd9a6182c3\\\"\",\r\n \"location\": + \"westus2\",\r\n \"zones\": [\r\n \"1\",\r\n \"3\",\r\n \"2\"\r\n + \ ],\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n + \ \"resourceGuid\": \"745bdd0a-6404-4be1-9db8-0c185aa2976a\",\r\n \"ipAddress\": + \"52.143.79.184\",\r\n \"publicIPAddressVersion\": \"IPv4\",\r\n \"publicIPAllocationMethod\": + \"Static\",\r\n \"idleTimeoutInMinutes\": 4,\r\n \"ipTags\": []\r\n + \ },\r\n \"type\": \"Microsoft.Network/publicIPAddresses\",\r\n \"sku\": + {\r\n \"name\": \"Standard\",\r\n \"tier\": \"Regional\"\r\n }\r\n}" headers: cache-control: - no-cache content-length: - - '753' + - '773' content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:31:49 GMT + - Tue, 23 Feb 2021 08:22:47 GMT etag: - - W/"cb367d82-1de4-4255-8a46-e07f2aaf2b32" + - W/"ca114406-f7fc-4a2d-82c7-83fd9a6182c3" expires: - '-1' pragma: @@ -212,7 +213,7 @@ interactions: x-content-type-options: - nosniff x-ms-arm-service-request-id: - - dfe11614-61f4-4a3d-a818-3b9bb79ae72f + - d85045b7-71b2-4ea9-b9b1-6e14f9a8c2d6 status: code: 200 message: OK @@ -231,14 +232,14 @@ interactions: - -g -n --sku --min-capacity --max-capacity --zones --public-ip-address --no-wait User-Agent: - python/3.7.3 (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.19.0 + azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.19.1 accept-language: - en-US method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_ag_zone000001?api-version=2020-10-01 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001","name":"cli_test_ag_zone000001","type":"Microsoft.Resources/resourceGroups","location":"westus2","tags":{"product":"azurecli","cause":"automation","date":"2021-02-19T07:31:38Z"},"properties":{"provisioningState":"Succeeded"}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001","name":"cli_test_ag_zone000001","type":"Microsoft.Resources/resourceGroups","location":"westus2","tags":{"product":"azurecli","cause":"automation","date":"2021-02-23T08:22:37Z"},"properties":{"provisioningState":"Succeeded"}}' headers: cache-control: - no-cache @@ -247,7 +248,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:31:49 GMT + - Tue, 23 Feb 2021 08:22:48 GMT expires: - '-1' pragma: @@ -276,7 +277,7 @@ interactions: - -g -n --sku --min-capacity --max-capacity --zones --public-ip-address --no-wait User-Agent: - python/3.7.3 (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.19.0 + azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.19.1 accept-language: - en-US method: GET @@ -292,7 +293,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:31:50 GMT + - Tue, 23 Feb 2021 08:22:49 GMT expires: - '-1' pragma: @@ -321,23 +322,23 @@ interactions: - -g -n --sku --min-capacity --max-capacity --zones --public-ip-address --no-wait User-Agent: - python/3.7.3 (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.19.0 + azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.19.1 accept-language: - en-US method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resources?$filter=resourceGroup%20eq%20%27cli_test_ag_zone000001%27%20and%20name%20eq%20%27pubip1%27%20and%20resourceType%20eq%20%27Microsoft.Network%2FpublicIPAddresses%27&api-version=2020-10-01 response: body: - string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/publicIPAddresses/pubip1","name":"pubip1","type":"Microsoft.Network/publicIPAddresses","sku":{"name":"Standard","tier":"Regional"},"location":"westus2","zones":["1"]}]}' + string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/publicIPAddresses/pubip1","name":"pubip1","type":"Microsoft.Network/publicIPAddresses","sku":{"name":"Standard","tier":"Regional"},"location":"westus2","zones":["1","3","2"]}]}' headers: cache-control: - no-cache content-length: - - '356' + - '364' content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:31:50 GMT + - Tue, 23 Feb 2021 08:22:49 GMT expires: - '-1' pragma: @@ -378,8 +379,9 @@ interactions: "[concat(variables(''appGwID''), ''/backendAddressPools/appGatewayBackendPool'')]"}, "backendHttpSettings": {"id": "[concat(variables(''appGwID''), ''/backendHttpSettingsCollection/appGatewayBackendHttpSettings'')]"}}}], "privateLinkConfigurations": [], "autoscaleConfiguration": {"minCapacity": 2, - "maxCapacity": 4}}, "zones": ["1"]}], "outputs": {"applicationGateway": {"type": - "object", "value": "[reference(''ag1'')]"}}}, "parameters": {}, "mode": "Incremental"}}' + "maxCapacity": 4}}, "zones": ["1", "3"]}], "outputs": {"applicationGateway": + {"type": "object", "value": "[reference(''ag1'')]"}}}, "parameters": {}, "mode": + "Incremental"}}' headers: Accept: - application/json @@ -390,32 +392,32 @@ interactions: Connection: - keep-alive Content-Length: - - '2813' + - '2818' Content-Type: - application/json; charset=utf-8 ParameterSetName: - -g -n --sku --min-capacity --max-capacity --zones --public-ip-address --no-wait User-Agent: - python/3.7.3 (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.19.0 + azure-mgmt-resource/12.0.0 Azure-SDK-For-Python AZURECLI/2.19.1 accept-language: - en-US method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_ag_zone000001/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2020-10-01 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Resources/deployments/ag_deploy_JT8HYmDxumHAZ0K9CXDzHel7UOkik0WT","name":"ag_deploy_JT8HYmDxumHAZ0K9CXDzHel7UOkik0WT","type":"Microsoft.Resources/deployments","properties":{"templateHash":"5834520772681259648","parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2021-02-19T07:31:55.3072277Z","duration":"PT2.3050691S","correlationId":"57b2e25b-859a-4606-96b6-3fd23288c73d","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus2"]},{"resourceType":"applicationGateways","locations":["westus2"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/virtualNetworks/ag1Vnet","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"ag1Vnet"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1","resourceType":"Microsoft.Network/applicationGateways","resourceName":"ag1"}]}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Resources/deployments/ag_deploy_CUjH9YLJ87qmgFQGTQmYJgUYY6tstggL","name":"ag_deploy_CUjH9YLJ87qmgFQGTQmYJgUYY6tstggL","type":"Microsoft.Resources/deployments","properties":{"templateHash":"18186301667908815070","parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2021-02-23T08:22:54.8425811Z","duration":"PT2.7907104S","correlationId":"1dda5afb-f6f7-48aa-a86d-f73dfbf924e2","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus2"]},{"resourceType":"applicationGateways","locations":["westus2"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/virtualNetworks/ag1Vnet","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"ag1Vnet"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1","resourceType":"Microsoft.Network/applicationGateways","resourceName":"ag1"}]}}' headers: azure-asyncoperation: - - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_ag_zone000001/providers/Microsoft.Resources/deployments/ag_deploy_JT8HYmDxumHAZ0K9CXDzHel7UOkik0WT/operationStatuses/08585878869724754585?api-version=2020-10-01 + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_ag_zone000001/providers/Microsoft.Resources/deployments/ag_deploy_CUjH9YLJ87qmgFQGTQmYJgUYY6tstggL/operationStatuses/08585875383134257523?api-version=2020-10-01 cache-control: - no-cache content-length: - - '1352' + - '1353' content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:31:55 GMT + - Tue, 23 Feb 2021 08:22:55 GMT expires: - '-1' pragma: @@ -443,7 +445,7 @@ interactions: ParameterSetName: - -g -n --exists User-Agent: - - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) + - AZURECLI/2.19.1 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1?api-version=2020-08-01 response: @@ -459,7 +461,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:31:57 GMT + - Tue, 23 Feb 2021 08:22:56 GMT expires: - '-1' pragma: @@ -487,21 +489,21 @@ interactions: ParameterSetName: - -g -n --exists User-Agent: - - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) + - AZURECLI/2.19.1 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1?api-version=2020-08-01 response: body: string: "{\r\n \"name\": \"ag1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n \"type\": + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \"type\": \"Microsoft.Network/applicationGateways\",\r\n \"location\": \"westus2\",\r\n - \ \"tags\": {},\r\n \"zones\": [\r\n \"1\"\r\n ],\r\n \"properties\": - {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": \"72fafdc9-c25f-4d8d-ac1f-3f8cdaee57a8\",\r\n + \ \"tags\": {},\r\n \"zones\": [\r\n \"1\",\r\n \"3\"\r\n ],\r\n \"properties\": + {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": \"414befb1-6adc-49ee-8722-2040df907634\",\r\n \ \"sku\": {\r\n \"name\": \"Standard_v2\",\r\n \"tier\": \"Standard_v2\"\r\n \ },\r\n \"operationalState\": \"Stopped\",\r\n \"gatewayIPConfigurations\": [\r\n {\r\n \"name\": \"appGatewayFrontendIP\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/gatewayIPConfigurations/appGatewayFrontendIP\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"subnet\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/virtualNetworks/ag1Vnet/subnets/default\"\r\n \ }\r\n },\r\n \"type\": \"Microsoft.Network/applicationGateways/gatewayIPConfigurations\"\r\n @@ -509,7 +511,7 @@ interactions: [],\r\n \"trustedClientCertificates\": [],\r\n \"sslProfiles\": [],\r\n \ \"frontendIPConfigurations\": [\r\n {\r\n \"name\": \"appGatewayFrontendIP\",\r\n \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/frontendIPConfigurations/appGatewayFrontendIP\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"type\": \"Microsoft.Network/applicationGateways/frontendIPConfigurations\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"privateIPAllocationMethod\": \"Dynamic\",\r\n \"publicIPAddress\": @@ -519,14 +521,14 @@ interactions: \ }\r\n ]\r\n }\r\n }\r\n ],\r\n \"frontendPorts\": [\r\n {\r\n \"name\": \"appGatewayFrontendPort\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/frontendPorts/appGatewayFrontendPort\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"port\": 80,\r\n \"httpListeners\": [\r\n {\r\n \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/httpListeners/appGatewayHttpListener\"\r\n \ }\r\n ]\r\n },\r\n \"type\": \"Microsoft.Network/applicationGateways/frontendPorts\"\r\n \ }\r\n ],\r\n \"backendAddressPools\": [\r\n {\r\n \"name\": \"appGatewayBackendPool\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/backendAddressPools/appGatewayBackendPool\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"backendAddresses\": [],\r\n \"requestRoutingRules\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/requestRoutingRules/rule1\"\r\n @@ -534,7 +536,7 @@ interactions: \ }\r\n ],\r\n \"loadDistributionPolicies\": [],\r\n \"backendHttpSettingsCollection\": [\r\n {\r\n \"name\": \"appGatewayBackendHttpSettings\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/backendHttpSettingsCollection/appGatewayBackendHttpSettings\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"port\": 80,\r\n \"protocol\": \"Http\",\r\n \"cookieBasedAffinity\": \"Disabled\",\r\n \"connectionDraining\": {\r\n \"enabled\": @@ -544,7 +546,7 @@ interactions: \ }\r\n ]\r\n },\r\n \"type\": \"Microsoft.Network/applicationGateways/backendHttpSettingsCollection\"\r\n \ }\r\n ],\r\n \"httpListeners\": [\r\n {\r\n \"name\": \"appGatewayHttpListener\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/httpListeners/appGatewayHttpListener\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"frontendIPConfiguration\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/frontendIPConfigurations/appGatewayFrontendIP\"\r\n \ },\r\n \"frontendPort\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/frontendPorts/appGatewayFrontendPort\"\r\n @@ -554,7 +556,7 @@ interactions: \ }\r\n ]\r\n },\r\n \"type\": \"Microsoft.Network/applicationGateways/httpListeners\"\r\n \ }\r\n ],\r\n \"urlPathMaps\": [],\r\n \"requestRoutingRules\": [\r\n {\r\n \"name\": \"rule1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/requestRoutingRules/rule1\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"ruleType\": \"Basic\",\r\n \"httpListener\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/httpListeners/appGatewayHttpListener\"\r\n @@ -571,13 +573,13 @@ interactions: cache-control: - no-cache content-length: - - '9352' + - '9362' content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:32:27 GMT + - Tue, 23 Feb 2021 08:23:26 GMT etag: - - W/"e5688c26-e38e-4084-85a1-da57c17b7fcb" + - W/"67551f34-6958-46c1-a60f-6362e435858a" expires: - '-1' pragma: @@ -594,7 +596,7 @@ interactions: x-content-type-options: - nosniff x-ms-arm-service-request-id: - - 5d93726f-8efb-4651-97fe-85f22be1fc9c + - eea4e3f2-10d1-4ccc-874f-2eb1ebda8d63 status: code: 200 message: OK @@ -612,21 +614,21 @@ interactions: ParameterSetName: - -g -n User-Agent: - - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) + - AZURECLI/2.19.1 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1?api-version=2020-08-01 response: body: string: "{\r\n \"name\": \"ag1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n \"type\": + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \"type\": \"Microsoft.Network/applicationGateways\",\r\n \"location\": \"westus2\",\r\n - \ \"tags\": {},\r\n \"zones\": [\r\n \"1\"\r\n ],\r\n \"properties\": - {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": \"72fafdc9-c25f-4d8d-ac1f-3f8cdaee57a8\",\r\n + \ \"tags\": {},\r\n \"zones\": [\r\n \"1\",\r\n \"3\"\r\n ],\r\n \"properties\": + {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": \"414befb1-6adc-49ee-8722-2040df907634\",\r\n \ \"sku\": {\r\n \"name\": \"Standard_v2\",\r\n \"tier\": \"Standard_v2\"\r\n \ },\r\n \"operationalState\": \"Stopped\",\r\n \"gatewayIPConfigurations\": [\r\n {\r\n \"name\": \"appGatewayFrontendIP\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/gatewayIPConfigurations/appGatewayFrontendIP\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"subnet\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/virtualNetworks/ag1Vnet/subnets/default\"\r\n \ }\r\n },\r\n \"type\": \"Microsoft.Network/applicationGateways/gatewayIPConfigurations\"\r\n @@ -634,7 +636,7 @@ interactions: [],\r\n \"trustedClientCertificates\": [],\r\n \"sslProfiles\": [],\r\n \ \"frontendIPConfigurations\": [\r\n {\r\n \"name\": \"appGatewayFrontendIP\",\r\n \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/frontendIPConfigurations/appGatewayFrontendIP\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"type\": \"Microsoft.Network/applicationGateways/frontendIPConfigurations\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"privateIPAllocationMethod\": \"Dynamic\",\r\n \"publicIPAddress\": @@ -644,14 +646,14 @@ interactions: \ }\r\n ]\r\n }\r\n }\r\n ],\r\n \"frontendPorts\": [\r\n {\r\n \"name\": \"appGatewayFrontendPort\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/frontendPorts/appGatewayFrontendPort\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"port\": 80,\r\n \"httpListeners\": [\r\n {\r\n \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/httpListeners/appGatewayHttpListener\"\r\n \ }\r\n ]\r\n },\r\n \"type\": \"Microsoft.Network/applicationGateways/frontendPorts\"\r\n \ }\r\n ],\r\n \"backendAddressPools\": [\r\n {\r\n \"name\": \"appGatewayBackendPool\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/backendAddressPools/appGatewayBackendPool\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"backendAddresses\": [],\r\n \"requestRoutingRules\": [\r\n {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/requestRoutingRules/rule1\"\r\n @@ -659,7 +661,7 @@ interactions: \ }\r\n ],\r\n \"loadDistributionPolicies\": [],\r\n \"backendHttpSettingsCollection\": [\r\n {\r\n \"name\": \"appGatewayBackendHttpSettings\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/backendHttpSettingsCollection/appGatewayBackendHttpSettings\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"port\": 80,\r\n \"protocol\": \"Http\",\r\n \"cookieBasedAffinity\": \"Disabled\",\r\n \"connectionDraining\": {\r\n \"enabled\": @@ -669,7 +671,7 @@ interactions: \ }\r\n ]\r\n },\r\n \"type\": \"Microsoft.Network/applicationGateways/backendHttpSettingsCollection\"\r\n \ }\r\n ],\r\n \"httpListeners\": [\r\n {\r\n \"name\": \"appGatewayHttpListener\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/httpListeners/appGatewayHttpListener\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"frontendIPConfiguration\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/frontendIPConfigurations/appGatewayFrontendIP\"\r\n \ },\r\n \"frontendPort\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/frontendPorts/appGatewayFrontendPort\"\r\n @@ -679,7 +681,7 @@ interactions: \ }\r\n ]\r\n },\r\n \"type\": \"Microsoft.Network/applicationGateways/httpListeners\"\r\n \ }\r\n ],\r\n \"urlPathMaps\": [],\r\n \"requestRoutingRules\": [\r\n {\r\n \"name\": \"rule1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/requestRoutingRules/rule1\",\r\n - \ \"etag\": \"W/\\\"e5688c26-e38e-4084-85a1-da57c17b7fcb\\\"\",\r\n + \ \"etag\": \"W/\\\"67551f34-6958-46c1-a60f-6362e435858a\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"ruleType\": \"Basic\",\r\n \"httpListener\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ag_zone000001/providers/Microsoft.Network/applicationGateways/ag1/httpListeners/appGatewayHttpListener\"\r\n @@ -696,13 +698,13 @@ interactions: cache-control: - no-cache content-length: - - '9352' + - '9362' content-type: - application/json; charset=utf-8 date: - - Fri, 19 Feb 2021 07:32:28 GMT + - Tue, 23 Feb 2021 08:23:26 GMT etag: - - W/"e5688c26-e38e-4084-85a1-da57c17b7fcb" + - W/"67551f34-6958-46c1-a60f-6362e435858a" expires: - '-1' pragma: @@ -719,7 +721,7 @@ interactions: x-content-type-options: - nosniff x-ms-arm-service-request-id: - - 449778cc-a7d6-48c1-8b9f-5377651f76a0 + - 5d65cfdb-35e7-4776-8460-8986bcc6b98b status: code: 200 message: OK diff --git a/src/azure-cli/azure/cli/command_modules/network/tests/latest/recordings/test_network_public_ip_zone.yaml b/src/azure-cli/azure/cli/command_modules/network/tests/latest/recordings/test_network_public_ip_zone.yaml new file mode 100644 index 00000000000..9d27e73e1b2 --- /dev/null +++ b/src/azure-cli/azure/cli/command_modules/network/tests/latest/recordings/test_network_public_ip_zone.yaml @@ -0,0 +1,220 @@ +interactions: +- request: + body: null + headers: + Accept: + - application/json + Accept-Encoding: + - gzip, deflate + CommandName: + - network public-ip create + Connection: + - keep-alive + ParameterSetName: + - -g -n --sku -z + User-Agent: + - python/3.7.3 (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.19.0 + accept-language: + - en-US + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_public_ip_zone000001?api-version=2020-10-01 + response: + body: + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_public_ip_zone000001","name":"cli_test_public_ip_zone000001","type":"Microsoft.Resources/resourceGroups","location":"eastus2","tags":{"product":"azurecli","cause":"automation","date":"2021-02-23T01:38:04Z"},"properties":{"provisioningState":"Succeeded"}}' + headers: + cache-control: + - no-cache + content-length: + - '429' + content-type: + - application/json; charset=utf-8 + date: + - Tue, 23 Feb 2021 01:38:09 GMT + expires: + - '-1' + pragma: + - no-cache + strict-transport-security: + - max-age=31536000; includeSubDomains + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + status: + code: 200 + message: OK +- request: + body: '{"location": "eastus2", "sku": {"name": "Standard"}, "zones": ["1", "2", + "3"], "properties": {"publicIPAllocationMethod": "Static", "publicIPAddressVersion": + "IPv4", "idleTimeoutInMinutes": 4}}' + headers: + Accept: + - application/json + Accept-Encoding: + - gzip, deflate + CommandName: + - network public-ip create + Connection: + - keep-alive + Content-Length: + - '193' + Content-Type: + - application/json + ParameterSetName: + - -g -n --sku -z + User-Agent: + - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) + method: PUT + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_public_ip_zone000001/providers/Microsoft.Network/publicIPAddresses/ip?api-version=2020-08-01 + response: + body: + string: "{\r\n \"name\": \"ip\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_public_ip_zone000001/providers/Microsoft.Network/publicIPAddresses/ip\",\r\n + \ \"etag\": \"W/\\\"b96f70bb-8378-452b-9b74-0337c1a65402\\\"\",\r\n \"location\": + \"eastus2\",\r\n \"zones\": [\r\n \"1\",\r\n \"2\",\r\n \"3\"\r\n + \ ],\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n + \ \"resourceGuid\": \"7e457801-466b-4e8a-9e3f-779f32911084\",\r\n \"publicIPAddressVersion\": + \"IPv4\",\r\n \"publicIPAllocationMethod\": \"Static\",\r\n \"idleTimeoutInMinutes\": + 4,\r\n \"ipTags\": []\r\n },\r\n \"type\": \"Microsoft.Network/publicIPAddresses\",\r\n + \ \"sku\": {\r\n \"name\": \"Standard\",\r\n \"tier\": \"Regional\"\r\n + \ }\r\n}" + headers: + azure-asyncnotification: + - Enabled + azure-asyncoperation: + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus2/operations/0f4f21b2-3bf7-4a56-bc8b-1f28b52d5d5b?api-version=2020-08-01 + cache-control: + - no-cache + content-length: + - '729' + content-type: + - application/json; charset=utf-8 + date: + - Tue, 23 Feb 2021 01:38:16 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - Microsoft-HTTPAPI/2.0 + - Microsoft-HTTPAPI/2.0 + strict-transport-security: + - max-age=31536000; includeSubDomains + x-content-type-options: + - nosniff + x-ms-arm-service-request-id: + - 36b17932-9bc8-4148-ad53-30e6bc59fd72 + x-ms-ratelimit-remaining-subscription-writes: + - '1198' + status: + code: 201 + message: Created +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - network public-ip create + Connection: + - keep-alive + ParameterSetName: + - -g -n --sku -z + User-Agent: + - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus2/operations/0f4f21b2-3bf7-4a56-bc8b-1f28b52d5d5b?api-version=2020-08-01 + response: + body: + string: "{\r\n \"status\": \"Succeeded\"\r\n}" + headers: + cache-control: + - no-cache + content-length: + - '29' + content-type: + - application/json; charset=utf-8 + date: + - Tue, 23 Feb 2021 01:38:17 GMT + expires: + - '-1' + pragma: + - no-cache + server: + - Microsoft-HTTPAPI/2.0 + - Microsoft-HTTPAPI/2.0 + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + x-ms-arm-service-request-id: + - 3f060818-140e-4af4-bffa-e031c96a5c4b + status: + code: 200 + message: OK +- request: + body: null + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + CommandName: + - network public-ip create + Connection: + - keep-alive + ParameterSetName: + - -g -n --sku -z + User-Agent: + - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/17.1.0 Python/3.7.3 (Windows-10-10.0.19041-SP0) + method: GET + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_public_ip_zone000001/providers/Microsoft.Network/publicIPAddresses/ip?api-version=2020-08-01 + response: + body: + string: "{\r\n \"name\": \"ip\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_public_ip_zone000001/providers/Microsoft.Network/publicIPAddresses/ip\",\r\n + \ \"etag\": \"W/\\\"c32d2dc8-946f-496f-9038-7e90acc371d2\\\"\",\r\n \"location\": + \"eastus2\",\r\n \"zones\": [\r\n \"1\",\r\n \"2\",\r\n \"3\"\r\n + \ ],\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n + \ \"resourceGuid\": \"7e457801-466b-4e8a-9e3f-779f32911084\",\r\n \"ipAddress\": + \"20.72.65.240\",\r\n \"publicIPAddressVersion\": \"IPv4\",\r\n \"publicIPAllocationMethod\": + \"Static\",\r\n \"idleTimeoutInMinutes\": 4,\r\n \"ipTags\": []\r\n + \ },\r\n \"type\": \"Microsoft.Network/publicIPAddresses\",\r\n \"sku\": + {\r\n \"name\": \"Standard\",\r\n \"tier\": \"Regional\"\r\n }\r\n}" + headers: + cache-control: + - no-cache + content-length: + - '764' + content-type: + - application/json; charset=utf-8 + date: + - Tue, 23 Feb 2021 01:38:18 GMT + etag: + - W/"c32d2dc8-946f-496f-9038-7e90acc371d2" + expires: + - '-1' + pragma: + - no-cache + server: + - Microsoft-HTTPAPI/2.0 + - Microsoft-HTTPAPI/2.0 + strict-transport-security: + - max-age=31536000; includeSubDomains + transfer-encoding: + - chunked + vary: + - Accept-Encoding + x-content-type-options: + - nosniff + x-ms-arm-service-request-id: + - 67b0251c-5522-4d2c-8b7b-93c9defc6452 + status: + code: 200 + message: OK +version: 1 diff --git a/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_network_commands.py b/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_network_commands.py index 733afa7a797..a687f1bbc8f 100644 --- a/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_network_commands.py +++ b/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_network_commands.py @@ -643,8 +643,12 @@ def test_network_ag_zone(self, resource_group): 'gateway': 'ag1', 'ip': 'pubip1' }) - self.cmd('network public-ip create -g {rg} -n {ip} --sku Standard -z 1') - self.cmd('network application-gateway create -g {rg} -n {gateway} --sku Standard_v2 --min-capacity 2 --max-capacity 4 --zones 1 --public-ip-address {ip} --no-wait') + + # for public-ip after '2020-08-01', when set '-z 1 3', actually return 'zones:[1,2,3]' + self.cmd('network public-ip create -g {rg} -n {ip} --sku Standard -z 1 3', checks=[ + self.check('length(publicIp.zones)', 3) + ]) + self.cmd('network application-gateway create -g {rg} -n {gateway} --sku Standard_v2 --min-capacity 2 --max-capacity 4 --zones 1 3 --public-ip-address {ip} --no-wait') self.cmd('network application-gateway wait -g {rg} -n {gateway} --exists') self.cmd('network application-gateway show -g {rg} -n {gateway}', checks=[ self.check('zones[0]', 1) @@ -1864,6 +1868,12 @@ def test_network_public_ip(self, resource_group): self.cmd('network public-ip list -g {rg}', checks=self.check("length[?name == '{ip1}']", None)) + @ResourceGroupPreparer(name_prefix='cli_test_public_ip_zone', location='eastus2') + def test_network_public_ip_zone(self, resource_group): + self.cmd('network public-ip create -g {rg} -n ip --sku Standard -z 1 2 3', checks=[ + self.check('length(publicIp.zones)', 3) + ]) + class NetworkZonedPublicIpScenarioTest(ScenarioTest):