Skip to content

Commit 34dcf04

Browse files
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 1a8f61e, reversing changes made to 3c90ff8. Co-authored-by: Zhenglai Zhang <[email protected]>
1 parent a1ce8e0 commit 34dcf04

18 files changed

+34
-519
lines changed

custom-words.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,6 @@ Reregister
14491449
Rescan
14501450
reservationorders
14511451
resetapikey
1452-
resetconnection
14531452
resetvpnclientsharedkey
14541453
Resolvability
14551454
resourcegraph

scripts/stostools/Directory.Build.props

Lines changed: 0 additions & 132 deletions
This file was deleted.

scripts/stostools/LaunchSToS.bat

Lines changed: 0 additions & 31 deletions
This file was deleted.

scripts/stostools/nuget.config

Lines changed: 0 additions & 21 deletions
This file was deleted.

scripts/stostools/stos.proj

Lines changed: 0 additions & 43 deletions
This file was deleted.

specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,11 +2432,11 @@
24322432
"readOnly": true,
24332433
"description": "The IP address allocated by the gateway to which dns requests can be sent."
24342434
},
2435-
"vNetExtendedLocationResourceId": {
2435+
"virtualNetworkExtendedLocationResourceId": {
24362436
"type": "string",
24372437
"description": "MAS FIJI customer vnet resource id. VirtualNetworkGateway of type local gateway is associated with the customer vnet."
24382438
},
2439-
"virtualNetworkExtendedLocation": {
2439+
"extendedLocation": {
24402440
"description": "The extended location of type local virtual network gateway.",
24412441
"$ref": "./network.json#/definitions/ExtendedLocation"
24422442
}

specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,12 @@
3636
"isEnabled": true,
3737
"retentionDays": 100,
3838
"logAnalyticsResources": {
39-
"workspaces": [
39+
"workspaceIds": [
4040
{
41-
"region": "westus",
42-
"workspaceId": {
43-
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
44-
}
41+
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
4542
},
4643
{
47-
"region": "eastus",
48-
"workspaceId": {
49-
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
50-
}
44+
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
5145
}
5246
],
5347
"defaultWorkspaceId": {

specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,12 @@
2323
"isEnabled": true,
2424
"retentionDays": 100,
2525
"logAnalyticsResources": {
26-
"workspaces": [
26+
"workspaceIds": [
2727
{
28-
"region": "westus",
29-
"workspaceId": {
30-
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
31-
}
28+
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
3229
},
3330
{
34-
"region": "eastus",
35-
"workspaceId": {
36-
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
37-
}
31+
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
3832
}
3933
],
4034
"defaultWorkspaceId": {
@@ -127,18 +121,12 @@
127121
"isEnabled": true,
128122
"retentionDays": 100,
129123
"logAnalyticsResources": {
130-
"workspaces": [
124+
"workspaceIds": [
131125
{
132-
"region": "westus",
133-
"workspaceId": {
134-
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
135-
}
126+
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
136127
},
137128
{
138-
"region": "eastus",
139-
"workspaceId": {
140-
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
141-
}
129+
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
142130
}
143131
],
144132
"defaultWorkspaceId": {
@@ -231,18 +219,12 @@
231219
"isEnabled": true,
232220
"retentionDays": 100,
233221
"logAnalyticsResources": {
234-
"workspaces": [
222+
"workspaceIds": [
235223
{
236-
"region": "westus",
237-
"workspaceId": {
238-
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
239-
}
224+
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace1"
240225
},
241226
{
242-
"region": "eastus",
243-
"workspaceId": {
244-
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
245-
}
227+
"id": "/subscriptions/subid/resourcegroups/rg1/providers/microsoft.operationalinsights/workspaces/workspace2"
246228
}
247229
],
248230
"defaultWorkspaceId": {

specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"enableInternetSecurity": false,
2121
"ingressBytesTransferred": 0,
2222
"egressBytesTransferred": 0,
23+
"trafficSelectorPolicies": [],
2324
"vpnLinkConnections": [
2425
{
2526
"name": "Connection-Link1",

specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"enableInternetSecurity": false,
2121
"ingressBytesTransferred": 0,
2222
"egressBytesTransferred": 0,
23+
"trafficSelectorPolicies": [],
2324
"vpnLinkConnections": [
2425
{
2526
"name": "Connection-Link1",

0 commit comments

Comments
 (0)