Report: Show min/avg/max latency for aws - fixes

[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 1b95030..661823c 100644 (file)
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -145,24 +145,32 @@ def plot_statistics(plot, input_data):
                 d_y_fail = meta[u"tests_failed"]
                 minutes = meta[u"elapsedtime"] // 60000
                 duration = f"{(minutes // 60):02d}:{(minutes % 60):02d}"
-                version = meta[u"version"]
+                version = meta.get(u"version", u"")
             except (KeyError, IndexError, ValueError, AttributeError):
                 continue
             data_x.append(date)
             data_y_pass.append(d_y_pass)
             data_y_fail.append(d_y_fail)
             data_y_duration.append(minutes)
+            if u"vpp" in job:
+                sut = u"vpp"
+            elif u"dpdk" in job:
+                sut = u"dpdk"
+            elif u"trex" in job:
+                sut = u"trex"
+            else:
+                sut = u""
             hover_text.append(hover_str.format(
                 date=date,
                 passed=d_y_pass,
                 failed=d_y_fail,
                 duration=duration,
-                sut=u"vpp" if u"vpp" in job else u"dpdk",
+                sut=sut,
                 build=version,
                 test=u"mrr" if u"mrr" in job else u"ndrpdr",
                 period=u"daily" if u"daily" in job else u"weekly",
                 build_nr=build_nr,
-                testbed=meta[u"testbed"]
+                testbed=meta.get(u"testbed", u"")
             ))
 
     traces = [
@@ -1514,8 +1522,6 @@ def plot_nf_heatmap(plot, input_data):
     regex_test_name = re.compile(r'^.*-(\d+ch|\d+pl)-'
                                  r'(\d+mif|\d+vh)-'
                                  r'(\d+vm\d+t|\d+dcr\d+t|\d+dcr\d+c).*$')
-    vals = dict()
-
     # Transform the data
     logging.info(
         f"    Creating the data set for the {plot.get(u'type', u'')} "
@@ -1532,6 +1538,7 @@ def plot_nf_heatmap(plot, input_data):
 
     for ttype in plot.get(u"test-type", (u"ndr", u"pdr")):
         for core in plot.get(u"core", tuple()):
+            vals = dict()
             for item in plot.get(u"include", tuple()):
                 reg_ex = re.compile(str(item.format(core=core)).lower())
                 for job in in_data: