X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fautogen%2FTestcase.py;h=32fc5014cc83d1d1e2172d5ec381e3090a92d678;hb=b6606e7625e308a66bdfb9d5a9c065b58e429a99;hp=3ffbc4594a36fd4bad104246e16b30f4976c2ec4;hpb=be5265bc9612f5aedf4f25720c4bd8941e359410;p=csit.git

diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py
index 3ffbc4594a..32fc5014cc 100644
--- a/resources/libraries/python/autogen/Testcase.py
+++ b/resources/libraries/python/autogen/Testcase.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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:
@@ -33,16 +33,17 @@ class Testcase:
         """
         self.template = Template(template_string)
 
-    def generate(self, 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.
 
         :param frame_size: Imix string or numeric frame size. Example: 74.
-        :param phy_cores: Number of physical cores to use. Example: 2.
+        :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 phy_cores: int or str
+        :type phy_cores: int, str or None
         :returns: Filled template, usable as test case code.
         :rtype: str
         """
@@ -57,6 +58,8 @@ class Testcase:
                 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(
@@ -100,7 +103,14 @@ 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:
-            template_string = f'''
+            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}}
@@ -109,5 +119,41 @@ class Testcase:
             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)