From: Tibor Frank <tifrank@cisco.com>
Date: Thu, 13 Feb 2020 12:23:18 +0000 (+0100)
Subject: Report: Format of tables
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=b47c8f8ed56880eda3f64cf06abd47155ea97db0

Report: Format of tables

Change-Id: I783ad52f7efab0e99d5238c0af0432aa77155193
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 b9a920ab32..576766952b 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -396,7 +396,7 @@ def table_merged_details(table, input_data):
                     if column[u"data"].split(u" ")[1] in (u"name", ):
                         col_data = f" |prein| {col_data} |preout| "
                     if column[u"data"].split(u" ")[1] in \
-                        (u"conf-history", u"show-run"):
+                        (u"conf-history", u"show-run", u"msg"):
                         col_data = col_data.replace(u" |br| ", u"", 1)
                         col_data = f" |prein| {col_data[:-5]} |preout| "
                     row_lst.append(f'"{col_data}"')
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index fae78d5188..5d9234e941 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -451,13 +451,11 @@ class ExecutionChecker(ResultVisitor):
             pdr_lat_90 = f"\n5. {pdr_lat_90}" if pdr_lat_90 else u""
 
             return (
-                u" |prein| "
                 f"1. {(data[u'ndr_low'] / 1e6):.2f} {data[u'ndr_low_b']:.2f}"
                 f"\n2. {(data[u'pdr_low'] / 1e6):.2f} {data[u'pdr_low_b']:.2f}"
                 f"{pdr_lat_10}"
                 f"{pdr_lat_50}"
                 f"{pdr_lat_90}"
-                u" |preout| "
             )
         except (AttributeError, IndexError, ValueError, KeyError):
             return msg
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index aec888fd3f..4a941e01b3 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -4136,7 +4136,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
     data: "data msg"
@@ -4155,7 +4155,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
 #    data: "data msg"
@@ -4174,7 +4174,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
 #    data: "data msg"
@@ -4193,7 +4193,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}/vpp_performance_results_2n_clx"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
 #    data: "data msg"
@@ -4212,7 +4212,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}/vpp_performance_results_3n_tsh"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
     data: "data msg"
@@ -4231,7 +4231,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}/vpp_performance_results_3n_dnv"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
     data: "data msg"
@@ -4250,7 +4250,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
     data: "data msg"
@@ -4458,7 +4458,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: "Status"
     data: "data msg"
@@ -4477,7 +4477,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: "Status"
 #    data: "data msg"
@@ -4496,7 +4496,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: "Status"
 #    data: "data msg"
@@ -4515,7 +4515,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/vpp_mrr_results_2n_clx"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: "Status"
 #    data: "data msg"
@@ -4534,7 +4534,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/vpp_mrr_results_3n_tsh"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: "Status"
 #    data: "data msg"
@@ -4553,7 +4553,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}/vpp_mrr_results_3n_dnv"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: "Status"
     data: "data msg"
@@ -4572,7 +4572,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: "Status"
     data: "data msg"
@@ -4724,10 +4724,8 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Documentation"
-    data: "data doc"
   - title: "Status"
     data: "data status"
   rows: "generated"
@@ -5145,7 +5143,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
     data: "data msg"
@@ -5164,7 +5162,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
 #    data: "data msg"
@@ -5183,7 +5181,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
 #    data: "data msg"
@@ -5202,7 +5200,7 @@
 #  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
 #  columns:
-#  - title: "Test Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
 #    data: "data msg"
@@ -5221,7 +5219,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
     data: "data msg"
@@ -5240,7 +5238,7 @@
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
   columns:
-  - title: "Test Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| 1. Mpps Gbps (NDR Throughput) |br| 2. Mpps Gbps (PDR Throughput) |br| 3. P50 P90 P99 , P50 P90 P99 (10% PDR Uni-Dir Latency in uSec) |br| 4. P50 P90 P99 , P50 P90 P99 (50% PDR Uni-Dir Latency in uSec) |br| 5. P50 P90 P99 , P50 P90 P99 (90% PDR Uni-Dir Latency in uSec) |preout| "
     data: "data msg"