trending: fix empty regressions and progressions

Signed-off-by: Viliam Luc <vluc@cisco.com>
Change-Id: I1405c5d1dbf9e137afbc5fd5d9f83ea572613ea9

diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py
index fafa863..b4ff42e 100644 (file)
--- a/resources/tools/presentation/generator_cpta.py
+++ b/resources/tools/presentation/generator_cpta.py
@@ -883,8 +883,8 @@ def _generate_all_charts(spec, input_data):
                 if tb in file and u"performance-trending-dashboard" in \
                         file and u"txt" in file:
                     file_to_read = f"{spec.cpta[u'output-file']}/{file}"
                 if tb in file and u"performance-trending-dashboard" in \
                         file and u"txt" in file:
                     file_to_read = f"{spec.cpta[u'output-file']}/{file}"

-                    with open(f"{file_to_read}", u"rt") as input:
-                        data = data + input.readlines()
+                    with open(f"{file_to_read}", u"rt") as f_in:
+                        data = data + f_in.readlines()

 
             for test_name, classification in job_data.items():
                 if classification != u"normal":
 
             for test_name, classification in job_data.items():
                 if classification != u"normal":


@@ -896,7 +896,7 @@ def _generate_all_charts(spec, input_data):
                         test_name = test_name.split("-", 1)
                         tst = test_name[1].split(".")[-1]
                         nic = test_name[0].split(".")[-1]
                         test_name = test_name.split("-", 1)
                         tst = test_name[1].split(".")[-1]
                         nic = test_name[0].split(".")[-1]

-                    frmsize = tst.split("-")[0].upper()
+                    frmsize = tst.split("-")[0]

                     tst = u"-".join(tst.split("-")[1:])
                     tst_name = f"{nic}-{frmsize}-{tst}"
                     if len(tst) > max_len.tst:
                     tst = u"-".join(tst.split("-")[1:])
                     tst_name = f"{nic}-{frmsize}-{tst}"
                     if len(tst) > max_len.tst:


@@ -943,7 +943,7 @@ def _generate_all_charts(spec, input_data):
                     f"{u' ' * (max_len.tst - len(test_reg_lst[idx]))}  "
                     f"{nic_reg_lst[idx]}"
                     f"{u' ' * (max_len.nic - len(nic_reg_lst[idx]))}  "
                     f"{u' ' * (max_len.tst - len(test_reg_lst[idx]))}  "
                     f"{nic_reg_lst[idx]}"
                     f"{u' ' * (max_len.nic - len(nic_reg_lst[idx]))}  "

-                    f"{frmsize_reg_lst[idx]}"
+                    f"{frmsize_reg_lst[idx].upper()}"

                     f"{u' ' * (max_len.frmsize - len(frmsize_reg_lst[idx]))}  "
                     f"{trend_reg_lst[idx]}"
                     f"{u' ' * (max_len.trend - len(str(trend_reg_lst[idx])))}  "
                     f"{u' ' * (max_len.frmsize - len(frmsize_reg_lst[idx]))}  "
                     f"{trend_reg_lst[idx]}"
                     f"{u' ' * (max_len.trend - len(str(trend_reg_lst[idx])))}  "


@@ -971,7 +971,7 @@ def _generate_all_charts(spec, input_data):
                     f"{u' ' * (max_len.tst - len(test_prog_lst[idx]))}  "
                     f"{nic_prog_lst[idx]}"
                     f"{u' ' * (max_len.nic - len(nic_prog_lst[idx]))}  "
                     f"{u' ' * (max_len.tst - len(test_prog_lst[idx]))}  "
                     f"{nic_prog_lst[idx]}"
                     f"{u' ' * (max_len.nic - len(nic_prog_lst[idx]))}  "

-                    f"{frmsize_prog_lst[idx]}"
+                    f"{frmsize_prog_lst[idx].upper()}"

                     f"{u' ' * (max_len.frmsize - len(frmsize_prog_lst[idx]))}  "
                     f"{trend_prog_lst[idx]}"
                     f"{u' ' * (max_len.trend -len(str(trend_prog_lst[idx])))}  "
                     f"{u' ' * (max_len.frmsize - len(frmsize_prog_lst[idx]))}  "
                     f"{trend_prog_lst[idx]}"
                     f"{u' ' * (max_len.trend -len(str(trend_prog_lst[idx])))}  "