Report 2005: Add data, fix sorting in comp tables

Change-Id: Ib0c42f5b9fbd9b9f9ebf0bff437ef9d145e6ddda
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index eee95d6..29a398a 100644 (file)
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -1662,7 +1662,6 @@ def table_comparison(table, input_data):
     if comparisons:
         for row in tbl_lst:
             new_row = deepcopy(row)
-            add_to_tbl = False
             for comp in comparisons:
                 ref_itm = row[int(comp[u"reference"])]
                 if ref_itm is None and \
@@ -1678,16 +1677,16 @@ def table_comparison(table, input_data):
                         ref_itm[u"mean"], cmp_itm[u"mean"],
                         ref_itm[u"stdev"], cmp_itm[u"stdev"]
                     )
-                    new_row.append(
-                        {
+                    if delta is None:
+                        break
+                    else:
+                        new_row.append({
                             u"mean": delta * 1e6,
                             u"stdev": d_stdev * 1e6
-                        }
-                    )
-                    add_to_tbl = True
+                        })
                 else:
-                    new_row.append(None)
-            if add_to_tbl:
+                    break
+            else:
                 tbl_cmp_lst.append(new_row)
 
     try:

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 66f2035..a6ff3b0 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -901,7 +901,9 @@
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
         - 64  # NDRPDR sel env 4
+        - 65  # NDRPDR sel env 4
         - 66  # NDRPDR sel env 4
+        - 70  # NDRPDR sel env 4
 
     vpp-performance-changes-2n-dnv-h1:
       csit-vpp-perf-verify-1908-2n-dnv:
@@ -2408,7 +2410,9 @@
       - 62  # NDRPDR sel env 4
       - 63  # NDRPDR sel env 4
       - 64  # NDRPDR sel env 4
+      - 65  # NDRPDR sel env 4
       - 66  # NDRPDR sel env 4
+      - 70  # NDRPDR sel env 4
       - 12  # MRR
       - 42  # Reconf
       - 45  # Reconf