Skip to content

Merge Network release branch into master #5189

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
sergey-shandar merged 19 commits into from
Feb 13, 2019
Merged

Merge Network release branch into master #5189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
25d3409
Adds base for updating Microsoft.Network from version stable/2018-11-…
MikhailTryakhov Jan 4, 2019
fb9564f
Updates readme
MikhailTryakhov Jan 4, 2019
cd3fe9f
Updates API version in new specs and examples
MikhailTryakhov Jan 4, 2019
3ec98c8
fixing invalid paths in frontdoor (#4991)
Jan 7, 2019
4906929
add max bound for application gateway autoscale config (#4996)
KaiChiLin Jan 7, 2019
3fcc923
fixing location in network samples (#4992)
Jan 7, 2019
7da6f1d
Fix duplicate path in old Network API versions (#5003)
anton-evseev Jan 9, 2019
e4158c5
missing location in route tables (#5024)
Jan 11, 2019
7be29f9
removed confusing readonly parameters from example (#5022)
Jan 14, 2019
9d588c8
Fix errors in ddosCustomPolicy.json (#5013)
anton-evseev Jan 18, 2019
f26cb6d
Pick AppGw changes from 2018-11-01 (#5044)
anton-evseev Jan 22, 2019
c8027f9
Adding the structure of ruleSequence and conditions in rewriteRuleSet…
Jan 22, 2019
3ded879
Added Prepare action for subnet (#5058)
Am018 Jan 22, 2019
598f0e7
updated the destination address description to also include service t…
anchalkpr Jan 30, 2019
e7a48d7
Update for Get Application Gateway Server Variables APIs (#5113)
nirkum18 Feb 5, 2019
c0f9183
Fixed issue: https://github.com/Azure/azure-rest-api-specs/issues/472…
irrogozh Feb 11, 2019
b616d58
Threat Intel changes for Azure Firewall (#5143)
fanymanea Feb 11, 2019
cf5b233
Merge branch 'master' into merge-network-release
anton-evseev Feb 12, 2019
8ad6916
Fix typos in Network 2018-12-01
anton-evseev Feb 12, 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
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions ...on/frontdoor/resource-manager/Microsoft.Network/preview/2018-08-01-preview/frontdoor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/provider/Microsoft.Network/frontDoors/{frontDoorName}/frontendEndpoints/{frontendEndpointName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/frontDoors/{frontDoorName}/frontendEndpoints/{frontendEndpointName}": {
"get": {
"tags": [
"FrontDoors"
Expand Down Expand Up @@ -1394,7 +1394,7 @@
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/provider/Microsoft.Network/frontDoors/{frontDoorName}/frontendEndpoints/{frontendEndpointName}/enableHttps": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/frontDoors/{frontDoorName}/frontendEndpoints/{frontendEndpointName}/enableHttps": {
"post": {
"tags": [
"FrontDoors"
Expand Down Expand Up @@ -1449,7 +1449,7 @@
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/provider/Microsoft.Network/frontDoors/{frontDoorName}/frontendEndpoints/{frontendEndpointName}/disableHttps": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/frontDoors/{frontDoorName}/frontendEndpoints/{frontendEndpointName}/disableHttps": {
"post": {
"tags": [
"FrontDoors"
Expand Down
5 changes: 3 additions & 2 deletions ...ork/resource-manager/Microsoft.Network/stable/2017-06-01/examples/LoadBalancerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"resourceGroupName" : "rg1",
"loadBalancerName" : "lb",
"parameters": {
"location": "eastus",
"properties": {
"frontendIPConfigurations": [
{
Expand Down Expand Up @@ -103,7 +104,7 @@
"name": "lb",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "westus",
"location": "eastus",
"properties": {
"provisioningState": "Succeeded",
"frontendIPConfigurations": [
Expand Down Expand Up @@ -214,7 +215,7 @@
"name": "lb",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "westus",
"location": "eastus",
"properties": {
"provisioningState": "Succeeded",
"frontendIPConfigurations": [
Expand Down
5 changes: 3 additions & 2 deletions ...rce-manager/Microsoft.Network/stable/2017-06-01/examples/LoadBalancerCreateWithZones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"resourceGroupName" : "rg1",
"loadBalancerName" : "lb",
"parameters": {
"location": "eastus",
"properties": {
"frontendIPConfigurations": [
{
Expand Down Expand Up @@ -104,7 +105,7 @@
"name": "lb",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "westus",
"location": "eastus",
"sku": {
"name": "Basic"
},
Expand Down Expand Up @@ -220,7 +221,7 @@
"name": "lb",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "westus",
"location": "eastus",
"sku": {
"name": "Basic"
},
Expand Down
3 changes: 2 additions & 1 deletion ...resource-manager/Microsoft.Network/stable/2017-06-01/examples/NetworkInterfaceCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
}
}
]
}
},
"location": "eastus"
}
},
"responses" : {
Expand Down
8 changes: 5 additions & 3 deletions ...urce-manager/Microsoft.Network/stable/2017-06-01/examples/NetworkSecurityGroupCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
"subscriptionId" : "subid",
"resourceGroupName" : "rg1",
"networkSecurityGroupName" : "testnsg",
"parameters": {}
"parameters": {
"location": "eastus"
}
},
"responses" : {
"200" : {
"body" : {
"name": "testnsg",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/testnsg",
"type": "Microsoft.Network/networkSecurityGroups",
"location": "westus",
"location": "eastus",
"properties": {
"provisioningState": "Succeeded",
"securityRules": [ ],
Expand Down Expand Up @@ -122,7 +124,7 @@
"name": "testnsg",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/testnsg",
"type": "Microsoft.Network/networkSecurityGroups",
"location": "westus",
"location": "eastus",
"properties": {
"provisioningState": "Succeeded",
"securityRules": [ ],
Expand Down
7 changes: 4 additions & 3 deletions ...ager/Microsoft.Network/stable/2017-06-01/examples/NetworkSecurityGroupCreateWithRule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
}
}
]
}
},
"location": "eastus"
}
},
"responses" : {
Expand All @@ -30,7 +31,7 @@
"name": "testnsg",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/testnsg",
"type": "Microsoft.Network/networkSecurityGroups",
"location": "westus",
"location": "eastus",
"properties": {
"provisioningState": "Succeeded",
"securityRules": [
Expand Down Expand Up @@ -156,7 +157,7 @@
"name": "testnsg",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/testnsg",
"type": "Microsoft.Network/networkSecurityGroups",
"location": "westus",
"location": "eastus",
"properties": {
"provisioningState": "Succeeded",
"securityRules": [
Expand Down
7 changes: 4 additions & 3 deletions ...r/Microsoft.Network/stable/2017-06-01/examples/PublicIpAddressCreateCustomizedValues.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@
"publicIPAllocationMethod": "Static",
"idleTimeoutInMinutes": 10,
"publicIPAddressVersion": "IPv4"
}
},
"location": "eastus"
}
},
"responses" : {
"200" : {
"body" : {
"name" : "testDNS-ip",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/test-ip",
"location" : "westus",
"location" : "eastus",
"zones": [ "1" ],
"properties" : {
"provisioningState" : "Succeeded",
Expand All @@ -36,7 +37,7 @@
"body" : {
"name" : "testDNS-ip",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/test-ip",
"location" : "westus",
"location" : "eastus",
"zones": [ "1" ],
"properties" : {
"provisioningState" : "Succeeded",
Expand Down
8 changes: 5 additions & 3 deletions ...e-manager/Microsoft.Network/stable/2017-06-01/examples/PublicIpAddressCreateDefaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
"subscriptionId" : "subid",
"resourceGroupName": "rg1",
"publicIpAddressName": "test-ip",
"parameters": {}
"parameters": {
"location": "eastus"
}
},
"responses" : {
"200" : {
"body" : {
"name" : "testDNS-ip",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/test-ip",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"publicIPAddressVersion" : "IPv4",
Expand All @@ -28,7 +30,7 @@
"body" : {
"name" : "testDNS-ip",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/test-ip",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"publicIPAddressVersion" : "IPv4",
Expand Down
7 changes: 4 additions & 3 deletions ...source-manager/Microsoft.Network/stable/2017-06-01/examples/PublicIpAddressCreateDns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"properties": {
"dnsSettings": {
"domainNameLabel": "dnslbl"
}
},
"location": "eastus"
}
}
},
Expand All @@ -17,7 +18,7 @@
"body" : {
"name" : "testDNS-ip",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/test-ip",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"publicIPAddressVersion" : "IPv4",
Expand All @@ -38,7 +39,7 @@
"body" : {
"name" : "testDNS-ip",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/test-ip",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"publicIPAddressVersion" : "IPv4",
Expand Down
4 changes: 3 additions & 1 deletion ...twork/resource-manager/Microsoft.Network/stable/2017-06-01/examples/RouteTableCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
"subscriptionId" : "subid",
"resourceGroupName" : "rg1",
"routeTableName" : "testrt",
"parameters": {}
"parameters": {
"location": "westus"
}
},
"responses" : {
"200" : {
Expand Down
3 changes: 2 additions & 1 deletion ...ource-manager/Microsoft.Network/stable/2017-06-01/examples/RouteTableCreateWithRoute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
}
}
]
}
},
"location": "westus"
}
},
"responses" : {
Expand Down
8 changes: 4 additions & 4 deletions ...k/resource-manager/Microsoft.Network/stable/2017-06-01/examples/VirtualNetworkCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"subscriptionId" : "subid",
"resourceGroupName" : "rg1",
"virtualNetworkName" : "test-vnet",
"location": "westus",
"parameters": {
"properties": {
"addressSpace": {
"addressPrefixes": [
"10.0.0.0/16"
]
}
}
},
"location": "eastus"
}
},
"responses" : {
Expand All @@ -21,7 +21,7 @@
"name" : "test-vnet",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet",
"type" : "Microsoft.Network/virtualNetworks",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"addressSpace" : {
Expand All @@ -39,7 +39,7 @@
"name" : "test-vnet",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet",
"type" : "Microsoft.Network/virtualNetworks",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"addressSpace" : {
Expand Down
7 changes: 4 additions & 3 deletions ...er/Microsoft.Network/stable/2017-06-01/examples/VirtualNetworkCreateServiceEndpoints.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
}
}
]
}
},
"location": "eastus"
}
},
"responses" : {
Expand All @@ -33,7 +34,7 @@
"name" : "vnet1",
"id" : "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1",
"type" : "Microsoft.Network/virtualNetworks",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"addressSpace" : {
Expand Down Expand Up @@ -72,7 +73,7 @@
"name" : "vnet1",
"id" : "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1",
"type" : "Microsoft.Network/virtualNetworks",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"addressSpace" : {
Expand Down
7 changes: 4 additions & 3 deletions ...urce-manager/Microsoft.Network/stable/2017-06-01/examples/VirtualNetworkCreateSubnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
}
}
]
}
},
"location": "eastus"
}
},
"responses" : {
Expand All @@ -28,7 +29,7 @@
"name" : "test-vnet",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet",
"type" : "Microsoft.Network/virtualNetworks",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"addressSpace" : {
Expand All @@ -55,7 +56,7 @@
"name" : "test-vnet",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet",
"type" : "Microsoft.Network/virtualNetworks",
"location" : "westus",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"addressSpace" : {
Expand Down
5 changes: 3 additions & 2 deletions ...ork/resource-manager/Microsoft.Network/stable/2017-08-01/examples/LoadBalancerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"resourceGroupName" : "rg1",
"loadBalancerName" : "lb",
"parameters": {
"location": "eastus",
"properties": {
"frontendIPConfigurations": [
{
Expand Down Expand Up @@ -103,7 +104,7 @@
"name": "lb",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "westus",
"location": "eastus",
"sku": {
"name": "Basic"
},
Expand Down Expand Up @@ -218,7 +219,7 @@
"name": "lb",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "westus",
"location": "eastus",
"sku": {
"name": "Basic"
},
Expand Down
5 changes: 3 additions & 2 deletions ...e-manager/Microsoft.Network/stable/2017-08-01/examples/LoadBalancerCreateStandardSku.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"resourceGroupName" : "rg1",
"loadBalancerName" : "lb",
"parameters": {
"location": "eastus",
"sku": {
"name": "Standard"
},
Expand Down Expand Up @@ -106,7 +107,7 @@
"name": "lb",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "westus",
"location": "eastus",
"sku": {
"name": "Standard"
},
Expand Down Expand Up @@ -221,7 +222,7 @@
"name": "lb",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb",
"type": "Microsoft.Network/loadBalancers",
"location": "westus",
"location": "eastus",
"sku": {
"name": "Standard"
},
Expand Down
Loading