CSIT-1351: Add Denverton results to report

 - Add tests' configurations
 - Add tests' operational data

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

2 files changed, 138 insertions, 2 deletions

diff --git a/resources/tools/presentation/generator_files.py b/resources/tools/presentation/generator_files.py
index ac3a8dbb83..3c2939e15a 100644
--- a/resources/tools/presentation/generator_files.py
+++ b/resources/tools/presentation/generator_files.py
@@ -114,7 +114,20 @@ def file_test_results(file_spec, input_data):
                     suite["level"] - file_spec["data-start-level"] - 1) *
                             len(suite["name"])))
 
+            if not ("-ndrpdr" in suite["name"] or
+                    "-mrr" in suite["name"] or
+                    "-func" in suite["name"] or
+                    "-device" in suite["name"]):
+                file_handler.write("\n{0}\n{1}\n".format(
+                    suite["name"], get_rst_title_char(
+                        suite["level"] - file_spec["data-start-level"] - 1) *
+                                len(suite["name"])))
+
             if _tests_in_suite(suite["name"], tests):
+                file_handler.write("\n{0}\n{1}\n".format(
+                    suite["name"], get_rst_title_char(
+                        suite["level"] - file_spec["data-start-level"] - 1) *
+                                   len(suite["name"])))
                 file_handler.write("\n{0}\n".format(
                     suite["doc"].replace('|br|', '\n\n -')))
                 for tbl_file in table_lst:
@@ -123,4 +136,5 @@ def file_test_results(file_spec, input_data):
                             RST_INCLUDE_TABLE.format(
                                 file_latex=tbl_file,
                                 file_html=tbl_file.split("/")[-1]))
+
     logging.info("  Done.")
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 2a32b2cae2..7e2aa7e2e9 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -52,9 +52,11 @@
     DIR[DTC,PERF,VPP,3N,HSW]: "{DIR[DTC]}/vpp_performance_configuration_3n_hsw"
     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,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,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"
@@ -64,6 +66,7 @@
     DIR[DTO,PERF,VPP,3N,HSW]: "{DIR[DTO]}/vpp_performance_operational_data_3n_hsw"
     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,2N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_2n_dnv"
 
     # .css patch file to fix tables generated by Sphinx
     DIR[CSS_PATCH_FILE]: "{DIR[STATIC]}/theme_overrides.css"
@@ -72,7 +75,6 @@
   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/intel_denverton_vpp_release_1810.tar.gz"
     URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/1810/robot-plugin.zip"
     URL[NEXUS]: "https://docs.fd.io/csit"
     DIR[NEXUS]: "report/_static/archive"
@@ -2595,6 +2597,28 @@
   - "name"
   - "vat-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 (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
 # Test Operational Data - VPP Performance Operational Data 3n-hsw
 -
   type: "table"
@@ -2661,6 +2685,28 @@
   - "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"
+
 # Detailed Test Results - VPP MRR Results 3n-hsw
 -
   type: "table"
@@ -2815,6 +2861,28 @@
   - "name"
   - "vat-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 (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
 # Detailed Test Results - VPP Functional Results - Ubuntu
 -
   type: "table"
@@ -3871,6 +3939,24 @@
   - "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,DNVvpp_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 Operational Data 3n-hsw
 -
   type: "file"
@@ -3925,6 +4011,24 @@
   - "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 MRR Results 3n-hsw
 -
   type: "file"
@@ -4051,6 +4155,24 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Configuration 2n-dnv
+-
+  type: "file"
+  title: "VPP MRR Configuration 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_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,MRR,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
 # VPP Functional Results - Ubuntu
 -
   type: "file"
@@ -27139,4 +27261,4 @@
   - "tags"
   layout:
     title: "vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-    layout: "plot-throughput-speedup-analysis"
\ No newline at end of file
+    layout: "plot-throughput-speedup-analysis"