aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/autogen/Testcase.py
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2020-02-11 00:57:10 +0000
committerTibor Frank <tifrank@cisco.com>2020-03-03 10:06:52 +0000
commit5570bf3ab49301201dd7607bb4f8de67fd8f16dc (patch)
tree4154400992c4899ab4c083e8ed66e160784cbcbf /resources/libraries/python/autogen/Testcase.py
parent827ed3c36c2d789dc3fd0f41cc17de1587416103 (diff)
perf: Clean up Hoststack tests
- Update test names with clients/streams - Convert test results to JSON output * iperf3 results include bits_per_second * vpp_echo results include both client and server output which includes time in seconds and rx_data/tx_data in bytes which can be used to calculate the average bits per second. Tx and Rx data will always be the same: BPS = (client tx_data * 8) / ((client time + server time) / 2) - Fix WRK test results data formatting errors Change-Id: Ie2aeb665e3cc0739b16f97ba2628eebe6e041d22 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'resources/libraries/python/autogen/Testcase.py')
-rw-r--r--resources/libraries/python/autogen/Testcase.py31
1 files changed, 5 insertions, 26 deletions
diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py
index c540d8ccec..d419b2993b 100644
--- a/resources/libraries/python/autogen/Testcase.py
+++ b/resources/libraries/python/autogen/Testcase.py
@@ -34,8 +34,7 @@ class Testcase:
"""
self.template = Template(template_string)
- def generate(self, num, frame_size, phy_cores, clients, streams,
- bytes_str):
+ def generate(self, num, frame_size, phy_cores):
"""Return string of test case code with placeholders filled.
Fail if there are placeholders left unfilled.
@@ -44,16 +43,9 @@ class Testcase:
: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 clients: Number of clients used by test program. Example: 4.
- :param streams: Number of streams used by test program. Example: 10.
- :param bytes_str: Size in bytes of stream sent by test program.
- Example: 1G
:type num: int
:type frame_size: str or int
:type phy_cores: int or str
- :type clients: int
- :type streams: int
- :type bytes_str: str
:returns: Filled template, usable as test case code.
:rtype: str
"""
@@ -75,11 +67,6 @@ class Testcase:
u"cores_num": f"${{{cores_num:d}}}",
u"cores_str": phy_cores,
u"tc_num": f"tc{num:02d}",
- u"clients_num": f"${{{clients:d}}}",
- u"clients_str": str(clients),
- u"streams_num": f"${{{streams:d}}}",
- u"streams_str": str(streams),
- u"bytes_str": bytes_str,
}
)
return self.template.substitute(subst_dict)
@@ -122,17 +109,9 @@ class Testcase:
| | [Tags] | ${{cores_str}}C
| | phy_cores=${{cores_num}}
'''
- elif u"iperf3" in suite_id:
- template_string = f'''
-| ${{tc_num}}-9000B-${{cores_str}}c-{suite_id}
-| | [Tags] | ${{cores_str}}C | ${{clients_str}}CLIENT | ${{streams_str}}STREAM
-| | phy_cores=${{cores_num}} | clients=${{clients_num}}'''
- template_string += f" | streams=${{streams_num}}\n"
else:
- template_string = f'''
-| ${{tc_num}}-9000B-${{cores_str}}c-{suite_id}
-| | [Tags] | ${{cores_str}}C | ${{clients_str}}CLIENT | ${{streams_str}}STREAM
-| | phy_cores=${{cores_num}} | clients=${{clients_num}}'''
- template_string += f" | streams=${{streams_num}}" \
- f" | bytes=${{bytes_str}}\n"
+ 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"
return cls(template_string)