summaryrefslogtreecommitdiff
path: root/src/conf_mode/nat.py
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-10-25 20:30:08 +0200
committerGitHub <noreply@github.com>2023-10-25 20:30:08 +0200
commitef55eab3c7cdac7b8febca9af15b5118aa475c45 (patch)
treecdd435b79159542d8ccbfe3d3fdfe8a16356c3ee /src/conf_mode/nat.py
parent73eb7777a5d3a3bce48719f651c6b0f3a1c1a79d (diff)
parent51abbc0f1b2ccf4785cf7f29f1fe6f4af6007ee6 (diff)
downloadvyos-1x-ef55eab3c7cdac7b8febca9af15b5118aa475c45.tar.gz
vyos-1x-ef55eab3c7cdac7b8febca9af15b5118aa475c45.zip
Merge pull request #2406 from nicolas-fort/T5681
T5681: Firewall,Nat and Nat66: simplified and standarize interface matcher
Diffstat (limited to 'src/conf_mode/nat.py')
-rwxr-xr-xsrc/conf_mode/nat.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/conf_mode/nat.py b/src/conf_mode/nat.py
index cb97a8662..44b13d413 100755
--- a/src/conf_mode/nat.py
+++ b/src/conf_mode/nat.py
@@ -151,11 +151,11 @@ def verify(nat):
err_msg = f'Source NAT configuration error in rule {rule}:'
if 'outbound_interface' in config:
- if 'interface_name' in config['outbound_interface'] and 'interface_group' in config['outbound_interface']:
- raise ConfigError(f'Cannot specify both interface-group and interface-name for nat source rule "{rule}"')
- elif 'interface_name' in config['outbound_interface']:
- if config['outbound_interface']['interface_name'] not in 'any' and config['outbound_interface']['interface_name'] not in interfaces():
- Warning(f'rule "{rule}" interface "{config["outbound_interface"]["interface_name"]}" does not exist on this system')
+ if 'name' in config['outbound_interface'] and 'group' in config['outbound_interface']:
+ raise ConfigError(f'{err_msg} - Cannot specify both interface group and interface name for nat source rule "{rule}"')
+ elif 'name' in config['outbound_interface']:
+ if config['outbound_interface']['name'] not in 'any' and config['outbound_interface']['name'] not in interfaces():
+ Warning(f'{err_msg} - interface "{config["outbound_interface"]["name"]}" does not exist on this system')
if not dict_search('translation.address', config) and not dict_search('translation.port', config):
if 'exclude' not in config and 'backend' not in config['load_balance']:
@@ -175,11 +175,11 @@ def verify(nat):
err_msg = f'Destination NAT configuration error in rule {rule}:'
if 'inbound_interface' in config:
- if 'interface_name' in config['inbound_interface'] and 'interface_group' in config['inbound_interface']:
- raise ConfigError(f'Cannot specify both interface-group and interface-name for destination nat rule "{rule}"')
- elif 'interface_name' in config['inbound_interface']:
- if config['inbound_interface']['interface_name'] not in 'any' and config['inbound_interface']['interface_name'] not in interfaces():
- Warning(f'rule "{rule}" interface "{config["inbound_interface"]["interface_name"]}" does not exist on this system')
+ if 'name' in config['inbound_interface'] and 'group' in config['inbound_interface']:
+ raise ConfigError(f'{err_msg} - Cannot specify both interface group and interface name for destination nat rule "{rule}"')
+ elif 'name' in config['inbound_interface']:
+ if config['inbound_interface']['name'] not in 'any' and config['inbound_interface']['name'] not in interfaces():
+ Warning(f'{err_msg} - interface "{config["inbound_interface"]["name"]}" does not exist on this system')
if not dict_search('translation.address', config) and not dict_search('translation.port', config) and 'redirect' not in config['translation']:
if 'exclude' not in config and 'backend' not in config['load_balance']: