Report: Add data

[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 cae334a..d31ccb1 100644 (file)
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -386,8 +386,8 @@ def plot_perf_box_name(plot, input_data):
                 if y_vals.get(test[u"parent"], None) is None:
                     y_vals[test[u"parent"]] = list()
                 try:
-                    if test[u"type"] in (u"NDRPDR", ):
-                        test_type = u"NDRPDR"
+                    if test[u"type"] in (u"NDRPDR", u"CPS"):
+                        test_type = test[u"type"]
 
                         if u"-pdr" in plot_title:
                             ttype = u"PDR"
@@ -477,7 +477,7 @@ def plot_perf_box_name(plot, input_data):
         # Create plot
         layout = deepcopy(plot[u"layout"])
         if layout.get(u"title", None):
-            if test_type in (u"HOSTSTACK", ):
+            if test_type in (u"HOSTSTACK", u"CPS"):
                 layout[u"title"] = f"<b>Bandwidth:</b> {layout[u'title']}"
             else:
                 layout[u"title"] = f"<b>Throughput:</b> {layout[u'title']}"
@@ -546,7 +546,7 @@ def plot_tsa_name(plot, input_data):
                         u"4": list()
                     }
                 try:
-                    if test[u"type"] not in (u"NDRPDR",):
+                    if test[u"type"] not in (u"NDRPDR", u"CPS"):
                         continue
 
                     if u"-pdr" in plot_title:
@@ -682,7 +682,7 @@ def plot_tsa_name(plot, input_data):
     x_vals = [1, 2, 4]
 
     # Limits:
-    if u"-gbps" not in plot_title:
+    if u"-gbps" not in plot_title and u"-cps-" not in plot_title:
         nic_limit /= 1e6
         lnk_limit /= 1e6
         pci_limit /= 1e6