Skip to content

[azure-firewall] az network firewall create: Support --edge-zone parameter for extended location feature #8892

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
necusjz merged 6 commits into from
Jun 30, 2025
Merged

[azure-firewall] az network firewall create: Support --edge-zone parameter for extended location feature #8892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac2abd5
codegen & test
cxznmhdcxz Jun 23, 2025
d3cba5b
keep edge-zone(extended location) param same with vnet create command
cxznmhdcxz Jun 23, 2025
d7d9721
update recording
cxznmhdcxz Jun 24, 2025
2de932f
update recording
cxznmhdcxz Jun 24, 2025
7d5bc66
update version
cxznmhdcxz Jun 24, 2025
c9cac5a
mask secret values in test
cxznmhdcxz Jun 25, 2025
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
4 changes: 4 additions & 0 deletions src/azure-firewall/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

Release History
===============
1.3.0
++++++
* `az network firewall create`: Add parameter `--edge-zone` to support extended location

1.2.3
++++++
* `az network firewall policy draft create`: Consume Policy Properies while creating draft
Expand Down
48 changes: 45 additions & 3 deletions src/azure-firewall/azext_firewall/aaz/latest/network/firewall/_create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class Create(AAZCommand):
"""

_aaz_info = {
"version": "2022-01-01",
"version": "2024-10-01",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/azurefirewalls/{}", "2022-01-01"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/azurefirewalls/{}", "2024-10-01"],
]
}

Expand Down Expand Up @@ -66,6 +66,10 @@ def _build_arguments_schema(cls, *args, **kwargs):
_args_schema.resource_group = AAZResourceGroupNameArg(
required=True,
)
_args_schema.extended_location = AAZObjectArg(
options=["--extended-location"],
help="The extended location of type local virtual network gateway.",
)
_args_schema.location = AAZResourceLocationArg(
help="Resource location.",
fmt=AAZResourceLocationArgFormat(
Expand Down Expand Up @@ -105,6 +109,17 @@ def _build_arguments_schema(cls, *args, **kwargs):
help="Space-separated list of availability zones into which to provision the resource. Allowed values: 1, 2, 3.",
)

extended_location = cls._args_schema.extended_location
extended_location.name = AAZStrArg(
options=["name"],
help="The name of the extended location.",
)
extended_location.type = AAZStrArg(
options=["type"],
help="The type of the extended location.",
enum={"EdgeZone": "EdgeZone"},
)

tags = cls._args_schema.tags
tags.Element = AAZStrArg()

Expand Down Expand Up @@ -297,7 +312,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2022-01-01",
"api-version", "2024-10-01",
required=True,
),
}
Expand All @@ -322,11 +337,17 @@ def content(self):
typ=AAZObjectType,
typ_kwargs={"flags": {"required": True, "client_flatten": True}}
)
_builder.set_prop("extendedLocation", AAZObjectType, ".extended_location")
_builder.set_prop("location", AAZStrType, ".location")
_builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}})
_builder.set_prop("tags", AAZDictType, ".tags")
_builder.set_prop("zones", AAZListType, ".zones")

extended_location = _builder.get(".extendedLocation")
if extended_location is not None:
extended_location.set_prop("name", AAZStrType, ".name")
extended_location.set_prop("type", AAZStrType, ".type")

properties = _builder.get(".properties")
if properties is not None:
properties.set_prop("additionalProperties", AAZDictType, ".additional_properties")
Expand Down Expand Up @@ -416,6 +437,9 @@ def _build_schema_on_200_201(cls):
_schema_on_200_201.etag = AAZStrType(
flags={"read_only": True},
)
_schema_on_200_201.extended_location = AAZObjectType(
serialized_name="extendedLocation",
)
_schema_on_200_201.id = AAZStrType()
_schema_on_200_201.location = AAZStrType()
_schema_on_200_201.name = AAZStrType(
Expand All @@ -430,13 +454,20 @@ def _build_schema_on_200_201(cls):
)
_schema_on_200_201.zones = AAZListType()

extended_location = cls._schema_on_200_201.extended_location
extended_location.name = AAZStrType()
extended_location.type = AAZStrType()

properties = cls._schema_on_200_201.properties
properties.additional_properties = AAZDictType(
serialized_name="additionalProperties",
)
properties.application_rule_collections = AAZListType(
serialized_name="applicationRuleCollections",
)
properties.autoscale_configuration = AAZObjectType(
serialized_name="autoscaleConfiguration",
)
properties.firewall_policy = AAZObjectType(
serialized_name="firewallPolicy",
)
Expand All @@ -449,6 +480,7 @@ def _build_schema_on_200_201(cls):
)
properties.ip_groups = AAZListType(
serialized_name="ipGroups",
flags={"read_only": True},
)
properties.management_ip_configuration = AAZObjectType(
serialized_name="managementIpConfiguration",
Expand Down Expand Up @@ -540,6 +572,16 @@ def _build_schema_on_200_201(cls):
target_fqdns = cls._schema_on_200_201.properties.application_rule_collections.Element.properties.rules.Element.target_fqdns
target_fqdns.Element = AAZStrType()

autoscale_configuration = cls._schema_on_200_201.properties.autoscale_configuration
autoscale_configuration.max_capacity = AAZIntType(
serialized_name="maxCapacity",
nullable=True,
)
autoscale_configuration.min_capacity = AAZIntType(
serialized_name="minCapacity",
nullable=True,
)

hub_ip_addresses = cls._schema_on_200_201.properties.hub_ip_addresses
hub_ip_addresses.private_ip_address = AAZStrType(
serialized_name="privateIPAddress",
Expand Down
6 changes: 3 additions & 3 deletions src/azure-firewall/azext_firewall/aaz/latest/network/firewall/_delete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class Delete(AAZCommand):
"""

_aaz_info = {
"version": "2022-01-01",
"version": "2024-10-01",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/azurefirewalls/{}", "2022-01-01"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/azurefirewalls/{}", "2024-10-01"],
]
}

Expand Down Expand Up @@ -139,7 +139,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2022-01-01",
"api-version", "2024-10-01",
required=True,
),
}
Expand Down
52 changes: 47 additions & 5 deletions src/azure-firewall/azext_firewall/aaz/latest/network/firewall/_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ class List(AAZCommand):
"""

_aaz_info = {
"version": "2022-01-01",
"version": "2024-10-01",
"resources": [
["mgmt-plane", "/subscriptions/{}/providers/microsoft.network/azurefirewalls", "2022-01-01"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/azurefirewalls", "2022-01-01"],
["mgmt-plane", "/subscriptions/{}/providers/microsoft.network/azurefirewalls", "2024-10-01"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/azurefirewalls", "2024-10-01"],
]
}

Expand Down Expand Up @@ -113,7 +113,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2022-01-01",
"api-version", "2024-10-01",
required=True,
),
}
Expand Down Expand Up @@ -158,6 +158,9 @@ def _build_schema_on_200(cls):
_element.etag = AAZStrType(
flags={"read_only": True},
)
_element.extended_location = AAZObjectType(
serialized_name="extendedLocation",
)
_element.id = AAZStrType()
_element.location = AAZStrType()
_element.name = AAZStrType(
Expand All @@ -172,13 +175,20 @@ def _build_schema_on_200(cls):
)
_element.zones = AAZListType()

extended_location = cls._schema_on_200.value.Element.extended_location
extended_location.name = AAZStrType()
extended_location.type = AAZStrType()

properties = cls._schema_on_200.value.Element.properties
properties.additional_properties = AAZDictType(
serialized_name="additionalProperties",
)
properties.application_rule_collections = AAZListType(
serialized_name="applicationRuleCollections",
)
properties.autoscale_configuration = AAZObjectType(
serialized_name="autoscaleConfiguration",
)
properties.firewall_policy = AAZObjectType(
serialized_name="firewallPolicy",
)
Expand All @@ -191,6 +201,7 @@ def _build_schema_on_200(cls):
)
properties.ip_groups = AAZListType(
serialized_name="ipGroups",
flags={"read_only": True},
)
properties.management_ip_configuration = AAZObjectType(
serialized_name="managementIpConfiguration",
Expand Down Expand Up @@ -282,6 +293,16 @@ def _build_schema_on_200(cls):
target_fqdns = cls._schema_on_200.value.Element.properties.application_rule_collections.Element.properties.rules.Element.target_fqdns
target_fqdns.Element = AAZStrType()

autoscale_configuration = cls._schema_on_200.value.Element.properties.autoscale_configuration
autoscale_configuration.max_capacity = AAZIntType(
serialized_name="maxCapacity",
nullable=True,
)
autoscale_configuration.min_capacity = AAZIntType(
serialized_name="minCapacity",
nullable=True,
)

hub_ip_addresses = cls._schema_on_200.value.Element.properties.hub_ip_addresses
hub_ip_addresses.private_ip_address = AAZStrType(
serialized_name="privateIPAddress",
Expand Down Expand Up @@ -507,7 +528,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2022-01-01",
"api-version", "2024-10-01",
required=True,
),
}
Expand Down Expand Up @@ -552,6 +573,9 @@ def _build_schema_on_200(cls):
_element.etag = AAZStrType(
flags={"read_only": True},
)
_element.extended_location = AAZObjectType(
serialized_name="extendedLocation",
)
_element.id = AAZStrType()
_element.location = AAZStrType()
_element.name = AAZStrType(
Expand All @@ -566,13 +590,20 @@ def _build_schema_on_200(cls):
)
_element.zones = AAZListType()

extended_location = cls._schema_on_200.value.Element.extended_location
extended_location.name = AAZStrType()
extended_location.type = AAZStrType()

properties = cls._schema_on_200.value.Element.properties
properties.additional_properties = AAZDictType(
serialized_name="additionalProperties",
)
properties.application_rule_collections = AAZListType(
serialized_name="applicationRuleCollections",
)
properties.autoscale_configuration = AAZObjectType(
serialized_name="autoscaleConfiguration",
)
properties.firewall_policy = AAZObjectType(
serialized_name="firewallPolicy",
)
Expand All @@ -585,6 +616,7 @@ def _build_schema_on_200(cls):
)
properties.ip_groups = AAZListType(
serialized_name="ipGroups",
flags={"read_only": True},
)
properties.management_ip_configuration = AAZObjectType(
serialized_name="managementIpConfiguration",
Expand Down Expand Up @@ -676,6 +708,16 @@ def _build_schema_on_200(cls):
target_fqdns = cls._schema_on_200.value.Element.properties.application_rule_collections.Element.properties.rules.Element.target_fqdns
target_fqdns.Element = AAZStrType()

autoscale_configuration = cls._schema_on_200.value.Element.properties.autoscale_configuration
autoscale_configuration.max_capacity = AAZIntType(
serialized_name="maxCapacity",
nullable=True,
)
autoscale_configuration.min_capacity = AAZIntType(
serialized_name="minCapacity",
nullable=True,
)

hub_ip_addresses = cls._schema_on_200.value.Element.properties.hub_ip_addresses
hub_ip_addresses.private_ip_address = AAZStrType(
serialized_name="privateIPAddress",
Expand Down
27 changes: 24 additions & 3 deletions src/azure-firewall/azext_firewall/aaz/latest/network/firewall/_show.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class Show(AAZCommand):
"""

_aaz_info = {
"version": "2022-01-01",
"version": "2024-10-01",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/azurefirewalls/{}", "2022-01-01"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/azurefirewalls/{}", "2024-10-01"],
]
}

Expand Down Expand Up @@ -117,7 +117,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2022-01-01",
"api-version", "2024-10-01",
required=True,
),
}
Expand Down Expand Up @@ -153,6 +153,9 @@ def _build_schema_on_200(cls):
_schema_on_200.etag = AAZStrType(
flags={"read_only": True},
)
_schema_on_200.extended_location = AAZObjectType(
serialized_name="extendedLocation",
)
_schema_on_200.id = AAZStrType()
_schema_on_200.location = AAZStrType()
_schema_on_200.name = AAZStrType(
Expand All @@ -167,13 +170,20 @@ def _build_schema_on_200(cls):
)
_schema_on_200.zones = AAZListType()

extended_location = cls._schema_on_200.extended_location
extended_location.name = AAZStrType()
extended_location.type = AAZStrType()

properties = cls._schema_on_200.properties
properties.additional_properties = AAZDictType(
serialized_name="additionalProperties",
)
properties.application_rule_collections = AAZListType(
serialized_name="applicationRuleCollections",
)
properties.autoscale_configuration = AAZObjectType(
serialized_name="autoscaleConfiguration",
)
properties.firewall_policy = AAZObjectType(
serialized_name="firewallPolicy",
)
Expand All @@ -186,6 +196,7 @@ def _build_schema_on_200(cls):
)
properties.ip_groups = AAZListType(
serialized_name="ipGroups",
flags={"read_only": True},
)
properties.management_ip_configuration = AAZObjectType(
serialized_name="managementIpConfiguration",
Expand Down Expand Up @@ -277,6 +288,16 @@ def _build_schema_on_200(cls):
target_fqdns = cls._schema_on_200.properties.application_rule_collections.Element.properties.rules.Element.target_fqdns
target_fqdns.Element = AAZStrType()

autoscale_configuration = cls._schema_on_200.properties.autoscale_configuration
autoscale_configuration.max_capacity = AAZIntType(
serialized_name="maxCapacity",
nullable=True,
)
autoscale_configuration.min_capacity = AAZIntType(
serialized_name="minCapacity",
nullable=True,
)

hub_ip_addresses = cls._schema_on_200.properties.hub_ip_addresses
hub_ip_addresses.private_ip_address = AAZStrType(
serialized_name="privateIPAddress",
Expand Down
Loading
Loading