X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=46aa71ca48fe8696e84b066038c809d8a66160db;hb=refs%2Fchanges%2F96%2F12196%2F2;hp=db79396857734478613dfa5dbfc4aff842507bcd;hpb=d5d53957f4686398727469e0f5b1774a5b6560fe;p=csit.git

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index db79396857..46aa71ca48 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -432,8 +432,8 @@ def table_performance_comparison(table, input_data):
     for tst_name in tbl_dict.keys():
         item = [tbl_dict[tst_name]["name"], ]
         if history:
-            for hist_list in tbl_dict[tst_name]["history"].values():
-                for hist_data in hist_list:
+            if tbl_dict[tst_name].get("history", None) is not None:
+                for hist_data in tbl_dict[tst_name]["history"].values():
                     if hist_data:
                         data_t = remove_outliers(
                             hist_data, outlier_const=table["outlier-const"])
@@ -444,6 +444,8 @@ def table_performance_comparison(table, input_data):
                             item.extend([None, None])
                     else:
                         item.extend([None, None])
+            else:
+                item.extend([None, None])
         if tbl_dict[tst_name]["ref-data"]:
             data_t = remove_outliers(tbl_dict[tst_name]["ref-data"],
                                      outlier_const=table["outlier-const"])
@@ -466,8 +468,8 @@ def table_performance_comparison(table, input_data):
                 item.extend([None, None])
         else:
             item.extend([None, None])
-        if item[-5] is not None and item[-3] is not None and item[-5] != 0:
-            item.append(int(relative_change(float(item[-5]), float(item[-3]))))
+        if item[-4] is not None and item[-2] is not None and item[-4] != 0:
+            item.append(int(relative_change(float(item[-4]), float(item[-2]))))
         if len(item) == len(header):
             tbl_lst.append(item)
 
@@ -846,7 +848,8 @@ def table_performance_trending_dashboard(table, input_data):
         for nrp in range(table["window"], -1, -1):
             tbl_pro = [item for item in tbl_reg if item[5] == nrp]
             for nro in range(table["window"], -1, -1):
-                tbl_out = [item for item in tbl_pro if item[5] == nro]
+                tbl_out = [item for item in tbl_pro if item[6] == nro]
+                tbl_out.sort(key=lambda rel: rel[2])
                 tbl_sorted.extend(tbl_out)
 
     file_name = "{0}{1}".format(table["output-file"], table["output-file-ext"])