X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=f4c57f76d4af7cca3a98f681146fa9c640576292;hb=3eb09745cc7a936dc91a68a4a723867c2311f3a1;hp=d2e7da353240a81d8a626342d21bc196023f7641;hpb=6a5bc78e5fca4f43619c9199ef05ecbe2bc5d356;p=csit.git

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index d2e7da3532..f4c57f76d4 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -423,8 +423,33 @@ def table_performance_comparison(table, input_data):
         if (len(item) == len(header)) and (item[-3] != "Not tested"):
             tbl_lst.append(item)
 
-    # Sort the table according to the relative change
-    tbl_lst.sort(key=lambda rel: rel[-1], reverse=True)
+    # Sort the table:
+    # 1. New in CSIT-XXXX
+    # 2. See footnote
+    # 3. Delta
+    tbl_new = list()
+    tbl_see = list()
+    tbl_delta = list()
+    for item in tbl_lst:
+        if isinstance(item[-1], str):
+            if "New in CSIT" in item[-1]:
+                tbl_new.append(item)
+            elif "See footnote" in item[-1]:
+                tbl_see.append(item)
+        else:
+            tbl_delta.append(item)
+
+    # Sort the tables:
+    tbl_new.sort(key=lambda rel: rel[0], reverse=False)
+    tbl_see.sort(key=lambda rel: rel[0], reverse=False)
+    tbl_see.sort(key=lambda rel: rel[-1], reverse=False)
+    tbl_delta.sort(key=lambda rel: rel[-1], reverse=True)
+
+    # Put the tables together:
+    tbl_lst = list()
+    tbl_lst.extend(tbl_new)
+    tbl_lst.extend(tbl_see)
+    tbl_lst.extend(tbl_delta)
 
     # Generate csv tables:
     csv_file = "{0}.csv".format(table["output-file"])
@@ -441,10 +466,10 @@ def table_performance_comparison(table, input_data):
             txt_file.writelines([
                 "\nFootnotes:\n",
                 "[1] CSIT-1908 changed test methodology of dot1q tests in "
-                "2n-skx testbeds, dot1q encapsulation is now used on both "
+                "2-node testbeds, dot1q encapsulation is now used on both "
                 "links of SUT.\n",
                 "    Previously dot1q was used only on a single link with the "
-                "other link carrying untagged Ethernet frames. This change "
+                "other link carrying untagged Ethernet frames. This changes "
                 "results\n",
                 "    in slightly lower throughput in CSIT-1908 for these "
                 "tests. See release notes."
@@ -693,8 +718,33 @@ def table_performance_comparison_nic(table, input_data):
         if (len(item) == len(header)) and (item[-3] != "Not tested"):
             tbl_lst.append(item)
 
-    # Sort the table according to the relative change
-    tbl_lst.sort(key=lambda rel: rel[-1], reverse=True)
+    # Sort the table:
+    # 1. New in CSIT-XXXX
+    # 2. See footnote
+    # 3. Delta
+    tbl_new = list()
+    tbl_see = list()
+    tbl_delta = list()
+    for item in tbl_lst:
+        if isinstance(item[-1], str):
+            if "New in CSIT" in item[-1]:
+                tbl_new.append(item)
+            elif "See footnote" in item[-1]:
+                tbl_see.append(item)
+        else:
+            tbl_delta.append(item)
+
+    # Sort the tables:
+    tbl_new.sort(key=lambda rel: rel[0], reverse=False)
+    tbl_see.sort(key=lambda rel: rel[0], reverse=False)
+    tbl_see.sort(key=lambda rel: rel[-1], reverse=False)
+    tbl_delta.sort(key=lambda rel: rel[-1], reverse=True)
+
+    # Put the tables together:
+    tbl_lst = list()
+    tbl_lst.extend(tbl_new)
+    tbl_lst.extend(tbl_see)
+    tbl_lst.extend(tbl_delta)
 
     # Generate csv tables:
     csv_file = "{0}.csv".format(table["output-file"])
@@ -711,10 +761,10 @@ def table_performance_comparison_nic(table, input_data):
             txt_file.writelines([
                 "\nFootnotes:\n",
                 "[1] CSIT-1908 changed test methodology of dot1q tests in "
-                "2n-skx testbeds, dot1q encapsulation is now used on both "
+                "2-node testbeds, dot1q encapsulation is now used on both "
                 "links of SUT.\n",
                 "    Previously dot1q was used only on a single link with the "
-                "other link carrying untagged Ethernet frames. This change "
+                "other link carrying untagged Ethernet frames. This changes "
                 "results\n",
                 "    in slightly lower throughput in CSIT-1908 for these "
                 "tests. See release notes."
@@ -744,9 +794,9 @@ def table_nics_comparison(table, input_data):
         header = ["Test case", ]
 
         if table["include-tests"] == "MRR":
-            hdr_param = "Receive Rate"
+            hdr_param = "Rec Rate"
         else:
-            hdr_param = "Throughput"
+            hdr_param = "Thput"
 
         header.extend(
             ["{0} {1} [Mpps]".format(table["reference"]["title"], hdr_param),
@@ -853,9 +903,9 @@ def table_soak_vs_ndr(table, input_data):
     try:
         header = [
             "Test case",
-            "{0} Throughput [Mpps]".format(table["reference"]["title"]),
+            "{0} Thput [Mpps]".format(table["reference"]["title"]),
             "{0} Stdev [Mpps]".format(table["reference"]["title"]),
-            "{0} Throughput [Mpps]".format(table["compare"]["title"]),
+            "{0} Thput [Mpps]".format(table["compare"]["title"]),
             "{0} Stdev [Mpps]".format(table["compare"]["title"]),
             "Delta [%]", "Stdev of delta [%]"]
         header_str = ",".join(header) + "\n"