Merge pull request #2066 from sever-sever/T5048

T5048: QoS index priority should be used only for shaper
vyos · Jul 2, 2023 · 1a6640a · 1a6640a
2 parents 9c4c2f4 + 332f017
commit 1a6640a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/python/vyos/qos/base.py b/python/vyos/qos/base.py
@@ -217,7 +217,8 @@ def update(self, config, direction, priority=None):
                 if 'match' in cls_config:
                     for index, (match, match_config) in enumerate(cls_config['match'].items(), start=1):
                         filter_cmd = filter_cmd_base
-                        filter_cmd += f' prio {index}'
+                        if self.qostype == 'shaper':
+                            filter_cmd += f' prio {index}'
                         if 'mark' in match_config:
                             mark = match_config['mark']
                             filter_cmd += f' handle {mark} fw'

diff --git a/python/vyos/qos/trafficshaper.py b/python/vyos/qos/trafficshaper.py
@@ -22,6 +22,7 @@
 
 class TrafficShaper(QoSBase):
     _parent = 1
+    qostype = 'shaper'
 
     # https://man7.org/linux/man-pages/man8/tc-htb.8.html
     def update(self, config, direction):