PAL: CSIT-1676: Split long files into chapters

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

46 files changed, 157 insertions, 240 deletions

diff --git a/docs/report/detailed_test_results/dpdk_performance_results_2n_clx/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_2n_clx/index.rst
index d769129c7a..47f5adcfde 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_2n_clx/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_2n_clx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    dpdk_performance_results_2n_clx
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_2n_dnv/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_2n_dnv/index.rst
index 3435556e57..71202c8a6d 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_2n_dnv/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_2n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    dpdk_performance_results_2n_dnv
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst
index ff3ce5a99a..405e27ff3e 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    dpdk_performance_results_2n_skx
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_3n_dnv/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_3n_dnv/index.rst
index 136a4a3783..0a482f7652 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_3n_dnv/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_3n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    dpdk_performance_results_3n_dnv
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_3n_hsw/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_3n_hsw/index.rst
index bb5021b180..3bdac2e3d5 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_3n_hsw/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_3n_hsw/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    dpdk_performance_results_3n_hsw
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst
index 1b8fc88681..e3d09eb260 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    dpdk_performance_results_3n_skx
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_3n_tsh/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_3n_tsh/index.rst
index 50f4423f00..49bd869698 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_3n_tsh/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_3n_tsh/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    dpdk_performance_results_3n_tsh
diff --git a/docs/report/detailed_test_results/vpp_device_results_ubuntu/index.rst b/docs/report/detailed_test_results/vpp_device_results_ubuntu/index.rst
index 398be9a507..ad0cc4f24a 100644
--- a/docs/report/detailed_test_results/vpp_device_results_ubuntu/index.rst
+++ b/docs/report/detailed_test_results/vpp_device_results_ubuntu/index.rst
@@ -9,4 +9,3 @@ VPP Device
 
 .. toctree::
 
-    vpp_device_results_ubuntu
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_2n_clx/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_2n_clx/index.rst
index 8c50809355..af4e5ebd8b 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_2n_clx/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_2n_clx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_results_2n_clx
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_2n_dnv/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_2n_dnv/index.rst
index 6f07ad955a..b5c164ecd7 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_2n_dnv/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_2n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_results_2n_dnv
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst
index 5ac81c8bf0..b590f794b9 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_results_2n_skx
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_3n_dnv/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_3n_dnv/index.rst
index eb8efb57fa..3afcbe106e 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_3n_dnv/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_3n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_results_3n_dnv
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_3n_hsw/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_3n_hsw/index.rst
index c7c96c3b53..f26f891ebb 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_3n_hsw/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_3n_hsw/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_results_3n_hsw
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst
index fc62696034..589b91e5ea 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_results_3n_skx
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_3n_tsh/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_3n_tsh/index.rst
index 2daea2fcd3..f032bfd4f8 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_3n_tsh/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_3n_tsh/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_results_3n_tsh
diff --git a/docs/report/detailed_test_results/vpp_performance_results_2n_clx/index.rst b/docs/report/detailed_test_results/vpp_performance_results_2n_clx/index.rst
index 63df81e3b8..af4e5ebd8b 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_2n_clx/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_2n_clx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_results_2n_clx
diff --git a/docs/report/detailed_test_results/vpp_performance_results_2n_dnv/index.rst b/docs/report/detailed_test_results/vpp_performance_results_2n_dnv/index.rst
index d6b927bd4a..b5c164ecd7 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_2n_dnv/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_2n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_results_2n_dnv
diff --git a/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst b/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst
index f3a5f81465..b590f794b9 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_results_2n_skx
diff --git a/docs/report/detailed_test_results/vpp_performance_results_3n_dnv/index.rst b/docs/report/detailed_test_results/vpp_performance_results_3n_dnv/index.rst
index c6f741441f..3afcbe106e 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_3n_dnv/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_3n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_results_3n_dnv
diff --git a/docs/report/detailed_test_results/vpp_performance_results_3n_hsw/index.rst b/docs/report/detailed_test_results/vpp_performance_results_3n_hsw/index.rst
index 2f258a588f..f26f891ebb 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_3n_hsw/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_3n_hsw/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_results_3n_hsw
diff --git a/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst b/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst
index 7b43ec2aef..589b91e5ea 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_results_3n_skx
diff --git a/docs/report/detailed_test_results/vpp_performance_results_3n_tsh/index.rst b/docs/report/detailed_test_results/vpp_performance_results_3n_tsh/index.rst
index ba30e4c882..f032bfd4f8 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_3n_tsh/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_3n_tsh/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_results_3n_tsh
diff --git a/docs/report/test_configuration/vpp_device_configuration_ubuntu/index.rst b/docs/report/test_configuration/vpp_device_configuration_ubuntu/index.rst
index 4538c7cbcc..b68edab403 100644
--- a/docs/report/test_configuration/vpp_device_configuration_ubuntu/index.rst
+++ b/docs/report/test_configuration/vpp_device_configuration_ubuntu/index.rst
@@ -9,4 +9,3 @@ VPP Device
 
 .. toctree::
 
-    vpp_device_configuration_ubuntu
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_2n_clx/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_2n_clx/index.rst
index 8597d73b4e..ad7cc34452 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_2n_clx/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_2n_clx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_configuration_2n_clx
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_2n_dnv/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_2n_dnv/index.rst
index 88decf7be8..c9606acafc 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_2n_dnv/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_2n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_configuration_2n_dnv
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst
index 7a1d13e6b4..ea1e46793c 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_configuration_2n_skx
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_3n_dnv/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_3n_dnv/index.rst
index 79effe1dcc..cd8c58fe06 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_3n_dnv/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_3n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_configuration_3n_dnv
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_3n_hsw/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_3n_hsw/index.rst
index f7c3a30ef6..d0b882910d 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_3n_hsw/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_3n_hsw/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_configuration_3n_hsw
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst
index cdab8e6b3a..ede99b2253 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_configuration_3n_skx
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_3n_tsh/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_3n_tsh/index.rst
index 0f37096222..efc3f296a7 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_3n_tsh/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_3n_tsh/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_mrr_configuration_3n_tsh
diff --git a/docs/report/test_configuration/vpp_performance_configuration_2n_clx/index.rst b/docs/report/test_configuration/vpp_performance_configuration_2n_clx/index.rst
index 875a9f293e..ad7cc34452 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_2n_clx/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_2n_clx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_configuration_2n_clx
diff --git a/docs/report/test_configuration/vpp_performance_configuration_2n_dnv/index.rst b/docs/report/test_configuration/vpp_performance_configuration_2n_dnv/index.rst
index 50e1a47a27..c9606acafc 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_2n_dnv/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_2n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_configuration_2n_dnv
diff --git a/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst b/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst
index dbfbc408e1..ea1e46793c 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_configuration_2n_skx
diff --git a/docs/report/test_configuration/vpp_performance_configuration_3n_dnv/index.rst b/docs/report/test_configuration/vpp_performance_configuration_3n_dnv/index.rst
index 2077635c12..cd8c58fe06 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_3n_dnv/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_3n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_configuration_3n_dnv
diff --git a/docs/report/test_configuration/vpp_performance_configuration_3n_hsw/index.rst b/docs/report/test_configuration/vpp_performance_configuration_3n_hsw/index.rst
index 28ba4fd1b7..d0b882910d 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_3n_hsw/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_3n_hsw/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_configuration_3n_hsw
diff --git a/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst b/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst
index 86fc9a9709..ede99b2253 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_configuration_3n_skx
diff --git a/docs/report/test_configuration/vpp_performance_configuration_3n_tsh/index.rst b/docs/report/test_configuration/vpp_performance_configuration_3n_tsh/index.rst
index e90823a87d..efc3f296a7 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_3n_tsh/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_3n_tsh/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_configuration_3n_tsh
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_2n_clx/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_2n_clx/index.rst
index d3bb6b4fdd..8f108d2457 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_2n_clx/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_2n_clx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_operational_data_2n_clx
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_2n_dnv/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_2n_dnv/index.rst
index b5f68cae55..b68de2242f 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_2n_dnv/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_2n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_operational_data_2n_dnv
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst
index 7872b2a13d..fed6324229 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_operational_data_2n_skx
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_3n_dnv/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_3n_dnv/index.rst
index abe077b3eb..451561d693 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_3n_dnv/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_3n_dnv/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_operational_data_3n_dnv
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_3n_hsw/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_3n_hsw/index.rst
index cd941ab978..badfdffcbe 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_3n_hsw/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_3n_hsw/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_operational_data_3n_hsw
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst
index c560eca82e..4a19d52936 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_operational_data_3n_skx
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_3n_tsh/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_3n_tsh/index.rst
index aa3921f841..066b346659 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_3n_tsh/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_3n_tsh/index.rst
@@ -9,4 +9,3 @@
 
 .. toctree::
 
-    vpp_performance_operational_data_3n_tsh
diff --git a/resources/tools/presentation/generator_files.py b/resources/tools/presentation/generator_files.py
index 4c39e6f648..d6c7546ae7 100644
--- a/resources/tools/presentation/generator_files.py
+++ b/resources/tools/presentation/generator_files.py
@@ -74,105 +74,37 @@ def _tests_in_suite(suite_name, tests):
     return False
 
 
-def file_test_results(file_spec, input_data):
+def file_test_results(file_spec, input_data, frmt=u"rst"):
     """Generate the file(s) with algorithms
     - file_test_results
     specified in the specification file.
 
     :param file_spec: File to generate.
     :param input_data: Data to process.
+    :param frmt: Format can be: rst or html
     :type file_spec: pandas.Series
     :type input_data: InputData
+    :type frmt: str
     """
 
-    file_name = f"{file_spec[u'output-file']}{file_spec[u'output-file-ext']}"
-    rst_header = file_spec[u"file-header"]
+    base_file_name = f"{file_spec[u'output-file']}"
+    rst_header = file_spec.get(u"file-header", u"")
+    start_lvl = file_spec.get(u"data-start-level", 4)
 
-    logging.info(f"  Generating the file {file_name} ...")
+    logging.info(f"  Generating the file {base_file_name} ...")
 
-    table_lst = get_files(file_spec[u"dir-tables"], u".csv", full_path=True)
-    if not table_lst:
-        logging.error(
-            f"  No tables to include in {file_spec[u'dir-tables']}. Skipping."
-        )
+    if frmt == u"html":
+        table_lst = get_files(file_spec[u"dir-tables"], u".rst", full_path=True)
+    elif frmt == u"rst":
+        table_lst = get_files(file_spec[u"dir-tables"], u".csv", full_path=True)
+    else:
         return
-
-    logging.info(f"    Writing file {file_name}")
-
-    logging.info(
-        f"    Creating the tests data set for the "
-        f"{file_spec.get(u'type', u'')} {file_spec.get(u'title', u'')}."
-    )
-    tests = input_data.filter_data(file_spec)
-    tests = input_data.merge_data(tests)
-
-    logging.info(
-        f"    Creating the suites data set for the "
-        f"{file_spec.get(u'type', u'')} {file_spec.get(u'title', u'')}."
-    )
-    file_spec[u"filter"] = u"all"
-    suites = input_data.filter_data(file_spec, data_set=u"suites")
-    suites = input_data.merge_data(suites)
-    suites.sort_index(inplace=True)
-
-    with open(file_name, u"wt") as file_handler:
-        file_handler.write(rst_header)
-        for suite_longname, suite in suites.items():
-            if len(suite_longname.split(u".")) <= \
-                    file_spec[u"data-start-level"]:
-                continue
-
-            title_line = \
-                get_rst_title_char(
-                    suite[u"level"] - file_spec[u"data-start-level"] - 1
-                ) * len(suite[u"name"])
-            if not (u"-ndrpdr" in suite[u"name"] or
-                    u"-mrr" in suite[u"name"] or
-                    u"-func" in suite[u"name"] or
-                    u"-device" in suite[u"name"] or
-                    u"-dev" in suite[u"name"]):
-                file_handler.write(f"\n{suite[u'name']}\n{title_line}\n")
-
-            if _tests_in_suite(suite[u"name"], tests):
-                file_handler.write(f"\n{suite[u'name']}\n{title_line}\n")
-                file_handler.write(
-                    f"\n{suite[u'doc']}\n".replace(u'|br|', u'\n\n -')
-                )
-                for tbl_file in table_lst:
-                    if suite[u"name"] in tbl_file:
-                        file_handler.write(
-                            RST_INCLUDE_TABLE.format(
-                                file_latex=tbl_file,
-                                file_html=tbl_file.split(u"/")[-1]))
-
-    logging.info(u"  Done.")
-
-
-def file_test_results_html(file_spec, input_data):
-    """Generate the file(s) with algorithms
-    - file_test_results_html
-    specified in the specification file.
-
-    :param file_spec: File to generate.
-    :param input_data: Data to process.
-    :type file_spec: pandas.Series
-    :type input_data: InputData
-    """
-
-    file_name = f"{file_spec[u'output-file']}.rst"
-    rst_header = file_spec[u"file-header"]
-
-    logging.info(f"  Generating the file {file_name} ...")
-
-    table_lst = get_files(file_spec[u"dir-tables"], u".rst", full_path=True)
     if not table_lst:
         logging.error(
             f"  No tables to include in {file_spec[u'dir-tables']}. Skipping."
         )
         return
 
-    logging.info(f"    Writing file {file_name}")
-
     logging.info(
         f"    Creating the tests data set for the "
         f"{file_spec.get(u'type', u'')} {file_spec.get(u'title', u'')}."
@@ -197,21 +129,30 @@ def file_test_results_html(file_spec, input_data):
         return
     suites = input_data.merge_data(suites)
 
-    with open(file_name, u"wt") as file_handler:
-        file_handler.write(rst_header)
-        for suite_longname, suite in suites.items():
-            if len(suite_longname.split(u".")) <= \
-                    file_spec[u"data-start-level"]:
-                continue
-
-            title_line = \
-                get_rst_title_char(
-                    suite[u"level"] - file_spec[u"data-start-level"] - 1
-                ) * len(suite[u"name"])
+    file_name = u""
+    for suite_longname, suite in suites.items():
+
+        suite_lvl = len(suite_longname.split(u"."))
+        if suite_lvl < start_lvl:
+            # Not interested in this suite
+            continue
+
+        if suite_lvl == start_lvl:
+            # Our top-level suite
+            chapter = suite_longname.split(u'.')[-1]
+            file_name = f"{base_file_name}/{chapter}.rst"
+            logging.info(f"    Writing file {file_name}")
+            with open(f"{base_file_name}/index.rst", u"a") as file_handler:
+                file_handler.write(f"    {chapter}\n")
+            with open(file_name, u"a") as file_handler:
+                file_handler.write(rst_header)
+
+        title_line = get_rst_title_char(suite[u"level"] - start_lvl + 2) * \
+            len(suite[u"name"])
+        with open(file_name, u"a") as file_handler:
             if not (u"-ndrpdr" in suite[u"name"] or
                     u"-mrr" in suite[u"name"] or
-                    u"-func" in suite[u"name"] or
-                    u"-device" in suite[u"name"]):
+                    u"-dev" in suite[u"name"]):
                 file_handler.write(f"\n{suite[u'name']}\n{title_line}\n")
 
             if _tests_in_suite(suite[u"name"], tests):
@@ -221,8 +162,28 @@ def file_test_results_html(file_spec, input_data):
                 )
                 for tbl_file in table_lst:
                     if suite[u"name"] in tbl_file:
-                        file_handler.write(
-                            f"\n.. include:: {tbl_file.split(u'/')[-1]}\n"
-                        )
+                        if frmt == u"html":
+                            file_handler.write(
+                                f"\n.. include:: {tbl_file.split(u'/')[-1]}\n"
+                            )
+                        elif frmt == u"rst":
+                            file_handler.write(
+                                RST_INCLUDE_TABLE.format(
+                                    file_latex=tbl_file,
+                                    file_html=tbl_file.split(u"/")[-1])
+                            )
 
     logging.info(u"  Done.")
+
+
+def file_test_results_html(file_spec, input_data):
+    """Generate the file(s) with algorithms
+    - file_test_results_html
+    specified in the specification file.
+
+    :param file_spec: File to generate.
+    :param input_data: Data to process.
+    :type file_spec: pandas.Series
+    :type input_data: InputData
+    """
+    file_test_results(file_spec, input_data, frmt=u"html")
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 1a1dcac44b..0fd89e80d5 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -5302,7 +5302,7 @@
   title: "VPP Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
+  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}"
   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,HSW]}"
   data: "vpp-perf-results-3n-hsw"
@@ -5312,82 +5312,82 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 ## VPP Performance Results 3n-skx
 #- type: "file"
 #  title: "VPP Performance Results 3n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
+#  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}"
 #  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,SKX]}"
 #  data: "vpp-perf-results-3n-skx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 #
 ## VPP Performance Results 2n-skx
 #- type: "file"
 #  title: "VPP Performance Results 2n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
+#  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}"
 #  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,SKX]}"
 #  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 
 ## VPP Performance Results 2n-clx
 #- type: "file"
 #  title: "VPP Performance Results 2n-clx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}/vpp_performance_results_2n_clx"
+#  output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}"
 #  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,CLX]}"
 #  data: "vpp-perf-results-2n-clx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 
 # VPP Performance Results 3n-tsh
 - type: "file"
   title: "VPP Performance Results 3n-tsh"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}/vpp_performance_results_3n_tsh"
+  output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}"
   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,TSH]}"
   data: "vpp-perf-results-3n-tsh"
-  filter: "not 'CFS_OPT'"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # 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"
+  output-file: "{DIR[DTR,PERF,VPP,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"
@@ -5397,14 +5397,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # 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"
+  output-file: "{DIR[DTR,PERF,VPP,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"
@@ -5414,14 +5414,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP Performance Configuration 3n-hsw
 - type: "file"
   title: "VPP Performance Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_performance_configuration_3n_hsw"
+  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}"
   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,HSW]}"
   data: "vpp-perf-results-3n-hsw"
@@ -5431,82 +5431,82 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 ## VPP Performance Configuration 3n-skx
 #- type: "file"
 #  title: "VPP Performance Configuration 3n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_performance_configuration_3n_skx"
+#  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}"
 #  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,SKX]}"
 #  data: "vpp-perf-results-3n-skx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 #
 ## VPP Performance Configuration 2n-skx
 #- type: "file"
 #  title: "VPP Performance Configuration 2n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_performance_configuration_2n_skx"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}"
 #  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,SKX]}"
 #  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 
 ## VPP Performance Configuration 2n-clx
 #- type: "file"
 #  title: "VPP Performance Configuration 2n-clx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,CLX]}/vpp_performance_configuration_2n_clx"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,CLX]}"
 #  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,CLX]}"
 #  data: "vpp-perf-results-2n-clx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 
 # VPP Performance Configuration 3n-tsh
 - type: "file"
   title: "VPP Performance Configuration 3n-tsh"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,3N,TSH]}/vpp_performance_configuration_3n_tsh"
+  output-file: "{DIR[DTC,PERF,VPP,3N,TSH]}"
   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,TSH]}"
   data: "vpp-perf-results-3n-tsh"
-  filter: "not 'CFS_OPT'"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # 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"
+  output-file: "{DIR[DTC,PERF,VPP,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"
@@ -5516,14 +5516,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # 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"
+  output-file: "{DIR[DTC,PERF,VPP,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"
@@ -5533,91 +5533,91 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP Performance Operational Data 3n-hsw
 - type: "file"
   title: "VPP Performance Operational Data 3n-hsw"
   algorithm: "file_test_results_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_performance_operational_data_3n_hsw"
+  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}"
   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,HSW]}"
   data: "vpp-perf-results-3n-hsw"
   filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
-  data-start-level: 3
+  data-start-level: 4
 
 ## VPP Performance Operational Data 3n-skx
 #- type: "file"
 #  title: "VPP Performance Operational Data 3n-skx"
 #  algorithm: "file_test_results_html"
-#  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_performance_operational_data_3n_skx"
+#  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}"
 #  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,SKX]}"
 #  data: "vpp-perf-results-3n-skx"
-#  filter: "not 'CFS_OPT'"
-#  data-start-level: 3
+#  filter: "all"
+#  data-start-level: 4
 #
 ## VPP Performance Operational Data 2n-skx
 #- type: "file"
 #  title: "VPP Performance Operational Data 2n-skx"
 #  algorithm: "file_test_results_html"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_performance_operational_data_2n_skx"
+#  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}"
 #  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,SKX]}"
 #  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'CFS_OPT'"
-#  data-start-level: 3
+#  filter: "all"
+#  data-start-level: 4
 
 ## VPP Performance Operational Data 2n-clx
 #- type: "file"
 #  title: "VPP Performance Operational Data 2n-clx"
 #  algorithm: "file_test_results_html"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}/vpp_performance_operational_data_2n_clx"
+#  output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}"
 #  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,CLX]}"
 #  data: "vpp-perf-results-2n-clx"
-#  filter: "not 'CFS_OPT'"
-#  data-start-level: 3
+#  filter: "all"
+#  data-start-level: 4
 
 # VPP Performance Operational Data 3n-tsh
 - type: "file"
   title: "VPP Performance Operational Data 3n-tsh"
   algorithm: "file_test_results_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}/vpp_performance_operational_data_3n_tsh"
+  output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}"
   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,TSH]}"
   data: "vpp-perf-results-3n-tsh"
-  filter: "not 'CFS_OPT'"
-  data-start-level: 3
+  filter: "all"
+  data-start-level: 4
 
 # VPP Performance Operational Data 3n-dnv
 - type: "file"
   title: "VPP Performance Operational Data 3n-dnv"
   algorithm: "file_test_results_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}/vpp_performance_operational_data_3n_dnv"
+  output-file: "{DIR[DTO,PERF,VPP,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'"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP Performance Operational Data 2n-dnv
 - type: "file"
   title: "VPP Performance Operational Data 2n-dnv"
   algorithm: "file_test_results_html"
-  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
+  output-file: "{DIR[DTO,PERF,VPP,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'"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP MRR Results 3n-hsw
 - type: "file"
   title: "VPP MRR Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
+  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}"
   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,MRR,VPP,3N,HSW]}"
   data: "vpp-mrr-results-3n-hsw"
@@ -5627,14 +5627,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 ## VPP MRR Results 3n-skx
 #- type: "file"
 #  title: "VPP MRR Results 3n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
+#  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}"
 #  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,MRR,VPP,3N,SKX]}"
 #  data: "vpp-mrr-results-3n-skx"
@@ -5644,14 +5644,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 #
 ## VPP MRR Results 2n-skx
 #- type: "file"
 #  title: "VPP MRR Results 2n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
+#  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}"
 #  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,MRR,VPP,2N,SKX]}"
 #  data: "vpp-mrr-results-2n-skx"
@@ -5661,14 +5661,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 
 ## VPP MRR Results 2n-clx
 #- type: "file"
 #  title: "VPP MRR Results 2n-clx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/vpp_mrr_results_2n_clx"
+#  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}"
 #  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,MRR,VPP,2N,CLX]}"
 #  data: "vpp-mrr-results-2n-clx"
@@ -5678,14 +5678,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level:
 
 # VPP MRR Results 3n-tsh
 - type: "file"
   title: "VPP MRR Results 3n-tsh"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/vpp_mrr_results_3n_tsh"
+  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}"
   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,MRR,VPP,3N,TSH]}"
   data: "vpp-mrr-results-3n-tsh"
@@ -5695,14 +5695,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP MRR Results 3n-dnv
 - type: "file"
   title: "VPP MRR Results 3n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}/vpp_mrr_results_3n_dnv"
+  output-file: "{DIR[DTR,MRR,VPP,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,MRR,VPP,3N,DNV]}"
   data: "vpp-mrr-results-3n-dnv"
@@ -5712,14 +5712,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP MRR Results 2n-dnv
 - type: "file"
   title: "VPP MRR Results 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+  output-file: "{DIR[DTR,MRR,VPP,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,MRR,VPP,2N,DNV]}"
   data: "vpp-mrr-results-2n-dnv"
@@ -5729,14 +5729,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP MRR Configuration 3n-hsw
 - type: "file"
   title: "VPP MRR Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_configuration_3n_hsw"
+  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}"
   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,3N,HSW]}"
   data: "vpp-mrr-results-3n-hsw"
@@ -5746,14 +5746,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 ## VPP MRR Configuration 3n-skx
 #- type: "file"
 #  title: "VPP MRR Configuration 3n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_configuration_3n_skx"
+#  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}"
 #  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,3N,SKX]}"
 #  data: "vpp-mrr-results-3n-skx"
@@ -5763,14 +5763,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 #
 ## VPP MRR Configuration 2n-skx
 #- type: "file"
 #  title: "VPP MRR Configuration 2n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_configuration_2n_skx"
+#  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}"
 #  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,SKX]}"
 #  data: "vpp-mrr-results-2n-skx"
@@ -5780,14 +5780,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 
 ## VPP MRR Configuration 2n-clx
 #- type: "file"
 #  title: "VPP MRR Configuration 2n-clx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}/vpp_mrr_configuration_2n_clx"
+#  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}"
 #  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,CLX]}"
 #  data: "vpp-mrr-results-2n-clx"
@@ -5797,14 +5797,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 
 # VPP MRR Configuration 3n-tsh
 - type: "file"
   title: "VPP MRR Configuration 3n-tsh"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
+  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}"
   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,3N,TSH]}"
   data: "vpp-mrr-results-3n-tsh"
@@ -5814,14 +5814,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP MRR Configuration 3n-dnv
 - type: "file"
   title: "VPP MRR Configuration 3n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}/vpp_mrr_configuration_3n_dnv"
+  output-file: "{DIR[DTC,MRR,VPP,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,MRR,VPP,3N,DNV]}"
   data: "vpp-mrr-results-3n-dnv"
@@ -5831,14 +5831,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # 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"
+  output-file: "{DIR[DTC,MRR,VPP,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: "vpp-mrr-results-2n-dnv"
@@ -5848,14 +5848,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP Device Results - Ubuntu
 - type: "file"
   title: "VPP Device Results - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
   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,FUNC,VPP,DEVICE,UBUNTU]}"
   data: "vpp-device-results-ubuntu"
@@ -5865,14 +5865,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # VPP Device Configuration - Ubuntu
 - type: "file"
   title: "VPP Device Configuration - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
   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,FUNC,VPP,DEVICE,UBUNTU]}"
   data: "vpp-device-results-ubuntu"
@@ -5882,14 +5882,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # DPDK Performance Results 3n-hsw
 - type: "file"
   title: "DPDK Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
   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,DPDK,3N,HSW]}"
   data: "dpdk-perf-results-3n-hsw"
@@ -5899,14 +5899,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 ## DPDK Performance Results 3n-skx
 #- type: "file"
 #  title: "DPDK Performance Results 3n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+#  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
 #  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,DPDK,3N,SKX]}"
 #  data: "dpdk-perf-results-3n-skx"
@@ -5916,14 +5916,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 #
 ## DPDK Performance Results 2n-skx
 #- type: "file"
 #  title: "DPDK Performance Results 2n-skx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
+#  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
 #  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,DPDK,2N,SKX]}"
 #  data: "dpdk-perf-results-2n-skx"
@@ -5933,14 +5933,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 
 ## DPDK Performance Results 2n-clx
 #- type: "file"
 #  title: "DPDK Performance Results 2n-clx"
 #  algorithm: "file_test_results"
 #  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
+#  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
 #  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,DPDK,2N,CLX]}"
 #  data: "dpdk-perf-results-2n-clx"
@@ -5950,14 +5950,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level: 4
 
 # DPDK Performance Results 2n-dnv
 - type: "file"
   title: "DPDK Performance Results 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
+  output-file: "{DIR[DTR,PERF,DPDK,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,DPDK,2N,DNV]}"
   data: "dpdk-perf-results-2n-dnv"
@@ -5967,14 +5967,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # DPDK Performance Results 3n-dnv
 - type: "file"
   title: "DPDK Performance Results 3n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
+  output-file: "{DIR[DTR,PERF,DPDK,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,DPDK,3N,DNV]}"
   data: "dpdk-perf-results-3n-dnv"
@@ -5984,14 +5984,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 # DPDK Performance Results 3n-tsh
 - type: "file"
   title: "DPDK Performance Results 3n-tsh"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}/dpdk_performance_results_3n_tsh"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
   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,DPDK,3N,TSH]}"
   data: "dpdk-perf-results-3n-tsh"
@@ -6001,7 +6001,7 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 ################################################################################
 ###                                P L O T S                                 ###