summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-05-16 17:55:35 +0200
committerGitHub <noreply@github.com>2022-05-16 17:55:35 +0200
commit9347dc53c5bd3d5712121524ea16f3030d735601 (patch)
tree8b7372c39006251bad91b7f130597bd128fc24eb
parentf105efc658b96a12eb4ecc12e245ecd67a6468e1 (diff)
parentb9e1a141ee2a4767ec312de1251eabb802913de7 (diff)
downloadvyos-1x-9347dc53c5bd3d5712121524ea16f3030d735601.tar.gz
vyos-1x-9347dc53c5bd3d5712121524ea16f3030d735601.zip
Merge pull request #1290 from sever-sever/T4373
ppppoe-server: T4373: Add option multiplier for correct shaping
-rw-r--r--data/templates/accel-ppp/config_shaper_radius.j23
-rw-r--r--interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i14
2 files changed, 17 insertions, 0 deletions
diff --git a/data/templates/accel-ppp/config_shaper_radius.j2 b/data/templates/accel-ppp/config_shaper_radius.j2
index c256647e4..942cdf132 100644
--- a/data/templates/accel-ppp/config_shaper_radius.j2
+++ b/data/templates/accel-ppp/config_shaper_radius.j2
@@ -6,5 +6,8 @@ attr={{ authentication.radius.rate_limit.attribute }}
{% if authentication.radius.rate_limit.vendor is vyos_defined %}
vendor={{ authentication.radius.rate_limit.vendor }}
{% endif %}
+{% if authentication.radius.rate_limit.multiplier is vyos_defined %}
+rate-multiplier={{ authentication.radius.rate_limit.multiplier }}
+{% endif %}
{% endif %}
{% endif %}
diff --git a/interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i b/interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i
index be49fce5a..f44920c3f 100644
--- a/interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i
+++ b/interface-definitions/include/accel-ppp/radius-additions-rate-limit.xml.i
@@ -21,6 +21,20 @@
<valueless />
</properties>
</leafNode>
+ <leafNode name="multiplier">
+ <properties>
+ <help>Shaper multiplier</help>
+ <valueHelp>
+ <format>&lt;0.001-1000&gt;</format>
+ <description>Shaper multiplier</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 0.001-1000 --float"/>
+ </constraint>
+ <constraintErrorMessage>Multiplier needs to be between 0.001 and 1000</constraintErrorMessage>
+ </properties>
+ <defaultValue>1</defaultValue>
+ </leafNode>
</children>
</node>
<!-- include end -->