T-Rex: 2.82, core pin, 8 workers

[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 70c2122..3ffbc45 100644 (file)
--- a/resources/libraries/python/autogen/Testcase.py
+++ b/resources/libraries/python/autogen/Testcase.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:


@@ -16,7 +16,7 @@
 from string import Template
 
 
 from string import Template
 
 

-class Testcase(object):
+class Testcase:

     """Class containing a template string and a substitution method."""
 
     def __init__(self, template_string):
     """Class containing a template string and a substitution method."""
 
     def __init__(self, template_string):


@@ -29,21 +29,18 @@ class Testcase(object):
             - 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):

         """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 phy_cores: Number of physical cores to use. Example: 2.
         :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

         :type frame_size: str or int
         :type phy_cores: int or str
         :returns: Filled template, usable as test case code.
         :type frame_size: str or int
         :type phy_cores: int or str
         :returns: Filled template, usable as test case code.


@@ -52,22 +49,22 @@ class Testcase(object):
         try:
             fsize = int(frame_size)
             subst_dict = {
         try:
             fsize = int(frame_size)
             subst_dict = {

-                "frame_num": "${%d}" % fsize,
-                "frame_str": "%dB" % fsize
+                u"frame_num": f"${{{fsize:d}}}",
+                u"frame_str": f"{fsize:d}B"

             }
         except ValueError:  # Assuming an IMIX string.
             subst_dict = {
             }
         except ValueError:  # Assuming an IMIX string.
             subst_dict = {

-                "frame_num": str(frame_size),
-                "frame_str": "IMIX"
+                u"frame_num": str(frame_size),
+                u"frame_str": u"IMIX"

             }
         cores_str = str(phy_cores)
         cores_num = int(cores_str)
         subst_dict.update(
             {
             }
         cores_str = str(phy_cores)
         cores_num = int(cores_str)
         subst_dict.update(
             {

-                "cores_num": "${%d}" % cores_num,
-                "cores_str": phy_cores,
-                "tc_num": "tc{num:02d}".format(num=num)
-            })
+                u"cores_num": f"${{{cores_num:d}}}",
+                u"cores_str": phy_cores,
+            }
+        )

         return self.template.substitute(subst_dict)
 
     @classmethod
         return self.template.substitute(subst_dict)
 
     @classmethod


@@ -82,10 +79,10 @@ class Testcase(object):
         :returns: Instance for generating testcase text of this type.
         :rtype: Testcase
         """
         :returns: Instance for generating testcase text of this type.
         :rtype: Testcase
         """

-        template_string = r'''
-| ${tc_num}-${frame_str}-${cores_str}c-''' + suite_id + r'''
-| | [Tags] | ${frame_str} | ${cores_str}C
-| | frame_size=${frame_num} | phy_cores=${cores_num}
+        template_string = f'''
+| ${{frame_str}}-${{cores_str}}c-{suite_id}
+| | [Tags] | ${{frame_str}} | ${{cores_str}}C
+| | frame_size=${{frame_num}} | phy_cores=${{cores_num}}

 '''
         return cls(template_string)
 
 '''
         return cls(template_string)
 


@@ -102,9 +99,15 @@ class Testcase(object):
         """
         # TODO: Choose a better frame size identifier for streamed protocols
         # (TCP, QUIC, SCTP, ...) where DUT (not TG) decides frame size.
         """
         # TODO: Choose a better frame size identifier for streamed protocols
         # (TCP, QUIC, SCTP, ...) where DUT (not TG) decides frame size.

-        template_string = r'''
-| ${tc_num}-IMIX-${cores_str}c-''' + suite_id + r'''
-| | [Tags] | ${cores_str}C
-| | phy_cores=${cores_num}
+        if u"tcphttp" in suite_id:
+            template_string = f'''
+| IMIX-${{cores_str}}c-{suite_id}
+| | [Tags] | ${{cores_str}}C
+| | phy_cores=${{cores_num}}
+'''
+        else:
+            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)
 '''
         return cls(template_string)