Add support for Traffic selector param in VpnConnection for virtualWan (

Azure#12903) * Add support for Traffic selector param in Connection - initial changes * Add trafficSelectorPolicies list in responses * Add trafficSelectorPolicies list in Get and List connection * cleanup stostools (Azure#12699) * Revert "Merge branch 'network-november-release' into ak-traffic-selector" This reverts commit 1a8f61e, reversing changes made to 3c90ff8. Co-authored-by: Zhenglai Zhang <darinzh@microsoft.com>
mkarmark · Feb 22, 2021 · 34dcf04 · 34dcf04
1 parent a1ce8e0
commit 34dcf04
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 519 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1449,7 +1449,6 @@ Reregister
 Rescan
 reservationorders
 resetapikey
-resetconnection
 resetvpnclientsharedkey
 Resolvability
 resourcegraph

diff --git a/scripts/stostools/Directory.Build.props b/scripts/stostools/Directory.Build.props
diff --git a/scripts/stostools/LaunchSToS.bat b/scripts/stostools/LaunchSToS.bat
diff --git a/scripts/stostools/nuget.config b/scripts/stostools/nuget.config
diff --git a/scripts/stostools/stos.proj b/scripts/stostools/stos.proj
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
@@ -2432,11 +2432,11 @@
           "readOnly": true,
           "description": "The IP address allocated by the gateway to which dns requests can be sent."
         },
-        "vNetExtendedLocationResourceId": {
+        "virtualNetworkExtendedLocationResourceId": {
           "type": "string",
           "description": "MAS FIJI customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
         },
-        "virtualNetworkExtendedLocation": {
+        "extendedLocation": {
           "description": "The extended location of type local virtual network gateway.",
           "$ref": "./network.json#/definitions/ExtendedLocation"
         }

diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json b/...work/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json
@@ -36,18 +36,12 @@
             "isEnabled": true,
             "retentionDays": 100,
             "logAnalyticsResources": {
-              "workspaces": [
+              "workspaceIds": [
                 {
-                  "region": "westus",
-                  "workspaceId": {
-                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
-                  }
+                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
                 },
                 {
-                  "region": "eastus",
-                  "workspaceId": {
-                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
-                  }
+                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
                 }
               ],
               "defaultWorkspaceId": {

diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json b/...work/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json
@@ -23,18 +23,12 @@
           "isEnabled": true,
           "retentionDays": 100,
           "logAnalyticsResources": {
-            "workspaces": [
+            "workspaceIds": [
               {
-                "region": "westus",
-                "workspaceId": {
-                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
-                }
+                "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
               },
               {
-                "region": "eastus",
-                "workspaceId": {
-                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
-                }
+                "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
               }
             ],
             "defaultWorkspaceId": {
@@ -127,18 +121,12 @@
             "isEnabled": true,
             "retentionDays": 100,
             "logAnalyticsResources": {
-              "workspaces": [
+              "workspaceIds": [
                 {
-                  "region": "westus",
-                  "workspaceId": {
-                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
-                  }
+                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
                 },
                 {
-                  "region": "eastus",
-                  "workspaceId": {
-                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
-                  }
+                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
                 }
               ],
               "defaultWorkspaceId": {
@@ -231,18 +219,12 @@
             "isEnabled": true,
             "retentionDays": 100,
             "logAnalyticsResources": {
-              "workspaces": [
+              "workspaceIds": [
                 {
-                  "region": "westus",
-                  "workspaceId": {
-                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
-                  }
+                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
                 },
                 {
-                  "region": "eastus",
-                  "workspaceId": {
-                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
-                  }
+                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
                 }
               ],
               "defaultWorkspaceId": {

diff --git a/...er/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json b/...er/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json
diff --git a/...twork/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json b/...twork/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json
@@ -20,6 +20,7 @@
           "enableInternetSecurity": false,
           "ingressBytesTransferred": 0,
           "egressBytesTransferred": 0,
+          "trafficSelectorPolicies": [],
           "vpnLinkConnections": [
             {
               "name": "Connection-Link1",

diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json b/...work/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json
@@ -20,6 +20,7 @@
             "enableInternetSecurity": false,
             "ingressBytesTransferred": 0,
             "egressBytesTransferred": 0,
+            "trafficSelectorPolicies": [],
             "vpnLinkConnections": [
               {
                 "name": "Connection-Link1",