diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-11-01 12:07:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-01 12:07:16 +0000 |
| commit | f3808b28ebf22e289cac5e54080f3d2656645a01 (patch) | |
| tree | 095864603743dc97eac8b401832dbe299df2cdd0 /python/vyos/firewall.py | |
| parent | 03e5ab66610770cb58e24aa6e1309264a091d812 (diff) | |
| parent | 2b38b45e219e363955b850d90a40564eb4b375c0 (diff) | |
| download | vyos-1x-f3808b28ebf22e289cac5e54080f3d2656645a01.tar.gz vyos-1x-f3808b28ebf22e289cac5e54080f3d2656645a01.zip | |
Merge pull request #2421 from sever-sever/T5681-sagitta
T5681: Firewall,Nat and Nat66: simplified and standarize interface ma…
Diffstat (limited to 'python/vyos/firewall.py')
| -rw-r--r-- | python/vyos/firewall.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/python/vyos/firewall.py b/python/vyos/firewall.py index 59e02a2f1..2ad93a85d 100644 --- a/python/vyos/firewall.py +++ b/python/vyos/firewall.py @@ -294,14 +294,14 @@ def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): if 'inbound_interface' in rule_conf: operator = '' - if 'interface_name' in rule_conf['inbound_interface']: - iiface = rule_conf['inbound_interface']['interface_name'] + if 'name' in rule_conf['inbound_interface']: + iiface = rule_conf['inbound_interface']['name'] if iiface[0] == '!': operator = '!=' iiface = iiface[1:] output.append(f'iifname {operator} {{{iiface}}}') else: - iiface = rule_conf['inbound_interface']['interface_group'] + iiface = rule_conf['inbound_interface']['group'] if iiface[0] == '!': operator = '!=' iiface = iiface[1:] @@ -309,14 +309,14 @@ def parse_rule(rule_conf, hook, fw_name, rule_id, ip_name): if 'outbound_interface' in rule_conf: operator = '' - if 'interface_name' in rule_conf['outbound_interface']: - oiface = rule_conf['outbound_interface']['interface_name'] + if 'name' in rule_conf['outbound_interface']: + oiface = rule_conf['outbound_interface']['name'] if oiface[0] == '!': operator = '!=' oiface = oiface[1:] output.append(f'oifname {operator} {{{oiface}}}') else: - oiface = rule_conf['outbound_interface']['interface_group'] + oiface = rule_conf['outbound_interface']['group'] if oiface[0] == '!': operator = '!=' oiface = oiface[1:] |