X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=f03a57f2794f2c6f291fce0e7fe75ab628f08b38;hp=e674a3e5c8115faf68f2702ab68fc051e6913f33;hb=a47cc2dbd97aee82deebec9bd750d661aaca6942;hpb=6c8ba1c706a4e9e467ab5e2a4b676b9016f9e610

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index e674a3e5c8..f03a57f279 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -610,12 +610,12 @@ def plot_perf_box_name(plot, input_data):
                             if u"TCP_CPS" in test[u"tags"]:
                                 test_type = u"VSAP_CPS"
                                 y_vals[test[u"parent"]].append(
-                                    test[u"result"][u"cps"] / 1e6
+                                    test[u"result"][u"cps"]
                                 )
                             elif u"TCP_RPS" in test[u"tags"]:
                                 test_type = u"VSAP_RPS"
                                 y_vals[test[u"parent"]].append(
-                                    test[u"result"][u"rps"] / 1e6
+                                    test[u"result"][u"rps"]
                                 )
                             else:
                                 continue
@@ -645,9 +645,13 @@ 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''))
+        if test_type in (u"VSAP_CPS", u"VSAP_RPS"):
+            data_y = [y if y else None for y in df_y[col]]
+        else:
+            data_y = [y / 1e6 if y else None for y in df_y[col]]
         kwargs = dict(
             x=[str(i + 1) + u'.'] * len(df_y[col]),
-            y=[y / 1e6 if y else None for y in df_y[col]],
+            y=data_y,
             name=(
                 f"{i + 1}. "
                 f"({nr_of_samples[i]:02d} "
@@ -677,12 +681,12 @@ def plot_perf_box_name(plot, input_data):
                 layout[u"title"] = f"<b>Bandwidth:</b> {layout[u'title']}"
             elif test_type == u"VSAP_CPS":
                 layout[u"title"] = f"<b>CPS:</b> {layout[u'title']}"
-                layout[u"yaxis"][u"title"] = u"<b>Connection Rate [Mcps]</b>"
+                layout[u"yaxis"][u"title"] = u"<b>Connection Rate [cps]</b>"
             elif test_type == u"VSAP_RPS":
                 layout[u"title"] = f"<b>RPS:</b> {layout[u'title']}"
-                layout[u"yaxis"][u"title"] = u"<b>Connection Rate [Mrps]</b>"
+                layout[u"yaxis"][u"title"] = u"<b>Connection Rate [rps]</b>"
             else:
-                layout[u"title"] = f"<b>Throughput:</b> {layout[u'title']}"
+                layout[u"title"] = f"<b>Tput:</b> {layout[u'title']}"
         if y_max and max(y_max) > 1:
             layout[u"yaxis"][u"range"] = [0, max(y_max) + 2]
         plpl = plgo.Figure(data=traces, layout=layout)
@@ -796,7 +800,7 @@ def plot_ndrpdr_box_name(plot, input_data):
                         layout[u"title"] = f"<b>CPS:</b> {layout[u'title']}"
                     else:
                         layout[u"title"] = \
-                            f"<b>Throughput:</b> {layout[u'title']}"
+                            f"<b>Tput:</b> {layout[u'title']}"
                 if data_y_max:
                     layout[u"yaxis"][u"range"] = [0, max(data_y_max) / 1e6 + 1]
                 plpl = plgo.Figure(data=traces, layout=layout)
@@ -891,7 +895,7 @@ def plot_mrr_box_name(plot, input_data):
             layout = deepcopy(plot[u"layout"])
             if layout.get(u"title", None):
                 layout[u"title"] = (
-                    f"<b>Throughput:</b> {layout[u'title'].format(core=core)}"
+                    f"<b>Tput:</b> {layout[u'title'].format(core=core)}"
                 )
             if data_y_max:
                 layout[u"yaxis"][u"range"] = [0, max(data_y_max) + 1]