diff --git a/package.json b/package.json
index 068193360e3f..b4b83ecff038 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "description": "Tests for Azure REST API Specifications",
   "license": "MIT",
   "devDependencies": {
-    "@azure/avocado": "^0.5.1",
+    "@azure/avocado": "^0.6.0",
     "@azure/rest-api-specs-scripts": "^0.4.0",
     "@ts-common/commonmark-to-markdown": "^1.2.0",
     "@ts-common/fs": "0.2.0",
@@ -23,7 +23,7 @@
     "mocha": "*",
     "ts-node": "^8.1.0",
     "tslib": "^1.10.0",
-    "typescript": "^3.4.4"
+    "typescript": "3.5.3"
   },
   "homepage": "https://github.com/azure/azure-rest-api-specs",
   "repository": {
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayGet.json
index 3e1cfae48b66..e74dab510d21 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayGet.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayGet.json
@@ -39,7 +39,8 @@
             "capacity": 0
           },
           "gatewayType": "Vpn",
-          "vpnType": "RouteBased",
+		  "vpnType": "RouteBased",
+		  "vpnGatewayGeneration": "None",
           "enableBgp": false,
           "activeActive": false,
           "vpnClientConfiguration": {
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayList.json
index f040b15c4a1e..9dae558728d0 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayList.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayList.json
@@ -41,6 +41,7 @@
               },
               "gatewayType": "Vpn",
               "vpnType": "RouteBased",
+			  "vpnGatewayGeneration": "None",
               "enableBgp": false,
               "activeActive": false,
               "vpnClientConfiguration": {
@@ -93,6 +94,7 @@
               },
               "gatewayType": "Vpn",
               "vpnType": "RouteBased",
+			  "vpnGatewayGeneration": "None",
               "enableBgp": false,
               "activeActive": false,
               "vpnClientConfiguration": {
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayUpdate.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayUpdate.json
index f33dd4b86379..165a2f8dddba 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayUpdate.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayUpdate.json
@@ -77,6 +77,7 @@
           },
           "gatewayType": "Vpn",
           "vpnType": "RouteBased",
+		  "vpnGatewayGeneration": "None",
           "enableBgp": false,
           "activeActive": false,
           "vpnClientConfiguration": {
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayUpdateTags.json
index 2a52cc452c65..2efeebcbab77 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayUpdateTags.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/VirtualNetworkGatewayUpdateTags.json
@@ -49,6 +49,7 @@
           },
           "gatewayType": "Vpn",
           "vpnType": "RouteBased",
+		  "vpnGatewayGeneration": "None",
           "enableBgp": false,
           "activeActive": false,
           "bgpSettings": {
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/virtualNetworkGateway.json
index 0c9397931452..d824e0ab9d9c 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/virtualNetworkGateway.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/virtualNetworkGateway.json
@@ -1780,6 +1780,19 @@
             "modelAsString": true
           }
         },
+        "vpnGatewayGeneration": {
+          "type": "string",
+          "description": "The generation for this VirtualNetworkGateway. Must be None if gatewayType is not VPN.",
+          "enum": [
+            "None",
+            "Generation1",
+            "Generation2"
+          ],
+          "x-ms-enum": {
+            "name": "VpnGatewayGeneration",
+            "modelAsString": true
+          }
+        },
         "enableBgp": {
           "type": "boolean",
           "description": "Whether BGP is enabled for this virtual network gateway or not."
@@ -1980,9 +1993,13 @@
             "VpnGw1",
             "VpnGw2",
             "VpnGw3",
+            "VpnGw4",
+            "VpnGw5",
             "VpnGw1AZ",
             "VpnGw2AZ",
             "VpnGw3AZ",
+            "VpnGw4AZ",
+            "VpnGw5AZ",
             "ErGw1AZ",
             "ErGw2AZ",
             "ErGw3AZ"
@@ -2003,9 +2020,13 @@
             "VpnGw1",
             "VpnGw2",
             "VpnGw3",
+            "VpnGw4",
+            "VpnGw5",
             "VpnGw1AZ",
             "VpnGw2AZ",
             "VpnGw3AZ",
+            "VpnGw4AZ",
+            "VpnGw5AZ",
             "ErGw1AZ",
             "ErGw2AZ",
             "ErGw3AZ"