diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-10-22 19:33:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-22 19:33:27 +0200 |
| commit | 2007a883125c7c6e1a0a1b06b0e0d32f9b1dc693 (patch) | |
| tree | f36f8fd5a217d1cf2dde93909a44cd0452940a50 /python/vyos | |
| parent | 282c32d51e2d013410fd39e33feba6e657894971 (diff) | |
| parent | 7fdf77b6b339bc12f1104b2d84945a82119c0eb4 (diff) | |
| download | vyos-1x-2007a883125c7c6e1a0a1b06b0e0d32f9b1dc693.tar.gz vyos-1x-2007a883125c7c6e1a0a1b06b0e0d32f9b1dc693.zip | |
Merge pull request #2394 from vyos/mergify/bp/sagitta/pr-2391
T5299: Add missed option ceiling for QoS shaper (backport #2391)
Diffstat (limited to 'python/vyos')
| -rw-r--r-- | python/vyos/qos/trafficshaper.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/python/vyos/qos/trafficshaper.py b/python/vyos/qos/trafficshaper.py index c63c7cf39..0d5f9a8a1 100644 --- a/python/vyos/qos/trafficshaper.py +++ b/python/vyos/qos/trafficshaper.py @@ -1,4 +1,4 @@ -# Copyright 2022 VyOS maintainers and contributors <maintainers@vyos.io> +# Copyright 2022-2023 VyOS maintainers and contributors <maintainers@vyos.io> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -89,6 +89,10 @@ class TrafficShaper(QoSBase): if 'priority' in cls_config: priority = cls_config['priority'] tmp += f' prio {priority}' + + if 'ceiling' in cls_config: + f_ceil = self._rate_convert(cls_config['ceiling']) + tmp += f' ceil {f_ceil}' self._cmd(tmp) tmp = f'tc qdisc replace dev {self._interface} parent {self._parent:x}:{cls:x} sfq' @@ -102,6 +106,9 @@ class TrafficShaper(QoSBase): if 'priority' in config['default']: priority = config['default']['priority'] tmp += f' prio {priority}' + if 'ceiling' in config['default']: + f_ceil = self._rate_convert(config['default']['ceiling']) + tmp += f' ceil {f_ceil}' self._cmd(tmp) tmp = f'tc qdisc replace dev {self._interface} parent {self._parent:x}:{default_minor_id:x} sfq' |