summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2023-01-04 19:35:33 +0100
committerChristian Poessinger <christian@poessinger.com>2023-01-04 19:35:33 +0100
commitbb97f80d358adea1dbf7eaff5d413ccfb95b0441 (patch)
treeee0e738cfcbba718892ea90e33790fc3947ca07a
parent5867d21077d605f1246459881addffa72ef538ff (diff)
downloadvyos-1x-bb97f80d358adea1dbf7eaff5d413ccfb95b0441.tar.gz
vyos-1x-bb97f80d358adea1dbf7eaff5d413ccfb95b0441.zip
qos: T4284: bugfix fair-queue queue-limit range
-rw-r--r--interface-definitions/qos.xml.in6
-rwxr-xr-xsmoketest/scripts/cli/test_qos.py8
2 files changed, 7 insertions, 7 deletions
diff --git a/interface-definitions/qos.xml.in b/interface-definitions/qos.xml.in
index 36190949e..8809369ff 100644
--- a/interface-definitions/qos.xml.in
+++ b/interface-definitions/qos.xml.in
@@ -201,13 +201,13 @@
<properties>
<help>Upper limit of the SFQ</help>
<valueHelp>
- <format>u32:2-127</format>
+ <format>u32:1-127</format>
<description>Queue size in packets</description>
</valueHelp>
<constraint>
- <validator name="numeric" argument="--range 2-127"/>
+ <validator name="numeric" argument="--range 1-127"/>
</constraint>
- <constraintErrorMessage>Queue limit must greater than 1 and less than 128</constraintErrorMessage>
+ <constraintErrorMessage>Queue limit must be in range 1 to 127</constraintErrorMessage>
</properties>
<defaultValue>127</defaultValue>
</leafNode>
diff --git a/smoketest/scripts/cli/test_qos.py b/smoketest/scripts/cli/test_qos.py
index c2fc71e04..014870ec4 100755
--- a/smoketest/scripts/cli/test_qos.py
+++ b/smoketest/scripts/cli/test_qos.py
@@ -130,7 +130,7 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
def test_03_fair_queue(self):
hash_interval = 10
- queue_limit = 50
+ queue_limit = 5
policy_type = 'fair-queue'
first = True
@@ -150,13 +150,13 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
self.cli_set(base_path + ['policy', policy_type, policy_name, 'queue-limit', str(queue_limit)])
hash_interval += 1
- queue_limit += 10
+ queue_limit += 1
# commit changes
self.cli_commit()
hash_interval = 10
- queue_limit = 50
+ queue_limit = 5
for interface in self._interfaces:
tmp = get_tc_qdisc_json(interface)
@@ -165,7 +165,7 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
self.assertEqual(queue_limit, tmp['options']['limit'])
hash_interval += 1
- queue_limit += 10
+ queue_limit += 1
def test_04_fq_codel(self):
policy_type = 'fq-codel'