Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Traffic selector param in VpnConnection for virtualWan #12903

Merged
merged 6 commits into from
Feb 22, 2021
Merged

Add support for Traffic selector param in VpnConnection for virtualWan #12903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c980608
Add support for Traffic selector param in Connection - initial changes
akshatkale Feb 8, 2021
cf7690d
Add trafficSelectorPolicies list in responses
akshatkale Feb 9, 2021
3c90ff8
Add trafficSelectorPolicies list in Get and List connection
akshatkale Feb 9, 2021
1a8f61e
Merge branch 'network-november-release' into ak-traffic-selector
akshatkale Feb 18, 2021
32d3c3a
cleanup stostools (#12699)
zhenglaizhang Jan 28, 2021
89e3561
Revert "Merge branch 'network-november-release' into ak-traffic-selec…
akshatkale Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion custom-words.txt
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions scripts/stostools/LaunchSToS.bat
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions scripts/stostools/nuget.config
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions scripts/stostools/stos.proj
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...n/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json
View file
Open in desktop
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
12 changes: 3 additions & 9 deletions ...work/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyGet.json
View file
Open in desktop
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
36 changes: 9 additions & 27 deletions ...work/resource-manager/Microsoft.Network/stable/2020-11-01/examples/FirewallPolicyPut.json
View file
Open in desktop
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
11 changes: 0 additions & 11 deletions ...er/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...twork/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionGet.json
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...work/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionList.json
View file
Open in desktop
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