-# 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:
"""Module defining utilities for test directory regeneration.
TODO: How can we check each suite id is unique,
-when currently the suite generation is run on each directory separately?
+ when currently the suite generation is run on each directory separately?
"""
import sys
)
if tmp2_prolog.count(u"HW_") == 2:
# TODO CSIT-1481: Crypto HW should be read
- # from topology file instead.
+ # from topology file instead.
if nic_name in Constants.NIC_NAME_TO_CRYPTO_HW:
tmp2_prolog = replace_defensively(
tmp2_prolog, u"HW_DH895xcc",
tmp2_filename
)
if u"DPDK" in in_prolog:
- check_suite_tag(old_suite_tag, tmp2_prolog)
- with open(tmp2_filename, u"wt") as file_out:
- file_out.write(tmp2_prolog)
- add_default_testcases(
- testcase, iface, old_suite_id, file_out, kwargs_list
+ for driver in Constants.DPDK_NIC_NAME_TO_DRIVER[nic_name]:
+ out_filename = replace_defensively(
+ tmp2_filename, old_suite_id,
+ Constants.DPDK_NIC_DRIVER_TO_SUITE_PREFIX[driver] \
+ + old_suite_id,
+ 1, u"Error adding driver prefix.", in_filename
+ )
+ out_prolog = replace_defensively(
+ tmp2_prolog, u"vfio-pci", driver, 1,
+ u"Driver name should appear once.", in_filename
+ )
+ out_prolog = replace_defensively(
+ out_prolog,
+ Constants.DPDK_NIC_DRIVER_TO_TAG[u"vfio-pci"],
+ Constants.DPDK_NIC_DRIVER_TO_TAG[driver], 1,
+ u"Driver tag should appear once.", in_filename
+ )
+ iface, suite_id, suite_tag = get_iface_and_suite_ids(
+ out_filename
+ )
+ # The next replace is probably a noop, but it is safer to
+ # maintain the same structure as for other edits.
+ out_prolog = replace_defensively(
+ out_prolog, old_suite_tag, suite_tag, 1,
+ f"Perf suite tag {old_suite_tag} should appear once.",
+ in_filename
)
- return
+ check_suite_tag(suite_tag, out_prolog)
+ # TODO: Reorder loops so suite_id is finalized sooner.
+ testcase = Testcase.default(suite_id)
+ with open(out_filename, u"wt") as file_out:
+ file_out.write(out_prolog)
+ add_default_testcases(
+ testcase, iface, suite_id, file_out, kwargs_list
+ )
+ continue
for driver in Constants.NIC_NAME_TO_DRIVER[nic_name]:
out_filename = replace_defensively(
tmp2_filename, old_suite_id,
u"Driver plugin should appear once.", in_filename
)
out_prolog = replace_defensively(
- out_prolog, Constants.NIC_DRIVER_TO_SETUP_ARG[u"vfio-pci"],
- Constants.NIC_DRIVER_TO_SETUP_ARG[driver], 1,
- u"Perf setup argument should appear once.", in_filename
+ out_prolog, Constants.NIC_DRIVER_TO_VFS[u"vfio-pci"],
+ Constants.NIC_DRIVER_TO_VFS[driver], 1,
+ u"NIC VFs argument should appear once.", in_filename
)
iface, suite_id, suite_tag = get_iface_and_suite_ids(
out_filename
)
- # The next replace is probably a noop, but it is safer to maintain
- # the same structure as for other edits.
+ # The next replace is probably a noop, but it is safer to
+ # maintain the same structure as for other edits.
out_prolog = replace_defensively(
out_prolog, old_suite_tag, suite_tag, 1,
f"Perf suite tag {old_suite_tag} should appear once.",
)
if tmp_prolog.count(u"HW_") == 2:
# TODO CSIT-1481: Crypto HW should be read
- # from topology file instead.
+ # from topology file instead.
if nic_name in Constants.NIC_NAME_TO_CRYPTO_HW.keys():
tmp_prolog = replace_defensively(
tmp_prolog, u"HW_DH895xcc",
u"Driver plugin should appear once.", in_filename
)
out_prolog = replace_defensively(
- out_prolog, Constants.NIC_DRIVER_TO_SETUP_ARG[u"vfio-pci"],
- Constants.NIC_DRIVER_TO_SETUP_ARG[driver], 1,
- u"Perf setup argument should appear once.", in_filename
+ out_prolog, Constants.NIC_DRIVER_TO_VFS[u"vfio-pci"],
+ Constants.NIC_DRIVER_TO_VFS[driver], 1,
+ u"NIC VFs argument should appear once.", in_filename
)
iface, suite_id, suite_tag = get_iface_and_suite_ids(out_filename)
out_prolog = replace_defensively(
min_frame_size = PROTOCOL_TO_MIN_FRAME_SIZE[protocol]
default_kwargs_list = [
- {u"frame_size": min_frame_size, u"phy_cores": 1, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": min_frame_size, u"phy_cores": 2, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": min_frame_size, u"phy_cores": 4, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 1518, u"phy_cores": 1, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 1518, u"phy_cores": 2, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 1518, u"phy_cores": 4, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 9000, u"phy_cores": 1, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 9000, u"phy_cores": 2, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": 9000, u"phy_cores": 4, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": u"IMIX_v4_1", u"phy_cores": 1, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": u"IMIX_v4_1", u"phy_cores": 2, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"frame_size": u"IMIX_v4_1", u"phy_cores": 4, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"}
+ {u"frame_size": min_frame_size, u"phy_cores": 1},
+ {u"frame_size": min_frame_size, u"phy_cores": 2},
+ {u"frame_size": min_frame_size, u"phy_cores": 4},
+ {u"frame_size": 1518, u"phy_cores": 1},
+ {u"frame_size": 1518, u"phy_cores": 2},
+ {u"frame_size": 1518, u"phy_cores": 4},
+ {u"frame_size": 9000, u"phy_cores": 1},
+ {u"frame_size": 9000, u"phy_cores": 2},
+ {u"frame_size": 9000, u"phy_cores": 4},
+ {u"frame_size": u"IMIX_v4_1", u"phy_cores": 1},
+ {u"frame_size": u"IMIX_v4_1", u"phy_cores": 2},
+ {u"frame_size": u"IMIX_v4_1", u"phy_cores": 4}
]
- hoststack_wrk_kwargs_list = [
- {u"phy_cores": i, u"frame_size": 0, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"} for i in (1, 2, 4)
+ hs_wrk_kwargs_list = [
+ {u"frame_size": 0, u"phy_cores": i} for i in (1, 2, 4)
]
- hoststack_iperf3_kwargs_list = [
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
- u"streams": 1, u"bytes_str": u"1G"},
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
- u"streams": 10, u"bytes_str": u"10G"},
- {u"phy_cores": 2, u"frame_size": 0, u"clients": 1,
- u"streams": 10, u"bytes_str": u"10G"},
- {u"phy_cores": 4, u"frame_size": 0, u"clients": 1,
- u"streams": 10, u"bytes_str": u"10G"},
+ hs_bps_kwargs_list = [
+ {u"frame_size": 1460, u"phy_cores": 1},
]
- hoststack_quic_kwargs_list = [
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
- u"streams": 1, u"bytes_str": u"100M"},
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 1,
- u"streams": 10, u"bytes_str": u"100M"},
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 10,
- u"streams": 1, u"bytes_str": u"100M"},
- {u"phy_cores": 1, u"frame_size": 0, u"clients": 10,
- u"streams": 10, u"bytes_str": u"100M"},
+ hs_quic_kwargs_list = [
+ {u"frame_size": 1280, u"phy_cores": 1},
]
for in_filename in glob(pattern):
elif in_filename.endswith(u"-reconf.robot"):
write_reconf_files(in_filename, in_prolog, default_kwargs_list)
elif in_filename[-10:] in (u"-cps.robot", u"-rps.robot"):
- write_tcp_files(in_filename, in_prolog,
- hoststack_wrk_kwargs_list)
- elif in_filename[-10:] in (u"-bps.robot"):
- write_tcp_files(in_filename, in_prolog,
- hoststack_iperf3_kwargs_list if u"iperf3"
- in in_filename else hoststack_quic_kwargs_list)
+ write_tcp_files(in_filename, in_prolog, hs_wrk_kwargs_list)
+ elif in_filename.endswith(u"-bps.robot"):
+ hoststack_kwargs_list = \
+ hs_quic_kwargs_list if u"quic" in in_filename \
+ else hs_bps_kwargs_list
+ write_tcp_files(in_filename, in_prolog, hoststack_kwargs_list)
else:
raise RuntimeError(
f"Error in {in_filename}: non-primary suite type found."
Code Review / csit.git / blobdiff