summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyazanov Alexander Mihailovich <alryaz@alryaz.com>2024-05-18 16:50:55 +0300
committerChristian Breunig <christian@breunig.cc>2024-05-22 19:44:39 +0200
commit03eae30b27433055ddc10f09fc134b83e9bd6cec (patch)
tree442883782536e216144da9263698404751448b9d
parent9a5897682a6d7fb59e2e90eb50b87dbbe8babaea (diff)
downloadvyos-1x-03eae30b27433055ddc10f09fc134b83e9bd6cec.tar.gz
vyos-1x-03eae30b27433055ddc10f09fc134b83e9bd6cec.zip
nat: T6365: remove warnings for negated interface selections by name
-rwxr-xr-xsrc/conf_mode/nat.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/conf_mode/nat.py b/src/conf_mode/nat.py
index 4cd9b570d..056351986 100755
--- a/src/conf_mode/nat.py
+++ b/src/conf_mode/nat.py
@@ -149,8 +149,12 @@ def verify(nat):
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'NAT interface "{config["outbound_interface"]["name"]}" for source NAT rule "{rule}" does not exist!')
+ interface_name = config['outbound_interface']['name']
+ if interface_name not in 'any':
+ if interface_name[0] == '!':
+ interface_name = interface_name[1:]
+ if interface_name not in interfaces():
+ Warning(f'NAT interface "{interface_name}" for source NAT rule "{rule}" does not exist!')
else:
group_name = config['outbound_interface']['group']
if group_name[0] == '!':
@@ -182,8 +186,12 @@ def verify(nat):
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'NAT interface "{config["inbound_interface"]["name"]}" for destination NAT rule "{rule}" does not exist!')
+ interface_name = config['inbound_interface']['name']
+ if interface_name not in 'any':
+ if interface_name[0] == '!':
+ interface_name = interface_name[1:]
+ if interface_name not in interfaces():
+ Warning(f'NAT interface "{interface_name}" for destination NAT rule "{rule}" does not exist!')
else:
group_name = config['inbound_interface']['group']
if group_name[0] == '!':