Report: Add DNV data

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

3 files changed, 295 insertions, 327 deletions

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 4795ab7985..f4c57f76d4 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -431,10 +431,11 @@ def table_performance_comparison(table, input_data):
     tbl_see = list()
     tbl_delta = list()
     for item in tbl_lst:
-        if "New in CSIT" in item[-1]:
-            tbl_new.append(item)
-        elif "See footnote" in item[-1]:
-            tbl_see.append(item)
+        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)
 
@@ -725,10 +726,11 @@ def table_performance_comparison_nic(table, input_data):
     tbl_see = list()
     tbl_delta = list()
     for item in tbl_lst:
-        if "New in CSIT" in item[-1]:
-            tbl_new.append(item)
-        elif "See footnote" in item[-1]:
-            tbl_see.append(item)
+        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)
 
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index f47f1bc6df..fc56af75e2 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -502,7 +502,7 @@ class ExecutionChecker(ResultVisitor):
                 self._data["tests"][self._test_ID]["show-run"] = str()
             if self._lookup_kw_nr > 1:
                 self._msg_type = None
-            if self._show_run_lookup_nr == 1:
+            if self._show_run_lookup_nr > 0:
                 message = str(msg.message).replace(' ', '').replace('\n', '').\
                     replace("'", '"').replace('b"', '"').replace('u"', '"')[8:]
                 runtime = loads(message)
@@ -547,7 +547,8 @@ class ExecutionChecker(ResultVisitor):
                 try:
                     self._data["tests"][self._test_ID]["show-run"] += " |br| "
                     self._data["tests"][self._test_ID]["show-run"] += \
-                        "**DUT" + str(self._lookup_kw_nr) + ":** |br| " + text
+                        "**DUT" + str(self._show_run_lookup_nr) + ":** |br| " \
+                        + text
                 except KeyError:
                     pass
 
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index dcd549ab1b..5487ebb4fa 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -33,11 +33,12 @@
     DIR[DTR,PERF,VPP,3N,SKX]: "{DIR[DTR]}/vpp_performance_results_3n_skx"
     DIR[DTR,PERF,VPP,2N,SKX]: "{DIR[DTR]}/vpp_performance_results_2n_skx"
     DIR[DTR,PERF,VPP,3N,TSH]: "{DIR[DTR]}/vpp_performance_results_3n_tsh"
+    DIR[DTR,PERF,VPP,3N,DNV]: "{DIR[DTR]}/vpp_performance_results_3n_dnv"
     DIR[DTR,PERF,VPP,2N,DNV]: "{DIR[DTR]}/vpp_performance_results_2n_dnv"
     DIR[DTR,MRR,VPP,3N,HSW]: "{DIR[DTR]}/vpp_mrr_results_3n_hsw"
     DIR[DTR,MRR,VPP,3N,SKX]: "{DIR[DTR]}/vpp_mrr_results_3n_skx"
     DIR[DTR,MRR,VPP,2N,SKX]: "{DIR[DTR]}/vpp_mrr_results_2n_skx"
-    DIR[DTR,MRR,VPP,2N,DNV]: "{DIR[DTR]}/vpp_mrr_results_2n_dnv"
+    # DIR[DTR,MRR,VPP,2N,DNV]: "{DIR[DTR]}/vpp_mrr_results_2n_dnv"
     DIR[DTR,PERF,COT,3N,HSW]: "{DIR[DTR]}/cot_performance_results_3n_hsw"
     DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu"
     DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos"
@@ -53,11 +54,12 @@
     DIR[DTC,PERF,VPP,3N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_3n_skx"
     DIR[DTC,PERF,VPP,2N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_2n_skx"
     DIR[DTC,PERF,VPP,3N,TSH]: "{DIR[DTC]}/vpp_performance_configuration_3n_tsh"
+    DIR[DTC,PERF,VPP,3N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_3n_dnv"
     DIR[DTC,PERF,VPP,2N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_2n_dnv"
     DIR[DTC,MRR,VPP,3N,HSW]: "{DIR[DTC]}/vpp_mrr_configuration_3n_hsw"
     DIR[DTC,MRR,VPP,3N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_3n_skx"
     DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx"
-    DIR[DTC,MRR,VPP,2N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_2n_dnv"
+    # DIR[DTC,MRR,VPP,2N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_2n_dnv"
     DIR[DTC,FUNC,VPP,UBUNTU]: "{DIR[DTC]}/vpp_functional_configuration_ubuntu"
     DIR[DTC,FUNC,VPP,CENTOS]: "{DIR[DTC]}/vpp_functional_configuration_centos"
     DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTC]}/vpp_device_configuration_ubuntu"
@@ -68,6 +70,7 @@
     DIR[DTO,PERF,VPP,3N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_3n_skx"
     DIR[DTO,PERF,VPP,2N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_skx"
     DIR[DTO,PERF,VPP,3N,TSH]: "{DIR[DTO]}/vpp_performance_operational_data_3n_tsh"
+    DIR[DTO,PERF,VPP,3N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_3n_dnv"
     DIR[DTO,PERF,VPP,2N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_2n_dnv"
 
     # .css patch file to fix tables generated by Sphinx
@@ -77,7 +80,7 @@
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job"
-    URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/{release}/robot-plugin.zip"
+    # URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/{release}/robot-plugin.zip"
     # URL[VIRL,DNV]: "http://download.it/from/nexus"
     URL[NEXUS,LOG]: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
     URL[NEXUS,DOC]: "https://docs.fd.io/csit"
@@ -278,6 +281,8 @@
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
 
+    # 3n-tsh
+
     plot-vpp-throughput-lat-tsa-3n-tsh:
       csit-vpp-perf-verify-1908-3n-tsh:
         - 7   # NDRPDR sel
@@ -289,6 +294,37 @@
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+
+    # 3n-dnv
+
+    plot-vpp-throughput-lat-tsa-3n-dnv:
+      csit-vpp-perf-verify-1908-3n-dnv:
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+
+    # 2n-dnv
+
+    plot-vpp-throughput-lat-tsa-2n-dnv:
+      csit-vpp-perf-verify-1908-2n-dnv:
+        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
 
     ###########################################################################
     # Simple tables (only one data set):
@@ -376,6 +412,14 @@
       csit-vpp-perf-verify-1908-3n-tsh:
         - 13  # NDRPDR sel
 
+    vpp-perf-results-3n-dnv:
+      csit-vpp-perf-verify-1908-3n-dnv:
+        - 16  # NDRPDR sel
+
+    vpp-perf-results-2n-dnv:
+      csit-vpp-perf-verify-1908-2n-dnv:
+        - 9   # NDRPDR sel
+
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1908-3n-hsw:
         - 39  # MRR sel
@@ -417,21 +461,6 @@
 
     # Performance changes
 
-#    intel-dnv-vpp-changes-2n-dnv-h1:
-#      intel-dnv-vpp-release-1810:
-#        - 1
-#    intel-dnv-vpp-changes-2n-dnv-ref:
-#      intel-dnv-vpp-release-1901:
-#        - 1
-#    intel-dnv-vpp-changes-2n-dnv-cmp:
-#      # intel-dnv-vpp-release-1904:
-#      intel-dnv-vpp-release-1901:
-#        - 1
-#    intel-dnv-vpp-changes-2n-dnv:
-#      - "intel-dnv-vpp-changes-2n-dnv-h1"
-#      - "intel-dnv-vpp-changes-2n-dnv-ref"
-#      - "intel-dnv-vpp-changes-2n-dnv-cmp"
-
     vpp-performance-changes-3n-hsw-h1:
       csit-vpp-perf-verify-1901-3n-hsw:
         - 10  # NDRPDR sel
@@ -1322,11 +1351,6 @@
     zip-extract: "robot-plugin/output.xml"
 
   builds:
-#    intel-dnv-vpp-release-1904:
-#      - 1
-#
-#    intel-dnv-vpp-release-1901:
-#      - 1
 
     csit-vpp-perf-verify-1901-3n-hsw:
       - 35  # MRR sel
@@ -1543,6 +1567,31 @@
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
       - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+
+    csit-vpp-perf-verify-1908-3n-dnv:
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+
+    csit-vpp-perf-verify-1908-2n-dnv:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     csit-dpdk-perf-verify-1901-3n-hsw:
       - 13  # NDRPDR sel
@@ -1969,160 +2018,6 @@
 ################################################################################
 # VPP
 
-## VPP Performance Changes 2n-dnv 1t1c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-dnv 1t1c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-pdr"
-#  history:
-#    - title: "rls1901"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-#  reference:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1908"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "PDR"
-#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-dnv 2t2c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-dnv 2t2c pdr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-pdr"
-#  history:
-#    - title: "rls1901"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-#  reference:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1908"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "PDR"
-#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-dnv 1t1c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-dnv 1t1c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-ndr"
-#  history:
-#    - title: "rls1901"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-#  reference:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1908"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "NDR"
-#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-dnv 2t2c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-dnv 2t2c ndr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-ndr"
-#  history:
-#    - title: "rls1901"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-#  reference:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1908"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "NDR"
-#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "throughput"
-#
-## VPP Performance Changes 2n-dnv 1t1c MRR
-#- type: "table"
-#  title: "VPP Performance Changes 2n-dnv 1t1c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr"
-#  history:
-#    - title: "rls1901"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-#  reference:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1908"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "MRR"
-#  filter: "'1T1C' and 'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 2n-dnv 2t2c MRR
-#- type: "table"
-#  title: "VPP Performance Changes 2n-dnv 2t2c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr"
-#  history:
-#    - title: "rls1901"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-#  reference:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1908"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "MRR"
-#  filter: "'2T2C' and 'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-#
-## VPP Performance Changes 2n-dnv 4t4c MRR
-#- type: "table"
-#  title: "VPP Performance Changes 2n-dnv 4t4c MRR"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr"
-#  history:
-#    - title: "rls1901"
-#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-#  reference:
-#    title: "rls1904"
-#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-#  compare:
-#    title: "rls1908"
-#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-#  data: "intel-dnv-vpp-changes-2n-dnv"
-#  include-tests: "MRR"
-#  filter: "'4T4C' and 'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
-
 # VPP Performance Changes 3n-hsw 1t1c pdr
 - type: "table"
   title: "VPP Performance Changes 3n-hsw 1t1c pdr"
@@ -2973,24 +2868,43 @@
   - "parent"
   - "msg"
 
-## Detailed Test Results - VPP Performance Results 2n-dnv
-#- type: "table"
-#  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-#  columns:
-#  - title: "Name"
-#    data: "data name"
-#  - title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
+# Detailed Test Results - VPP Performance Results 3n-dnv
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 3n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}/vpp_performance_results_3n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-perf-results-3n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP Performance Results 2n-dnv
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-perf-results-2n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Test configuration - VPP Performance Test Configs 3n-hsw
 - type: "table"
@@ -3068,24 +2982,43 @@
   - "name"
   - "conf-history"
 
-## Test configuration - VPP Performance Test Configs 2n-dnv
-#- type: "table"
-#  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
-#  columns:
-#  - title: "Name"
-#    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
+# Test configuration - VPP Performance Test Configs 3n-dnv
+- type: "table"
+  title: "Test configuration - VPP Performance Test Configs 3n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}/vpp_test_configuration_3n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
+  rows: "generated"
+  data: "vpp-perf-results-3n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+# Test configuration - VPP Performance Test Configs 2n-dnv
+- type: "table"
+  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
+  rows: "generated"
+  data: "vpp-perf-results-2n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Test Operational Data - VPP Performance Operational Data 3n-hsw
 - type: "table"
@@ -3163,24 +3096,43 @@
   - "name"
   - "show-run"
 
-## Test Operational Data - VPP Performance Operational Data 2n-dnv
-#- type: "table"
-#  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
-#  columns:
-#  - title: "Name"
-#    data: "data name"
-#  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-#    data: "data show-run"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "show-run"
+# Test Operational Data - VPP Performance Operational Data 3n-dnv
+- type: "table"
+  title: "Test Operational Data - VPP Performance Operational Data 3n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}/vpp_test_operational_3n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
+  rows: "generated"
+  data: "vpp-perf-results-3n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "show-run"
+
+# Test Operational Data - VPP Performance Operational Data 2n-dnv
+- type: "table"
+  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
+  rows: "generated"
+  data: "vpp-perf-results-2n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "show-run"
 
 # Detailed Test Results - VPP MRR Results 3n-hsw
 - type: "table"
@@ -3239,25 +3191,6 @@
   - "parent"
   - "msg"
 
-## Detailed Test Results - VPP MRR Results 2n-dnv
-#- type: "table"
-#  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
-#  columns:
-#  - title: "Name"
-#    data: "data name"
-#  - title: "Status"
-#    data: "data msg"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
-
 # Test configuration - VPP MRR Test Configs 3n-hsw
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-hsw"
@@ -3315,25 +3248,6 @@
   - "name"
   - "conf-history"
 
-## Test configuration - VPP MRR Test Configs 2n-dnv
-#- type: "table"
-#  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
-#  columns:
-#  - title: "Name"
-#    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "intel-dnv-vpp"
-#  filter: "'MRR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
-
 # Detailed Test Results - VPP Functional Results - Ubuntu
 - type: "table"
   title: "Detailed Test Results - VPP Functional Results - Ubuntu"
@@ -3949,22 +3863,39 @@
   - "parent"
   data-start-level: 3
 
-## VPP Performance Results 2n-dnv
-#- type: "file"
-#  title: "VPP Performance Results 2n-dnv"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+# VPP Performance Results 3n-dnv
+- type: "file"
+  title: "VPP Performance Results 3n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}/vpp_performance_results_3n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,VPP,3N,DNV]}"
+  data: "vpp-perf-results-3n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Results 2n-dnv
+- type: "file"
+  title: "VPP Performance Results 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
+  data: "vpp-perf-results-2n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 # VPP Performance Configuration 3n-hsw
 - type: "file"
@@ -4034,22 +3965,39 @@
   - "parent"
   data-start-level: 3
 
-## VPP Performance Configuration 2n-dnv
-#- type: "file"
-#  title: "VPP Performance Configuration 2n-dnv"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+# VPP Performance Configuration 3n-dnv
+- type: "file"
+  title: "VPP Performance Configuration 3n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}/vpp_performance_configuration_3n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,PERF,VPP,3N,DNV]}"
+  data: "vpp-perf-results-3n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Configuration 2n-dnv
+- type: "file"
+  title: "VPP Performance Configuration 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
+  data: "vpp-perf-results-2n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 # VPP Performance Operational Data 3n-hsw
 - type: "file"
@@ -4119,22 +4067,39 @@
   - "parent"
   data-start-level: 3
 
-## VPP Performance Operational Data 2n-dnv
-#- type: "file"
-#  title: "VPP Performance Operational Data 2n-dnv"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-#  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
-#  data: "intel-dnv-vpp"
-#  filter: "'NDRPDR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+# VPP Performance Operational Data 3n-dnv
+- type: "file"
+  title: "VPP Performance Operational Data 3n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}/vpp_performance_operational_data_3n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTO,PERF,VPP,3N,DNV]}"
+  data: "vpp-perf-results-3n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Operational Data 2n-dnv
+- type: "file"
+  title: "VPP Performance Operational Data 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
+  data: "vpp-perf-results-2n-dnv"
+  filter: "'NDRPDR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 # VPP MRR Results 3n-hsw
 - type: "file"