diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-29 15:03:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 15:03:47 +0100 |
| commit | 5b3b79410dca8753e76692b80b84cadab8357031 (patch) | |
| tree | 8745ace15b93bbf5a4c4343c1236634158d9683a /src/conf_mode/nat66.py | |
| parent | 2eb5b3943377047549b6c5171854f82af20c80bb (diff) | |
| parent | 9f863a50f1ac6c81782df6c43f7df816d9e11b16 (diff) | |
| download | vyos-1x-5b3b79410dca8753e76692b80b84cadab8357031.tar.gz vyos-1x-5b3b79410dca8753e76692b80b84cadab8357031.zip | |
Merge pull request #2709 from c-po/nat-T5681
nat: T5681: relax wording on non existing interface Warning message
Diffstat (limited to 'src/conf_mode/nat66.py')
| -rwxr-xr-x | src/conf_mode/nat66.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py index dee1551fe..4c1ead258 100755 --- a/src/conf_mode/nat66.py +++ b/src/conf_mode/nat66.py @@ -64,10 +64,10 @@ def verify(nat): if 'outbound_interface' in config: 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}"') + 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') + Warning(f'NAT66 interface "{config["outbound_interface"]["name"]}" for source NAT66 rule "{rule}" does not exist!') addr = dict_search('translation.address', config) if addr != None: @@ -88,10 +88,10 @@ def verify(nat): if 'inbound_interface' in config: 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}"') + 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') + Warning(f'NAT66 interface "{config["inbound_interface"]["name"]}" for destination NAT66 rule "{rule}" does not exist!') return None |