Skip to content
4 changes: 4 additions & 0 deletions src/azure-firewall/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
Release History
===============

2.0.0
++++++
* `az network firewall packet-capture-operation`: Add packet capture operation support for the azure firewall

1.5.0
++++++
* `az network firewall create`: Add parameter `--enable-dnstap-logging`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from ._learned_ip_prefix import *
from ._list import *
from ._list_fqdn_tags import *
from ._packet_capture_operation import *
from ._show import *
from ._update import *
from ._wait import *
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ def _build_arguments_schema(cls, *args, **kwargs):

def _execute_operations(self):
self.pre_operations()
condition_0 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
condition_1 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
condition_0 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
condition_1 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
if condition_0:
self.AzureFirewallsList(ctx=self.ctx)()
if condition_1:
self.AzureFirewallsListAll(ctx=self.ctx)()
if condition_1:
self.AzureFirewallsList(ctx=self.ctx)()
self.post_operations()

@register_callback
Expand All @@ -69,7 +69,7 @@ def _output(self, *args, **kwargs):
next_link = self.deserialize_output(self.ctx.vars.instance.next_link)
return result, next_link

class AzureFirewallsList(AAZHttpOperation):
class AzureFirewallsListAll(AAZHttpOperation):
CLIENT_TYPE = "MgmtClient"

def __call__(self, *args, **kwargs):
Expand All @@ -83,7 +83,7 @@ def __call__(self, *args, **kwargs):
@property
def url(self):
return self.client.format_url(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls",
"/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureFirewalls",
**self.url_parameters
)

Expand All @@ -98,10 +98,6 @@ def error_format(self):
@property
def url_parameters(self):
parameters = {
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
"subscriptionId", self.ctx.subscription_id,
required=True,
Expand Down Expand Up @@ -488,7 +484,7 @@ def _build_schema_on_200(cls):

return cls._schema_on_200

class AzureFirewallsListAll(AAZHttpOperation):
class AzureFirewallsList(AAZHttpOperation):
CLIENT_TYPE = "MgmtClient"

def __call__(self, *args, **kwargs):
Expand All @@ -502,7 +498,7 @@ def __call__(self, *args, **kwargs):
@property
def url(self):
return self.client.format_url(
"/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureFirewalls",
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls",
**self.url_parameters
)

Expand All @@ -517,6 +513,10 @@ def error_format(self):
@property
def url_parameters(self):
parameters = {
**self.serialize_url_param(
"resourceGroupName", self.ctx.args.resource_group,
required=True,
),
**self.serialize_url_param(
"subscriptionId", self.ctx.subscription_id,
required=True,
Expand Down
Loading
Loading