Skip to content

Commit

Permalink
Add support for Traffic selector param in VpnConnection for virtualWan (
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
akshatkale and zhenglaizhang authored Feb 22, 2021
1 parent a1ce8e0 commit 34dcf04
Show file tree
Hide file tree
Showing 18 changed files with 34 additions and 519 deletions.
1 change: 0 additions & 1 deletion custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1449,7 +1449,6 @@ Reregister
Rescan
reservationorders
resetapikey
resetconnection
resetvpnclientsharedkey
Resolvability
resourcegraph
Expand Down
132 changes: 0 additions & 132 deletions scripts/stostools/Directory.Build.props

This file was deleted.

31 changes: 0 additions & 31 deletions scripts/stostools/LaunchSToS.bat

This file was deleted.

21 changes: 0 additions & 21 deletions scripts/stostools/nuget.config

This file was deleted.

43 changes: 0 additions & 43 deletions scripts/stostools/stos.proj

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"enableInternetSecurity": false,
"ingressBytesTransferred": 0,
"egressBytesTransferred": 0,
"trafficSelectorPolicies": [],
"vpnLinkConnections": [
{
"name": "Connection-Link1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"enableInternetSecurity": false,
"ingressBytesTransferred": 0,
"egressBytesTransferred": 0,
"trafficSelectorPolicies": [],
"vpnLinkConnections": [
{
"name": "Connection-Link1",
Expand Down
Loading

0 comments on commit 34dcf04

Please sign in to comment.