Merge branch 'pptp-rewrite' of github.com:c-po/vyos-1x into current

* 'pptp-rewrite' of github.com:c-po/vyos-1x:
  accel-ppp: fix wrong reference in verify() on missing attributes
  accel-ppp: T2314: bugfix wrong placement of endif in Jinja2 template
  vpn: pptp: T2351: add support for common radius-additions XML
  vpn: pptp: T2351: migrate to common radius CLI
  vpn: pptp: T2351: migrate to common name-server, wins-server nodes
  accel-ppp: provide common wins-server include definition
  vpn: pptp: T2351: use first IP from client pool as gateway address
  vpn: pptp: T2351: align configuration to other accel implementations
  vpn: pptp: T2351: migrate from SysVinit to systemd
  vyos.util: migrate all cpu_count() occurances to common get_half_cpus()

1 files changed, 3 insertions, 7 deletions

diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py
index 94eb675f7..95cb066d8 100755
--- a/src/conf_mode/service_pppoe-server.py
+++ b/src/conf_mode/service_pppoe-server.py
@@ -23,7 +23,7 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.template import render
-from vyos.util import call
+from vyos.util import call, get_half_cpus()
 from vyos.validate import is_ipv4
 from vyos import ConfigError
 
@@ -78,7 +78,7 @@ default_config_data = {
     'radius_dynamic_author': '',
     'sesscrtl': 'replace',
     'snmp': False,
-    'thread_cnt': '1'
+    'thread_cnt': get_half_cpus()
 }
 
 def get_config():
@@ -90,10 +90,6 @@ def get_config():
     conf.set_level(base_path)
     pppoe = deepcopy(default_config_data)
 
-    cpu = os.cpu_count()
-    if cpu > 1:
-        pppoe['thread_cnt'] = int(cpu/2)
-
     # general options
     if conf.exists(['access-concentrator']):
         pppoe['concentrator'] = conf.return_value(['access-concentrator'])
@@ -393,7 +389,7 @@ def verify(pppoe):
         for radius in pppoe['radius_server']:
             if not radius['key']:
                 server = radius['server']
-                raise ConfigError(f'Missing RADIUS secret key for server "{{ server }}"')
+                raise ConfigError(f'Missing RADIUS secret key for server "{ server }"')
 
     if len(pppoe['wins']) > 2:
         raise ConfigError('Not more then two IPv4 WINS name-servers can be configured')