From ca4b529f9d09096841138f8ce708274148745acd Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Wed, 9 Dec 2020 14:30:58 -0800 Subject: [PATCH 1/5] Remove edge zone parameter --- .../Microsoft.Network/stable/2020-08-01/customIpPrefix.json | 4 ---- .../examples/CustomIpPrefixCreateCustomizedValues.json | 3 +-- .../stable/2020-08-01/examples/LoadBalancerCreate.json | 1 - .../stable/2020-08-01/examples/NetworkInterfaceCreate.json | 1 - .../examples/PublicIpAddressCreateCustomizedValues.json | 3 +-- .../examples/PublicIpPrefixCreateCustomizedValues.json | 1 - .../stable/2020-08-01/examples/VirtualNetworkCreate.json | 3 +-- .../Microsoft.Network/stable/2020-08-01/loadBalancer.json | 4 ---- .../Microsoft.Network/stable/2020-08-01/networkInterface.json | 4 ---- .../Microsoft.Network/stable/2020-08-01/publicIpAddress.json | 4 ---- .../Microsoft.Network/stable/2020-08-01/publicIpPrefix.json | 4 ---- .../Microsoft.Network/stable/2020-08-01/virtualNetwork.json | 4 ---- 12 files changed, 3 insertions(+), 33 deletions(-) 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 4b8c67f9e3a6..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 @@ -396,10 +396,6 @@ "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 1358df0ee825..e870ed12dc1c 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,8 +10,7 @@ "parameters": { "location": "westus", "properties": { - "cidr": "0.0.0.0/24", - "edgeZone": "edgeZone0" + "cidr": "0.0.0.0/24" } } }, 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 05397ab9ccf4..beb9e4adc44d 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,7 +7,6 @@ "parameters": { "location": "eastus", "properties": { - "edgeZone": "edgeZone0", "frontendIPConfigurations": [ { "name": "fe-lb", 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 658bbc1e6b27..1c57d321dbd4 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,7 +6,6 @@ "networkInterfaceName": "test-nic", "parameters": { "properties": { - "edgeZone": "edgeZone0", "enableAcceleratedNetworking": true, "ipConfigurations": [ { 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 0bb241d7029e..529b359be568 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,8 +11,7 @@ "properties": { "publicIPAllocationMethod": "Static", "idleTimeoutInMinutes": 10, - "publicIPAddressVersion": "IPv4", - "edgeZone": "edgeZone0" + "publicIPAddressVersion": "IPv4" }, "sku": { "name": "Standard", 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 28dcb79b5cd9..2d33f4c80dcc 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,7 +10,6 @@ "parameters": { "location": "westus", "properties": { - "edgeZone": "edgeZone0", "publicIPAddressVersion": "IPv4", "prefixLength": 30 }, 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 36838bb6066c..8969cdfb99f0 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,8 +10,7 @@ "addressPrefixes": [ "10.0.0.0/16" ] - }, - "edgeZone": "edgeZone0" + } }, "location": "eastus" } 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 1f2c30090b44..90bd68f1f00b 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 @@ -2100,10 +2100,6 @@ "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." 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 a491bbb1d1a8..772d00e21261 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,10 +1153,6 @@ "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." 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 9e3ee52cef30..57805367524b 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,10 +444,6 @@ "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." 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 c97b8f567efb..a0733159988a 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,10 +437,6 @@ "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." 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 833d147f47b4..6de777eed539 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,10 +1752,6 @@ "$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 f81d833536897748fff9896499a60e633e963ac1 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Wed, 9 Dec 2020 17:08:23 -0800 Subject: [PATCH 2/5] Add extended location for private endpoint and private link service --- .../Microsoft.Network/stable/2020-08-01/privateEndpoint.json | 4 ++++ .../stable/2020-08-01/privateLinkService.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateEndpoint.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateEndpoint.json index 537bca2979c0..3a3966b36ab3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateEndpoint.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateEndpoint.json @@ -647,6 +647,10 @@ "definitions": { "PrivateEndpoint": { "properties": { + "extendedLocation": { + "$ref": "./network.json#/definitions/ExtendedLocation", + "description": "The extended location of the load balancer." + }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/PrivateEndpointProperties", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateLinkService.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateLinkService.json index 0b7593209fb5..bb0fcd51b27e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateLinkService.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateLinkService.json @@ -769,6 +769,10 @@ "definitions": { "PrivateLinkService": { "properties": { + "extendedLocation": { + "$ref": "./network.json#/definitions/ExtendedLocation", + "description": "The extended location of the load balancer." + }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/PrivateLinkServiceProperties", From 41717248ff1d2cd17d5517693cdd47a5a536ddf5 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Wed, 9 Dec 2020 20:13:23 -0800 Subject: [PATCH 3/5] Add examples --- .../stable/2020-08-01/examples/PrivateEndpointCreate.json | 4 ++++ .../stable/2020-08-01/examples/PrivateLinkServiceCreate.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json index cc4d1d43e874..9eff6da54edd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json @@ -4,6 +4,10 @@ "subscriptionId": "subId", "resourceGroupName": "rg1", "privateEndpointName": "testPe", + "extendedLocation" : { + "Type" : "EdgeZone", + "Name" : "edgeZone0" + }, "parameters": { "location": "eastus2euap", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json index fc29982aa504..fbe77a890e68 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json @@ -4,6 +4,10 @@ "subscriptionId": "subId", "resourceGroupName": "rg1", "serviceName": "testPls", + "extendedLocation" : { + "Type" : "EdgeZone", + "Name" : "edgeZone0" + }, "parameters": { "location": "eastus", "properties": { From ea7970483580f2628ff4c368a21bef02bbebff78 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Wed, 9 Dec 2020 20:35:09 -0800 Subject: [PATCH 4/5] Capitalization --- .../stable/2020-08-01/examples/PrivateEndpointCreate.json | 4 ++-- .../stable/2020-08-01/examples/PrivateLinkServiceCreate.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json index 9eff6da54edd..d444ddfef677 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json @@ -5,8 +5,8 @@ "resourceGroupName": "rg1", "privateEndpointName": "testPe", "extendedLocation" : { - "Type" : "EdgeZone", - "Name" : "edgeZone0" + "type" : "EdgeZone", + "name" : "edgeZone0" }, "parameters": { "location": "eastus2euap", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json index fbe77a890e68..9dac165d26e5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json @@ -5,8 +5,8 @@ "resourceGroupName": "rg1", "serviceName": "testPls", "extendedLocation" : { - "Type" : "EdgeZone", - "Name" : "edgeZone0" + "type" : "EdgeZone", + "name" : "edgeZone0" }, "parameters": { "location": "eastus", From 486073ef70744d474a591085439e75f637f32e35 Mon Sep 17 00:00:00 2001 From: Will Ehrich Date: Wed, 9 Dec 2020 21:44:13 -0800 Subject: [PATCH 5/5] Prettier --- .../stable/2020-08-01/examples/PrivateEndpointCreate.json | 6 +++--- .../2020-08-01/examples/PrivateLinkServiceCreate.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json index d444ddfef677..d7051042cfa1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json @@ -4,9 +4,9 @@ "subscriptionId": "subId", "resourceGroupName": "rg1", "privateEndpointName": "testPe", - "extendedLocation" : { - "type" : "EdgeZone", - "name" : "edgeZone0" + "extendedLocation": { + "type": "EdgeZone", + "name": "edgeZone0" }, "parameters": { "location": "eastus2euap", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json index 9dac165d26e5..821568aae815 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json @@ -4,9 +4,9 @@ "subscriptionId": "subId", "resourceGroupName": "rg1", "serviceName": "testPls", - "extendedLocation" : { - "type" : "EdgeZone", - "name" : "edgeZone0" + "extendedLocation": { + "type": "EdgeZone", + "name": "edgeZone0" }, "parameters": { "location": "eastus",