Reprot: Add dpdk tsh

Change-Id: I577b6957a605f11bc66494273fa37a6345fc117e
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 280f41f5b7ee7415f75839b3096efe4b3935b581)

3 files changed, 99 insertions, 8 deletions

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 93c91830ec..dd81ef4b0b 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -317,6 +317,8 @@ def table_details(table, input_data):
                 try:
                     col_data = str(data[job][build][test][column[
                         u"data"].split(" ")[1]]).replace(u'"', u'""')
+                    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"):
                         col_data = col_data.replace(u" |br| ", u"", 1)
@@ -391,6 +393,8 @@ def table_merged_details(table, input_data):
                     col_data = col_data.replace(
                         u"No Data", u"Not Captured     "
                     )
+                    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"):
                         col_data = col_data.replace(u" |br| ", u"", 1)
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 73b9ea114a..fae78d5188 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -423,14 +423,19 @@ class ExecutionChecker(ResultVisitor):
                 return u""
 
             if hdr_lat_1 and hdr_lat_2:
-                return (
-                    f"{hdr_lat_1.get_value_at_percentile(50.0)} "
-                    f"{hdr_lat_1.get_value_at_percentile(90.0)} "
-                    f"{hdr_lat_1.get_value_at_percentile(99.0)} , "
-                    f"{hdr_lat_2.get_value_at_percentile(50.0)} "
-                    f"{hdr_lat_2.get_value_at_percentile(90.0)} "
-                    f"{hdr_lat_2.get_value_at_percentile(99.0)}"
-                )
+                hdr_lat_1_50 = hdr_lat_1.get_value_at_percentile(50.0)
+                hdr_lat_1_90 = hdr_lat_1.get_value_at_percentile(90.0)
+                hdr_lat_1_99 = hdr_lat_1.get_value_at_percentile(99.0)
+                hdr_lat_2_50 = hdr_lat_2.get_value_at_percentile(50.0)
+                hdr_lat_2_90 = hdr_lat_2.get_value_at_percentile(90.0)
+                hdr_lat_2_99 = hdr_lat_2.get_value_at_percentile(99.0)
+
+                if (hdr_lat_1_50 + hdr_lat_1_90 + hdr_lat_1_99 +
+                        hdr_lat_2_50 + hdr_lat_2_90 + hdr_lat_2_99):
+                    return (
+                        f"{hdr_lat_1_50} {hdr_lat_1_90} {hdr_lat_1_99} , "
+                        f"{hdr_lat_2_50} {hdr_lat_2_90} {hdr_lat_2_99}"
+                    )
 
             return u""
 
@@ -1030,6 +1035,8 @@ class ExecutionChecker(ResultVisitor):
                     }
                 except (AttributeError, IndexError, ValueError, TypeError):
                     test_result[u"status"] = u"FAIL"
+            elif u"DEVICETEST" in tags:
+                test_result[u"type"] = u"DEVICETEST"
             else:
                 test_result[u"status"] = u"FAIL"
                 self._data[u"tests"][self._test_id] = test_result
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 80e070164c..462684a323 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -427,6 +427,14 @@
       csit-vpp-perf-verify-2001-3n-tsh:
         - 4   # NDRPDR sel
 
+    plot-dpdk-throughput-latency-3n-tsh:
+      csit-dpdk-perf-verify-2001-3n-tsh:
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+
     # 3n-dnv
 
     plot-vpp-throughput-lat-tsa-3n-dnv:
@@ -629,6 +637,10 @@
       csit-dpdk-perf-verify-2001-3n-dnv:
         - 12  # NDRPDR sel
 
+    dpdk-perf-results-3n-tsh:
+      csit-dpdk-perf-verify-2001-3n-tsh:
+        - 3   # NDRPDR sel
+
 ###########################################################################
     # Tables (more than one data set)
 
@@ -2305,6 +2317,13 @@
       - 20  # NDRPDR sel
       - 22  # NDRPDR sel
 
+    csit-dpdk-perf-verify-2001-3n-tsh:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+
     csit-vpp-device-2001-ubuntu1804-1n-skx:
       - 57
 
@@ -15045,6 +15064,56 @@
     title: "3n-dnv-x553-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
+# 3n-tsh-x520
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-tsh-x520-64b-1t1c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-tsh"
+  include:
+    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-tsh-x520-64b-2t2c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-tsh"
+  include:
+    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-tsh-x520-64b-1t1c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-tsh"
+  include:
+    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-tsh-x520-64b-2t2c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-tsh-x520-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-tsh"
+  include:
+    - "tests.dpdk.perf.10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
 ################################################################################
 ###   2n-clx                                                                 ###
 ################################################################################
@@ -16506,3 +16575,14 @@
   filter: "'1T1C' and 'NIC_Intel-XL710'"
   layout:
     layout: "plot-hdrh-latency-by-percentile"
+
+- type: "plot"
+  title: "Latency by percentile: DPDK 3n-tsh"
+  algorithm: "plot_hdrh_lat_by_percentile"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-tsh"
+  output-file-links: "{DIR[LAT,DPDK]}/3n_tsh.rst"
+  target-links: "../../_static/dpdk"
+  data: "plot-dpdk-hdrh-lat-3n-tsh"
+  filter: "'1T1C' and 'NIC_Intel-X520-DA2'"
+  layout:
+    layout: "plot-hdrh-latency-by-percentile"