diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/bash/entry/check/tc_naming.sh | 12 | ||||
| -rw-r--r-- | resources/libraries/python/autogen/Regenerator.py | 10 | ||||
| -rw-r--r-- | resources/libraries/python/autogen/Testcase.py | 12 |
3 files changed, 13 insertions, 21 deletions
diff --git a/resources/libraries/bash/entry/check/tc_naming.sh b/resources/libraries/bash/entry/check/tc_naming.sh index 2a084d9669..e9f86fc0dd 100644 --- a/resources/libraries/bash/entry/check/tc_naming.sh +++ b/resources/libraries/bash/entry/check/tc_naming.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# 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: @@ -28,12 +28,12 @@ source "${BASH_FUNCTION_DIR}/common.sh" || { exit 1 } -# Grep of interest: We want all tc01- prefixed (skip TC variations for now). +# Grep of interest: We want all [0-9]{2,4}B- or IMIX- prefixed. # Currently script assumes all variations inside to be part of either # auto-generation or not checked at all (VIRL derivates). -r_grep="tc01-" +r_grep="([0-9]{2,4}B|IMIX)-" # Parse grep of interest (learn path, learn suite, learn testcase name). -r_parse='(.*)\/(.*).robot.*(tc[[:digit:]]{2}-.*)' +r_parse='(.*)\/(.*).robot.*(([0-9]{2,4}B|IMIX)-.*)' # CSIT Testcase naming convention rules. # https://wiki.fd.io/view/CSIT/csit-test-naming @@ -48,7 +48,6 @@ r_parse='(.*)\/(.*).robot.*(tc[[:digit:]]{2}-.*)' # One caveat of this solution is that we cannot proceed to check full names now # as majority of Testcases does not meet naming criteria. s_testc_rules=( - 'TC id' 'packet size' 'core combination' 'NIC driver mode' @@ -56,8 +55,7 @@ s_testc_rules=( 'test type' ) r_testc_rules=( - '^tc[[:digit:]]{2}-' - '([[:digit:]]{2,4}B|IMIX)-' + '^([[:digit:]]{2,4}B|IMIX)-' '([[:digit:]]+c-){0,1}' '(avf-|1lbvpplacp-|2lbvpplacp-){0,1}' '(eth|dot1q|dot1ad)' diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index 3ef589d351..0d291e231e 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -130,9 +130,7 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list): :type file_out: file :type tc_kwargs_list: dict """ - # We bump tc number in any case, so that future enables/disables - # do not affect the numbering of other test cases. - for num, kwargs in enumerate(tc_kwargs_list, start=1): + for kwargs in tc_kwargs_list: # TODO: Is there a better way to disable some combinations? emit = True if kwargs[u"frame_size"] == 9000: @@ -163,7 +161,7 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list): if kwargs[u"frame_size"] not in MIN_FRAME_SIZE_VALUES: emit = False if emit: - file_out.write(testcase.generate(num=num, **kwargs)) + file_out.write(testcase.generate(**kwargs)) def add_tcp_testcases(testcase, file_out, tc_kwargs_list): @@ -176,8 +174,8 @@ def add_tcp_testcases(testcase, file_out, tc_kwargs_list): :type file_out: file :type tc_kwargs_list: dict """ - for num, kwargs in enumerate(tc_kwargs_list, start=1): - file_out.write(testcase.generate(num=num, **kwargs)) + for kwargs in tc_kwargs_list: + file_out.write(testcase.generate(**kwargs)) def write_default_files(in_filename, in_prolog, kwargs_list): diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py index c4ed60685b..3ffbc4594a 100644 --- a/resources/libraries/python/autogen/Testcase.py +++ b/resources/libraries/python/autogen/Testcase.py @@ -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}} ''' @@ -105,13 +101,13 @@ class Testcase: # (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} +| IMIX-${{cores_str}}c-{suite_id} | | [Tags] | ${{cores_str}}C | | phy_cores=${{cores_num}} ''' else: template_string = f''' -| ${{tc_num}}-${{frame_str}}-${{cores_str}}c-{suite_id[:-4]}-{suite_id[-3:]} +| ${{frame_str}}-${{cores_str}}c-{suite_id[:-4]}-{suite_id[-3:]} | | [Tags] | ${{cores_str}}C\n| | phy_cores=${{cores_num}} ''' return cls(template_string) |