From a214378b5d0589fcbd9a9cc8c9b25bce8a862cec Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Wed, 1 Feb 2023 15:50:36 +0100 Subject: C-Dash: Add hoststack Signed-off-by: Tibor Frank Change-Id: I5055bc785f5ba5c9b13ba83eaf646975cfe86ea4 --- csit.infra.dash/app/cdash/trending/layout.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'csit.infra.dash/app/cdash/trending/layout.py') diff --git a/csit.infra.dash/app/cdash/trending/layout.py b/csit.infra.dash/app/cdash/trending/layout.py index 2d65567489..2a91bf4755 100644 --- a/csit.infra.dash/app/cdash/trending/layout.py +++ b/csit.infra.dash/app/cdash/trending/layout.py @@ -111,11 +111,10 @@ class Layout: # Get structure of tests: tbs = dict() - for _, row in self._data[["job", "test_id"]].drop_duplicates().\ - iterrows(): + cols = ["job", "test_id", "test_type", "tg_type"] + for _, row in self._data[cols].drop_duplicates().iterrows(): lst_job = row["job"].split("-") dut = lst_job[1] - ttype = lst_job[3] tbed = "-".join(lst_job[-2:]) lst_test = row["test_id"].split(".") if dut == "dpdk": @@ -160,14 +159,23 @@ class Layout: tbs[dut][infra][area][test]["frame-size"].append( framesize.upper() ) - if ttype == "mrr": + if row["test_type"] == "mrr": if "MRR" not in tbs[dut][infra][area][test]["test-type"]: tbs[dut][infra][area][test]["test-type"].append("MRR") - elif ttype == "ndrpdr": + elif row["test_type"] == "ndrpdr": if "NDR" not in tbs[dut][infra][area][test]["test-type"]: tbs[dut][infra][area][test]["test-type"].extend( ("NDR", "PDR") ) + elif row["test_type"] == "hoststack": + if row["tg_type"] in ("iperf", "vpp"): + if "BPS" not in tbs[dut][infra][area][test]["test-type"]: + tbs[dut][infra][area][test]["test-type"].append("BPS") + elif row["tg_type"] == "ab": + if "CPS" not in tbs[dut][infra][area][test]["test-type"]: + tbs[dut][infra][area][test]["test-type"].extend( + ("CPS", "RPS") + ) self._spec_tbs = tbs # Read from files: -- cgit 1.2.3-korg