Report: Add data

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

8 files changed, 1008 insertions, 581 deletions

diff --git a/docs/report/detailed_test_results/vpp_mrr_results/index.rst b/docs/report/detailed_test_results/vpp_mrr_results/index.rst
index 605ae35386..9989860809 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results/index.rst
@@ -7,8 +7,8 @@ VPP MRR
     ../vpp_mrr_results_3n_tsh/index
     ../vpp_mrr_results_2n_dnv/index
     ../vpp_mrr_results_3n_dnv/index
+    ../vpp_mrr_results_2n_clx/index
 
 ..
     ../vpp_mrr_results_2n_skx/index
     ../vpp_mrr_results_3n_skx/index
-    ../vpp_mrr_results_2n_clx/index
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 0855516b9b..6c4adc2d31 100644
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -8,7 +8,10 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
 +================+============================================================+
 | .09            | 1. Added data:                                             |
 |                |                                                            |
+|                |    - VPP performance tests 3n-hsw                          |
 |                |    - VPP performance tests 2n-clx                          |
+|                |    - VPP performance tests 3n-dnv                          |
+|                |    - VPP performance tests 3n-tsh                          |
 |                |    - DPDK performance tests 2n-clx                         |
 |                |                                                            |
 +----------------+------------------------------------------------------------+
diff --git a/docs/report/test_configuration/vpp_mrr_configuration/index.rst b/docs/report/test_configuration/vpp_mrr_configuration/index.rst
index e686bdda77..400e45dae5 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration/index.rst
@@ -7,9 +7,8 @@ VPP MRR
     ../vpp_mrr_configuration_3n_tsh/index
     ../vpp_mrr_configuration_2n_dnv/index
     ../vpp_mrr_configuration_3n_dnv/index
+    ../vpp_mrr_configuration_2n_clx/index
 
 ..
-
     ../vpp_mrr_configuration_2n_skx/index
     ../vpp_mrr_configuration_3n_skx/index
-    ../vpp_mrr_configuration_2n_clx/index
diff --git a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
index ae134a18db..678c044fe0 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_chains.rst
@@ -475,75 +475,74 @@ Additional information about graph data:
 
         \clearpage
 
-..
-    2n-clx-xxv710-mrr
-    ~~~~~~~~~~~~~~~~~
+2n-clx-xxv710-mrr
+~~~~~~~~~~~~~~~~~
 
-    imix-2t1c-eth-l2bd
-    ------------------
+imix-2t1c-eth-l2bd
+------------------
 
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="ifrmclx04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-2t1c-base-csc-mrr.html"></iframe>
-        </center>
+    <center>
+    <iframe id="ifrmclx04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-2t1c-base-csc-mrr.html"></iframe>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-2t1c-base-csc-mrr}
-                \label{fig:l2bd-2n-clx-xxv710-imix-2t1c-base-csc-mrr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-2t1c-base-csc-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-2t1c-base-csc-mrr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
-    imix-4t2c-eth-l2bd
-    ------------------
+imix-4t2c-eth-l2bd
+------------------
 
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="ifrmclx05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-4t2c-base-csc-mrr.html"></iframe>
-        </center>
+    <center>
+    <iframe id="ifrmclx05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-4t2c-base-csc-mrr.html"></iframe>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-4t2c-base-csc-mrr}
-                \label{fig:l2bd-2n-clx-xxv710-imix-4t2c-base-csc-mrr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-4t2c-base-csc-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-4t2c-base-csc-mrr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
-    imix-8t4c-eth-l2bd
-    ------------------
+imix-8t4c-eth-l2bd
+------------------
 
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="ifrmclx06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-8t4c-base-csc-mrr.html"></iframe>
-        </center>
+    <center>
+    <iframe id="ifrmclx06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-8t4c-base-csc-mrr.html"></iframe>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-8t4c-base-csc-mrr}
-                \label{fig:l2bd-2n-clx-xxv710-imix-8t4c-base-csc-mrr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-8t4c-base-csc-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-8t4c-base-csc-mrr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 2n-clx-xxv710-ndr
 ~~~~~~~~~~~~~~~~~
diff --git a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
index 3c0559f3d2..a8aa4e8001 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/cnf_service_pipelines.rst
@@ -475,75 +475,74 @@ Additional information about graph data:
 
         \clearpage
 
-..
-    2n-clx-xxv710-mrr
-    ~~~~~~~~~~~~~~~~~
+2n-clx-xxv710-mrr
+~~~~~~~~~~~~~~~~~
 
-    imix-2t1c-eth-l2bd
-    ------------------
+imix-2t1c-eth-l2bd
+------------------
 
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="ifrmclx04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-2t1c-base-csp-mrr.html"></iframe>
-        </center>
+    <center>
+    <iframe id="ifrmclx04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-2t1c-base-csp-mrr.html"></iframe>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-2t1c-base-csp-mrr}
-                \label{fig:l2bd-2n-clx-xxv710-imix-2t1c-base-csp-mrr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-2t1c-base-csp-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-2t1c-base-csp-mrr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
-    imix-4t2c-eth-l2bd
-    ------------------
+imix-4t2c-eth-l2bd
+------------------
 
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="ifrmclx05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-4t2c-base-csp-mrr.html"></iframe>
-        </center>
+    <center>
+    <iframe id="ifrmclx05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-4t2c-base-csp-mrr.html"></iframe>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-4t2c-base-csp-mrr}
-                \label{fig:l2bd-2n-clx-xxv710-imix-4t2c-base-csp-mrr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-4t2c-base-csp-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-4t2c-base-csp-mrr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
-    imix-8t4c-eth-l2bd
-    ------------------
+imix-8t4c-eth-l2bd
+------------------
 
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="ifrmclx06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-8t4c-base-csp-mrr.html"></iframe>
-        </center>
+    <center>
+    <iframe id="ifrmclx06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-8t4c-base-csp-mrr.html"></iframe>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-8t4c-base-csp-mrr}
-                \label{fig:l2bd-2n-clx-xxv710-imix-8t4c-base-csp-mrr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-8t4c-base-csp-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-8t4c-base-csp-mrr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 2n-clx-xxv710-ndr
 ~~~~~~~~~~~~~~~~~
diff --git a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
index ea4d020164..45b762ec06 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains.rst
@@ -474,75 +474,74 @@ Additional information about graph data:
 
         \clearpage
 
-..
-    2n-clx-xxv710-mrr
-    ~~~~~~~~~~~~~~~~~
+2n-clx-xxv710-mrr
+~~~~~~~~~~~~~~~~~
 
-    imix-2t1c-eth-l2bd
-    ------------------
+imix-2t1c-eth-l2bd
+------------------
 
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="ifrmclx04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-mrr.html"></iframe>
-        </center>
+    <center>
+    <iframe id="ifrmclx04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-mrr.html"></iframe>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-mrr}
-                \label{fig:l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-mrr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-mrr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
-    imix-4t2c-eth-l2bd
-    ------------------
+imix-4t2c-eth-l2bd
+------------------
 
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="ifrmclx05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-mrr.html"></iframe>
-        </center>
+    <center>
+    <iframe id="ifrmclx05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-mrr.html"></iframe>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-mrr}
-                \label{fig:l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-mrr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-mrr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
-    imix-8t4c-eth-l2bd
-    ------------------
+imix-8t4c-eth-l2bd
+------------------
 
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="ifrmclx06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-mrr.html"></iframe>
-        </center>
+    <center>
+    <iframe id="ifrmclx06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-mrr.html"></iframe>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-mrr}
-                \label{fig:l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-mrr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-mrr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 2n-clx-xxv710-ndr
 ~~~~~~~~~~~~~~~~~
diff --git a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst
index ee922d1162..26884848d0 100644
--- a/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst
+++ b/docs/report/vpp_performance_tests/nf_service_density/vnf_service_chains_vxlan.rst
@@ -64,7 +64,413 @@ Additional information about graph data:
 
     \clearpage
 
-2n-skx-xxv710-mrr
+..
+    2n-skx-xxv710-mrr
+    ~~~~~~~~~~~~~~~~~
+
+    64b-2t1c-eth-l2bd
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr}
+                \label{fig:l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-4t2c-eth-l2bd
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr}
+                \label{fig:l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-8t4c-eth-l2bd
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr}
+                \label{fig:l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    imix-2t1c-eth-l2bd
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
+                \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    imix-4t2c-eth-l2bd
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
+                \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    imix-8t4c-eth-l2bd
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
+                \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    2n-skx-xxv710-ndr
+    ~~~~~~~~~~~~~~~~~
+
+    64b-2t1c-eth-l2bd
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr}
+                \label{fig:l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-4t2c-eth-l2bd
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr}
+                \label{fig:l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-8t4c-eth-l2bd
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr}
+                \label{fig:l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    imix-2t1c-eth-l2bd
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
+                \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    imix-4t2c-eth-l2bd
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
+                \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    imix-8t4c-eth-l2bd
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
+                \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    2n-skx-xxv710-pdr
+    ~~~~~~~~~~~~~~~~~
+
+    64b-2t1c-eth-l2bd
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr}
+                \label{fig:l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-4t2c-eth-l2bd
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr}
+                \label{fig:l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    64b-8t4c-eth-l2bd
+    -----------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr}
+                \label{fig:l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    imix-2t1c-eth-l2bd
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
+                \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    imix-4t2c-eth-l2bd
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
+                \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+    imix-8t4c-eth-l2bd
+    ------------------
+
+    .. raw:: html
+
+        <center>
+        <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr.html"></iframe>
+        </center>
+
+    .. raw:: latex
+
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
+                \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
+        \end{figure}
+
+    .. raw:: latex
+
+        \clearpage
+
+2n-clx-xxv710-mrr
 ~~~~~~~~~~~~~~~~~
 
 64b-2t1c-eth-l2bd
@@ -73,7 +479,7 @@ Additional information about graph data:
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr.html"></iframe>
+    <iframe id="ifrm201" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-64b-2t1c-base-vsc-vxlan-mrr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -81,8 +487,8 @@ Additional information about graph data:
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-64b-2t1c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-64b-2t1c-base-vsc-vxlan-mrr}
     \end{figure}
 
 .. raw:: latex
@@ -95,7 +501,7 @@ Additional information about graph data:
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr.html"></iframe>
+    <iframe id="ifrm202" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-64b-4t2c-base-vsc-vxlan-mrr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -103,8 +509,8 @@ Additional information about graph data:
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-64b-4t2c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-64b-4t2c-base-vsc-vxlan-mrr}
     \end{figure}
 
 .. raw:: latex
@@ -117,7 +523,7 @@ Additional information about graph data:
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr.html"></iframe>
+    <iframe id="ifrm203" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-64b-8t4c-base-vsc-vxlan-mrr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -125,8 +531,8 @@ Additional information about graph data:
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-64b-8t4c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-64b-8t4c-base-vsc-vxlan-mrr}
     \end{figure}
 
 .. raw:: latex
@@ -139,7 +545,7 @@ imix-2t1c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr.html"></iframe>
+    <iframe id="ifrm204" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-mrr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -147,8 +553,8 @@ imix-2t1c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-mrr}
     \end{figure}
 
 .. raw:: latex
@@ -161,7 +567,7 @@ imix-4t2c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr.html"></iframe>
+    <iframe id="ifrm205" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-mrr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -169,8 +575,8 @@ imix-4t2c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-mrr}
     \end{figure}
 
 .. raw:: latex
@@ -183,7 +589,7 @@ imix-8t4c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr.html"></iframe>
+    <iframe id="ifrm206" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-mrr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -191,15 +597,15 @@ imix-8t4c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-mrr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-2n-skx-xxv710-ndr
+2n-clx-xxv710-ndr
 ~~~~~~~~~~~~~~~~~
 
 64b-2t1c-eth-l2bd
@@ -208,7 +614,7 @@ imix-8t4c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr.html"></iframe>
+    <iframe id="ifrm207" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-64b-2t1c-base-vsc-vxlan-ndr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -216,8 +622,8 @@ imix-8t4c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-64b-2t1c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-clx-xxv710-64b-2t1c-base-vsc-vxlan-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -230,7 +636,7 @@ imix-8t4c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr.html"></iframe>
+    <iframe id="ifrm208" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-64b-4t2c-base-vsc-vxlan-ndr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -238,8 +644,8 @@ imix-8t4c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-64b-4t2c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-clx-xxv710-64b-4t2c-base-vsc-vxlan-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -252,7 +658,7 @@ imix-8t4c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr.html"></iframe>
+    <iframe id="ifrm209" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-64b-8t4c-base-vsc-vxlan-ndr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -260,8 +666,8 @@ imix-8t4c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-64b-8t4c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-clx-xxv710-64b-8t4c-base-vsc-vxlan-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -274,7 +680,7 @@ imix-2t1c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr.html"></iframe>
+    <iframe id="ifrm210" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-ndr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -282,8 +688,8 @@ imix-2t1c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -296,7 +702,7 @@ imix-4t2c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr.html"></iframe>
+    <iframe id="ifrm211" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-ndr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -304,8 +710,8 @@ imix-4t2c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -318,7 +724,7 @@ imix-8t4c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr.html"></iframe>
+    <iframe id="ifrm212" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-ndr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -326,15 +732,15 @@ imix-8t4c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-ndr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-2n-skx-xxv710-pdr
+2n-clx-xxv710-pdr
 ~~~~~~~~~~~~~~~~~
 
 64b-2t1c-eth-l2bd
@@ -343,7 +749,7 @@ imix-8t4c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr.html"></iframe>
+    <iframe id="ifrm213" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-64b-2t1c-base-vsc-vxlan-pdr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -351,8 +757,8 @@ imix-8t4c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-64b-2t1c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-clx-xxv710-64b-2t1c-base-vsc-vxlan-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -365,7 +771,7 @@ imix-8t4c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr.html"></iframe>
+    <iframe id="ifrm214" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-64b-4t2c-base-vsc-vxlan-pdr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -373,8 +779,8 @@ imix-8t4c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-64b-4t2c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-clx-xxv710-64b-4t2c-base-vsc-vxlan-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -387,7 +793,7 @@ imix-8t4c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm15" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr.html"></iframe>
+    <iframe id="ifrm215" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-64b-8t4c-base-vsc-vxlan-pdr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -395,8 +801,8 @@ imix-8t4c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-64b-8t4c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-clx-xxv710-64b-8t4c-base-vsc-vxlan-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -409,7 +815,7 @@ imix-2t1c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm16" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr.html"></iframe>
+    <iframe id="ifrm216" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-pdr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -417,8 +823,8 @@ imix-2t1c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -431,7 +837,7 @@ imix-4t2c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr.html"></iframe>
+    <iframe id="ifrm217" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-pdr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -439,8 +845,8 @@ imix-4t2c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -453,7 +859,7 @@ imix-8t4c-eth-l2bd
 .. raw:: html
 
     <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr.html"></iframe>
+    <iframe id="ifrm218" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-pdr.html"></iframe>
     </center>
 
 .. raw:: latex
@@ -461,6 +867,6 @@ imix-8t4c-eth-l2bd
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
-            \label{fig:l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
+            \label{fig:l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-pdr}
     \end{figure}
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index cb90124b40..96b0faa2f9 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -379,6 +379,8 @@
         - 28  # NDRPDR sel
         - 29  # NDRPDR sel
         - 32  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 44  # NDRPDR sel
 
 
     plot-vpp-hdrh-lat-2n-clx:
@@ -391,12 +393,13 @@
         - 28  # NDRPDR sel
         - 29  # NDRPDR sel
         - 32  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 44  # NDRPDR sel
 
 
     plot-vpp-nfv-2n-clx-mrr:
-      # TODO: Replace the data
       csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
+        - 39  # MRR
 
     plot-dpdk-throughput-latency-2n-clx:
       csit-dpdk-perf-verify-2001-2n-clx:
@@ -427,10 +430,11 @@
         - 8   # NDRPDR sel
         - 10  # NDRPDR sel
         - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
 
     plot-vpp-hdrh-lat-3n-tsh:
       csit-vpp-perf-verify-2001-3n-tsh:
-        - 4   # NDRPDR sel
+        - 10  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-tsh:
       csit-dpdk-perf-verify-2001-3n-tsh:
@@ -566,6 +570,9 @@
         - 64  # NDRPDR full
         - 65  # NDRPDR full
         - 67  # NDRPDR full
+        - 70  # NDRPDR full
+        - 72  # NDRPDR full
+        - 73  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       # TODO: Replace
@@ -584,11 +591,12 @@
         - 35  # NDRPDR full
         - 36  # NDRPDR full
         - 38  # NDRPDR full
+        - 41  # NDRPDR full
+        - 42  # NDRPDR full
 
     vpp-perf-results-3n-tsh:
-      # TODO: Replace
       csit-vpp-perf-verify-2001-3n-tsh:
-        - 3   # NDRPDR sel
+        - 10  # NDRPDR sel
 
     vpp-perf-results-3n-dnv:
       csit-vpp-perf-verify-2001-3n-dnv:
@@ -600,6 +608,9 @@
         - 24  # NDRPDR full
         - 25  # NDRPDR full
         - 26  # NDRPDR full
+        - 37  # NDRPDR full
+        - 38  # NDRPDR full
+        - 39  # NDRPDR full
 
     vpp-perf-results-2n-dnv:
       csit-vpp-perf-verify-2001-2n-dnv:
@@ -627,10 +638,8 @@
         - 69  # MRR sel
 
     vpp-mrr-results-2n-clx:
-      # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-clx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 69  # MRR sel
+      csit-vpp-perf-verify-2001-2n-clx:
+        - 39  # MRR
 
     vpp-mrr-results-3n-tsh:
       csit-vpp-perf-verify-2001-3n-tsh:
@@ -887,6 +896,7 @@
         - 8   # NDRPDR sel
         - 10  # NDRPDR sel
         - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
     vpp-performance-changes-3n-tsh:
       - "vpp-performance-changes-3n-tsh-ref"
       - "vpp-performance-changes-3n-tsh-cmp"
@@ -1184,6 +1194,8 @@
         - 28  # NDRPDR sel
         - 29  # NDRPDR sel
         - 32  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 44  # NDRPDR sel
 
     vpp-compare-testbeds-skx-clx:
       - "vpp-compare-testbeds-skx-clx-ref"
@@ -1207,10 +1219,8 @@
       csit-vpp-perf-verify-1908-2n-skx:
         - 69  # MRR sel
     vpp-compare-testbeds-mrr-skx-clx-cmp:
-      # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-clx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 69  # MRR sel
+      csit-vpp-perf-verify-2001-2n-clx:
+        - 39  # MRR
     vpp-compare-testbeds-mrr-skx-clx:
       - "vpp-compare-testbeds-mrr-skx-clx-ref"
       - "vpp-compare-testbeds-mrr-skx-clx-cmp"
@@ -2031,6 +2041,9 @@
       - 64  # NDRPDR full
       - 65  # NDRPDR full
       - 67  # NDRPDR full
+      - 70  # NDRPDR full
+      - 72  # NDRPDR full
+      - 73  # NDRPDR full
 
 #    csit-vpp-perf-verify-1904-3n-skx:
 #      - 7   # MRR sel
@@ -2133,10 +2146,15 @@
       - 28  # NDRPDR sel
       - 29  # NDRPDR sel
       - 32  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 39  # MRR
       - 34  # NDRPDR full
       - 35  # NDRPDR full
       - 36  # NDRPDR full
       - 38  # NDRPDR full
+      - 41  # NDRPDR full
+      - 42  # NDRPDR full
 
     csit-vpp-perf-verify-1908-3n-tsh:
       - 7   # NDRPDR sel
@@ -2157,6 +2175,7 @@
       - 8   # NDRPDR sel
       - 10  # NDRPDR sel
       - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
       - 9   # MRR sel
 
     csit-vpp-perf-verify-1908-3n-dnv:
@@ -2191,6 +2210,9 @@
       - 24  # NDRPDR full
       - 25  # NDRPDR full
       - 26  # NDRPDR full
+      - 37  # NDRPDR full
+      - 38  # NDRPDR full
+      - 39  # NDRPDR full
 
     csit-vpp-perf-verify-1908-2n-dnv:
       - 1   # NDRPDR sel
@@ -4540,22 +4562,22 @@
 #  - "parent"
 #  - "msg"
 
-## Detailed Test Results - VPP MRR Results 2n-clx
-#- type: "table"
-#  title: "Detailed Test Results - VPP MRR Results 2n-clx"
-#  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/vpp_mrr_results_2n_clx"
-#  columns:
-#  - title: " |prein| Test Name |preout| "
-#    data: "data name"
-#  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
-#    data: "data msg"
-#  data: "vpp-mrr-results-2n-clx"
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
+# Detailed Test Results - VPP MRR Results 2n-clx
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 2n-clx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/vpp_mrr_results_2n_clx"
+  columns:
+  - title: " |prein| Test Name |preout| "
+    data: "data name"
+  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+    data: "data msg"
+  data: "vpp-mrr-results-2n-clx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-tsh
 - type: "table"
@@ -4659,22 +4681,22 @@
 #  - "name"
 #  - "conf-history"
 
-## Test configuration - VPP MRR Test Configs 2n-clx
-#- type: "table"
-#  title: "Test configuration - VPP MRR Test Configs 2n-clx"
-#  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}/vpp_mrr_test_configuration_2n_clx"
-#  columns:
-#  - title: " |prein| Test Name |preout| "
-#    data: "data name"
-#  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-#    data: "data conf-history"
-#  data: "vpp-mrr-results-2n-clx"
-#  filter: "all"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
+# Test configuration - VPP MRR Test Configs 2n-clx
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 2n-clx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}/vpp_mrr_test_configuration_2n_clx"
+  columns:
+  - title: " |prein| Test Name |preout| "
+    data: "data name"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+    data: "data conf-history"
+  data: "vpp-mrr-results-2n-clx"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 3n-tsh
 - type: "table"
@@ -5505,15 +5527,15 @@
 #  filter: "all"
 #  data-start-level: 4
 
-## VPP MRR Results 2n-clx
-#- type: "file"
-#  title: "VPP MRR Results 2n-clx"
-#  algorithm: "file_test_results"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}"
-#  dir-tables: "{DIR[DTR,MRR,VPP,2N,CLX]}"
-#  data: "vpp-mrr-results-2n-clx"
-#  filter: "all"
-#  data-start-level: 4
+# VPP MRR Results 2n-clx
+- type: "file"
+  title: "VPP MRR Results 2n-clx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}"
+  dir-tables: "{DIR[DTR,MRR,VPP,2N,CLX]}"
+  data: "vpp-mrr-results-2n-clx"
+  filter: "all"
+  data-start-level: 4
 
 # VPP MRR Results 3n-tsh
 - type: "file"
@@ -5575,15 +5597,15 @@
 #  filter: "all"
 #  data-start-level: 4
 
-## VPP MRR Configuration 2n-clx
-#- type: "file"
-#  title: "VPP MRR Configuration 2n-clx"
-#  algorithm: "file_test_results"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}"
-#  dir-tables: "{DIR[DTC,MRR,VPP,2N,CLX]}"
-#  data: "vpp-mrr-results-2n-clx"
-#  filter: "all"
-#  data-start-level: 4
+# VPP MRR Configuration 2n-clx
+- type: "file"
+  title: "VPP MRR Configuration 2n-clx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}"
+  dir-tables: "{DIR[DTC,MRR,VPP,2N,CLX]}"
+  data: "vpp-mrr-results-2n-clx"
+  filter: "all"
+  data-start-level: 4
 
 # VPP MRR Configuration 3n-tsh
 - type: "file"
@@ -9248,86 +9270,86 @@
 ###############################################################################
 # Plots - 2n-clx NF Density - VSC - MRR IMIX
 
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#    layout: "plot-service-density"
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
 
 # Plots - NF Density - VSC - NDR IMIX
 - type: "plot"
@@ -9493,84 +9515,84 @@
     title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
     layout: "plot-service-density"
 
-## Plots - NF Density - VSC - MRR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
+# Plots - NF Density - VSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
 
 # Plots - NF Density - VSC - NDR IMIX
 - type: "plot"
@@ -9730,84 +9752,84 @@
     title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
     layout: "plot-service-density"
 
-## Plots - NF Density - CSC - MRR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
+# Plots - NF Density - CSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
 
 # Plots - NF Density - CSC - NDR IMIX
 - type: "plot"
@@ -9967,84 +9989,84 @@
     title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
-## Plots - NF Density - CSP - MRR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-clx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
+# Plots - NF Density - CSP - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
 
 # Plots - NF Density - CSP - NDR IMIX
 - type: "plot"