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

Network october release #4040

Merged
merged 12 commits into from
Oct 30, 2018
Merged

Network october release #4040

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4b3ae81
Updated NetworkConfigurationDiagnostic API + example (#3905)
irrogozh Sep 14, 2018
d5b22d7
Fix incorrect API versions in Network's examples (#3954)
anton-evseev Sep 20, 2018
69fc43d
swagger change for application gateway waf global config and exclusio…
azhao155 Sep 21, 2018
26fc76c
add customer error spec for Application Gateway (#3985)
KaiChiLin Sep 21, 2018
3820caa
Add ICMP to the list of supported protocols (#3993)
fanymanea Sep 24, 2018
ef5d818
Merge remote-tracking branch 'origin/master' into network-october-rel…
lmazuel Sep 28, 2018
a6ea587
change appgw custom error status code enum and fix a typo of customEr…
KaiChiLin Oct 4, 2018
758c143
Add ExpressRoutePort swagger (#4104)
srividyathirumala Oct 15, 2018
6c4312e
Cherry pick NRP's changes from master to October branch (#4251)
anton-evseev Oct 18, 2018
e8f2b49
Changes to add operation id for outbound rules (#4320)
khannarhea Oct 29, 2018
b5843bc
Change one parameter (#4339)
wdehrich Oct 29, 2018
d041708
New SKU for ER (#4342)
raraveen Oct 30, 2018
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
2 changes: 1 addition & 1 deletion ...soft.Network/stable/2018-07-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters" : {
"api-version": "2018-06-01",
"api-version": "2018-07-01",
"subscriptionId" : "subid",
"resourceGroupName" : "rg1",
"networkWatcherName" : "nw1",
Expand Down
86 changes: 84 additions & 2 deletions ...tion/network/resource-manager/Microsoft.Network/stable/2018-08-01/applicationGateway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,14 @@
"provisioningState": {
"type": "string",
"description": "Provisioning state of the HTTP listener resource. Possible values are: 'Updating', 'Deleting', and 'Failed'."
}
},
"customErrorConfigurations": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayCustomError"
},
"description": "Custom error configurations of the HTTP listener."
}
},
"description": "Properties of HTTP listener of an application gateway."
},
Expand Down Expand Up @@ -1683,7 +1690,14 @@
"provisioningState": {
"type": "string",
"description": "Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'."
}
},
"customErrorConfigurations": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayCustomError"
},
"description": "Custom error configurations of the application gateway resource."
}
},
"description": "Properties of the application gateway."
},
Expand Down Expand Up @@ -1827,6 +1841,31 @@
"minimum": 8,
"exclusiveMinimum": false,
"description": "Maxium request body size for WAF."
},
"maxRequestBodySizeInKb": {
"type": "integer",
"format": "int32",
"maximum": 128,
"exclusiveMaximum": false,
"minimum": 8,
"exclusiveMinimum": false,
"description": "Maxium request body size in Kb for WAF."
},
"fileUploadLimitInMb": {
"type": "integer",
"format": "int32",
"maximum": 500,
"exclusiveMaximum": false,
"minimum": 0,
"exclusiveMinimum": false,
"description": "Maxium file upload size in Mb for WAF."
},
"exclusions": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayFirewallExclusion"
},
"description": "The exclusion list."
}
},
"required": [
Expand Down Expand Up @@ -1895,6 +1934,28 @@
],
"description": "Allows to disable rules within a rule group or an entire rule group."
},
"ApplicationGatewayFirewallExclusion": {
"properties": {
"matchVariable": {
"type": "string",
"description": "The variable to be excluded."
},
"selectorMatchOperator": {
"type": "string",
"description": "When matchVariable is a collection, operate on the selector to specify which elements in the collection this exclusion applies to."
},
"selector": {
"type": "string",
"description": "When matchVariable is a collection, operator used to specify which elements in the collection this exclusion applies to."
}
},
"required": [
"matchVariable",
"selectorMatchOperator",
"selector"
],
"description": "Allow to exclude some variable satisfy the condition for the WAF check"
},
"ApplicationGatewayAvailableWafRuleSetsResult": {
"properties": {
"value": {
Expand Down Expand Up @@ -2084,6 +2145,27 @@
}
},
"description": "Properties of ApplicationGatewaySslPredefinedPolicy"
},
"ApplicationGatewayCustomError": {
"properties": {
"statusCode": {
"type": "string",
"description": "Status code of the application gateway customer error.",
"enum": [
"HttpStatus403",
"HttpStatus502"
],
"x-ms-enum": {
"name": "ApplicationGatewayCustomErrorStatusCode",
"modelAsString": true
}
},
"customErrorPageUrl": {
"type": "string",
"description": "Error page URL of the application gateway customer error."
}
},
"description": "Customer error of an application gateway."
},
"PolicyNameEnum": {
"type": "string",
Expand Down
3 changes: 2 additions & 1 deletion ...ification/network/resource-manager/Microsoft.Network/stable/2018-08-01/azureFirewall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,8 @@
"enum":[
"TCP",
"UDP",
"Any"
"Any",
"ICMP"
],
"x-ms-enum":{
"name":"AzureFirewallNetworkRuleProtocol",
Expand Down
79 changes: 79 additions & 0 deletions ...osoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitCreateOnExpressRoutePort.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"parameters": {
"subscriptionId": "subid",
"api-version": "2018-08-01",
"resourceGroupName": "rg1",
"type": "Microsoft.Network/expressRouteCircuits",
"circuitName": "expressRouteCircuit1",
"parameters": {
"location": "westus",
"sku": {
"name": "Premium_MeteredData",
"tier": "Premium",
"family": "MeteredData"
},
"properties": {
"expressRoutePort": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName"
},
"bandwidthInGbps":10
}
}
},
"responses": {
"200": {
"body": {
"name": "expressRouteCircuit1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteCircuits/expressRouteCircuit1",
"type": "Microsoft.Network/expressRouteCircuits",
"location": "westus",
"properties": {
"provisioningState": "Succeeded",
"peerings": [],
"authorizations": [],
"expressRoutePort": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName"
},
"bandwidthInGbps":10,
"circuitProvisioningState": "Enabled",
"allowClassicOperations": false,
"gatewayManagerEtag": "20",
"serviceKey": "d281f746-ee01-4d00-8b0a-edec4833772b",
"serviceProviderProvisioningState": "Provisioned"
},
"sku": {
"name": "Premium_MeteredData",
"tier": "Premium",
"family": "MeteredData"
}
}
},
"201": {
"body": {
"name": "expressRouteCircuit1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteCircuits/expressRouteCircuit1",
"type": "Microsoft.Network/expressRouteCircuits",
"location": "westus",
"properties": {
"provisioningState": "Succeeded",
"peerings": [],
"authorizations": [],
"expressRoutePort": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName"
},
"bandwidthInGbps":10,
"circuitProvisioningState": "Enabled",
"allowClassicOperations": false,
"gatewayManagerEtag": "20",
"serviceKey": "d281f746-ee01-4d00-8b0a-edec4833772b",
"serviceProviderProvisioningState": "Provisioned"
},
"sku": {
"name": "Premium_MeteredData",
"tier": "Premium",
"family": "MeteredData"
}
}
}
}
}
18 changes: 16 additions & 2 deletions ...anager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
"peerASN": 200,
"primaryPeerAddressPrefix": "192.168.16.252/30",
"secondaryPeerAddressPrefix": "192.168.18.252/30",
"vlanId": 200
"vlanId": 200,
"ipv6PeeringConfig": {
"primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
"secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126"
}
}
}
},
Expand All @@ -34,6 +38,11 @@
"vlanId": 200,
"gatewayManagerEtag": "",
"lastModifiedBy": "Customer",
"ipv6PeeringConfig": {
"primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
"secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
"state": "Enabled"
},
"expressRouteConnection": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName"
}
Expand All @@ -57,7 +66,12 @@
"state": "Enabled",
"vlanId": 200,
"gatewayManagerEtag": "",
"lastModifiedBy": "Customer",
"lastModifiedBy": "Customer",
"ipv6PeeringConfig": {
"primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
"secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
"state": "Enabled"
},
"expressRouteConnection": ""
}
}
Expand Down
5 changes: 5 additions & 0 deletions ...-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
"vlanId": 200,
"gatewayManagerEtag": "103",
"lastModifiedBy": "Customer",
"ipv6PeeringConfig": {
"primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
"secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
"state": "Enabled"
},
"expressRouteConnection": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName"
}
Expand Down
20 changes: 17 additions & 3 deletions ...osoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
"peerASN": 200,
"primaryPeerAddressPrefix": "192.168.16.252/30",
"secondaryPeerAddressPrefix": "192.168.18.252/30",
"vlanId": 200
"vlanId": 200,
"ipv6PeeringConfig": {
"primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
"secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126"
}
}
}
},
Expand All @@ -33,7 +37,12 @@
"state": "Enabled",
"vlanId": 200,
"gatewayManagerEtag": "",
"lastModifiedBy": "Customer"
"lastModifiedBy": "Customer",
"ipv6PeeringConfig": {
"primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
"secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
"state": "Enabled"
}
}
}
},
Expand All @@ -54,7 +63,12 @@
"state": "Enabled",
"vlanId": 200,
"gatewayManagerEtag": "",
"lastModifiedBy": "Customer"
"lastModifiedBy": "Customer",
"ipv6PeeringConfig": {
"primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
"secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
"state": "Enabled"
}
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion ...icrosoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@
"state": "Enabled",
"vlanId": 200,
"gatewayManagerEtag": "",
"lastModifiedBy": "Customer"
"lastModifiedBy": "Customer",
"ipv6PeeringConfig": {
"primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
"secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
"state": "Enabled"
}
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion ...crosoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@
"state": "Enabled",
"vlanId": 200,
"gatewayManagerEtag": "",
"lastModifiedBy": "Customer"
"lastModifiedBy": "Customer",
"ipv6PeeringConfig": {
"primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
"secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
"state": "Enabled"
}
}
}
]
Expand Down
26 changes: 26 additions & 0 deletions ...rk/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteLinkGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"parameters": {
"subscriptionId": "subid",
"api-version": "2018-08-01",
"resourceGroupName": "rg1",
"expressRoutePortName": "portName",
"linkName": "linkName"
},
"responses": {
"200": {
"body": {
"name": "linkName",
"id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/expressRoutePorts/portName/links/linkName",
"properties": {
"provisioningState": "Succeeded",
"routerName": "router1",
"interfaceName": "Ethernet 0/0",
"patchPanelId": "patchPanelId1",
"rackId": "rackId1",
"connectorType": "LC",
"adminState": "Disabled"
}
}
}
}
}
Loading