summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDmitriyEshenko <dmitriy.eshenko@vyos.io>2020-07-27 11:37:23 +0000
committerDmitriyEshenko <dmitriy.eshenko@vyos.io>2020-07-27 11:37:23 +0000
commit9df4b2ee8caa64093f27e9af212224b2a30e6047 (patch)
tree8639b87087e1726a1aacd5a58b1ffabc1a6c870d /src
parent88d6c303286c6ed8d924e00e588226aad4a5cd57 (diff)
downloadvyos-1x-9df4b2ee8caa64093f27e9af212224b2a30e6047.tar.gz
vyos-1x-9df4b2ee8caa64093f27e9af212224b2a30e6047.zip
pppoe-server: T2067: Allow setting multiple service-names
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/accel_pppoe.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conf_mode/accel_pppoe.py b/src/conf_mode/accel_pppoe.py
index 1df873171..93d950b52 100755
--- a/src/conf_mode/accel_pppoe.py
+++ b/src/conf_mode/accel_pppoe.py
@@ -237,7 +237,7 @@ interface={{int}}
{% endfor %}
{% endif %}
{% if svc_name %}
-service-name={{svc_name}}
+service-name={{svc_name|join(',')}}
{% endif %}
{% if pado_delay %}
pado-delay={{pado_delay}}
@@ -334,7 +334,7 @@ def get_config():
'client_ipv6_pool' : {},
'interface' : [],
'ppp_gw' : '',
- 'svc_name' : '',
+ 'svc_name' : [],
'dns' : [],
'dnsv6' : [],
'wins' : [],
@@ -350,7 +350,7 @@ def get_config():
if c.exists('access-concentrator'):
config_data['concentrator'] = c.return_value('access-concentrator')
if c.exists('service-name'):
- config_data['svc_name'] = c.return_value('service-name')
+ config_data['svc_name'] = c.return_values('service-name')
if c.exists('interface'):
config_data['interface'] = c.return_values('interface')
if c.exists('local-ip'):