From fb6fc47fabe6b53248df063bfb38f9caf557cf97 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 13:22:04 -0800 Subject: [PATCH 01/11] Add extendedLocation property to customIpPrefix --- .../Microsoft.Network/stable/2020-07-01/customIpPrefix.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/customIpPrefix.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/customIpPrefix.json index e29f262f4ff4..d14d83f57777 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/customIpPrefix.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/customIpPrefix.json @@ -402,6 +402,10 @@ }, "CustomIpPrefix": { "properties": { + "extendedLocation": { + "$ref": "./network.json#/definitions/ExtendedLocation", + "description": "The extended location of the custom IP prefix." + }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/CustomIpPrefixPropertiesFormat", From 6cf87938a780afa0c883dd7ba44448f983313371 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 14:02:21 -0800 Subject: [PATCH 02/11] Fix the directory --- .../Microsoft.Network/stable/2020-07-01/customIpPrefix.json | 4 ---- .../Microsoft.Network/stable/2020-08-01/customIpPrefix.json | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/customIpPrefix.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/customIpPrefix.json index d14d83f57777..e29f262f4ff4 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/customIpPrefix.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/customIpPrefix.json @@ -402,10 +402,6 @@ }, "CustomIpPrefix": { "properties": { - "extendedLocation": { - "$ref": "./network.json#/definitions/ExtendedLocation", - "description": "The extended location of the custom IP prefix." - }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/CustomIpPrefixPropertiesFormat", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/customIpPrefix.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/customIpPrefix.json index 09e9491f3150..a1b3cf07cbba 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/customIpPrefix.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/customIpPrefix.json @@ -402,6 +402,10 @@ }, "CustomIpPrefix": { "properties": { + "extendedLocation": { + "$ref": "./network.json#/definitions/ExtendedLocation", + "description": "The extended location of the custom IP prefix." + }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/CustomIpPrefixPropertiesFormat", From 606d1ed68e1b5865183e4259f7755fb21eef2795 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 15:35:25 -0800 Subject: [PATCH 03/11] Address linting errors --- .../stable/2020-08-01/cloudServiceNetworkInterface.json | 4 ++-- .../stable/2020-08-01/cloudServicePublicIpAddress.json | 2 +- .../Microsoft.Network/stable/2020-08-01/virtualWan.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/cloudServiceNetworkInterface.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/cloudServiceNetworkInterface.json index 26b2a8b81e4d..ff4aad776a16 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/cloudServiceNetworkInterface.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/cloudServiceNetworkInterface.json @@ -40,7 +40,7 @@ "NetworkInterfaces" ], "operationId": "NetworkInterfaces_ListCloudServiceRoleInstanceNetworkInterfaces", - "description": "Gets information about all network interfaces in a role instance in a cloud service", + "description": "Gets information about all network interfaces in a role instance in a cloud service.", "parameters": [ { "name": "resourceGroupName", @@ -174,7 +174,7 @@ "in": "path", "required": true, "type": "string", - "description": "The name of role instance" + "description": "The name of role instance." }, { "name": "networkInterfaceName", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/cloudServicePublicIpAddress.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/cloudServicePublicIpAddress.json index 125ee047c5d4..31af7ddb9570 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/cloudServicePublicIpAddress.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/cloudServicePublicIpAddress.json @@ -108,7 +108,7 @@ "in": "path", "required": true, "type": "string", - "description": "The name of role instance" + "description": "The name of role instance." }, { "name": "networkInterfaceName", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json index b4bebab277dd..7ebe8d995148 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json @@ -6106,7 +6106,7 @@ "items": { "$ref": "./network.json#/definitions/SubResource" }, - "description": "List of egress VpnSiteLinkConnections" + "description": "List of egress VpnSiteLinkConnections." }, "ingressVpnSiteLinkConnections": { "type": "array", @@ -6365,7 +6365,7 @@ "InitiatorOnly" ], "x-ms-enum": { - "name": "vpnLinkConnectionMode", + "name": "VpnLinkConnectionMode", "modelAsString": true } }, From aef254fd78c295f13eb671a7e74a5b653d9b314a Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 16:14:48 -0800 Subject: [PATCH 04/11] Fix another linting error --- .../Microsoft.Network/stable/2020-08-01/virtualWan.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json index 7ebe8d995148..10ab477b505f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualWan.json @@ -6431,7 +6431,7 @@ "items": { "$ref": "./network.json#/definitions/SubResource" }, - "description": "List of ingress NatRules" + "description": "List of ingress NatRules." }, "egressNatRules": { "type": "array", From efa3d2f638012c899ea44e75e7fb731b98c41f10 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 16:56:06 -0800 Subject: [PATCH 05/11] Add edge zone parameter for network interfaces --- .../Microsoft.Network/stable/2020-08-01/networkInterface.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json index 772d00e21261..a491bbb1d1a8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json @@ -1153,6 +1153,10 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the network interface resource." + }, + "edgeZone": { + "type": "string", + "description": "The edge zone of the network interface." } }, "description": "NetworkInterface properties." From 4ef5592fdce8be5e5d840ff8df39a033546827e8 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 18:26:54 -0800 Subject: [PATCH 06/11] Looks like edgeZone parameter is working when creating network interfaces --- .../stable/2020-08-01/examples/NetworkInterfaceCreate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/NetworkInterfaceCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/NetworkInterfaceCreate.json index 1c57d321dbd4..658bbc1e6b27 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/NetworkInterfaceCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/NetworkInterfaceCreate.json @@ -6,6 +6,7 @@ "networkInterfaceName": "test-nic", "parameters": { "properties": { + "edgeZone": "edgeZone0", "enableAcceleratedNetworking": true, "ipConfigurations": [ { From 378da1c434597c4d97501448c48c674ee4be4ed3 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 18:49:28 -0800 Subject: [PATCH 07/11] EdgeZone parameter for load balancer --- .../stable/2020-08-01/examples/LoadBalancerCreate.json | 1 + .../Microsoft.Network/stable/2020-08-01/loadBalancer.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/LoadBalancerCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/LoadBalancerCreate.json index beb9e4adc44d..05397ab9ccf4 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/LoadBalancerCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/LoadBalancerCreate.json @@ -7,6 +7,7 @@ "parameters": { "location": "eastus", "properties": { + "edgeZone": "edgeZone0", "frontendIPConfigurations": [ { "name": "fe-lb", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/loadBalancer.json index 2c5ef55a80ff..b058b14b564d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/loadBalancer.json @@ -2096,6 +2096,10 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the load balancer resource." + }, + "edgeZone": { + "type": "string", + "description": "The edge zone of the load balancer." } }, "description": "Properties of the load balancer." From 0344160883b3e120dc1bc2f53ef5bbc31cbff5b4 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 18:56:48 -0800 Subject: [PATCH 08/11] Add edge zone parameter for public IP address --- .../examples/PublicIpAddressCreateCustomizedValues.json | 3 ++- .../Microsoft.Network/stable/2020-08-01/publicIpAddress.json | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PublicIpAddressCreateCustomizedValues.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PublicIpAddressCreateCustomizedValues.json index 529b359be568..0bb241d7029e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PublicIpAddressCreateCustomizedValues.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PublicIpAddressCreateCustomizedValues.json @@ -11,7 +11,8 @@ "properties": { "publicIPAllocationMethod": "Static", "idleTimeoutInMinutes": 10, - "publicIPAddressVersion": "IPv4" + "publicIPAddressVersion": "IPv4", + "edgeZone": "edgeZone0" }, "sku": { "name": "Standard", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json index 57805367524b..9e3ee52cef30 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json @@ -444,6 +444,10 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the public IP address resource." + }, + "edgeZone": { + "type": "string", + "description": "The edge zone of the public IP address." } }, "description": "Public IP address properties." From 3c4ff56b62fd5eec482b27e648bd83b159b46d00 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 19:00:21 -0800 Subject: [PATCH 09/11] Add edge zone parameter for public IP prefix --- .../examples/PublicIpPrefixCreateCustomizedValues.json | 1 + .../Microsoft.Network/stable/2020-08-01/publicIpPrefix.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PublicIpPrefixCreateCustomizedValues.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PublicIpPrefixCreateCustomizedValues.json index 2d33f4c80dcc..28dcb79b5cd9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PublicIpPrefixCreateCustomizedValues.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PublicIpPrefixCreateCustomizedValues.json @@ -10,6 +10,7 @@ "parameters": { "location": "westus", "properties": { + "edgeZone": "edgeZone0", "publicIPAddressVersion": "IPv4", "prefixLength": 30 }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json index a0733159988a..c97b8f567efb 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json @@ -437,6 +437,10 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the public IP prefix resource." + }, + "edgeZone": { + "type": "string", + "description": "The edge zone of the public IP prefix." } }, "description": "Public IP prefix properties." From 4623b8116583fb7f6cfe55ff7bcc57c35d0435ce Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 19:06:24 -0800 Subject: [PATCH 10/11] Add edgeZone parameter for virtual networks --- .../stable/2020-08-01/examples/VirtualNetworkCreate.json | 3 ++- .../Microsoft.Network/stable/2020-08-01/virtualNetwork.json | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkCreate.json index 8969cdfb99f0..36838bb6066c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkCreate.json @@ -10,7 +10,8 @@ "addressPrefixes": [ "10.0.0.0/16" ] - } + }, + "edgeZone": "edgeZone0" }, "location": "eastus" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json index 6de777eed539..833d147f47b4 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json @@ -1752,6 +1752,10 @@ "$ref": "./network.json#/definitions/SubResource" }, "description": "Array of IpAllocation which reference this VNET." + }, + "edgeZone": { + "type": "string", + "description": "The edge zone of the virtual network." } }, "description": "Properties of the virtual network." From 6ff989eadb9ddb00b46b3f089b8e7a264ad39524 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Thu, 3 Dec 2020 19:10:41 -0800 Subject: [PATCH 11/11] Add edge zone parameter for custom IP prefix --- .../Microsoft.Network/stable/2020-08-01/customIpPrefix.json | 4 ++++ .../examples/CustomIpPrefixCreateCustomizedValues.json | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/customIpPrefix.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/customIpPrefix.json index a1b3cf07cbba..4b8c67f9e3a6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/customIpPrefix.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/customIpPrefix.json @@ -396,6 +396,10 @@ "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the custom IP prefix resource." + }, + "edgeZone": { + "type": "string", + "description": "The edge zone of the custom IP prefix." } }, "description": "Custom IP prefix properties." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/CustomIpPrefixCreateCustomizedValues.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/CustomIpPrefixCreateCustomizedValues.json index e870ed12dc1c..1358df0ee825 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/CustomIpPrefixCreateCustomizedValues.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/CustomIpPrefixCreateCustomizedValues.json @@ -10,7 +10,8 @@ "parameters": { "location": "westus", "properties": { - "cidr": "0.0.0.0/24" + "cidr": "0.0.0.0/24", + "edgeZone": "edgeZone0" } } },