From 4384d7e984648eac3253656c9eec38d30c4a7bf5 Mon Sep 17 00:00:00 2001 From: Anchal Kapoor Date: Fri, 22 May 2020 13:38:28 -0700 Subject: [PATCH 1/2] multi pip for firewall in hub swagger change --- .../stable/2020-05-01/azureFirewall.json | 22 ++++++++++--- .../examples/AzureFirewallPutInHub.json | 32 +++++++++++++------ 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/azureFirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/azureFirewall.json index 36a08bc94432..4d9f4d6b5c5e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/azureFirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/azureFirewall.json @@ -462,15 +462,30 @@ }, "description": "IpGroups associated with azure firewall." }, - "HubIPAddresses": { + "HubPublicIPAddresses": { "properties": { - "publicIPAddresses": { + "addresses": { "type": "array", - "description": "List of Public IP addresses associated with azure firewall.", + "description": "The number of Public IP addresses associated with azure firewall.", "items": { "$ref": "#/definitions/AzureFirewallPublicIPAddress" } }, + "count": { + "type": "integer", + "format": "int32", + "description": "Private IP Address associated with azure firewall." + } + }, + "description": "Public IP addresses associated with azure firewall." + }, + "HubIPAddresses": { + "properties": { + "publicIPs": { + "type": "array", + "description": "Public IP addresses associated with azure firewall.", + "$ref": "#/definitions/HubPublicIPAddresses" + }, "privateIPAddress": { "type": "string", "description": "Private IP Address associated with azure firewall." @@ -537,7 +552,6 @@ "description": "The firewallPolicy associated with this azure firewall." }, "hubIpAddresses": { - "readOnly": true, "description": "IP addresses associated with AzureFirewall.", "$ref": "#/definitions/HubIPAddresses" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/AzureFirewallPutInHub.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/AzureFirewallPutInHub.json index 6a825ddad041..2c2c34246929 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/AzureFirewallPutInHub.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/AzureFirewallPutInHub.json @@ -21,6 +21,12 @@ }, "firewallPolicy": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/policy1" + }, + "hubIpAddresses": { + "publicIPs": { + "addresses": [], + "count": 1 + } } } } @@ -51,11 +57,14 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/policy1" }, "hubIpAddresses": { - "publicIPAddresses": [ - { - "address": "13.73.240.12" - } - ], + "publicIPs": { + "addresses": [ + { + "address": "13.73.240.12" + } + ], + "count": 1 + }, "privateIPAddress": "10.0.0.0" }, "additionalProperties": {} @@ -87,11 +96,14 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/policy1" }, "hubIpAddresses": { - "publicIPAddresses": [ - { - "address": "13.73.240.12" - } - ], + "publicIPs": { + "addresses": [ + { + "address": "13.73.240.12" + } + ], + "count": 1 + }, "privateIPAddress": "10.0.0.0" }, "ipGroups": [], From c9083a628cff5e53dc95a1c2a03d5710a0ebe182 Mon Sep 17 00:00:00 2001 From: Anchal Kapoor Date: Wed, 27 May 2020 11:42:35 -0700 Subject: [PATCH 2/2] resolving issues --- .../stable/2020-05-01/examples/AzureFirewallPutInHub.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/AzureFirewallPutInHub.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/AzureFirewallPutInHub.json index 2c2c34246929..58886d7c3f20 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/AzureFirewallPutInHub.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/AzureFirewallPutInHub.json @@ -64,7 +64,7 @@ } ], "count": 1 - }, + }, "privateIPAddress": "10.0.0.0" }, "additionalProperties": {} @@ -103,7 +103,7 @@ } ], "count": 1 - }, + }, "privateIPAddress": "10.0.0.0" }, "ipGroups": [],