X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=20779dde25f5e2bbde724482e320e07adcef6150;hp=cf8ac4598c8de9513b96aecfe6e155b7ca912f83;hb=d75974b805248dd484876b7e196fdc7475e5999b;hpb=8efda89f80a75bc1ba19c8a214c2edba51540206

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index cf8ac4598c..20779dde25 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -411,14 +411,16 @@ def table_performance_comparison(table, input_data):
             item.append(round(stdev(data_t) / 1000000, 2))
         else:
             item.extend(["Not tested", "Not tested"])
-        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]))))
-        elif item[-4] is None or item[-2] is None or item[-4] == 0:
+        if item[-2] == "Not tested":
+            pass
+        elif item[-4] == "Not tested":
             item.append("New in CSIT-1908")
         elif topo == "2n-skx" and "dot1q" in tbl_dict[tst_name]["name"]:
             item.append("See footnote [1]")
             footnote = True
-        if (len(item) == len(header)) and (item[-3] is not None):
+        elif item[-4] != 0:
+            item.append(int(relative_change(float(item[-4]), float(item[-2]))))
+        if (len(item) == len(header)) and (item[-3] != "Not tested"):
             tbl_lst.append(item)
 
     # Sort the table according to the relative change
@@ -437,13 +439,13 @@ def table_performance_comparison(table, input_data):
     if footnote:
         with open(txt_file_name, 'a') as txt_file:
             txt_file.writelines([
-                "Footnotes:",
+                "\nFootnotes:\n",
                 "[1] CSIT-1908 changed test methodology of dot1q tests in "
                 "2n-skx testbeds, dot1q encapsulation is now used on both "
-                "links of SUT.",
+                "links of SUT.\n",
                 "    Previously dot1q was used only on a single link with the "
                 "other link carrying untagged Ethernet frames. This change "
-                "results",
+                "results\n",
                 "    in slightly lower throughput in CSIT-1908 for these "
                 "tests. See release notes."
             ])
@@ -679,14 +681,16 @@ def table_performance_comparison_nic(table, input_data):
             item.append(round(stdev(data_t) / 1000000, 2))
         else:
             item.extend(["Not tested", "Not tested"])
-        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]))))
-        elif item[-4] is None or item[-2] is None or item[-4] == 0:
+        if item[-2] == "Not tested":
+            pass
+        elif item[-4] == "Not tested":
             item.append("New in CSIT-1908")
         elif topo == "2n-skx" and "dot1q" in tbl_dict[tst_name]["name"]:
             item.append("See footnote [1]")
             footnote = True
-        if (len(item) == len(header)) and (item[-3] is not None):
+        elif item[-4] != 0:
+            item.append(int(relative_change(float(item[-4]), float(item[-2]))))
+        if (len(item) == len(header)) and (item[-3] != "Not tested"):
             tbl_lst.append(item)
 
     # Sort the table according to the relative change
@@ -705,13 +709,13 @@ def table_performance_comparison_nic(table, input_data):
     if footnote:
         with open(txt_file_name, 'a') as txt_file:
             txt_file.writelines([
-                "Footnotes:",
+                "\nFootnotes:\n",
                 "[1] CSIT-1908 changed test methodology of dot1q tests in "
                 "2n-skx testbeds, dot1q encapsulation is now used on both "
-                "links of SUT.",
+                "links of SUT.\n",
                 "    Previously dot1q was used only on a single link with the "
                 "other link carrying untagged Ethernet frames. This change "
-                "results",
+                "results\n",
                 "    in slightly lower throughput in CSIT-1908 for these "
                 "tests. See release notes."
             ])
@@ -740,9 +744,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),
@@ -849,9 +853,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"