Skip to content

Commit bc2b135

Browse files
lmazuellmazuel
authored
Network october release (#4040)
* Updated NetworkConfigurationDiagnostic API + example (#3905) * Fix incorrect API versions in Network's examples (#3954) * Fixed incorrect API versions in 2018-08-01's examples Added missing example for serviceEndpointPolicy.json * Fixed incorrect API version in 2018-07-01 example * swagger change for application gateway waf global config and exclusion list (#3972) * swagger change for application gateway waf global config and exclusion list * address the comments * add customer error spec for Application Gateway (#3985) * add customer error spec for Application Gateway * fix property name issue * Add ICMP to the list of supported protocols (#3993) * change appgw custom error status code enum and fix a typo of customErrorConfigurations (#4050) * add customer error spec for Application Gateway * fix property name issue * change appgw custom error status code enum and fix a typo of customErrorConfiguration * Add ExpressRoutePort swagger (#4104) * Add ExpressRoutePort details to readme.md * ExpressRoutePort swagger * Refer SubscriptionIdParameter and ApiVersionParameter from network.json * Cherry pick NRP's changes from master to October branch (#4251) * Remove error code from swagger (#4103) * Modifying example templates : enabling Ipv6 support for Private Peering (#4232) * Modifying example templates : enabling Ipv6 support for Private Peering * Resolving oav validation error * Changes to add operation id for outbound rules (#4320) * Changes to add operation id for outbound rules * Changes to make outbound rule similar to load balancing rule * fix failures - add example json files * fix failures * Fixed line endings, specs, examples * Change one parameter (#4339) * Change parameter in most recent version * Fix example * New SKU for ER (#4342)
1 parent 7fa7860 commit bc2b135

34 files changed

+1815
-27
lines changed

‎specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters" : {
3-
"api-version": "2018-06-01",
3+
"api-version": "2018-07-01",
44
"subscriptionId" : "subid",
55
"resourceGroupName" : "rg1",
66
"networkWatcherName" : "nw1",

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/applicationGateway.json‎

Lines changed: 84 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,14 @@
12171217
"provisioningState": {
12181218
"type": "string",
12191219
"description": "Provisioning state of the HTTP listener resource. Possible values are: 'Updating', 'Deleting', and 'Failed'."
1220-
}
1220+
},
1221+
"customErrorConfigurations": {
1222+
"type": "array",
1223+
"items": {
1224+
"$ref": "#/definitions/ApplicationGatewayCustomError"
1225+
},
1226+
"description": "Custom error configurations of the HTTP listener."
1227+
}
12211228
},
12221229
"description": "Properties of HTTP listener of an application gateway."
12231230
},
@@ -1683,7 +1690,14 @@
16831690
"provisioningState": {
16841691
"type": "string",
16851692
"description": "Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'."
1686-
}
1693+
},
1694+
"customErrorConfigurations": {
1695+
"type": "array",
1696+
"items": {
1697+
"$ref": "#/definitions/ApplicationGatewayCustomError"
1698+
},
1699+
"description": "Custom error configurations of the application gateway resource."
1700+
}
16871701
},
16881702
"description": "Properties of the application gateway."
16891703
},
@@ -1827,6 +1841,31 @@
18271841
"minimum": 8,
18281842
"exclusiveMinimum": false,
18291843
"description": "Maxium request body size for WAF."
1844+
},
1845+
"maxRequestBodySizeInKb": {
1846+
"type": "integer",
1847+
"format": "int32",
1848+
"maximum": 128,
1849+
"exclusiveMaximum": false,
1850+
"minimum": 8,
1851+
"exclusiveMinimum": false,
1852+
"description": "Maxium request body size in Kb for WAF."
1853+
},
1854+
"fileUploadLimitInMb": {
1855+
"type": "integer",
1856+
"format": "int32",
1857+
"maximum": 500,
1858+
"exclusiveMaximum": false,
1859+
"minimum": 0,
1860+
"exclusiveMinimum": false,
1861+
"description": "Maxium file upload size in Mb for WAF."
1862+
},
1863+
"exclusions": {
1864+
"type": "array",
1865+
"items": {
1866+
"$ref": "#/definitions/ApplicationGatewayFirewallExclusion"
1867+
},
1868+
"description": "The exclusion list."
18301869
}
18311870
},
18321871
"required": [
@@ -1895,6 +1934,28 @@
18951934
],
18961935
"description": "Allows to disable rules within a rule group or an entire rule group."
18971936
},
1937+
"ApplicationGatewayFirewallExclusion": {
1938+
"properties": {
1939+
"matchVariable": {
1940+
"type": "string",
1941+
"description": "The variable to be excluded."
1942+
},
1943+
"selectorMatchOperator": {
1944+
"type": "string",
1945+
"description": "When matchVariable is a collection, operate on the selector to specify which elements in the collection this exclusion applies to."
1946+
},
1947+
"selector": {
1948+
"type": "string",
1949+
"description": "When matchVariable is a collection, operator used to specify which elements in the collection this exclusion applies to."
1950+
}
1951+
},
1952+
"required": [
1953+
"matchVariable",
1954+
"selectorMatchOperator",
1955+
"selector"
1956+
],
1957+
"description": "Allow to exclude some variable satisfy the condition for the WAF check"
1958+
},
18981959
"ApplicationGatewayAvailableWafRuleSetsResult": {
18991960
"properties": {
19001961
"value": {
@@ -2084,6 +2145,27 @@
20842145
}
20852146
},
20862147
"description": "Properties of ApplicationGatewaySslPredefinedPolicy"
2148+
},
2149+
"ApplicationGatewayCustomError": {
2150+
"properties": {
2151+
"statusCode": {
2152+
"type": "string",
2153+
"description": "Status code of the application gateway customer error.",
2154+
"enum": [
2155+
"HttpStatus403",
2156+
"HttpStatus502"
2157+
],
2158+
"x-ms-enum": {
2159+
"name": "ApplicationGatewayCustomErrorStatusCode",
2160+
"modelAsString": true
2161+
}
2162+
},
2163+
"customErrorPageUrl": {
2164+
"type": "string",
2165+
"description": "Error page URL of the application gateway customer error."
2166+
}
2167+
},
2168+
"description": "Customer error of an application gateway."
20872169
},
20882170
"PolicyNameEnum": {
20892171
"type": "string",

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/azureFirewall.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,8 @@
741741
"enum":[
742742
"TCP",
743743
"UDP",
744-
"Any"
744+
"Any",
745+
"ICMP"
745746
],
746747
"x-ms-enum":{
747748
"name":"AzureFirewallNetworkRuleProtocol",

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitCreateOnExpressRoutePort.json‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"api-version": "2018-08-01",
5+
"resourceGroupName": "rg1",
6+
"type": "Microsoft.Network/expressRouteCircuits",
7+
"circuitName": "expressRouteCircuit1",
8+
"parameters": {
9+
"location": "westus",
10+
"sku": {
11+
"name": "Premium_MeteredData",
12+
"tier": "Premium",
13+
"family": "MeteredData"
14+
},
15+
"properties": {
16+
"expressRoutePort": {
17+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName"
18+
},
19+
"bandwidthInGbps":10
20+
}
21+
}
22+
},
23+
"responses": {
24+
"200": {
25+
"body": {
26+
"name": "expressRouteCircuit1",
27+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteCircuits/expressRouteCircuit1",
28+
"type": "Microsoft.Network/expressRouteCircuits",
29+
"location": "westus",
30+
"properties": {
31+
"provisioningState": "Succeeded",
32+
"peerings": [],
33+
"authorizations": [],
34+
"expressRoutePort": {
35+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName"
36+
},
37+
"bandwidthInGbps":10,
38+
"circuitProvisioningState": "Enabled",
39+
"allowClassicOperations": false,
40+
"gatewayManagerEtag": "20",
41+
"serviceKey": "d281f746-ee01-4d00-8b0a-edec4833772b",
42+
"serviceProviderProvisioningState": "Provisioned"
43+
},
44+
"sku": {
45+
"name": "Premium_MeteredData",
46+
"tier": "Premium",
47+
"family": "MeteredData"
48+
}
49+
}
50+
},
51+
"201": {
52+
"body": {
53+
"name": "expressRouteCircuit1",
54+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteCircuits/expressRouteCircuit1",
55+
"type": "Microsoft.Network/expressRouteCircuits",
56+
"location": "westus",
57+
"properties": {
58+
"provisioningState": "Succeeded",
59+
"peerings": [],
60+
"authorizations": [],
61+
"expressRoutePort": {
62+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName"
63+
},
64+
"bandwidthInGbps":10,
65+
"circuitProvisioningState": "Enabled",
66+
"allowClassicOperations": false,
67+
"gatewayManagerEtag": "20",
68+
"serviceKey": "d281f746-ee01-4d00-8b0a-edec4833772b",
69+
"serviceProviderProvisioningState": "Provisioned"
70+
},
71+
"sku": {
72+
"name": "Premium_MeteredData",
73+
"tier": "Premium",
74+
"family": "MeteredData"
75+
}
76+
}
77+
}
78+
}
79+
}

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteLinkGet.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"api-version": "2018-08-01",
5+
"resourceGroupName": "rg1",
6+
"expressRoutePortName": "portName",
7+
"linkName": "linkName"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"name": "linkName",
13+
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName/links/linkName",
14+
"properties": {
15+
"provisioningState": "Succeeded",
16+
"routerName": "router1",
17+
"interfaceName": "Ethernet 0/0",
18+
"patchPanelId": "patchPanelId1",
19+
"rackId": "rackId1",
20+
"connectorType": "LC",
21+
"adminState": "Disabled"
22+
}
23+
}
24+
}
25+
}
26+
}

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteLinkList.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"api-version": "2018-08-01",
5+
"resourceGroupName": "rg1",
6+
"expressRoutePortName": "portName"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"value": [
12+
{
13+
"name": "link1",
14+
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName/links/link1",
15+
"properties": {
16+
"provisioningState": "Succeeded",
17+
"routerName": "router1",
18+
"interfaceName": "Ethernet 0/0",
19+
"patchPanelId": "patchPanelId1",
20+
"rackId": "rackId1",
21+
"connectorType": "LC",
22+
"adminState": "Disabled"
23+
}
24+
},
25+
{
26+
"name": "link2",
27+
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName/links/link2",
28+
"properties": {
29+
"provisioningState": "Succeeded",
30+
"routerName": "router2",
31+
"interfaceName": "Ethernet 0/0",
32+
"patchPanelId": "patchPanelId2",
33+
"rackId": "rackId2",
34+
"connectorType": "LC",
35+
"adminState": "Disabled"
36+
}
37+
}
38+
]
39+
}
40+
}
41+
}
42+
}

0 commit comments

Comments
 (0)