diff options
| -rw-r--r-- | csit.infra.dash/app/cdash/stats/layout.py | 4 | ||||
| -rw-r--r-- | csit.infra.dash/app/cdash/trending/graphs.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/csit.infra.dash/app/cdash/stats/layout.py b/csit.infra.dash/app/cdash/stats/layout.py index 1be236ab3a..753eb37670 100644 --- a/csit.infra.dash/app/cdash/stats/layout.py +++ b/csit.infra.dash/app/cdash/stats/layout.py @@ -583,8 +583,8 @@ class Layout: Input("dd-tbeds", "value"), Input("url", "href") ) - def _update_ctrl_panel(cp_data: dict, dut: str, ttype: str, cadence:str, - tbed: str, href: str) -> tuple: + def _update_ctrl_panel(cp_data: dict, dut: str, ttype: str, + cadence: str, tbed: str, href: str) -> tuple: """Update the application when the event is detected. :param cp_data: Current status of the control panel stored in diff --git a/csit.infra.dash/app/cdash/trending/graphs.py b/csit.infra.dash/app/cdash/trending/graphs.py index 32ab8df610..fe85c13adb 100644 --- a/csit.infra.dash/app/cdash/trending/graphs.py +++ b/csit.infra.dash/app/cdash/trending/graphs.py @@ -135,13 +135,12 @@ def graph_trending( customdata = list() customdata_samples = list() for idx, (_, row) in enumerate(df.iterrows()): - d_type = "trex" if row["dut_type"] == "none" else row["dut_type"] hover_itm = ( f"date: {row['start_time'].strftime('%Y-%m-%d %H:%M:%S')}<br>" f"<prop> [{row[C.UNIT[ttype]]}]: {y_data[idx]:,.0f}<br>" f"<stdev>" f"<additional-info>" - f"{d_type}-ref: {row['dut_version']}<br>" + f"{row['dut_type']}-ref: {row['dut_version']}<br>" f"csit-ref: {row['job']}/{row['build']}<br>" f"hosts: {', '.join(row['hosts'])}" ) @@ -176,12 +175,11 @@ def graph_trending( hover_trend = list() for avg, stdev, (_, row) in zip(trend_avg, trend_stdev, df.iterrows()): - d_type = "trex" if row["dut_type"] == "none" else row["dut_type"] hover_itm = ( f"date: {row['start_time'].strftime('%Y-%m-%d %H:%M:%S')}<br>" f"trend [{row[C.UNIT[ttype]]}]: {avg:,.0f}<br>" f"stdev [{row[C.UNIT[ttype]]}]: {stdev:,.0f}<br>" - f"{d_type}-ref: {row['dut_version']}<br>" + f"{row['dut_type']}-ref: {row['dut_version']}<br>" f"csit-ref: {row['job']}/{row['build']}<br>" f"hosts: {', '.join(row['hosts'])}" ) |