-# 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
"""
found = prolog.count(u"| " + suite_tag)
if found != 1:
- raise ValueError(f"Suite tag found {found} times for {suite_id}")
+ raise ValueError(f"Suite tag found {found} times for {suite_tag}")
def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
)
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",
add_default_testcases(
testcase, iface, old_suite_id, file_out, kwargs_list
)
- return
+ continue
for driver in Constants.NIC_NAME_TO_DRIVER[nic_name]:
out_filename = replace_defensively(
tmp2_filename, old_suite_id,
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"frame_size": u"IMIX_v4_1", u"phy_cores": 2},
{u"frame_size": u"IMIX_v4_1", u"phy_cores": 4}
]
- tcp_kwargs_list = [
- {u"phy_cores": i, u"frame_size": 0} for i in (1, 2, 4)
+ hs_wrk_kwargs_list = [
+ {u"frame_size": 0, u"phy_cores": i} for i in (1, 2, 4)
]
+ hs_bps_kwargs_list = [
+ {u"frame_size": 0, u"phy_cores": 1},
+ ]
+
for in_filename in glob(pattern):
if not self.quiet:
print(
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, tcp_kwargs_list)
+ write_tcp_files(in_filename, in_prolog, hs_wrk_kwargs_list)
+ elif in_filename.endswith(u"-bps.robot"):
+ write_tcp_files(in_filename, in_prolog, hs_bps_kwargs_list)
else:
raise RuntimeError(
f"Error in {in_filename}: non-primary suite type found."