From 34dcf04f0ee453fa739ec2f790376a8decb5a3ab Mon Sep 17 00:00:00 2001 From: Akshat Kale Date: Sun, 21 Feb 2021 21:36:45 -0800 Subject: [PATCH] Add support for Traffic selector param in VpnConnection for virtualWan (#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 (#12699) * Revert "Merge branch 'network-november-release' into ak-traffic-selector" This reverts commit 1a8f61e3c4395f410d6ff16ee41da4d2eeb091b5, reversing changes made to 3c90ff8ccb6c1e46c0480643906d6b5c5388e8c8. Co-authored-by: Zhenglai Zhang --- custom-words.txt | 1 - scripts/stostools/Directory.Build.props | 132 ----------------- scripts/stostools/LaunchSToS.bat | 31 ---- scripts/stostools/nuget.config | 21 --- scripts/stostools/stos.proj | 43 ------ .../2020-08-01/virtualNetworkGateway.json | 4 +- .../examples/FirewallPolicyGet.json | 12 +- .../examples/FirewallPolicyPut.json | 36 ++--- .../VirtualNetworkGatewayConnectionReset.json | 11 -- .../2020-11-01/examples/VpnConnectionGet.json | 1 + .../examples/VpnConnectionList.json | 1 + .../2020-11-01/examples/VpnConnectionPut.json | 12 +- .../VpnSiteLinkConnectionGetIkeSas.json | 20 --- .../examples/VpnSiteLinkConnectionReset.json | 13 -- .../stable/2020-11-01/firewallPolicy.json | 20 +-- .../stable/2020-11-01/loadBalancer.json | 4 - .../2020-11-01/virtualNetworkGateway.json | 51 ------- .../stable/2020-11-01/virtualWan.json | 140 +----------------- 18 files changed, 34 insertions(+), 519 deletions(-) delete mode 100644 scripts/stostools/Directory.Build.props delete mode 100644 scripts/stostools/LaunchSToS.bat delete mode 100644 scripts/stostools/nuget.config delete mode 100644 scripts/stostools/stos.proj delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json diff --git a/custom-words.txt b/custom-words.txt index f5f1273f1f76..78acfcea9cd8 100644 --- 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 deleted file mode 100644 index 72ce43bc9d3e..000000000000 --- a/scripts/stostools/Directory.Build.props +++ /dev/null @@ -1,132 +0,0 @@ - - - $(MSBuildThisFileDirectory) - .\ - $([System.IO.Path]::GetFullPath($(CurrentDir)).Trim('\')) - - - $(RepoRootAbspath) - $(RepoRoot)\src - $(RepoRoot)\tools - $(RepoRoot)\eng - $(RepoToolsDir)\LocalNugetFeed - $(RepoEngDir)\alias - $(RepoToolsDir)\NugetExe - $(RepoSrcDir)\NugetToolsPackage - $(RepoRoot)\restoredPackages - - - - false - - - - $(RepoSrcDir)\CI - $(RepoCISrcDir)\CI.Common - $(RepoCISrcDir)\CI.BuildTasks - $(NugPkgSrcDir)\CI.Tools.Package - $(CINugPkgSrcDir)\build\tasks - $(CIBuildOutputDir)\netstandard2.0 - - - - $(RepoSrcDir)\SwaggerToSdk - $(RepoSToSSrcDir)\Common\SToS.Common - $(RepoSToSSrcDir)\BuildTasks\SToS.BuildTasks - $(NugPkgSrcDir)\SwaggerToSdk.Tools.Package - $(SToSNugPkgSrcRootDir)\build - $(SToSNugPkgSrcDir)\Sdk - $(SToSNugPkgSrcDir)\tasks - $(SToSBuildOutputDir)\netstandard2.0 - $(SToSBuildOutputDir)\net461 - - - - Debug - AnyCPU - - - - - $(MSBuildRuntimeType) - netstandard2.0 - net461 - - - true - true - - - - - - - - - - - - - - - - - - true - true - true - false - - - - - currentUser.props - $(LocalDevUserBootstrapDirPath)\$(DefaultCurrentUserPropsFileName) - $(RepoDeveloperDir)\$(UserName)\$(DefaultCurrentUserPropsFileName) - - - - - $(UserName) - $(LocalDevUser).bootStrap.targets - $(RepoDeveloperDir)\$(LocalDevUser)\$(DefaultCurrentUserPropsFileName) - - - - $(RepoDeveloperDir)\$(LocalDevUser) - $(LocalDevUserTargetsDir)\$(DefaultCurrentuserTargetsFileName) - $(LocalDevUserBootstrapDirPath)\currentUser.props - - $(SToSNugPkgSdkDir)\SToS.props - - - - - - true - true - true - false - false - - \ No newline at end of file diff --git a/scripts/stostools/LaunchSToS.bat b/scripts/stostools/LaunchSToS.bat deleted file mode 100644 index 27b6263a8a05..000000000000 --- a/scripts/stostools/LaunchSToS.bat +++ /dev/null @@ -1,31 +0,0 @@ -@echo OFF - -set StartupProj=%1 -set PrNumber=%2 -set LastGithubCommitId=%3 -set GitHubUrl=%4 -set TriggerComment=%5 -set DebugMode=%6 -set LogVerbosity=%7 - -if "%VSWHERE%"=="" set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" - -for /f "usebackq tokens=*" %%i in (`"%VSWHERE%" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do ( - set InstallDir=%%i -) - -CALL "%InstallDir%\Common7\Tools\VsDevCmd.bat" - -echo StartupProj: %StartupProj% -echo Pr#: %PrNumber% -echo Last Commit Id: %LastGithubCommitId% -echo GitHub Url: %GitHubUrl% -echo Trigger Comment: %TriggerComment% -echo DebugMode: %DebugMode% -echo Log Verbosity: %LogVerbosity% - -dotnet msbuild %startupProj% /t:StartNetSdkCodeGeneration /v:%LogVerbosity% /p:githubprnumber=%PrNumber% /p:githubcommitid=%LastGithubCommitId% /p:giturl=%GitHubUrl% /p:DebugMode=%DebugMode% /p:triggercomment=%TriggerComment% - -REM dotnet msbuild stos.proj /t:StartNetSdkCodeGeneration /v:N /p:githubprnumber=63 /p:githubcommitid=b5ee45302838515adc14857ed45c44ed99a1e517 /p:giturl=https://github.com/Azure/AzSwaggerSpecsTestClone /p:DebugMode=false /p:triggercomment=startbuild -REM LaunchSToS.bat stos.proj 63 b5ee45302838515adc14857ed45c44ed99a1e517 https://github.com/Azure/AzSwaggerSpecsTestClone startbuild false D -REM stostools\LaunchSToS.bat SToS.proj %ghprbPullId% %ghprbActualCommit% %GIT_URL% %ghprbCommentBody% false n diff --git a/scripts/stostools/nuget.config b/scripts/stostools/nuget.config deleted file mode 100644 index f475a9c957d1..000000000000 --- a/scripts/stostools/nuget.config +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/scripts/stostools/stos.proj b/scripts/stostools/stos.proj deleted file mode 100644 index ef96abcd6920..000000000000 --- a/scripts/stostools/stos.proj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - $(MSBuildRuntimeType) - netstandard2.0 - net461 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json index 690f82a5b620..1a0684f3f1e5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json +++ b/specification/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/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json index ad5694ddbc4a..0041022738f2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json +++ b/specification/network/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/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json index 18bdb9bfe8e5..c12e14e91651 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json +++ b/specification/network/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/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json deleted file mode 100644 index accebce62715..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parameters": { - "api-version": "2020-08-01", - "subscriptionId": "subid", - "resourceGroupName": "rg1", - "virtualNetworkGatewayConnectionName": "conn1" - }, - "responses": { - "202": {} - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json index 067d28c42b30..4bd7fbc1b4a9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json +++ b/specification/network/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/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json index 8b302487219f..bf7f8bb7980c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json +++ b/specification/network/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", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json index 18e5d0c3c9d6..291b2d106189 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json @@ -20,10 +20,12 @@ "connectionBandwidth": 200, "vpnConnectionProtocolType": "IKEv2", "sharedKey": "key", - "vpnLinkConnectionMode": "Default" + "vpnLinkConnectionMode": "Default", + "usePolicyBasedTrafficSelectors": false } } - ] + ], + "trafficSelectorPolicies": [] } } }, @@ -91,7 +93,8 @@ "vnetRoutes": { "staticRoutes": [] } - } + }, + "trafficSelectorPolicies": [] } } }, @@ -157,7 +160,8 @@ "vnetRoutes": { "staticRoutes": [] } - } + }, + "trafficSelectorPolicies": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json deleted file mode 100644 index 5df6560e5667..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json deleted file mode 100644 index 1a1571a85599..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parameters": { - "api-version": "2020-08-01", - "subscriptionId": "subid", - "resourceGroupName": "rg1", - "gatewayName": "gateway1", - "connectionName": "vpnConnection1", - "linkConnectionName": "Connection-Link1" - }, - "responses": { - "202": {} - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json index 0d71d86dc5d0..3ddd2720b4e6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json @@ -1376,11 +1376,11 @@ "description": "Log Analytics Resources for Firewall Policy Insights.", "x-ms-discriminator-value": "FirewallPolicyLogAnalyticsResources", "properties": { - "workspaces": { + "workspaceIds": { "type": "array", - "description": "List of workspaces for Firewall Policy Insights.", + "description": "List of workspace Ids for Firewall Policy Insights.", "items": { - "$ref": "#/definitions/FirewallPolicyLogAnalyticsWorkspace" + "$ref": "./network.json#/definitions/SubResource" } }, "defaultWorkspaceId": { @@ -1388,20 +1388,6 @@ "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 index e9ce60ac8315..9119efbdd954 100644 --- 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,10 +1510,6 @@ "$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/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json index 77569ee60de6..33fcb3bfb7c0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json @@ -1882,57 +1882,6 @@ } } }, - "/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": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualWan.json index 9ee66232c41c..8246e556bcd9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualWan.json @@ -2094,71 +2094,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}/vpnLinkConnections/{linkConnectionName}/resetconnection": { - "post": { - "tags": [ - "vpnLinkConnections" - ], - "operationId": "VpnLinkConnections_ResetConnection", - "description": "Resets the VpnLink connection specified.", - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group." - }, - { - "name": "gatewayName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the gateway." - }, - { - "name": "connectionName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the vpn connection." - }, - { - "name": "linkConnectionName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the vpn link connection." - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "202": { - "description": "Accepted and the operation ResetConnection will complete asynchronously." - }, - "default": { - "description": "The operation ResetConnection could not be completed.", - "schema": { - "$ref": "./networkWatcher.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-examples": { - "ResetVpnLinkConnection": { - "$ref": "./examples/VpnSiteLinkConnectionReset.json" - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways": { "get": { "operationId": "VpnGateways_ListByResourceGroup", @@ -2483,74 +2418,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}/vpnLinkConnections/{linkConnectionName}/getikesas": { - "post": { - "operationId": "VpnLinkConnections_GetIkeSas", - "x-ms-examples": { - "GetVpnLinkConnectionIkeSa": { - "$ref": "./examples/VpnSiteLinkConnectionGetIkeSas.json" - } - }, - "description": "Lists IKE Security Associations for Vpn Site Link Connection in the specified resource group.", - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group." - }, - { - "name": "gatewayName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the gateway." - }, - { - "name": "connectionName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the vpn connection." - }, - { - "name": "linkConnectionName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the vpn link connection." - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "202": { - "description": "Accepted and the operation GetIkeSas will complete asynchronously." - }, - "200": { - "description": "Request successful. The operation getikesas completed on vpn site link connection.", - "schema": { - "type": "string" - } - }, - "default": { - "description": "The operation GetIkeSas could not be completed.", - "schema": { - "$ref": "./networkWatcher.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "location" - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{vpnConnectionName}/startpacketcapture": { "post": { "operationId": "VpnConnections_StartPacketCapture", @@ -6357,6 +6224,13 @@ }, "description": "The IPSec Policies to be considered by this connection." }, + "trafficSelectorPolicies": { + "type": "array", + "items": { + "$ref": "./virtualNetworkGateway.json#/definitions/TrafficSelectorPolicy" + }, + "description": "The Traffic Selector Policies to be considered by this connection." + }, "enableRateLimiting": { "type": "boolean", "description": "EnableBgp flag."