summaryrefslogtreecommitdiff
path: root/python/vyos
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-15 16:18:29 +0100
committerGitHub <noreply@github.com>2024-02-15 16:18:29 +0100
commiteb079e4a49150934dec082861176f5a5213c1206 (patch)
tree4d74c32d40d8d25522aeb54600a154517df41c53 /python/vyos
parent697ce8c51c2ae9667a699b3d95e0ffa6b1984328 (diff)
parent8eec0b5b062b5f98a865949ac0f2a49d61b81199 (diff)
downloadvyos-1x-eb079e4a49150934dec082861176f5a5213c1206.tar.gz
vyos-1x-eb079e4a49150934dec082861176f5a5213c1206.zip
Merge pull request #3013 from vyos/mergify/bp/sagitta/pr-3004
T6029: Rewritten Accel-PPP services to an identical feature set (backport #3004)
Diffstat (limited to 'python/vyos')
-rw-r--r--python/vyos/accel_ppp_util.py32
1 files changed, 20 insertions, 12 deletions
diff --git a/python/vyos/accel_ppp_util.py b/python/vyos/accel_ppp_util.py
index bd0c46a19..845b2f5f0 100644
--- a/python/vyos/accel_ppp_util.py
+++ b/python/vyos/accel_ppp_util.py
@@ -106,7 +106,26 @@ def get_pools_in_order(data: dict) -> list:
return pools
-def verify_accel_ppp_base_service(config, local_users=True):
+def verify_accel_ppp_name_servers(config):
+ if "name_server_ipv4" in config:
+ if len(config["name_server_ipv4"]) > 2:
+ raise ConfigError(
+ "Not more then two IPv4 DNS name-servers " "can be configured"
+ )
+ if "name_server_ipv6" in config:
+ if len(config["name_server_ipv6"]) > 3:
+ raise ConfigError(
+ "Not more then three IPv6 DNS name-servers " "can be configured"
+ )
+
+
+def verify_accel_ppp_wins_servers(config):
+ if 'wins_server' in config and len(config['wins_server']) > 2:
+ raise ConfigError(
+ 'Not more then two WINS name-servers can be configured')
+
+
+def verify_accel_ppp_authentication(config, local_users=True):
"""
Common helper function which must be used by all Accel-PPP services based
on get_config_dict()
@@ -148,17 +167,6 @@ def verify_accel_ppp_base_service(config, local_users=True):
if not dict_search('authentication.radius.dynamic_author.key', config):
raise ConfigError('DAE/CoA server key required!')
- if "name_server_ipv4" in config:
- if len(config["name_server_ipv4"]) > 2:
- raise ConfigError(
- "Not more then two IPv4 DNS name-servers " "can be configured"
- )
-
- if "name_server_ipv6" in config:
- if len(config["name_server_ipv6"]) > 3:
- raise ConfigError(
- "Not more then three IPv6 DNS name-servers " "can be configured"
- )