diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-21 13:28:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-21 13:28:37 +0100 |
| commit | 1ca76b8f9b069ce1f8073326518196dbe95681c6 (patch) | |
| tree | c988df4a39e18d97c3322d5a7de981d07fa142a5 | |
| parent | 36d0196a9554fb36fafc541510ca057849c25fd7 (diff) | |
| parent | 7f277e0e93cac0678ef101f0c36d1a916ec778b0 (diff) | |
| download | vyos-1x-1ca76b8f9b069ce1f8073326518196dbe95681c6.tar.gz vyos-1x-1ca76b8f9b069ce1f8073326518196dbe95681c6.zip | |
Merge pull request #2865 from vyos/mergify/bp/sagitta/pr-2862
T5961: Fix QoS policy shaper class match vif (backport #2862)
| -rw-r--r-- | python/vyos/qos/base.py | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/python/vyos/qos/base.py b/python/vyos/qos/base.py index 27045043e..a22039e52 100644 --- a/python/vyos/qos/base.py +++ b/python/vyos/qos/base.py @@ -14,6 +14,7 @@ # License along with this library. If not, see <http://www.gnu.org/licenses/>. import os +import jmespath from vyos.base import Warning from vyos.utils.process import cmd @@ -226,6 +227,9 @@ class QoSBase: if 'mark' in match_config: mark = match_config['mark'] filter_cmd += f' handle {mark} fw' + if 'vif' in match_config: + vif = match_config['vif'] + filter_cmd += f' basic match "meta(vlan mask 0xfff eq {vif})"' for af in ['ip', 'ipv6']: tc_af = af @@ -301,23 +305,28 @@ class QoSBase: filter_cmd += f' flowid {self._parent:x}:{cls:x}' self._cmd(filter_cmd) + vlan_expression = "match.*.vif" + match_vlan = jmespath.search(vlan_expression, cls_config) + if any(tmp in ['exceed', 'bandwidth', 'burst'] for tmp in cls_config): - filter_cmd += f' action police' - - if 'exceed' in cls_config: - action = cls_config['exceed'] - filter_cmd += f' conform-exceed {action}' - if 'not_exceed' in cls_config: - action = cls_config['not_exceed'] - filter_cmd += f'/{action}' - - if 'bandwidth' in cls_config: - rate = self._rate_convert(cls_config['bandwidth']) - filter_cmd += f' rate {rate}' - - if 'burst' in cls_config: - burst = cls_config['burst'] - filter_cmd += f' burst {burst}' + # For "vif" "basic match" is used instead of "action police" T5961 + if not match_vlan: + filter_cmd += f' action police' + + if 'exceed' in cls_config: + action = cls_config['exceed'] + filter_cmd += f' conform-exceed {action}' + if 'not_exceed' in cls_config: + action = cls_config['not_exceed'] + filter_cmd += f'/{action}' + + if 'bandwidth' in cls_config: + rate = self._rate_convert(cls_config['bandwidth']) + filter_cmd += f' rate {rate}' + + if 'burst' in cls_config: + burst = cls_config['burst'] + filter_cmd += f' burst {burst}' cls = int(cls) filter_cmd += f' flowid {self._parent:x}:{cls:x}' self._cmd(filter_cmd) |