Skip to content

[DO NOT MERGE] Some changes to network #24526

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

Draft
wants to merge 48 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
525de97
[Do not merge] generate network-manager sdk only
ZengTaoxu Mar 30, 2022
54093a5
Merge branch 'Azure:main' into main
ZengTaoxu Mar 30, 2022
7d6c646
Update readme.python.md
ZengTaoxu Mar 30, 2022
fb2e47e
update readme.python
BigCat20196 Mar 31, 2022
18e8de4
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs
ZengTaoxu Jun 7, 2022
bdcffd8
Merge branch 'Azure:main' into main
ZengTaoxu Jun 7, 2022
20f9ce8
Merge branch 'Azure:main' into main
ZengTaoxu Jun 8, 2022
9926ae0
Merge branch 'Azure:main' into main
ZengTaoxu Jun 8, 2022
8e45d1a
Merge branch 'Azure:main' into main
ZengTaoxu Jul 7, 2022
664aaac
Merge branch 'Azure:main' into main
ZengTaoxu Jul 22, 2022
617d6af
Merge branch 'Azure:main' into main
ZengTaoxu Jul 25, 2022
c592186
Merge branch 'Azure:main' into main
ZengTaoxu Jul 26, 2022
5f37a0c
Merge branch 'Azure:main' into main
ZengTaoxu Aug 17, 2022
198330b
Merge branch 'Azure:main' into main
ZengTaoxu Sep 9, 2022
31ac573
Merge branch 'Azure:main' into main
ZengTaoxu Sep 20, 2022
5d6efa2
Merge branch 'Azure:main' into main
ZengTaoxu Oct 9, 2022
9bc03d1
Merge branch 'Azure:main' into main
ZengTaoxu Nov 11, 2022
7f27a17
Merge branch 'Azure:main' into main
ZengTaoxu Nov 24, 2022
9ccf818
Merge branch 'Azure:main' into main
ZengTaoxu Nov 29, 2022
a3f724b
Merge branch 'Azure:main' into main
ZengTaoxu Dec 15, 2022
4db42b8
Merge branch 'Azure:main' into main
ZengTaoxu Dec 21, 2022
b4b20a5
Merge branch 'Azure:main' into main
ZengTaoxu Dec 28, 2022
5cdc0e4
Merge branch 'Azure:main' into main
ZengTaoxu Jan 16, 2023
794f44b
Merge branch 'Azure:main' into main
ZengTaoxu Jan 18, 2023
bd799b5
Merge branch 'Azure:main' into main
ZengTaoxu Feb 28, 2023
3b80302
Merge branch 'Azure:main' into main
ZengTaoxu Mar 7, 2023
3f00aff
Merge branch 'Azure:main' into main
ZengTaoxu Mar 14, 2023
4b3444b
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs
ZengTaoxu Mar 14, 2023
651f18a
Merge branch 'main' of https://github.com/ZengTaoxu/azure-rest-api-specs
ZengTaoxu Mar 14, 2023
29b122d
Merge branch 'Azure:main' into main
ZengTaoxu Mar 27, 2023
5096b73
Merge branch 'Azure:main' into main
ZengTaoxu May 30, 2023
8c0608a
Merge branch 'Azure:main' into main
ZengTaoxu Jun 13, 2023
52123eb
Merge branch 'Azure:main' into main
ZengTaoxu Jun 15, 2023
b9222be
[DO NOT MERGE] Some changes to network
ZengTaoxu Jun 21, 2023
6a98659
Update webapplicationfirewall.json
ZengTaoxu Jun 21, 2023
6757f2c
Merge branch 'Azure:main' into main
ZengTaoxu Jul 21, 2023
19af2aa
Merge branch 'main' of https://github.com/ZengTaoxu/azure-rest-api-sp…
ZengTaoxu Jul 21, 2023
3b59352
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs …
ZengTaoxu Oct 7, 2023
892d72e
Merge branch 'Azure:main' into modify-network-swagger
ZengTaoxu Oct 20, 2023
f2243c0
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs …
ZengTaoxu Dec 18, 2023
1db9529
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs …
ZengTaoxu Jan 3, 2024
95ccc43
Merge branch 'Azure:main' into modify-network-swagger
ZengTaoxu Jan 4, 2024
e29e795
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs …
ZengTaoxu Feb 2, 2024
f81c81f
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs …
ZengTaoxu Feb 22, 2024
aeb05ad
Merge branch 'Azure:main' into modify-network-swagger
ZengTaoxu Feb 28, 2024
be73c47
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs …
ZengTaoxu Mar 20, 2024
fa4f910
Merge branch 'modify-network-swagger' of https://github.com/ZengTaoxu…
ZengTaoxu Apr 1, 2024
b7ef763
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs …
ZengTaoxu Apr 1, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -944,21 +944,24 @@
"items": {
"$ref": "./applicationGateway.json#/definitions/ApplicationGatewayBackendAddressPool"
},
"description": "The reference to ApplicationGatewayBackendAddressPool resource."
"description": "The reference to ApplicationGatewayBackendAddressPool resource.",
"x-ms-identifiers": ["id"]
},
"loadBalancerBackendAddressPools": {
"type": "array",
"items": {
"$ref": "./loadBalancer.json#/definitions/BackendAddressPool"
},
"description": "The reference to LoadBalancerBackendAddressPool resource."
"description": "The reference to LoadBalancerBackendAddressPool resource.",
"x-ms-identifiers": ["id"]
},
"loadBalancerInboundNatRules": {
"type": "array",
"items": {
"$ref": "./loadBalancer.json#/definitions/InboundNatRule"
},
"description": "A list of references of LoadBalancerInboundNatRules."
"description": "A list of references of LoadBalancerInboundNatRules.",
"x-ms-identifiers": ["id"]
},
"privateIPAddress": {
"type": "string",
Expand Down Expand Up @@ -1331,7 +1334,7 @@
"description": "A collection of effective security rules."
},
"tagMap": {
"type": "string",
"type": "object",
"additionalProperties": {
"type": "array",
"items": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6460,16 +6460,16 @@
"description": "Peer routing details."
},
"PeerRouteList": {
"properties": {
"value": {
"type": "array",
"items": {
"$ref": "#/definitions/PeerRoute"
},
"description": "List of peer routes."
}
"type": "object",
"additionalProperties": {
"type": "array",
"items": {
"$ref": "#/definitions/PeerRoute"
},
"x-ms-identifiers": [],
"description": "List of peer routes."
},
"description": "List of virtual router peer routes."
"description": "Map from virtual router instance to list of peer routes."
},
"HubIpConfiguration": {
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2548,7 +2548,8 @@
"items": {
"$ref": "#/definitions/ApplicationGatewayRewriteRule"
},
"description": "Rewrite rules in the rewrite rule set."
"description": "Rewrite rules in the rewrite rule set.",
"x-ms-identifiers": ["name"]
},
"provisioningState": {
"readOnly": true,
Expand All @@ -2573,7 +2574,8 @@
"items": {
"$ref": "#/definitions/ApplicationGatewayRewriteRuleCondition"
},
"description": "Conditions based on which the action set execution will be evaluated."
"description": "Conditions based on which the action set execution will be evaluated.",
"x-ms-identifiers": ["variable"]
},
"actionSet": {
"type": "object",
Expand Down Expand Up @@ -2769,7 +2771,8 @@
"items": {
"$ref": "#/definitions/ApplicationGatewayPrivateLinkIpConfiguration"
},
"description": "An array of application gateway private link ip configurations."
"description": "An array of application gateway private link ip configurations.",
"x-ms-identifiers": ["name"]
},
"provisioningState": {
"readOnly": true,
Expand Down Expand Up @@ -3010,98 +3013,112 @@
"items": {
"$ref": "#/definitions/ApplicationGatewayAuthenticationCertificate"
},
"description": "Authentication certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Authentication certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"trustedRootCertificates": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayTrustedRootCertificate"
},
"description": "Trusted Root certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Trusted Root certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"trustedClientCertificates": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayTrustedClientCertificate"
},
"description": "Trusted client certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Trusted client certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"sslCertificates": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewaySslCertificate"
},
"description": "SSL certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "SSL certificates of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"frontendIPConfigurations": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayFrontendIPConfiguration"
},
"description": "Frontend IP addresses of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Frontend IP addresses of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"frontendPorts": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayFrontendPort"
},
"description": "Frontend ports of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Frontend ports of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"probes": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayProbe"
},
"description": "Probes of the application gateway resource."
"description": "Probes of the application gateway resource.",
"x-ms-identifiers": ["name"]
},
"backendAddressPools": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayBackendAddressPool"
},
"description": "Backend address pool of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Backend address pool of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"backendHttpSettingsCollection": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayBackendHttpSettings"
},
"description": "Backend http settings of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Backend http settings of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"backendSettingsCollection": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayBackendSettings"
},
"description": "Backend settings of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Backend settings of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"httpListeners": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayHttpListener"
},
"description": "Http listeners of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Http listeners of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"listeners": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayListener"
},
"description": "Listeners of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Listeners of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"sslProfiles": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewaySslProfile"
},
"description": "SSL profiles of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "SSL profiles of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"urlPathMaps": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayUrlPathMap"
},
"description": "URL path map of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "URL path map of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"requestRoutingRules": {
"type": "array",
Expand All @@ -3122,14 +3139,16 @@
"items": {
"$ref": "#/definitions/ApplicationGatewayRewriteRuleSet"
},
"description": "Rewrite rules for the application gateway resource."
"description": "Rewrite rules for the application gateway resource.",
"x-ms-identifiers": ["name"]
},
"redirectConfigurations": {
"type": "array",
"items": {
"$ref": "#/definitions/ApplicationGatewayRedirectConfiguration"
},
"description": "Redirect configurations of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits)."
"description": "Redirect configurations of the application gateway resource. For default limits, see [Application Gateway limits](https://docs.microsoft.com/azure/azure-subscription-service-limits#application-gateway-limits).",
"x-ms-identifiers": ["name"]
},
"webApplicationFirewallConfiguration": {
"$ref": "#/definitions/ApplicationGatewayWebApplicationFirewallConfiguration",
Expand All @@ -3156,7 +3175,8 @@
"items": {
"$ref": "#/definitions/ApplicationGatewayPrivateLinkConfiguration"
},
"description": "PrivateLink configurations on application gateway."
"description": "PrivateLink configurations on application gateway.",
"x-ms-identifiers": ["name"]
},
"privateEndpointConnections": {
"readOnly": true,
Expand Down Expand Up @@ -3275,7 +3295,8 @@
"items": {
"$ref": "#/definitions/ApplicationGatewayPathRule"
},
"description": "Path rule of URL path map resource."
"description": "Path rule of URL path map resource.",
"x-ms-identifiers": ["name"]
},
"provisioningState": {
"readOnly": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2219,7 +2219,10 @@
"$ref": "./network.json#/definitions/SubResource"
}
],
"description": "Inbound NAT pool of the load balancer."
"description": "Inbound NAT pool of the load balancer.",
"required": [
"properties"
]
},
"OutboundRulePropertiesFormat": {
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@
"type": "array",
"items": {
"$ref": "#/definitions/WebApplicationFirewallCustomRule"
}
},
"x-ms-identifiers": ["name"]
},
"applicationGateways": {
"readOnly": true,
Expand Down Expand Up @@ -668,8 +669,7 @@
"description": "Define match conditions.",
"required": [
"matchVariables",
"operator",
"matchValues"
"operator"
],
"properties": {
"matchVariables": {
Expand Down