summaryrefslogtreecommitdiff
path: root/src/op_mode/firewall.py
diff options
context:
space:
mode:
authorNicolas Fort <nicolasfort1988@gmail.com>2023-05-31 15:07:42 +0000
committerNicolas Fort <nicolasfort1988@gmail.com>2023-08-11 11:49:54 -0300
commit68d14fe80145542ffd08a5f7d5cde6c090a0de07 (patch)
tree3a915a4bd61d41117b92c16d00455681f2dffebf /src/op_mode/firewall.py
parent342db936a02a02ba04867f932137638485ef0a6f (diff)
downloadvyos-1x-68d14fe80145542ffd08a5f7d5cde6c090a0de07.tar.gz
vyos-1x-68d14fe80145542ffd08a5f7d5cde6c090a0de07.zip
T5160: firewall refactor: change firewall ip to firewall ipv4
Diffstat (limited to 'src/op_mode/firewall.py')
-rwxr-xr-xsrc/op_mode/firewall.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/op_mode/firewall.py b/src/op_mode/firewall.py
index 8eb883f81..ff7e2f398 100755
--- a/src/op_mode/firewall.py
+++ b/src/op_mode/firewall.py
@@ -27,7 +27,7 @@ from vyos.utils.dict import dict_search_args
def get_config_firewall(conf, hook=None, priority=None, ipv6=False, interfaces=True):
config_path = ['firewall']
if hook:
- config_path += ['ipv6' if ipv6 else 'ip', hook]
+ config_path += ['ipv6' if ipv6 else 'ipv4', hook]
if priority:
config_path += [priority]
@@ -160,9 +160,9 @@ def show_firewall():
if not firewall:
return
- if 'ip' in firewall:
- for hook, hook_conf in firewall['ip'].items():
- for prior, prior_conf in firewall['ip'][hook].items():
+ if 'ipv4' in firewall:
+ for hook, hook_conf in firewall['ipv4'].items():
+ for prior, prior_conf in firewall['ipv4'][hook].items():
output_firewall_name(hook, prior, prior_conf, ipv6=False)
if 'ipv6' in firewall:
@@ -265,9 +265,9 @@ def show_summary():
v4_out = []
v6_out = []
- if 'ip' in firewall:
- for hook, hook_conf in firewall['ip'].items():
- for prior, prior_conf in firewall['ip'][hook].items():
+ if 'ipv4' in firewall:
+ for hook, hook_conf in firewall['ipv4'].items():
+ for prior, prior_conf in firewall['ipv4'][hook].items():
description = prior_conf.get('description', '')
v4_out.append([hook, prior, description])
@@ -296,9 +296,9 @@ def show_statistics():
if not firewall:
return
- if 'ip' in firewall:
- for hook, hook_conf in firewall['ip'].items():
- for prior, prior_conf in firewall['ip'][hook].items():
+ if 'ipv4' in firewall:
+ for hook, hook_conf in firewall['ipv4'].items():
+ for prior, prior_conf in firewall['ipv4'][hook].items():
output_firewall_name_statistics(hook,prior, prior_conf, ipv6=False)
if 'ipv6' in firewall: