summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhagbard <vyosdev@derith.de>2019-06-18 15:07:41 -0700
committerJohn Estabrook <jestabro@sentrium.io>2020-01-17 14:01:46 -0600
commitcaec7a022a5760cac1bf67499e77c3028571d510 (patch)
tree6bda8e07fd50766e07bd881eccb582a397c2a2a3
parentd1b12cf8bbe964e9cdb6c0e60fe74d5c410d448c (diff)
downloadvyos-1x-caec7a022a5760cac1bf67499e77c3028571d510.tar.gz
vyos-1x-caec7a022a5760cac1bf67499e77c3028571d510.zip
[pppoe-server] T1452 - add vendor option to shaper
(cherry picked from commit 85c9e0200a4619f0388b7fd7ba9a03f4be933ef5)
-rw-r--r--interface-definitions/pppoe-server.xml5
-rwxr-xr-xsrc/conf_mode/accel_pppoe.py6
2 files changed, 11 insertions, 0 deletions
diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml
index 1190cd9ff..18b0e649c 100644
--- a/interface-definitions/pppoe-server.xml
+++ b/interface-definitions/pppoe-server.xml
@@ -194,6 +194,11 @@
<help>Specifies which radius attribute contains rate information. (default is Filter-Id)</help>
</properties>
</leafNode>
+ <leafNode name="vendor">
+ <properties>
+ <help>Specifies the vendor dictionary. (dictionary needs to be in /usr/share/accel-ppp/radius)</help>
+ </properties>
+ </leafNode>
<leafNode name="enable">
<properties>
<help>Enables Bandwidth shaping via RADIUS</help>
diff --git a/src/conf_mode/accel_pppoe.py b/src/conf_mode/accel_pppoe.py
index 3b3bf8cac..97e3723f0 100755
--- a/src/conf_mode/accel_pppoe.py
+++ b/src/conf_mode/accel_pppoe.py
@@ -169,6 +169,9 @@ verbose=1
[shaper]
verbose=1
attr={{authentication['radiusopt']['shaper']['attr']}}
+{% if authentication['radiusopt']['shaper']['vendor'] %}
+vendor={{authentication['radiusopt']['shaper']['vendor']}}
+{% endif -%}
{% endif -%}
{% endif %}
@@ -476,6 +479,9 @@ def get_config():
config_data['authentication']['radiusopt']['shaper'] = {
'attr' : c.return_value('authentication radius-settings rate-limit attribute')
}
+ if c.exists('authentication radius-settings rate-limit vendor'):
+ config_data['authentication']['radiusopt']['shaper']['vendor'] = c.return_value('authentication radius-settings rate-limit vendor')
+
if c.exists('mtu'):
config_data['mtu'] = c.return_value('mtu')