From 9b9177b59acbcf24e49f44f53e1d0d24a3a35509 Mon Sep 17 00:00:00 2001
From: litchiyangMSFT <64560090+litchiyangMSFT@users.noreply.github.com>
Date: Mon, 19 Oct 2020 00:42:05 -0700
Subject: [PATCH] Add type "Local gateway" to virtualNetworkGateway to
 2020-07-01 (#11231)

* Add virtual hub bgp connections subresources virtualRouterPeerAdvertisedRoute and virtualRouterPeerLearnedRoute with POST opertion

* Add examples

* Change name of operationid

* change output of advertised route

* Add PUT InboundSecurityRules for NVA

* merge

* Add examples

* merge

* merge

* change output of advertised route

* Add type local to virtualNetworkGateway

* fix bug

* fix bug

* fix typo

* fix bug and add requirements

* Add Enum

* fix bug

* Add InboundSecurityRule, virtualRouterPeerAdvertisedRoute and virtualRouterPeerLearnedRoute

* prettier

* Add to 0701

* Update virtualNetworkGateway.json

Change description to match others

* Revert "Update virtualNetworkGateway.json"

This reverts commit a4b72d46bb7df12272f8a5e5833deb24324261ff.

* Change description

* change names

* change name to match

* match

* change definition

* change reference

* change ref

* delete from 0601
---
 .../2020-06-01/virtualNetworkGateway.json     | 35 +------------------
 .../2020-07-01/virtualNetworkGateway.json     | 12 ++++++-
 2 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualNetworkGateway.json
index da70172235e3..91017276c4e0 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualNetworkGateway.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualNetworkGateway.json
@@ -2291,8 +2291,7 @@
           "description": "The type of this virtual network gateway.",
           "enum": [
             "Vpn",
-            "ExpressRoute",
-            "LocalGateway"
+            "ExpressRoute"
           ],
           "x-ms-enum": {
             "name": "VirtualNetworkGatewayType",
@@ -2374,14 +2373,6 @@
           "type": "string",
           "readOnly": true,
           "description": "The IP address allocated by the gateway to which dns requests can be sent."
-        },
-        "virtualNetworkExtendedLocationResourceId": {
-          "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": "#/definitions/ExtendedLocation"
         }
       },
       "description": "VirtualNetworkGateway properties."
@@ -2759,30 +2750,6 @@
       },
       "description": "Gateway routing details."
     },
-    "ExtendedLocation": {
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "Name of extended location."
-        },
-        "type": {
-          "type": "string",
-          "description": "Type of extended location.",
-          "enum": [
-            "EdgeZone"
-          ],
-          "x-ms-enum": {
-            "name": "ExtendedLocationType",
-            "modelAsString": true
-          }
-        }
-      },
-      "required": [
-        "name",
-        "type"
-      ],
-      "description": "The extended location of type local virtual network gateway."
-    },
     "VirtualNetworkGateway": {
       "properties": {
         "properties": {
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetworkGateway.json
index 2e1ec50609ef..75173a6faa9a 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetworkGateway.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetworkGateway.json
@@ -2291,7 +2291,8 @@
           "description": "The type of this virtual network gateway.",
           "enum": [
             "Vpn",
-            "ExpressRoute"
+            "ExpressRoute",
+            "LocalGateway"
           ],
           "x-ms-enum": {
             "name": "VirtualNetworkGatewayType",
@@ -2373,6 +2374,15 @@
           "type": "string",
           "readOnly": true,
           "description": "The IP address allocated by the gateway to which dns requests can be sent."
+        },
+        "virtualNetworkExtendedLocationResourceId": {
+          "type": "string",
+          "description": "MAS FIJI customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
+        },
+        "extendedLocation": {
+          "readOnly": true,
+          "description": "The extended location of type local virtual network gateway.",
+          "$ref": "./network.json#/definitions/ExtendedLocation"
         }
       },
       "description": "VirtualNetworkGateway properties."