Merge branch 'network-july-release' of https://github.com/Azure/azure…

…-rest-api-specs into service-tags-pagination
Azure · Oct 8, 2020 · a55655d · a55655d
2 parents a18e2b6 + 8075566
commit a55655d
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 0 deletions.
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/loadBalancer.json
@@ -2102,6 +2102,10 @@
     },
     "LoadBalancer": {
       "properties": {
+        "extendedLocation": {
+          "$ref": "./network.json#/definitions/ExtendedLocation",
+          "description": "The extended location of the load balancer."
+        },
         "sku": {
           "$ref": "#/definitions/LoadBalancerSku",
           "description": "The load balancer SKU."

diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/network.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/network.json
@@ -300,6 +300,34 @@
         "name": "IPVersion",
         "modelAsString": true
       }
+    },
+    "ExtendedLocationType": {
+      "type": "string",
+      "description": "The supported ExtendedLocation types. Currently only EdgeZone is supported in Microsoft.Network resources.",
+      "enum": [
+        "EdgeZone"
+      ],
+      "x-ms-enum": {
+        "name": "ExtendedLocationTypes",
+        "modelAsString": true
+      }
+    },
+    "ExtendedLocation": {
+      "description": "ExtendedLocation complex type.",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of the extended location."
+        },
+        "type": {
+          "$ref": "#/definitions/ExtendedLocationType",
+          "description": "The type of the extended location."
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
     }
   },
   "parameters": {

diff --git a/...cation/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkInterface.json b/...cation/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkInterface.json
@@ -1159,6 +1159,10 @@
     },
     "NetworkInterface": {
       "properties": {
+        "extendedLocation": {
+          "$ref": "./network.json#/definitions/ExtendedLocation",
+          "description": "The extended location of the network interface."
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/NetworkInterfacePropertiesFormat",

diff --git a/...ication/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json b/...ication/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json
@@ -450,6 +450,10 @@
     },
     "PublicIPAddress": {
       "properties": {
+        "extendedLocation": {
+          "$ref": "./network.json#/definitions/ExtendedLocation",
+          "description": "The extended location of the public ip address."
+        },
         "sku": {
           "$ref": "#/definitions/PublicIPAddressSku",
           "description": "The public IP address SKU."

diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpPrefix.json b/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpPrefix.json
@@ -443,6 +443,10 @@
     },
     "PublicIPPrefix": {
       "properties": {
+        "extendedLocation": {
+          "$ref": "./network.json#/definitions/ExtendedLocation",
+          "description": "The extended location of the public ip address."
+        },
         "sku": {
           "$ref": "#/definitions/PublicIPPrefixSku",
           "description": "The public IP prefix SKU."

diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json b/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json
@@ -1758,6 +1758,10 @@
     },
     "VirtualNetwork": {
       "properties": {
+        "extendedLocation": {
+          "$ref": "./network.json#/definitions/ExtendedLocation",
+          "description": "The extended location of the virtual network."
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/VirtualNetworkPropertiesFormat",