aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--csit.infra.dash/app/cdash/comparisons/tables.py20
-rw-r--r--csit.infra.dash/app/cdash/utils/constants.py6
2 files changed, 19 insertions, 7 deletions
diff --git a/csit.infra.dash/app/cdash/comparisons/tables.py b/csit.infra.dash/app/cdash/comparisons/tables.py
index b2bee7f9d4..2cafc9fa51 100644
--- a/csit.infra.dash/app/cdash/comparisons/tables.py
+++ b/csit.infra.dash/app/cdash/comparisons/tables.py
@@ -70,8 +70,12 @@ def select_comparison_data(
for itm in data_in["test_id"].unique().tolist():
itm_lst = itm.split(".")
test = itm_lst[-1].rsplit("-", 1)[0]
+ if "hoststack" in itm:
+ test_type = f"hoststack-{ttype}"
+ else:
+ test_type = ttype
df = data_in.loc[(data_in["test_id"] == itm)]
- l_df = df[C.VALUE_ITER[ttype]].to_list()
+ l_df = df[C.VALUE_ITER[test_type]].to_list()
if len(l_df) and isinstance(l_df[0], list):
tmp_df = list()
for l_itm in l_df:
@@ -85,7 +89,7 @@ def select_comparison_data(
d_data["name"].append(f"{test.replace(f'{drv}-', '')}-{ttype}")
d_data["mean"].append(int(mean_val * norm_factor))
d_data["stdev"].append(int(std_val * norm_factor))
- d_data["unit"].append(df[C.UNIT[ttype]].to_list()[0])
+ d_data["unit"].append(df[C.UNIT[test_type]].to_list()[0])
return pd.DataFrame(d_data)
lst_df = list()
@@ -108,11 +112,17 @@ def select_comparison_data(
drv = "" if itm["driver"] == "dpdk" else itm["driver"].replace("_", "-")
core = str() if itm["dut"] == "trex" else itm["core"].lower()
- reg_id = \
- f"^.*[.|-]{itm['nic']}.*{itm['frmsize'].lower()}-{core}-{drv}.*$"
+ ttype = "ndrpdr" if itm["ttype"] in ("NDR", "PDR", "Latency") \
+ else itm["ttype"].lower()
tmp_df = tmp_df[
(tmp_df.job.str.endswith(itm["tbed"])) &
- (tmp_df.test_id.str.contains(reg_id, regex=True))
+ (tmp_df.test_id.str.contains(
+ (
+ f"^.*[.|-]{itm['nic']}.*{itm['frmsize'].lower()}-"
+ f"{core}-{drv}.*-{ttype}$"
+ ),
+ regex=True
+ ))
]
if itm["driver"] == "dpdk":
for drv in C.DRIVERS:
diff --git a/csit.infra.dash/app/cdash/utils/constants.py b/csit.infra.dash/app/cdash/utils/constants.py
index e9304b6b1a..4ca38ac90a 100644
--- a/csit.infra.dash/app/cdash/utils/constants.py
+++ b/csit.infra.dash/app/cdash/utils/constants.py
@@ -220,7 +220,8 @@ class Constants:
"hoststack-cps": "result_rate_value",
"hoststack-rps": "result_rate_value",
"hoststack-bps": "result_bandwidth_value",
- "hoststack-lat": "result_latency_value"
+ "hoststack-lat": "result_latency_value",
+ "hoststack-latency": "result_latency_value"
}
UNIT = {
@@ -232,7 +233,8 @@ class Constants:
"hoststack-cps": "result_rate_unit",
"hoststack-rps": "result_rate_unit",
"hoststack-bps": "result_bandwidth_unit",
- "hoststack-lat": "result_latency_unit"
+ "hoststack-lat": "result_latency_unit",
+ "hoststack-latency": "result_latency_unit"
}
# Latencies.