2 files changed, 81 insertions, 11 deletions
diff --git a/smoketest/scripts/cli/test_qos.py b/smoketest/scripts/cli/test_qos.py
index b98c0e9b7..77d384024 100755
--- a/smoketest/scripts/cli/test_qos.py
+++ b/smoketest/scripts/cli/test_qos.py
@@ -26,25 +26,42 @@ from vyos.utils.process import cmd
 
 base_path = ['qos']
 
-def get_tc_qdisc_json(interface) -> dict:
+def get_tc_qdisc_json(interface, all=False) -> dict:
     tmp = cmd(f'tc -detail -json qdisc show dev {interface}')
     tmp = loads(tmp)
+
+    if all:
+        return tmp
+
     return next(iter(tmp))
 
-def get_tc_filter_json(interface, direction) -> list:
-    if direction not in ['ingress', 'egress']:
+
+def get_tc_filter_json(interface, direction=None) -> list:
+    if direction not in ['ingress', 'egress', None]:
         raise ValueError()
-    tmp = cmd(f'tc -detail -json filter show dev {interface} {direction}')
+
+    cmd_stmt = f'tc -detail -json filter show dev {interface}'
+    if direction:
+        cmd_stmt += f' {direction}'
+
+    tmp = cmd(cmd_stmt)
     tmp = loads(tmp)
     return tmp
 
-def get_tc_filter_details(interface, direction) -> list:
+
+def get_tc_filter_details(interface, direction=None) -> list:
     # json doesn't contain all params, such as mtu
-    if direction not in ['ingress', 'egress']:
+    if direction not in ['ingress', 'egress', None]:
         raise ValueError()
-    tmp = cmd(f'tc -details filter show dev {interface} {direction}')
+
+    cmd_stmt = f'tc -details filter show dev {interface}'
+    if direction:
+        cmd_stmt += f' {direction}'
+
+    tmp = cmd(cmd_stmt)
     return tmp
 
+
 class TestQoS(VyOSUnitTestSHIM.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -854,6 +871,57 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
         self.cli_set(['qos', 'traffic-match-group', '3', 'match-group', 'unexpected'])
         self.cli_commit()
 
+    def test_20_round_robin_policy_default(self):
+        interface = self._interfaces[0]
+        policy_name = f'qos-policy-{interface}'
+
+        self.cli_set(base_path + ['interface', interface, 'egress', policy_name])
+        self.cli_set(
+            base_path
+            + ['policy', 'round-robin', policy_name, 'description', 'default policy']
+        )
+
+        # commit changes
+        self.cli_commit()
+
+        tmp = get_tc_qdisc_json(interface, all=True)
+
+        self.assertEqual(2, len(tmp))
+        self.assertEqual('drr', tmp[0]['kind'])
+        self.assertDictEqual({}, tmp[0]['options'])
+        self.assertEqual('sfq', tmp[1]['kind'])
+        self.assertDictEqual(
+            {
+                'limit': 127,
+                'quantum': 1514,
+                'depth': 127,
+                'flows': 128,
+                'divisor': 1024,
+            },
+            tmp[1]['options'],
+        )
+
+        tmp = get_tc_filter_json(interface)
+        self.assertEqual(3, len(tmp))
+
+        for rec in tmp:
+            self.assertEqual('u32', rec['kind'])
+            self.assertEqual(1, rec['pref'])
+            self.assertEqual('all', rec['protocol'])
+
+        self.assertDictEqual(
+            {
+                'fh': '800::800',
+                'order': 2048,
+                'key_ht': '800',
+                'bkt': '0',
+                'flowid': '1:1',
+                'not_in_hw': True,
+                'match': {'value': '0', 'mask': '0', 'offmask': '', 'off': 0},
+            },
+            tmp[2]['options'],
+        )
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_system_option.py b/smoketest/scripts/cli/test_system_option.py
index ed0280628..f3112cf0b 100755
--- a/smoketest/scripts/cli/test_system_option.py
+++ b/smoketest/scripts/cli/test_system_option.py
@@ -23,6 +23,7 @@ from vyos.utils.system import sysctl_read
 
 base_path = ['system', 'option']
 
+
 class TestSystemOption(VyOSUnitTestSHIM.TestCase):
     def tearDown(self):
         self.cli_delete(base_path)
@@ -59,6 +60,7 @@ class TestSystemOption(VyOSUnitTestSHIM.TestCase):
 
     def test_performance(self):
         tuned_service = 'tuned.service'
+        path = ['system', 'sysctl', 'parameter']
 
         self.assertFalse(is_systemd_service_active(tuned_service))
 
@@ -67,11 +69,11 @@ class TestSystemOption(VyOSUnitTestSHIM.TestCase):
         gc_thresh2 = '262000'
         gc_thresh3 = '524000'
 
-        self.cli_set(['system', 'sysctl', 'parameter', 'net.ipv4.neigh.default.gc_thresh1', 'value', gc_thresh1])
-        self.cli_set(['system', 'sysctl', 'parameter', 'net.ipv4.neigh.default.gc_thresh2', 'value', gc_thresh2])
-        self.cli_set(['system', 'sysctl', 'parameter', 'net.ipv4.neigh.default.gc_thresh3', 'value', gc_thresh3])
+        self.cli_set(path + ['net.ipv4.neigh.default.gc_thresh1', 'value', gc_thresh1])
+        self.cli_set(path + ['net.ipv4.neigh.default.gc_thresh2', 'value', gc_thresh2])
+        self.cli_set(path + ['net.ipv4.neigh.default.gc_thresh3', 'value', gc_thresh3])
 
-        self.cli_set(base_path + ['performance', 'throughput'])
+        self.cli_set(base_path + ['performance', 'network-throughput'])
         self.cli_commit()
 
         self.assertTrue(is_systemd_service_active(tuned_service))