From 53b7082b70f15582c223ebe0bddce5feafaed5ba Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Tue, 16 Jul 2024 09:33:26 +0000
Subject: C-Dash: Make extraction of topo-arch more flexible

Change-Id: I5f59a881d6c23c3e40054a6d829abdcbcafb966b
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 csit.infra.dash/app/cdash/search/layout.py | 9 ++++-----
 csit.infra.dash/app/cdash/search/tables.py | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'csit.infra.dash/app/cdash/search')

diff --git a/csit.infra.dash/app/cdash/search/layout.py b/csit.infra.dash/app/cdash/search/layout.py
index aa4dd53d5b..8dd244a3c1 100644
--- a/csit.infra.dash/app/cdash/search/layout.py
+++ b/csit.infra.dash/app/cdash/search/layout.py
@@ -33,7 +33,7 @@ from ..utils.control_panel import ControlPanel
 from ..utils.trigger import Trigger
 from ..utils.utils import gen_new_url, generate_options, navbar_trending, \
     filter_table_data, sort_table_data, show_trending_graph_data, \
-    show_iterative_graph_data, show_tooltip
+    show_iterative_graph_data, show_tooltip, get_topo_arch
 from ..utils.url_processing import url_decode
 from .tables import search_table
 from ..coverage.tables import coverage_tables
@@ -110,7 +110,7 @@ class Layout:
                 l_id = row["test_id"].split(".")
                 suite = l_id[-2].replace("2n1l-", "").replace("1n1l-", "").\
                     replace("2n-", "")
-                tb = "-".join(row["job"].split("-")[-2:])
+                tb = get_topo_arch(row["job"].split("-"))
                 nic = suite.split("-")[0]
                 for driver in C.DRIVERS:
                     if driver in suite:
@@ -644,7 +644,7 @@ class Layout:
                             "release-dis": C.STYLE_DONT_DISPLAY,
                             "release-val": str(),
                             "help-dis": disabled,
-                            "help-val": "<testbed> <nic> <driver> " + \
+                            "help-val": "<topo> <arch> <nic> <driver> " + \
                                 "<framesize> <cores> <test>",
                             "search-dis": disabled,
                             "search-val": str()
@@ -664,7 +664,7 @@ class Layout:
                     ctrl_panel.set({
                         "release-val": trigger.value,
                         "help-dis": C.STYLE_DISPLAY,
-                        "help-val": "<DUT version> <testbed> <nic> " + \
+                        "help-val": "<DUT version> <topo> <arch> <nic> " + \
                             "<driver> <framesize> <core> <test>",
                         "search-dis": C.STYLE_DISPLAY,
                         "search-val": str()
@@ -758,7 +758,6 @@ class Layout:
                     (data["dut_version"] == dutver) &
                     (data["release"] == rls)
                 )])
-
             df = df[df.full_id.str.contains(
                 f".*{tb}.*{nic}.*{test_name}",
                 regex=True
diff --git a/csit.infra.dash/app/cdash/search/tables.py b/csit.infra.dash/app/cdash/search/tables.py
index a5ffd76d3d..3492fba16f 100644
--- a/csit.infra.dash/app/cdash/search/tables.py
+++ b/csit.infra.dash/app/cdash/search/tables.py
@@ -18,6 +18,7 @@
 import pandas as pd
 
 from ..utils.constants import Constants as C
+from ..utils.utils import get_topo_arch
 
 
 def select_search_data(data: pd.DataFrame, selection: list) -> pd.DataFrame:
@@ -80,7 +81,7 @@ def search_table(data: pd.DataFrame, selection: list) -> pd.DataFrame:
         l_id = row["test_id"].split(".")
         suite = l_id[-2].replace("2n1l-", "").replace("1n1l-", "").\
             replace("2n-", "")
-        l_tb.append("-".join(row["job"].split("-")[-2:]))
+        l_tb.append(get_topo_arch(row["job"].split("-")))
         l_nic.append(suite.split("-")[0])
         if selection["datatype"] != "trending":
             l_dutver.append(row["dut_version"])
-- 
cgit 1.2.3-korg