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

diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py
index 224295e1e2..3ffbc4594a 100644
--- 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) 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:
@@ -29,21 +29,18 @@ 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".
-            - tc_num - Start of testcase name, example: "tc04".
         :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.
 
-        :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.
-        :type num: int
         :type frame_size: str or int
         :type phy_cores: int or str
         :returns: Filled template, usable as test case code.
@@ -66,7 +63,6 @@ class Testcase:
             {
                 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)
@@ -84,7 +80,7 @@ class Testcase:
         :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}}
 '''
@@ -103,9 +99,15 @@ class Testcase:
         """
         # TODO: Choose a better frame size identifier for streamed protocols
         # (TCP, QUIC, SCTP, ...) where DUT (not TG) decides frame size.
-        template_string = f'''
-| ${{tc_num}}-IMIX-${{cores_str}}c-{suite_id}
+        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)