fix(vlan): do not apply strip offload

[csit.git] / resources / libraries / python / autogen / Testcase.py

diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py
index d419b29..32fc501 100644 (file)
--- a/resources/libraries/python/autogen/Testcase.py
+++ b/resources/libraries/python/autogen/Testcase.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.

 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:


@@ -29,23 +29,21 @@ class Testcase:
             - cores_str - Number of physical cores to use, example: "2".
             - frame_num - Framesize as a number, example: "${74}".
             - frame_str - Framesize in upper case, example: "74B".
             - cores_str - Number of physical cores to use, example: "2".
             - frame_num - Framesize as a number, example: "${74}".
             - frame_str - Framesize in upper case, example: "74B".

-            - tc_num - Start of testcase name, example: "tc04".

         :type template_string: str
         """
         self.template = Template(template_string)
 
         :type template_string: str
         """
         self.template = Template(template_string)
 

-    def generate(self, num, frame_size, phy_cores):
+    def generate(self, frame_size, phy_cores=None):

         """Return string of test case code with placeholders filled.
 
         Fail if there are placeholders left unfilled.
         It is not required for all placeholders to be present in template.
 
         """Return string of test case code with placeholders filled.
 
         Fail if there are placeholders left unfilled.
         It is not required for all placeholders to be present in template.
 

-        :param num: Test case number. Example value: 4.

         :param frame_size: Imix string or numeric frame size. Example: 74.
         :param frame_size: Imix string or numeric frame size. Example: 74.

-        :param phy_cores: Number of physical cores to use. Example: 2.
-        :type num: int
+        :param phy_cores: Number of physical cores to use. Example: 2. It can
+            be None in n2n testcases.

         :type frame_size: str or int
         :type frame_size: str or int

-        :type phy_cores: int or str
+        :type phy_cores: int, str or None

         :returns: Filled template, usable as test case code.
         :rtype: str
         """
         :returns: Filled template, usable as test case code.
         :rtype: str
         """


@@ -60,13 +58,14 @@ class Testcase:
                 u"frame_num": str(frame_size),
                 u"frame_str": u"IMIX"
             }
                 u"frame_num": str(frame_size),
                 u"frame_str": u"IMIX"
             }

+        if phy_cores is None:
+            return self.template.substitute(subst_dict)

         cores_str = str(phy_cores)
         cores_num = int(cores_str)
         subst_dict.update(
             {
                 u"cores_num": f"${{{cores_num:d}}}",
                 u"cores_str": phy_cores,
         cores_str = str(phy_cores)
         cores_num = int(cores_str)
         subst_dict.update(
             {
                 u"cores_num": f"${{{cores_num:d}}}",
                 u"cores_str": phy_cores,

-                u"tc_num": f"tc{num:02d}",

             }
         )
         return self.template.substitute(subst_dict)
             }
         )
         return self.template.substitute(subst_dict)


@@ -84,7 +83,7 @@ class Testcase:
         :rtype: Testcase
         """
         template_string = f'''
         :rtype: Testcase
         """
         template_string = f'''

-| ${{tc_num}}-${{frame_str}}-${{cores_str}}c-{suite_id}
+| ${{frame_str}}-${{cores_str}}c-{suite_id}

 | | [Tags] | ${{frame_str}} | ${{cores_str}}C
 | | frame_size=${{frame_num}} | phy_cores=${{cores_num}}
 '''
 | | [Tags] | ${{frame_str}} | ${{cores_str}}C
 | | frame_size=${{frame_num}} | phy_cores=${{cores_num}}
 '''


@@ -104,14 +103,57 @@ class Testcase:
         # TODO: Choose a better frame size identifier for streamed protocols
         # (TCP, QUIC, SCTP, ...) where DUT (not TG) decides frame size.
         if u"tcphttp" in suite_id:
         # TODO: Choose a better frame size identifier for streamed protocols
         # (TCP, QUIC, SCTP, ...) where DUT (not TG) decides frame size.
         if u"tcphttp" in suite_id:

-            template_string = f'''
-| ${{tc_num}}-IMIX-${{cores_str}}c-{suite_id}
+            if u"rps" or u"cps" in suite_id:
+                template_string = f'''
+| ${{frame_str}}-${{cores_str}}c-{suite_id}
+| | [Tags] | ${{frame_str}} | ${{cores_str}}C
+| | frame_size=${{frame_num}} | phy_cores=${{cores_num}}
+'''
+            else:
+                template_string = f'''
+| IMIX-${{cores_str}}c-{suite_id}

 | | [Tags] | ${{cores_str}}C
 | | phy_cores=${{cores_num}}
 '''
         else:
 | | [Tags] | ${{cores_str}}C
 | | phy_cores=${{cores_num}}
 '''
         else:

-            template_string = \
-                f"\n| ${{tc_num}}-9000B-${{cores_str}}c-{suite_id[:-4]}" \
-                f"-{suite_id[-3:]}\n" \
-                f"| | [Tags] | ${{cores_str}}C\n| | phy_cores=${{cores_num}}\n"
+            template_string = f'''
+| ${{frame_str}}-${{cores_str}}c-{suite_id[:-4]}-{suite_id[-3:]}
+| | [Tags] | ${{cores_str}}C\n| | phy_cores=${{cores_num}}
+'''
+        return cls(template_string)
+
+    @classmethod
+    def iperf3(cls, suite_id):
+        """Factory method for creating "iperf3" testcase objects.
+
+        Testcase name will contain core count, but not frame size.
+
+        :param suite_id: Part of suite name to distinguish from other suites.
+        :type suite_id: str
+        :returns: Instance for generating testcase text of this type.
+        :rtype: Testcase
+        """
+        template_string = f'''
+| 128KB-${{cores_str}}c-{suite_id}
+| | [Tags] | 128KB | ${{cores_str}}C
+| | frame_size=${{frame_num}} | phy_cores=${{cores_num}}
+'''
+        return cls(template_string)
+
+    @classmethod
+    def trex(cls, suite_id):
+        """Factory method for creating "trex" testcase objects.
+
+        Testcase name will contain frame size, but not core count.
+
+        :param suite_id: Part of suite name to distinguish from other suites.
+        :type suite_id: str
+        :returns: Instance for generating testcase text of this type.
+        :rtype: Testcase
+        """
+        template_string = f'''
+| ${{frame_str}}--{suite_id}
+| | [Tags] | ${{frame_str}}
+| | frame_size=${{frame_num}}
+'''

         return cls(template_string)
         return cls(template_string)