Skip to content

Merge Network's October release branch into master #7564

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

Merged
yungezz merged 21 commits into from
Oct 22, 2019
Merged

Merge Network's October release branch into master #7564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a1ea355
Adds base for updating Microsoft.Network from version stable/2019-08-…
anton-evseev Oct 3, 2019
8417102
Updates readme
anton-evseev Oct 3, 2019
8c8e9a6
Updates API version in new specs and examples
anton-evseev Oct 3, 2019
a5601a2
Update readme for Network 2019-09-01 (#7393)
anton-evseev Oct 4, 2019
c25d1b6
Add swagger specs for VirtualHubRouteTableV2 (#7394)
nagula-ritvika Oct 8, 2019
6d05a76
Tesha/fqdn filtering (#7427)
tejasshah7 Oct 9, 2019
e9e108d
Fix BGP ASN minimum value for virtualRouter (#7412)
naveenchekuri Oct 10, 2019
9eda83e
Swagger perSite and perListener firewall policy - 2019_09_01 (#7401)
venk8 Oct 10, 2019
c0cecd0
chore: jsonfmt network (#7451)
nschonni Oct 11, 2019
59f8d83
Network: Mark read-only properties as such (#7488)
anton-evseev Oct 16, 2019
32fe8ee
Minor Bug Fix in List api (#7446)
nagula-ritvika Oct 17, 2019
ac4e611
Fixed desctiption for destinationPort in NetworkConfigurationDiagnost…
irrogozh Oct 17, 2019
72a8c91
Fix read-only property in expressRouteCircuit.json (#7526)
anton-evseev Oct 17, 2019
02e4f48
Add geomatch operator to AppGW WAF custom rule operators (#7489)
jshaker Oct 17, 2019
d540d68
IpGroups Changes (#7397)
ssripadham Oct 17, 2019
93aa714
Adding hostnames support in Application Gateway Listener Properties (…
Oct 17, 2019
e8ab263
Fix Virtual Wan Point to site feature resources property names from s…
Nilambari Oct 20, 2019
6590a86
add additional properties to template and examples (#7532)
b564518128 Oct 20, 2019
0917b5e
Update for private link feature (#7507)
bowen0106 Oct 21, 2019
5d3aa5a
Network: add missing default responses (#7545)
anton-evseev Oct 21, 2019
13c64de
Fix PATCH operations in Network (#7542)
anton-evseev Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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 @@ -660,6 +660,7 @@ ipconfigurations
ipfilterrules
Ipsec
ipssl
ipgroups
iscloneable
Iscsi
iscsiservers
Expand Down
2 changes: 1 addition & 1 deletion ...ification/network/resource-manager/Microsoft.Network/stable/2019-08-01/azureFirewall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@
"description": "Name of an Azure Firewall SKU.",
"enum": [
"AZFW_VNet",
"AZFW_Hub"
"AZFW_Hub"
],
"x-ms-enum": {
"name": "AzureFirewallSkuName",
Expand Down
2 changes: 1 addition & 1 deletion ...etwork/stable/2019-08-01/examples/GenerateVirtualWanVpnServerConfigurationVpnProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"resourceGroupName": "rg1",
"virtualWANName": "wan1",
"vpnClientParams": {
"vpnServerConfigurationResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnconfig1",
"vpnServerConfigurationResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnconfig1",
"authenticationMethod": "EAPTLS"
}
},
Expand Down
12 changes: 6 additions & 6 deletions ...er/Microsoft.Network/stable/2019-08-01/examples/GetVirtualWanVpnServerConfigurations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"200": {
"description": "Request successful.",
"body": {
"vpnServerConfigurationResourceIds": [
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnconfig1",
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnconfig2"
]
}
"vpnServerConfigurationResourceIds": [
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnconfig1",
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnconfig2"
]
}
},
"202": {}
"202": {}
}
}
32 changes: 16 additions & 16 deletions ...twork/resource-manager/Microsoft.Network/stable/2019-08-01/examples/P2SVpnGatewayGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@
"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"vpnGatewayScaleUnit": 1,
"vpnClientConnectionHealth": {
"vpnClientConnectionsCount": 2,
Expand All @@ -50,4 +50,4 @@
}
}
}
}
}
30 changes: 15 additions & 15 deletions ...anager/Microsoft.Network/stable/2019-08-01/examples/P2SVpnGatewayGetConnectionHealth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@
"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"vpnGatewayScaleUnit": 1,
"vpnClientConnectionHealth": {
"vpnClientConnectionsCount": 2,
Expand Down
34 changes: 17 additions & 17 deletions ...icrosoft.Network/stable/2019-08-01/examples/P2SVpnGatewayGetConnectionHealthDetailed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "p2s-vpn-gateway-test",
"gatewayName": "p2svpngateway",
"api-version": "2019-08-01",
"request": {
"vpnUserNamesFilter": [
"vpnUser1",
"vpnUser2"
],
"outputBlobSasUrl": "https://blobcortextesturl.blob.core.windows.net/folderforconfig/p2sconnectionhealths?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b"
}
},
"responses": {
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "p2s-vpn-gateway-test",
"gatewayName": "p2svpngateway",
"api-version": "2019-08-01",
"request": {
"vpnUserNamesFilter": [
"vpnUser1",
"vpnUser2"
],
"outputBlobSasUrl": "https://blobcortextesturl.blob.core.windows.net/folderforconfig/p2sconnectionhealths?sp=rw&se=2018-01-10T03%3A42%3A04Z&sv=2017-04-17&sig=WvXrT5bDmDFfgHs%2Brz%2BjAu123eRCNE9BO0eQYcPDT7pY%3D&sr=b"
}
},
"responses": {
"200": {
"body": ""
},
"202": {}
}
}
}
}
73 changes: 36 additions & 37 deletions ...work/resource-manager/Microsoft.Network/stable/2019-08-01/examples/P2SVpnGatewayList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
},
"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"vpnGatewayScaleUnit": 1,
"vpnClientConnectionHealth": {
"vpnClientConnectionsCount": 2,
Expand All @@ -60,25 +60,24 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2"
},
"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"vpnClientAddressPool": {
"addressPrefixes": [
"101.4.0.0/16"
]
}
}
}
],

"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"vpnClientAddressPool": {
"addressPrefixes": [
"101.4.0.0/16"
]
}
}
}
],
"vpnGatewayScaleUnit": 1,
"vpnClientConnectionHealth": {
"vpnClientConnectionsCount": 2,
Expand Down
64 changes: 32 additions & 32 deletions ...anager/Microsoft.Network/stable/2019-08-01/examples/P2SVpnGatewayListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
},
"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"properties": {
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"properties": {
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"vpnGatewayScaleUnit": 1,
"vpnClientConnectionHealth": {
"vpnClientConnectionsCount": 2,
Expand All @@ -58,22 +58,22 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2"
},
"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"properties": {
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"vpnServerConfiguration": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnServerConfigurations/vpnServerConfiguration1"
},
"p2sConnectionConfigurations": [
{
"name": "P2SConnectionConfig1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/p2sVpnGateways/p2sVpnGateway1/p2sConnectionConfigurations/P2SConnectionConfig1",
"properties": {
"vpnClientAddressPool": {
"addressPrefixes": [
"101.3.0.0/16"
]
}
}
}
],
"vpnGatewayScaleUnit": 1,
"vpnClientConnectionHealth": {
"vpnClientConnectionsCount": 2,
Expand Down
Loading