PAL: Detailed test results

Change-Id: I75ebad7874602dbc136440a3b4c6f94b095728c4
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 6c0a7fc917b8ff8d558a19f392711f6f527623a3)

5 files changed, 59 insertions, 3 deletions

diff --git a/docs/report/detailed_test_results/vpp_performance_results/index.rst b/docs/report/detailed_test_results/vpp_performance_results/index.rst
index 0459da69ab..b6cdd64a29 100644
--- a/docs/report/detailed_test_results/vpp_performance_results/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results/index.rst
@@ -7,8 +7,8 @@ VPP Throughput
     ../vpp_performance_results_3n_tsh/index
     ../vpp_performance_results_2n_dnv/index
     ../vpp_performance_results_3n_dnv/index
-    ../vpp_performance_results_2n_clx/index
 
 ..
+    ../vpp_performance_results_2n_clx/index
     ../vpp_performance_results_2n_skx/index
     ../vpp_performance_results_3n_skx/index
diff --git a/docs/report/test_configuration/vpp_performance_configuration/index.rst b/docs/report/test_configuration/vpp_performance_configuration/index.rst
index 7b4b9ab460..7085c8951d 100644
--- a/docs/report/test_configuration/vpp_performance_configuration/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration/index.rst
@@ -7,8 +7,8 @@ VPP Throughput
     ../vpp_performance_configuration_3n_tsh/index
     ../vpp_performance_configuration_2n_dnv/index
     ../vpp_performance_configuration_3n_dnv/index
-    ../vpp_performance_configuration_2n_clx/index
 
 ..
+    ../vpp_performance_configuration_2n_clx/index
     ../vpp_performance_configuration_2n_skx/index
     ../vpp_performance_configuration_3n_skx/index
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data/index.rst
index 7eca0de3b6..e1c4748529 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data/index.rst
@@ -7,8 +7,8 @@ VPP Throughput
     ../vpp_performance_operational_data_3n_tsh/index
     ../vpp_performance_operational_data_2n_dnv/index
     ../vpp_performance_operational_data_3n_dnv/index
-    ../vpp_performance_operational_data_2n_clx/index
 
 ..
+    ../vpp_performance_operational_data_2n_clx/index
     ../vpp_performance_operational_data_2n_skx/index
     ../vpp_performance_operational_data_3n_skx/index
diff --git a/docs/report/vpp_performance_tests/comparisons/2n-clx_vs_3n-hsw_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/2n-clx_vs_3n-hsw_testbeds.rst
new file mode 100644
index 0000000000..44f2eb91c9
--- /dev/null
+++ b/docs/report/vpp_performance_tests/comparisons/2n-clx_vs_3n-hsw_testbeds.rst
@@ -0,0 +1,55 @@
+2n-clx vs. 3n-Hsw Testbeds
+--------------------------
+
+Relative comparison of |vpp-release| packet throughput (NDR, PDR and
+MRR) is calculated for the same tests executed on 3-Node Skylake (3n-
+skx) and 3-Node Haswell (3n-hsw) physical testbed types, in 1-core,
+2-core and 4-core configurations.
+
+.. note::
+
+    Test results have been generated by
+    `FD.io test executor vpp performance job 3n-hsw`_ and
+    `FD.io test executor vpp performance job 2n-clx`_
+    with RF result
+    files csit-vpp-perf-|srelease|-\*.zip
+    `archived here <../../_static/archive/>`_.
+
+NDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-1c-ndr.html>`_
+  - `HTML 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-2c-ndr.html>`_
+  - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-1c-ndr.txt>`_
+  - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-2c-ndr.txt>`_
+  - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-1c-ndr.csv>`_
+  - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-2c-ndr.csv>`_
+
+PDR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-1c-pdr.html>`_
+  - `HTML 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-2c-pdr.html>`_
+  - `ASCII 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-1c-pdr.txt>`_
+  - `ASCII 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-2c-pdr.txt>`_
+  - `CSV 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-1c-pdr.csv>`_
+  - `CSV 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-2c-pdr.csv>`_
+
+MRR Comparison
+~~~~~~~~~~~~~~
+
+Comparison tables in HTML, ASCII and CSV formats:
+
+  - `HTML 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-1c-mrr.html>`_
+  - `HTML 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-2c-mrr.html>`_
+  - `HTML 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-4c-mrr.html>`_
+  - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-1c-mrr.txt>`_
+  - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-2c-mrr.txt>`_
+  - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-4c-mrr.txt>`_
+  - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-1c-mrr.csv>`_
+  - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-2c-mrr.csv>`_
+  - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-2n-clx-4c-mrr.csv>`_
diff --git a/docs/report/vpp_performance_tests/comparisons/index.rst b/docs/report/vpp_performance_tests/comparisons/index.rst
index 4511a3e578..79b103e117 100644
--- a/docs/report/vpp_performance_tests/comparisons/index.rst
+++ b/docs/report/vpp_performance_tests/comparisons/index.rst
@@ -24,6 +24,7 @@ Comparisons
 .. toctree::
 
     current_vs_previous_release
+    2n-clx_vs_3n-hsw_testbeds
 
 ..
     3n-skx_vs_3n-hsw_testbeds