X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=1e21ee156214a8fb28dde26c02d239d1a7c2f591;hb=196f423567c562227d3c0313402f70457e0e4f9f;hp=30e2710d872c2f8c45d8229b99c9975516216b73;hpb=549ab1ae1abc485af7677f5d7b3703c9d22dabbb;p=csit.git diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py index 30e2710d87..1e21ee1562 100644 --- a/resources/tools/presentation/generator_plots.py +++ b/resources/tools/presentation/generator_plots.py @@ -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 )