Add extended location properties for private link service and private…

… endpoints and remove edge zone properties (#12039) * Remove edge zone parameter * Add extended location for private endpoint and private link service * Add examples * Capitalization * Prettier Co-authored-by: Will Ehrich <william.ehrich@microsoft.com>
Azure · Dec 30, 2020 · 6f0cd18 · 6f0cd18
1 parent 3001750
commit 6f0cd18
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 33 deletions.
diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2020-08-01/customIpPrefix.json b/...fication/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/...er/Microsoft.Network/stable/2020-08-01/examples/CustomIpPrefixCreateCustomizedValues.json b/...er/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/...ork/resource-manager/Microsoft.Network/stable/2020-08-01/examples/LoadBalancerCreate.json b/...ork/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/...resource-manager/Microsoft.Network/stable/2020-08-01/examples/NetworkInterfaceCreate.json b/...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/.../resource-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateEndpointCreate.json b/.../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/...source-manager/Microsoft.Network/stable/2020-08-01/examples/PrivateLinkServiceCreate.json b/...source-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": {

diff --git a/...r/Microsoft.Network/stable/2020-08-01/examples/PublicIpAddressCreateCustomizedValues.json b/...r/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/...er/Microsoft.Network/stable/2020-08-01/examples/PublicIpPrefixCreateCustomizedValues.json b/...er/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/...k/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkCreate.json b/...k/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
@@ -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/...cation/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json b/...cation/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/...ication/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateEndpoint.json b/...ication/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/...tion/network/resource-manager/Microsoft.Network/stable/2020-08-01/privateLinkService.json b/...tion/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",

diff --git a/...ication/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json b/...ication/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/...fication/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json b/...fication/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/...fication/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json b/...fication/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."