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

Revert "Add support for Traffic selector param in VpnConnection for virtualWan" #13088

Merged
merged 2 commits into from
Feb 23, 2021
Merged

Revert "Add support for Traffic selector param in VpnConnection for virtualWan" #13088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61238b5
Revert "Add support for Traffic selector param in VpnConnection for v…
akshatkale Feb 22, 2021
ec3b1d0
cleanup stostools (#12699)
zhenglaizhang Jan 28, 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: 1 addition & 0 deletions custom-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,7 @@ Reregister
Rescan
reservationorders
resetapikey
resetconnection
resetvpnclientsharedkey
Resolvability
resourcegraph
Expand Down
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."
},
"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"
}
Expand Down
12 changes: 9 additions & 3 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,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": {
Expand Down
36 changes: 27 additions & 9 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,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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down
11 changes: 11 additions & 0 deletions ...er/Microsoft.Network/stable/2020-11-01/examples/VirtualNetworkGatewayConnectionReset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"parameters": {
"api-version": "2020-08-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"virtualNetworkGatewayConnectionName": "conn1"
},
"responses": {
"202": {}
}
}
1 change: 0 additions & 1 deletion ...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,7 +20,6 @@
"enableInternetSecurity": false,
"ingressBytesTransferred": 0,
"egressBytesTransferred": 0,
"trafficSelectorPolicies": [],
"vpnLinkConnections": [
{
"name": "Connection-Link1",
Expand Down
1 change: 0 additions & 1 deletion ...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,7 +20,6 @@
"enableInternetSecurity": false,
"ingressBytesTransferred": 0,
"egressBytesTransferred": 0,
"trafficSelectorPolicies": [],
"vpnLinkConnections": [
{
"name": "Connection-Link1",
Expand Down
12 changes: 4 additions & 8 deletions ...twork/resource-manager/Microsoft.Network/stable/2020-11-01/examples/VpnConnectionPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@
"connectionBandwidth": 200,
"vpnConnectionProtocolType": "IKEv2",
"sharedKey": "key",
"vpnLinkConnectionMode": "Default",
"usePolicyBasedTrafficSelectors": false
"vpnLinkConnectionMode": "Default"
}
}
],
"trafficSelectorPolicies": []
]
}
}
},
Expand Down Expand Up @@ -93,8 +91,7 @@
"vnetRoutes": {
"staticRoutes": []
}
},
"trafficSelectorPolicies": []
}
}
}
},
Expand Down Expand Up @@ -160,8 +157,7 @@
"vnetRoutes": {
"staticRoutes": []
}
},
"trafficSelectorPolicies": []
}
}
}
}
Expand Down
20 changes: 20 additions & 0 deletions ...-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionGetIkeSas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}\""
}
}
}
13 changes: 13 additions & 0 deletions ...urce-manager/Microsoft.Network/stable/2020-11-01/examples/VpnSiteLinkConnectionReset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"api-version": "2020-08-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"gatewayName": "gateway1",
"connectionName": "vpnConnection1",
"linkConnectionName": "Connection-Link1"
},
"responses": {
"202": {}
}
}
20 changes: 17 additions & 3 deletions ...fication/network/resource-manager/Microsoft.Network/stable/2020-11-01/firewallPolicy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
}
}
}
}
4 changes: 4 additions & 0 deletions specification/network/resource-manager/Microsoft.Network/stable/2020-11-01/loadBalancer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
51 changes: 51 additions & 0 deletions ...n/network/resource-manager/Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Loading