Report: Fix plot_perf_box_name 15/28915/1
authorTibor Frank <tifrank@cisco.com>
Fri, 18 Sep 2020 08:25:09 +0000 (10:25 +0200)
committerTibor Frank <tifrank@cisco.com>
Fri, 18 Sep 2020 08:25:09 +0000 (10:25 +0200)
Change-Id: I660819b881b1109f6f6bf250b66ba025e9278f56
Signed-off-by: Tibor Frank <tifrank@cisco.com>
resources/tools/presentation/generator_plots.py

index 30e2710..1e21ee1 100644 (file)
@@ -372,14 +372,6 @@ def plot_perf_box_name(plot, input_data):
     # Prepare the data for the plot
     plot_title = plot.get(u"title", u"").lower()
 
-    if u"-pdr" in plot_title:
-        ttype = u"PDR"
-    elif u"-ndr" in plot_title:
-        ttype = u"NDR"
-    else:
-        raise RuntimeError(u"Wrong title. No information about test type. Add"
-                           u"'-ndr' or '-pdr' to the test title.")
-
     if u"-gbps" in plot_title:
         value = u"gbps"
         multiplier = 1e6
@@ -397,6 +389,16 @@ def plot_perf_box_name(plot, input_data):
                     if test[u"type"] in (u"NDRPDR", ):
                         test_type = u"NDRPDR"
 
+                        if u"-pdr" in plot_title:
+                            ttype = u"PDR"
+                        elif u"-ndr" in plot_title:
+                            ttype = u"NDR"
+                        else:
+                            raise RuntimeError(
+                                u"Wrong title. No information about test type. "
+                                u"Add '-ndr' or '-pdr' to the test title."
+                            )
+
                         y_vals[test[u"parent"]].append(
                             test[value][ttype][u"LOWER"] * multiplier
                         )