C-Dash: Unify processing of Latency

Signed-off-by: Tibor Frank <tifrank@cisco.com>
Change-Id: I92ed4ebc1aa6e7b7731035fb923d6138c3c3def2

3 files changed, 12 insertions, 16 deletions

diff --git a/csit.infra.dash/app/cdash/report/graphs.py b/csit.infra.dash/app/cdash/report/graphs.py
index 9d10efc4f0..544fdf0b54 100644
--- a/csit.infra.dash/app/cdash/report/graphs.py
+++ b/csit.infra.dash/app/cdash/report/graphs.py
@@ -145,7 +145,7 @@ def graph_iterative(data: pd.DataFrame, sel:dict, layout: dict,
         show_tput = True
 
         if ttype == "pdr":
-            y_lat_row = itm_data[C.VALUE_ITER["pdr-lat"]].to_list()
+            y_lat_row = itm_data[C.VALUE_ITER["latency"]].to_list()
             y_lat = [(y / norm_factor) for y in y_lat_row]
             if y_lat:
                 try:
diff --git a/csit.infra.dash/app/cdash/trending/graphs.py b/csit.infra.dash/app/cdash/trending/graphs.py
index cb1d2c6012..10ad745e1e 100644
--- a/csit.infra.dash/app/cdash/trending/graphs.py
+++ b/csit.infra.dash/app/cdash/trending/graphs.py
@@ -144,7 +144,7 @@ def graph_trending(
             return list(), list()
 
         x_axis = df["start_time"].tolist()
-        if ttype == "pdr-lat":
+        if ttype == "latency":
             y_data = [(v / norm_factor) for v in df[C.VALUE[ttype]].tolist()]
         else:
             y_data = [(v * norm_factor) for v in df[C.VALUE[ttype]].tolist()]
@@ -185,10 +185,10 @@ def graph_trending(
             else:
                 add_info = str()
             hover_itm = hover_itm.replace(
-                "<prop>", "latency" if ttype == "pdr-lat" else "average"
+                "<prop>", "latency" if ttype == "latency" else "average"
             ).replace("<stdev>", stdev).replace("<additional-info>", add_info)
             hover.append(hover_itm)
-            if ttype == "pdr-lat":
+            if ttype == "latency":
                 customdata_samples.append(_get_hdrh_latencies(row, name))
                 customdata.append({"name": name})
             else:
@@ -208,7 +208,7 @@ def graph_trending(
                 f"csit-ref: {row['job']}/{row['build']}<br>"
                 f"hosts: {', '.join(row['hosts'])}"
             )
-            if ttype == "pdr-lat":
+            if ttype == "latency":
                 hover_itm = hover_itm.replace("[pps]", "[us]")
             hover_trend.append(hover_itm)
 
@@ -262,7 +262,7 @@ def graph_trending(
                         f"trend [pps]: {trend_avg[idx]:,.0f}<br>"
                         f"classification: {anomaly}"
                     )
-                    if ttype == "pdr-lat":
+                    if ttype == "latency":
                         hover_itm = hover_itm.replace("[pps]", "[us]")
                     hover.append(hover_itm)
             anomaly_color.extend([0.0, 0.5, 1.0])
@@ -282,7 +282,7 @@ def graph_trending(
                         "symbol": "circle-open",
                         "color": anomaly_color,
                         "colorscale": C.COLORSCALE_LAT \
-                            if ttype == "pdr-lat" else C.COLORSCALE_TPUT,
+                            if ttype == "latency" else C.COLORSCALE_TPUT,
                         "showscale": True,
                         "line": {
                             "width": 2
@@ -295,7 +295,7 @@ def graph_trending(
                             "tickmode": "array",
                             "tickvals": [0.167, 0.500, 0.833],
                             "ticktext": C.TICK_TEXT_LAT \
-                                if ttype == "pdr-lat" else C.TICK_TEXT_TPUT,
+                                if ttype == "latency" else C.TICK_TEXT_TPUT,
                             "ticks": "",
                             "ticklen": 0,
                             "tickangle": -90,
@@ -343,7 +343,7 @@ def graph_trending(
 
         if itm["testtype"] == "pdr":
             traces, _ = _generate_trending_traces(
-                "pdr-lat",
+                "latency",
                 itm["id"],
                 df,
                 get_color(idx),
diff --git a/csit.infra.dash/app/cdash/utils/constants.py b/csit.infra.dash/app/cdash/utils/constants.py
index 4ca38ac90a..43e5f4a56b 100644
--- a/csit.infra.dash/app/cdash/utils/constants.py
+++ b/csit.infra.dash/app/cdash/utils/constants.py
@@ -63,7 +63,7 @@ class Constants:
 
     # Maximal value of TIME_PERIOD for data read from the parquets in days.
     # Do not change without a good reason.
-    MAX_TIME_PERIOD = 130
+    MAX_TIME_PERIOD = 20  # 130
 
     # It defines the time period for data read from the parquets in days from
     # now back to the past.
@@ -204,23 +204,21 @@ class Constants:
         "mrr": "result_receive_rate_rate_avg",
         "ndr": "result_ndr_lower_rate_value",
         "pdr": "result_pdr_lower_rate_value",
-        "pdr-lat": "result_latency_forward_pdr_50_avg",
+        "latency": "result_latency_forward_pdr_50_avg",
         "hoststack-cps": "result_rate_value",
         "hoststack-rps": "result_rate_value",
         "hoststack-bps": "result_bandwidth_value",
-        "hoststack-lat": "result_latency_value"
+        "hoststack-latency": "result_latency_value"
     }
 
     VALUE_ITER = {
         "mrr": "result_receive_rate_rate_values",
         "ndr": "result_ndr_lower_rate_value",
         "pdr": "result_pdr_lower_rate_value",
-        "pdr-lat": "result_latency_forward_pdr_50_avg",
         "latency": "result_latency_forward_pdr_50_avg",
         "hoststack-cps": "result_rate_value",
         "hoststack-rps": "result_rate_value",
         "hoststack-bps": "result_bandwidth_value",
-        "hoststack-lat": "result_latency_value",
         "hoststack-latency": "result_latency_value"
     }
 
@@ -228,12 +226,10 @@ class Constants:
         "mrr": "result_receive_rate_rate_unit",
         "ndr": "result_ndr_lower_rate_unit",
         "pdr": "result_pdr_lower_rate_unit",
-        "pdr-lat": "result_latency_forward_pdr_50_unit",
         "latency": "result_latency_forward_pdr_50_unit",
         "hoststack-cps": "result_rate_unit",
         "hoststack-rps": "result_rate_unit",
         "hoststack-bps": "result_bandwidth_unit",
-        "hoststack-lat": "result_latency_unit",
         "hoststack-latency": "result_latency_unit"
     }