Separate files needing GPL license

[csit.git] / resources / tools / presentation / generator_plots.py

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 5c96989..89eb1c6 100644 (file)
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -622,13 +622,14 @@ def plot_perf_box_name(plot, input_data):
         f"{plot.get(u'title', u'')}."
     )
     data = input_data.filter_tests_by_name(
-        plot, params=[u"throughput", u"parent", u"tags", u"type"])
+        plot, params=[u"throughput", u"result", u"parent", u"tags", u"type"])
     if data is None:
         logging.error(u"No data.")
         return
 
     # Prepare the data for the plot
     y_vals = OrderedDict()
+    test_type = u""
     for job in data:
         for build in job:
             for test in build:
@@ -639,13 +640,30 @@ def plot_perf_box_name(plot, input_data):
                             u"-pdr" in plot.get(u"title", u"").lower()):
                         y_vals[test[u"parent"]].\
                             append(test[u"throughput"][u"PDR"][u"LOWER"])
+                        test_type = u"NDRPDR"
                     elif (test[u"type"] in (u"NDRPDR", ) and
                           u"-ndr" in plot.get(u"title", u"").lower()):
                         y_vals[test[u"parent"]]. \
                             append(test[u"throughput"][u"NDR"][u"LOWER"])
+                        test_type = u"NDRPDR"
                     elif test[u"type"] in (u"SOAK", ):
                         y_vals[test[u"parent"]].\
                             append(test[u"throughput"][u"LOWER"])
+                        test_type = u"SOAK"
+                    elif test[u"type"] in (u"HOSTSTACK", ):
+                        if u"LDPRELOAD" in test[u"tags"]:
+                            y_vals[test[u"parent"]].append(
+                                float(test[u"result"][u"bits_per_second"]) / 1e3
+                            )
+                        elif u"VPPECHO" in test[u"tags"]:
+                            y_vals[test[u"parent"]].append(
+                                (float(test[u"result"][u"client"][u"tx_data"])
+                                 * 8 / 1e3) /
+                                ((float(test[u"result"][u"client"][u"time"]) +
+                                  float(test[u"result"][u"server"][u"time"])) /
+                                 2)
+                            )
+                        test_type = u"HOSTSTACK"
                     else:
                         continue
                 except (KeyError, TypeError):
@@ -671,23 +689,26 @@ def plot_perf_box_name(plot, input_data):
         tst_name = re.sub(REGEX_NIC, u"",
                           col.lower().replace(u'-ndrpdr', u'').
                           replace(u'2n1l-', u''))
-        traces.append(
-            plgo.Box(
-                x=[str(i + 1) + u'.'] * len(df_y[col]),
-                y=[y / 1000000 if y else None for y in df_y[col]],
-                name=(
-                    f"{i + 1}. "
-                    f"({nr_of_samples[i]:02d} "
-                    f"run{u's' if nr_of_samples[i] > 1 else u''}) "
-                    f"{tst_name}"
-                ),
-                hoverinfo=u"y+name"
-            )
+        kwargs = dict(
+            x=[str(i + 1) + u'.'] * len(df_y[col]),
+            y=[y / 1e6 if y else None for y in df_y[col]],
+            name=(
+                f"{i + 1}. "
+                f"({nr_of_samples[i]:02d} "
+                f"run{u's' if nr_of_samples[i] > 1 else u''}) "
+                f"{tst_name}"
+            ),
+            hoverinfo=u"y+name"
         )
+        if test_type in (u"SOAK", ):
+            kwargs[u"boxpoints"] = u"all"
+
+        traces.append(plgo.Box(**kwargs))
+
         try:
             val_max = max(df_y[col])
             if val_max:
-                y_max.append(int(val_max / 1000000) + 2)
+                y_max.append(int(val_max / 1e6) + 2)
         except (ValueError, TypeError) as err:
             logging.error(repr(err))
             continue
@@ -696,7 +717,10 @@ def plot_perf_box_name(plot, input_data):
         # Create plot
         layout = deepcopy(plot[u"layout"])
         if layout.get(u"title", None):
-            layout[u"title"] = f"<b>Throughput:</b> {layout[u'title']}"
+            if test_type in (u"HOSTSTACK", ):
+                layout[u"title"] = f"<b>Bandwidth:</b> {layout[u'title']}"
+            else:
+                layout[u"title"] = f"<b>Throughput:</b> {layout[u'title']}"
         if y_max:
             layout[u"yaxis"][u"range"] = [0, max(y_max)]
         plpl = plgo.Figure(data=traces, layout=layout)
@@ -954,7 +978,7 @@ def plot_tsa_name(plot, input_data):
             if test_val:
                 avg_val = sum(test_val) / len(test_val)
                 y_vals[test_name][key] = [avg_val, len(test_val)]
-                ideal = avg_val / (int(key) * 1000000.0)
+                ideal = avg_val / (int(key) * 1e6)
                 if test_name not in y_1c_max or ideal > y_1c_max[test_name]:
                     y_1c_max[test_name] = ideal
 
@@ -972,10 +996,10 @@ def plot_tsa_name(plot, input_data):
                     test_name.replace(u'-ndrpdr', u'').replace(u'2n1l-', u'')
                 )
                 vals[name] = OrderedDict()
-                y_val_1 = test_vals[u"1"][0] / 1000000.0
-                y_val_2 = test_vals[u"2"][0] / 1000000.0 if test_vals[u"2"][0] \
+                y_val_1 = test_vals[u"1"][0] / 1e6
+                y_val_2 = test_vals[u"2"][0] / 1e6 if test_vals[u"2"][0] \
                     else None
-                y_val_4 = test_vals[u"4"][0] / 1000000.0 if test_vals[u"4"][0] \
+                y_val_4 = test_vals[u"4"][0] / 1e6 if test_vals[u"4"][0] \
                     else None
 
                 vals[name][u"val"] = [y_val_1, y_val_2, y_val_4]