PAL: Tests order in plots

Change-Id: Ic9342f0f3deea3d7d175c437993289c86464bb99
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 494f7e4abf409894ccb3652ded0cb0eedeabf85a)

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 40ba60d..869d2ca 100644 (file)
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -380,54 +380,66 @@ def plot_perf_box_name(plot, input_data):
         multiplier = 1.0
     y_vals = OrderedDict()
     test_type = u""
-    for job in data:
-        for build in job:
-            for test in build:
-                if y_vals.get(test[u"parent"], None) is None:
-                    y_vals[test[u"parent"]] = list()
-                try:
-                    if test[u"type"] in (u"NDRPDR", u"CPS"):
-                        test_type = test[u"type"]
-
-                        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
-                        )
-
-                    elif test[u"type"] in (u"SOAK", ):
-                        y_vals[test[u"parent"]].\
-                            append(test[u"throughput"][u"LOWER"])
-                        test_type = u"SOAK"
+    for item in plot.get(u"include", tuple()):
+        reg_ex = re.compile(str(item).lower())
+        for job in data:
+            for build in job:
+                for test_id, test in build.iteritems():
+                    if not re.match(reg_ex, str(test_id).lower()):
+                        continue
+                    if y_vals.get(test[u"parent"], None) is None:
+                        y_vals[test[u"parent"]] = list()
+                    try:
+                        if test[u"type"] in (u"NDRPDR", u"CPS"):
+                            test_type = test[u"type"]
+
+                            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 "
+                                    u"type. Add '-ndr' or '-pdr' to the test "
+                                    u"title."
+                                )
 
-                    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
+                                test[value][ttype][u"LOWER"] * multiplier
                             )
-                        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
+                        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"
 
-                except (KeyError, TypeError):
-                    y_vals[test[u"parent"]].append(None)
+                        else:
+                            continue
+
+                    except (KeyError, TypeError):
+                        y_vals[test[u"parent"]].append(None)
 
     # Add None to the lists with missing data
     max_len = 0
@@ -538,37 +550,43 @@ def plot_tsa_name(plot, input_data):
         multiplier = 1.0
 
     y_vals = OrderedDict()
-    for job in data:
-        for build in job:
-            for test in build:
-                if y_vals.get(test[u"parent"], None) is None:
-                    y_vals[test[u"parent"]] = {
-                        u"1": list(),
-                        u"2": list(),
-                        u"4": list()
-                    }
-                try:
-                    if test[u"type"] not in (u"NDRPDR", u"CPS"):
-                        continue
-
-                    if u"-pdr" in plot_title:
-                        ttype = u"PDR"
-                    elif u"-ndr" in plot_title:
-                        ttype = u"NDR"
-                    else:
-                        continue
-
-                    if u"1C" in test[u"tags"]:
-                        y_vals[test[u"parent"]][u"1"]. \
-                            append(test[value][ttype][u"LOWER"] * multiplier)
-                    elif u"2C" in test[u"tags"]:
-                        y_vals[test[u"parent"]][u"2"]. \
-                            append(test[value][ttype][u"LOWER"] * multiplier)
-                    elif u"4C" in test[u"tags"]:
-                        y_vals[test[u"parent"]][u"4"]. \
-                            append(test[value][ttype][u"LOWER"] * multiplier)
-                except (KeyError, TypeError):
-                    pass
+    for item in plot.get(u"include", tuple()):
+        reg_ex = re.compile(str(item).lower())
+        for job in data:
+            for build in job:
+                for test_id, test in build.iteritems():
+                    if re.match(reg_ex, str(test_id).lower()):
+                        if y_vals.get(test[u"parent"], None) is None:
+                            y_vals[test[u"parent"]] = {
+                                u"1": list(),
+                                u"2": list(),
+                                u"4": list()
+                            }
+                        try:
+                            if test[u"type"] not in (u"NDRPDR", u"CPS"):
+                                continue
+
+                            if u"-pdr" in plot_title:
+                                ttype = u"PDR"
+                            elif u"-ndr" in plot_title:
+                                ttype = u"NDR"
+                            else:
+                                continue
+
+                            if u"1C" in test[u"tags"]:
+                                y_vals[test[u"parent"]][u"1"].append(
+                                    test[value][ttype][u"LOWER"] * multiplier
+                                )
+                            elif u"2C" in test[u"tags"]:
+                                y_vals[test[u"parent"]][u"2"].append(
+                                    test[value][ttype][u"LOWER"] * multiplier
+                                )
+                            elif u"4C" in test[u"tags"]:
+                                y_vals[test[u"parent"]][u"4"].append(
+                                    test[value][ttype][u"LOWER"] * multiplier
+                                )
+                        except (KeyError, TypeError):
+                            pass
 
     if not y_vals:
         logging.warning(f"No data for the plot {plot.get(u'title', u'')}")