diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-29 15:08:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 15:08:47 +0100 |
| commit | 93427954f3abbce755847e61d0dd6471dce1bdd9 (patch) | |
| tree | a876dc12bd6539150c7d8e77a647fed5f24fdc33 /src/conf_mode/nat66.py | |
| parent | d92b951dbede64018dd2edc94e1619cb899a7828 (diff) | |
| parent | 188ad6ae8c107ab8a3325b097297261b0e26a0f6 (diff) | |
| download | vyos-1x-93427954f3abbce755847e61d0dd6471dce1bdd9.tar.gz vyos-1x-93427954f3abbce755847e61d0dd6471dce1bdd9.zip | |
Merge pull request #2713 from vyos/mergify/bp/sagitta/pr-2709
nat: T5681: relax wording on non existing interface Warning message (backport #2709)
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 990d6132e..ed716b2a2 100755 --- a/src/conf_mode/nat66.py +++ b/src/conf_mode/nat66.py @@ -104,10 +104,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: @@ -128,10 +128,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 |