Revert "Add support for Traffic selector param in VpnConnection for v…

…irtualWan" (#13088) * Revert "Add support for Traffic selector param in VpnConnection for virtualWan (#12903)" This reverts commit 34dcf04. * cleanup stostools (#12699) Co-authored-by: Zhenglai Zhang <darinzh@microsoft.com>
Azure · Feb 23, 2021 · b143498 · b143498
1 parent 34dcf04
commit b143498
Show file tree

Hide file tree

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

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."
         },
-        "virtualNetworkExtendedLocationResourceId": {
+        "vNetExtendedLocationResourceId": {
           "type": "string",
           "description": "MAS FIJI customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
         },
-        "extendedLocation": {
+        "virtualNetworkExtendedLocation": {
           "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,12 +36,18 @@
             "isEnabled": true,
             "retentionDays": 100,
             "logAnalyticsResources": {
-              "workspaceIds": [
+              "workspaces": [
                 {
-                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
+                  "region": "westus",
+                  "workspaceId": {
+                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
+                  }
                 },
                 {
-                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
+                  "region": "eastus",
+                  "workspaceId": {
+                    "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,12 +23,18 @@
           "isEnabled": true,
           "retentionDays": 100,
           "logAnalyticsResources": {
-            "workspaceIds": [
+            "workspaces": [
               {
-                "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
+                "region": "westus",
+                "workspaceId": {
+                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
+                }
               },
               {
-                "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
+                "region": "eastus",
+                "workspaceId": {
+                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
+                }
               }
             ],
             "defaultWorkspaceId": {
@@ -121,12 +127,18 @@
             "isEnabled": true,
             "retentionDays": 100,
             "logAnalyticsResources": {
-              "workspaceIds": [
+              "workspaces": [
                 {
-                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
+                  "region": "westus",
+                  "workspaceId": {
+                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
+                  }
                 },
                 {
-                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
+                  "region": "eastus",
+                  "workspaceId": {
+                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
+                  }
                 }
               ],
               "defaultWorkspaceId": {
@@ -219,12 +231,18 @@
             "isEnabled": true,
             "retentionDays": 100,
             "logAnalyticsResources": {
-              "workspaceIds": [
+              "workspaces": [
                 {
-                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
+                  "region": "westus",
+                  "workspaceId": {
+                    "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
+                  }
                 },
                 {
-                  "id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
+                  "region": "eastus",
+                  "workspaceId": {
+                    "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
@@ -0,0 +1,11 @@
+{
+  "parameters": {
+    "api-version": "2020-08-01",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg1",
+    "virtualNetworkGatewayConnectionName": "conn1"
+  },
+  "responses": {
+    "202": {}
+  }
+}
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,7 +20,6 @@
           "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,7 +20,6 @@
             "enableInternetSecurity": false,
             "ingressBytesTransferred": 0,
             "egressBytesTransferred": 0,
-            "trafficSelectorPolicies": [],
             "vpnLinkConnections": [
               {
                 "name": "Connection-Link1",

diff --git a/...twork/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json b/...twork/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json
@@ -20,12 +20,10 @@
               "connectionBandwidth": 200,
               "vpnConnectionProtocolType": "IKEv2",
               "sharedKey": "key",
-              "vpnLinkConnectionMode": "Default",
-              "usePolicyBasedTrafficSelectors": false
+              "vpnLinkConnectionMode": "Default"
             }
           }
-        ],
-        "trafficSelectorPolicies": []
+        ]
       }
     }
   },
@@ -93,8 +91,7 @@
             "vnetRoutes": {
               "staticRoutes": []
             }
-          },
-          "trafficSelectorPolicies": []
+          }
         }
       }
     },
@@ -160,8 +157,7 @@
             "vnetRoutes": {
               "staticRoutes": []
             }
-          },
-          "trafficSelectorPolicies": []
+          }
         }
       }
     }

diff --git a/...-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json b/...-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json
@@ -0,0 +1,20 @@
+{
+  "parameters": {
+    "api-version": "2020-11-01",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg1",
+    "gatewayName": "gateway1",
+    "connectionName": "vpnConnection1",
+    "linkConnectionName": "Connection-Link1"
+  },
+  "responses": {
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/westus/operationResults/{operationId}?api-version=2020-11-01"
+      }
+    },
+    "200": {
+      "body": "\"{\"Status\":\"Successful\",\"Data\":null}\""
+    }
+  }
+}
diff --git a/...urce-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json b/...urce-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json
@@ -0,0 +1,13 @@
+{
+  "parameters": {
+    "api-version": "2020-08-01",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg1",
+    "gatewayName": "gateway1",
+    "connectionName": "vpnConnection1",
+    "linkConnectionName": "Connection-Link1"
+  },
+  "responses": {
+    "202": {}
+  }
+}
diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json b/...fication/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json
@@ -1376,18 +1376,32 @@
       "description": "Log Analytics Resources for Firewall Policy Insights.",
       "x-ms-discriminator-value": "FirewallPolicyLogAnalyticsResources",
       "properties": {
-        "workspaceIds": {
+        "workspaces": {
           "type": "array",
-          "description": "List of workspace Ids for Firewall Policy Insights.",
+          "description": "List of workspaces for Firewall Policy Insights.",
           "items": {
-            "$ref": "./network.json#/definitions/SubResource"
+            "$ref": "#/definitions/FirewallPolicyLogAnalyticsWorkspace"
           }
         },
         "defaultWorkspaceId": {
           "$ref": "./network.json#/definitions/SubResource",
           "description": "The default workspace Id for Firewall Policy Insights."
         }
       }
+    },
+    "FirewallPolicyLogAnalyticsWorkspace": {
+      "description": "Log Analytics Workspace for Firewall Policy Insights.",
+      "x-ms-discriminator-value": "FirewallPolicyLogAnalyticsWorkspace",
+      "properties": {
+        "region": {
+          "type": "string",
+          "description": "Region to configure the Workspace."
+        },
+        "workspaceId": {
+          "$ref": "./network.json#/definitions/SubResource",
+          "description": "The workspace Id for Firewall Policy Insights."
+        }
+      }
     }
   }
 }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/loadBalancer.json
@@ -1510,6 +1510,10 @@
           "$ref": "./network.json#/definitions/SubResource",
           "description": "Reference to an existing virtual network."
         },
+        "subnet": {
+          "$ref": "./network.json#/definitions/SubResource",
+          "description": "Reference to an existing subnet."
+        },
         "ipAddress": {
           "type": "string",
           "description": "IP Address belonging to the referenced virtual network.",

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
@@ -1882,6 +1882,57 @@
         }
       }
     },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/resetconnection": {
+      "post": {
+        "tags": [
+          "VirtualNetworkGatewayConnections"
+        ],
+        "operationId": "VirtualNetworkGatewayConnections_ResetConnection",
+        "description": "Resets the virtual network gateway connection specified.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayConnectionName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network gateway Connection."
+          },
+          {
+            "$ref": "./network.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./network.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously."
+          },
+          "default": {
+            "description": "The operation resetconnection could not be completed.",
+            "schema": {
+              "$ref": "./networkWatcher.json#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "ResetVirtualNetworkGatewayConnection": {
+            "$ref": "./examples/VirtualNetworkGatewayConnectionReset.json"
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}": {
       "put": {
         "tags": [