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

Changes related to setting VpnClient AAD authentication options to Virtual network gateway resource & Advertising virtual Wan 2 released APIs. #5935

Merged
merged 10 commits into from
May 16, 2019
Merged

Changes related to setting VpnClient AAD authentication options to Virtual network gateway resource & Advertising virtual Wan 2 released APIs. #5935

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a5675c
Changes related to setting VpnClient AAD authentication options to Vi…
Nilambari May 13, 2019
4ed319e
Advertising virtual Wan 2 released APIs through swagger
Nilambari May 13, 2019
f973b03
Merge branch 'network-april-release' of https://github.com/Azure/azur…
Nilambari May 13, 2019
63f3518
Incorporate code review comments
Nilambari May 14, 2019
672b878
Merge branch 'network-april-release' of https://github.com/Azure/azur…
Nilambari May 14, 2019
7b6a060
Minor format fixes
EvgenyAgafonchikov May 15, 2019
5b11ebc
Merge pull request #1 from EvgenyAgafonchikov/minor-fix
Nilambari May 15, 2019
d2cef1a
Add newly added param:usePolicyBasedTrafficSelectors to VpnConnection…
Nilambari May 15, 2019
9f2f978
Merge branch 'network-april-release' of https://github.com/Azure/azur…
Nilambari May 15, 2019
bfeb347
Merge branch 'network-april-release1' of https://github.com/Nilambari…
Nilambari May 15, 2019
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
48 changes: 48 additions & 0 deletions ...anager/Microsoft.Network/stable/2019-04-01/examples/P2SVpnGatewayGetConnectionHealth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"parameters": {
"gatewayName": "p2sVpnGateway1",
"resourceGroupName": "rg1",
"api-version": "2019-04-01",
"subscriptionId": "subid"
},
"responses": {
"200": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add entry for 202 response code

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

"body": {
"name": "p2sVpnGateway1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/P2SvpnGateways/p2sVpnGateway1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"location": "West US",
"type": "Microsoft.Network/p2sVpnGateways",
"properties": {
"provisioningState": "Succeeded",
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
},
"p2SVpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
},
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
},
"customRoutes": {
"addressPrefixes": [
"101.168.0.6/32"
]
},
"vpnGatewayScaleUnit": 1,
"vpnClientConnectionHealth": {
"vpnClientConnectionsCount": 2,
"allocatedIpAddresses": [
"1.1.1.1",
"2.2.2.2"
],
"totalIngressBytesTransferred":2000,
"totalEgressBytesTransferred":3000
}
}
}
}
}
}
10 changes: 10 additions & 0 deletions ...source-manager/Microsoft.Network/stable/2019-04-01/examples/VirtualNetworkGatewayGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@
"vpnType": "RouteBased",
"enableBgp": false,
"activeActive": false,
"vpnClientConfiguration": {
"vpnClientProtocols": [
"OpenVPN"
],
"vpnClientRootCertificates": [],
"vpnClientRevokedCertificates": [],
"aadTenant": "https://login.microsoftonline.com/99163270-c9ab-4279-bb12-5353ed9bf6e1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor, code style: please keep TAB/space consistency over the files

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

"aadAudience": "fd11706c-e78c-4828-8be7-ac7dcefd4b17",
"aadIssuer": "https://sts.windows.net/99163270-c9ab-4279-bb12-5353ed9bf6e1/"
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor, code style: please remove trailing spaces

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

"bgpSettings": {
"asn": 65514,
"bgpPeeringAddress": "10.0.1.30",
Expand Down
15 changes: 10 additions & 5 deletions ...ource-manager/Microsoft.Network/stable/2019-04-01/examples/VirtualNetworkGatewayList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,16 @@
"vpnType": "RouteBased",
"enableBgp": false,
"activeActive": false,
"vpnClientConfiguration": {
"vpnClientProtocols": [],
"vpnClientRootCertificates": [],
"vpnClientRevokedCertificates": []
},
"vpnClientConfiguration": {
"vpnClientProtocols": [
"OpenVPN"
],
"vpnClientRootCertificates": [],
"vpnClientRevokedCertificates": [],
"aadTenant": "https://login.microsoftonline.com/99163270-c9ab-4279-bb12-5353ed9bf6e1",
"aadAudience": "fd11706c-e78c-4828-8be7-ac7dcefd4b17",
"aadIssuer": "https://sts.windows.net/99163270-c9ab-4279-bb12-5353ed9bf6e1/"
},
"bgpSettings": {
"asn": 65515,
"bgpPeeringAddress": "10.1.0.46",
Expand Down
16 changes: 10 additions & 6 deletions ...rce-manager/Microsoft.Network/stable/2019-04-01/examples/VirtualNetworkGatewayUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,13 @@
"activeActive": false,
"vpnClientConfiguration": {
"vpnClientProtocols": [
"SSTP",
"IkeV2"
"OpenVPN"
],
"vpnClientRootCertificates": [],
"vpnClientRevokedCertificates": []
"vpnClientRevokedCertificates": [],
"aadTenant": "",
"aadAudience": "",
"aadIssuer": ""
},
"bgpSettings": {
"asn": 65515,
Expand Down Expand Up @@ -138,11 +140,13 @@
"activeActive": false,
"vpnClientConfiguration": {
"vpnClientProtocols": [
"SSTP",
"IkeV2"
"OpenVPN"
],
"vpnClientRootCertificates": [],
"vpnClientRevokedCertificates": []
"vpnClientRevokedCertificates": [],
"aadTenant": "https://login.microsoftonline.com/99163270-c9ab-4279-bb12-5353ed9bf6e1",
"aadAudience": "fd11706c-e78c-4828-8be7-ac7dcefd4b17",
"aadIssuer": "https://sts.windows.net/99163270-c9ab-4279-bb12-5353ed9bf6e1/"
},
"bgpSettings": {
"asn": 65515,
Expand Down
53 changes: 53 additions & 0 deletions ...etwork/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnGatewayReset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"parameters": {
"gatewayName": "vpngw",
"resourceGroupName": "rg1",
"api-version": "2019-04-01",
"subscriptionId": "subid"
},
"responses": {
"202" : { },
"200": {
"body": {
"name": "vpngw",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"location": "West US",
"type": "Microsoft.Network/vpnGateways",
"properties": {
"provisioningState": "Succeeded",
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
},
"connections": [
{
"name": "vpnConnection1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw/vpnConnections/vpnConnection1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"remoteVpnSite": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1"
},
"connectionStatus": "Connected",
"ingressBytesTransferred": 0,
"egressBytesTransferred": 0,
"routingWeight": 0,
"connectionBandwidth": 100,
"sharedKey": "key",
"enableBgp": false,
"useLocalAzureIpAddress": false,
"ipsecPolicies": [ ]
}
}
],
"bgpSettings": {
"asn": 65514,
"bgpPeeringAddress": "10.0.1.30",
"peerWeight": 0
}
}
}
}
}
}
12 changes: 12 additions & 0 deletions ...n/network/resource-manager/Microsoft.Network/stable/2019-04-01/virtualNetworkGateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,6 +1873,18 @@
"radiusServerSecret": {
"type": "string",
"description": "The radius secret property of the VirtualNetworkGateway resource for vpn client connection."
},
"aadTenant": {
"type": "string",
"description": "The AADTenant property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication."
},
"aadAudience": {
"type": "string",
"description": "The AADAudience property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication."
},
"aadIssuer": {
"type": "string",
"description": "The AADIssuer property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication."
}
},
"description": "VpnClientConfiguration for P2S client."
Expand Down
100 changes: 99 additions & 1 deletion specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/virtualWan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,6 +1390,55 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/reset": {
"post": {
"tags": [
"vpnGateways"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"vpnGateways"
"VpnGateways"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

],
"operationId": "vpnGateways_Reset",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basing on other operations format

Suggested change
"operationId": "vpnGateways_Reset",
"operationId": "VpnGateways_Reset",

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

"description": "Resets the primary of the vpn gateway in the specified resource group.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The resource group name of the VpnGateway."
},
{
"name": "gatewayName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the gateway."
},
{
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"202": {
"description": "Accepted and the operation will complete asynchronously."
},
"200": {
"description": "Request successful. The operation reset the primary of the VpnGateway.",
"schema": {
"$ref": "#/definitions/VpnGateway"
}
}
},
"x-ms-examples": {
"ResetVpnGateway": { "$ref": "./examples/VpnGatewayReset.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",
Expand Down Expand Up @@ -2300,7 +2349,56 @@
"final-state-via": "location"
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/getp2svpnconnectionhealth": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/getp2svpnconnectionhealth": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/getP2sVpnConnectionHealth": {

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

"post": {
"tags": [
"P2SVpnGateways"
],
"operationId": "P2sVpnGateways_GetP2sVpnConnectionHealth",
"description": "Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.",
"parameters": [
{
"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 P2SVpnGateway."
},
{
"$ref": "./network.json#/parameters/ApiVersionParameter"
},
{
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "P2S Vpn Gateway with P2S connection health details.",
"schema": {
"$ref": "#/definitions/P2SVpnGateway"
}
},
"202": {
"description": "Accepted and the operation will complete asynchronously."
}
},
"x-ms-examples": {
"P2SVpnGatewayGetConnectionHealth": { "$ref": "./examples/P2SVpnGatewayGetConnectionHealth.json" }
},
"x-ms-long-running-operation": true,
"x-ms-long-running-operation-options": {
"final-state-via": "location"
}
}
}
},
"definitions": {
"VirtualWanProperties": {
Expand Down