-
Notifications
You must be signed in to change notification settings - Fork 5.1k
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.
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
sergey-shandar
merged 10 commits into
Azure:network-april-release
from
Nilambari:network-april-release1
May 16, 2019
Merged
Changes from all 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 4ed319e
Advertising virtual Wan 2 released APIs through swagger
Nilambari f973b03
Merge branch 'network-april-release' of https://github.com/Azure/azur…
Nilambari 63f3518
Incorporate code review comments
Nilambari 672b878
Merge branch 'network-april-release' of https://github.com/Azure/azur…
Nilambari 7b6a060
Minor format fixes
EvgenyAgafonchikov 5b11ebc
Merge pull request #1 from EvgenyAgafonchikov/minor-fix
Nilambari d2cef1a
Add newly added param:usePolicyBasedTrafficSelectors to VpnConnection…
Nilambari 9f2f978
Merge branch 'network-april-release' of https://github.com/Azure/azur…
Nilambari bfeb347
Merge branch 'network-april-release1' of https://github.com/Nilambari…
Nilambari File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
50 changes: 50 additions & 0 deletions
50
...anager/Microsoft.Network/stable/2019-04-01/examples/P2SVpnGatewayGetConnectionHealth.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| { | ||
| "parameters": { | ||
| "gatewayName": "p2sVpnGateway1", | ||
| "resourceGroupName": "rg1", | ||
| "api-version": "2019-04-01", | ||
| "subscriptionId": "subid" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "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 | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "202": { | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...etwork/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnGatewayReset.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.