summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-11 14:58:12 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-11 14:59:18 +0200
commit3f6e5bc3fcac66d234b8ea1d6ab98dd2178b286d (patch)
treef8735d8755542c0be848ec102a6f9a62ea555ce8
parent3203f2a6d4958eb97f1c678ee7054a1f9c210a41 (diff)
downloadvyos-1x-3f6e5bc3fcac66d234b8ea1d6ab98dd2178b286d.tar.gz
vyos-1x-3f6e5bc3fcac66d234b8ea1d6ab98dd2178b286d.zip
accel-ppp: T3731: eliminate service name from error message
VyOS will automatically append the subsystem name (pppoe-server or sstp) when something goes wrong. No need to hardcode this into the error string a second time. (cherry picked from commit 29463355e6ec98195ffd52e018bc775cd4199456)
-rw-r--r--python/vyos/configverify.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/vyos/configverify.py b/python/vyos/configverify.py
index 0fb3501e8..0b6e6fc13 100644
--- a/python/vyos/configverify.py
+++ b/python/vyos/configverify.py
@@ -315,7 +315,7 @@ def verify_accel_ppp_base_service(config):
# vertify auth settings
if dict_search('authentication.mode', config) == 'local':
if not dict_search('authentication.local_users', config):
- raise ConfigError('PPPoE local auth mode requires local users to be configured!')
+ raise ConfigError('Authentication mode local requires local users to be configured!')
for user in dict_search('authentication.local_users.username', config):
user_config = config['authentication']['local_users']['username'][user]
@@ -339,7 +339,7 @@ def verify_accel_ppp_base_service(config):
raise ConfigError(f'Missing RADIUS secret key for server "{server}"')
if 'gateway_address' not in config:
- raise ConfigError('PPPoE server requires gateway-address to be configured!')
+ raise ConfigError('Server requires gateway-address to be configured!')
if 'name_server_ipv4' in config:
if len(config['name_server_ipv4']) > 2: