Merge pull request #3131 from HollyGurza/T1871

qos: T1871: add MTU option when configure limiter traffic-policy

4 files changed, 65 insertions, 1 deletions

diff --git a/interface-definitions/include/qos/mtu.xml.i b/interface-definitions/include/qos/mtu.xml.i
new file mode 100644
index 000000000..161d4c27f
--- /dev/null
+++ b/interface-definitions/include/qos/mtu.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from qos/mtu.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>MTU size for this class</help>
+    <valueHelp>
+      <format>u32:256-65535</format>
+      <description>Bytes</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 256-65535"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/qos.xml.in b/interface-definitions/qos.xml.in
index 31b9a7d21..7618c3027 100644
--- a/interface-definitions/qos.xml.in
+++ b/interface-definitions/qos.xml.in
@@ -278,6 +278,7 @@
                   #include <include/generic-description.xml.i>
                   #include <include/qos/bandwidth.xml.i>
                   #include <include/qos/burst.xml.i>
+                  #include <include/qos/mtu.xml.i>
                   #include <include/qos/class-police-exceed.xml.i>
                   #include <include/qos/class-match.xml.i>
                   #include <include/qos/class-priority.xml.i>
@@ -293,6 +294,7 @@
                 <children>
                   #include <include/qos/bandwidth.xml.i>
                   #include <include/qos/burst.xml.i>
+                  #include <include/qos/mtu.xml.i>
                   #include <include/qos/class-police-exceed.xml.i>
                 </children>
               </node>
diff --git a/python/vyos/qos/base.py b/python/vyos/qos/base.py
index 47318122b..c8e881ee2 100644
--- a/python/vyos/qos/base.py
+++ b/python/vyos/qos/base.py
@@ -324,6 +324,11 @@ class QoSBase:
                             if 'burst' in cls_config:
                                 burst = cls_config['burst']
                                 filter_cmd += f' burst {burst}'
+
+                            if 'mtu' in cls_config:
+                                mtu = cls_config['mtu']
+                                filter_cmd += f' mtu {mtu}'
+
                         cls = int(cls)
                         filter_cmd += f' flowid {self._parent:x}:{cls:x}'
                         self._cmd(filter_cmd)
@@ -387,6 +392,10 @@ class QoSBase:
                     burst = config['default']['burst']
                     filter_cmd += f' burst {burst}'
 
+                if 'mtu' in config['default']:
+                    mtu = config['default']['mtu']
+                    filter_cmd += f' mtu {mtu}'
+
                 if 'class' in config:
                     filter_cmd += f' flowid {self._parent:x}:{default_cls_id:x}'
 
diff --git a/smoketest/scripts/cli/test_qos.py b/smoketest/scripts/cli/test_qos.py
index 81e7326f8..46ef68b1d 100755
--- a/smoketest/scripts/cli/test_qos.py
+++ b/smoketest/scripts/cli/test_qos.py
@@ -38,6 +38,13 @@ def get_tc_filter_json(interface, direction) -> list:
     tmp = loads(tmp)
     return tmp
 
+def get_tc_filter_details(interface, direction) -> list:
+    # json doesn't contain all params, such as mtu
+    if direction not in ['ingress', 'egress']:
+        raise ValueError()
+    tmp = cmd(f'tc -details filter show dev {interface} {direction}')
+    return tmp
+
 class TestQoS(VyOSUnitTestSHIM.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -234,7 +241,12 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
     def test_05_limiter(self):
         qos_config = {
             '1' : {
-                'bandwidth' : '1000000',
+                'bandwidth' : '3000000',
+                'exceed' : 'pipe',
+                'burst' : '100Kb',
+                'mtu' : '1600',
+                'not-exceed' : 'continue',
+                'priority': '15',
                 'match4' : {
                     'ssh'   : { 'dport' : '22', },
                     },
@@ -262,6 +274,10 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
             self.cli_set(base_path + ['interface', interface, 'ingress', policy_name])
             # set default bandwidth parameter for all remaining connections
             self.cli_set(base_path + ['policy', 'limiter', policy_name, 'default', 'bandwidth', '500000'])
+            self.cli_set(base_path + ['policy', 'limiter', policy_name, 'default', 'burst', '200kb'])
+            self.cli_set(base_path + ['policy', 'limiter', policy_name, 'default', 'exceed', 'drop'])
+            self.cli_set(base_path + ['policy', 'limiter', policy_name, 'default', 'mtu', '3000'])
+            self.cli_set(base_path + ['policy', 'limiter', policy_name, 'default', 'not-exceed', 'ok'])
 
             for qos_class, qos_class_config in qos_config.items():
                 qos_class_base = base_path + ['policy', 'limiter', policy_name, 'class', qos_class]
@@ -279,6 +295,21 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
                 if 'bandwidth' in qos_class_config:
                     self.cli_set(qos_class_base + ['bandwidth', qos_class_config['bandwidth']])
 
+                if 'exceed' in qos_class_config:
+                    self.cli_set(qos_class_base + ['exceed', qos_class_config['exceed']])
+
+                if 'not-exceed' in qos_class_config:
+                    self.cli_set(qos_class_base + ['not-exceed', qos_class_config['not-exceed']])
+
+                if 'burst' in qos_class_config:
+                    self.cli_set(qos_class_base + ['burst', qos_class_config['burst']])
+
+                if 'mtu' in qos_class_config:
+                    self.cli_set(qos_class_base + ['mtu', qos_class_config['mtu']])
+
+                if 'priority' in qos_class_config:
+                    self.cli_set(qos_class_base + ['priority', qos_class_config['priority']])
+
 
         # commit changes
         self.cli_commit()
@@ -303,6 +334,14 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
                         dport = int(match_config['dport'])
                         self.assertEqual(f'{dport:x}', filter['options']['match']['value'])
 
+            tc_details = get_tc_filter_details(interface, 'ingress')
+            self.assertTrue('filter parent ffff: protocol all pref 20 u32 chain 0' in tc_details)
+            self.assertTrue('rate 1Gbit burst 15125b mtu 2Kb action drop overhead 0b linklayer ethernet' in tc_details)
+            self.assertTrue('filter parent ffff: protocol all pref 15 u32 chain 0' in tc_details)
+            self.assertTrue('rate 3Gbit burst 102000b mtu 1600b action pipe/continue overhead 0b linklayer ethernet' in tc_details)
+            self.assertTrue('rate 500Mbit burst 204687b mtu 3000b action drop overhead 0b linklayer ethernet' in tc_details)
+            self.assertTrue('filter parent ffff: protocol all pref 255 basic chain 0' in tc_details)
+
     def test_06_network_emulator(self):
         policy_type = 'network-emulator'