diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-14 19:12:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-14 19:12:47 +0200 |
| commit | 5f2179306708f7faa13bbc826dddde839b015bbb (patch) | |
| tree | 54107cbbd8e0f413c51a14dc1dc876bb6133c1b2 /src/conf_mode | |
| parent | 39e3c9e06e79b720265b16840a2a8858c9939278 (diff) | |
| parent | ec5437913e489f40fea6bab89a6bb5f565cd1ab7 (diff) | |
| download | vyos-1x-5f2179306708f7faa13bbc826dddde839b015bbb.tar.gz vyos-1x-5f2179306708f7faa13bbc826dddde839b015bbb.zip | |
Merge pull request #2253 from nicolas-fort/T5561
T5561: nat: inbound|outbound interface should not be mandatory
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/nat.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/conf_mode/nat.py b/src/conf_mode/nat.py index 08e96f10b..e37a7011c 100755 --- a/src/conf_mode/nat.py +++ b/src/conf_mode/nat.py @@ -195,11 +195,10 @@ def verify(nat): if dict_search('source.rule', nat): for rule, config in dict_search('source.rule', nat).items(): err_msg = f'Source NAT configuration error in rule {rule}:' - if 'outbound_interface' not in config: - raise ConfigError(f'{err_msg} outbound-interface not specified') - if config['outbound_interface'] not in 'any' and config['outbound_interface'] not in interfaces(): - Warning(f'rule "{rule}" interface "{config["outbound_interface"]}" does not exist on this system') + if 'outbound_interface' in config: + if config['outbound_interface'] not in 'any' and config['outbound_interface'] not in interfaces(): + Warning(f'rule "{rule}" interface "{config["outbound_interface"]}" 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']: @@ -218,11 +217,9 @@ def verify(nat): for rule, config in dict_search('destination.rule', nat).items(): err_msg = f'Destination NAT configuration error in rule {rule}:' - if 'inbound_interface' not in config: - raise ConfigError(f'{err_msg}\n' \ - 'inbound-interface not specified') - elif config['inbound_interface'] not in 'any' and config['inbound_interface'] not in interfaces(): - Warning(f'rule "{rule}" interface "{config["inbound_interface"]}" does not exist on this system') + if 'inbound_interface' in config: + if config['inbound_interface'] not in 'any' and config['inbound_interface'] not in interfaces(): + Warning(f'rule "{rule}" interface "{config["inbound_interface"]}" 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']: |