hotfix on extended location hierarchy (Azure#13943)

yibirnba · Apr 20, 2021 · 5bb6cc1 · 5bb6cc1
1 parent 5047dfd
commit 5bb6cc1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/...n/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetworkGateway.json b/...n/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetworkGateway.json
@@ -2375,13 +2375,9 @@
           "readOnly": true,
           "description": "The IP address allocated by the gateway to which dns requests can be sent."
         },
-        "virtualNetworkExtendedLocationResourceId": {
+        "vNetExtendedLocationResourceId": {
           "type": "string",
-          "description": "MAS FIJI customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
-        },
-        "extendedLocation": {
-          "description": "The extended location of type local virtual network gateway.",
-          "$ref": "./network.json#/definitions/ExtendedLocation"
+          "description": "Customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
         }
       },
       "description": "VirtualNetworkGateway properties."
@@ -2761,6 +2757,10 @@
     },
     "VirtualNetworkGateway": {
       "properties": {
+        "extendedLocation": {
+          "$ref": "./network.json#/definitions/ExtendedLocation",
+          "description": "The extended location of type local virtual network gateway."
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/VirtualNetworkGatewayPropertiesFormat",

diff --git a/...n/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json b/...n/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json
@@ -2434,11 +2434,7 @@
         },
         "vNetExtendedLocationResourceId": {
           "type": "string",
-          "description": "MAS FIJI customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
-        },
-        "virtualNetworkExtendedLocation": {
-          "description": "The extended location of type local virtual network gateway.",
-          "$ref": "./network.json#/definitions/ExtendedLocation"
+          "description": "Customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
         }
       },
       "description": "VirtualNetworkGateway properties."
@@ -2818,6 +2814,10 @@
     },
     "VirtualNetworkGateway": {
       "properties": {
+        "extendedLocation": {
+          "$ref": "./network.json#/definitions/ExtendedLocation",
+          "description": "The extended location of type local virtual network gateway."
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/VirtualNetworkGatewayPropertiesFormat",

diff --git a/...n/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json b/...n/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json
@@ -2485,11 +2485,7 @@
         },
         "vNetExtendedLocationResourceId": {
           "type": "string",
-          "description": "MAS FIJI customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
-        },
-        "virtualNetworkExtendedLocation": {
-          "description": "The extended location of type local virtual network gateway.",
-          "$ref": "./network.json#/definitions/ExtendedLocation"
+          "description": "Customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
         }
       },
       "description": "VirtualNetworkGateway properties."
@@ -2886,6 +2882,10 @@
     },
     "VirtualNetworkGateway": {
       "properties": {
+        "extendedLocation": {
+          "$ref": "./network.json#/definitions/ExtendedLocation",
+          "description": "The extended location of type local virtual network gateway."
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/VirtualNetworkGatewayPropertiesFormat",