diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-07-27 18:39:51 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 18:39:51 +0700 |
| commit | 16b1a4fa0e575d1afa39e60b029dd23ea34da871 (patch) | |
| tree | 8639b87087e1726a1aacd5a58b1ffabc1a6c870d | |
| parent | 7c84c631d58b84a67837c677b73d23698715c205 (diff) | |
| parent | 9df4b2ee8caa64093f27e9af212224b2a30e6047 (diff) | |
| download | vyos-1x-16b1a4fa0e575d1afa39e60b029dd23ea34da871.tar.gz vyos-1x-16b1a4fa0e575d1afa39e60b029dd23ea34da871.zip | |
Merge pull request #518 from DmitriyEshenko/crux-pppoe-pado-delay
pppoe-server: T2067: Allow setting multiple service-names
| -rw-r--r-- | interface-definitions/pppoe-server.xml | 1 | ||||
| -rwxr-xr-x | src/conf_mode/accel_pppoe.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml index ea77140c2..331f03b1f 100644 --- a/interface-definitions/pppoe-server.xml +++ b/interface-definitions/pppoe-server.xml @@ -395,6 +395,7 @@ <regex>^[a-zA-Z0-9\-]{1,100}</regex> </constraint> <constraintErrorMessage>servicename can contain aplhanumerical characters and dashes only (max. 100)</constraintErrorMessage> + <multi/> </properties> </leafNode> <node name="wins-servers"> 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'): |