Report: Add VSAP tests

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

3 files changed, 285 insertions, 58 deletions

diff --git a/docs/report/vpp_performance_tests/hoststack_testing/vsap/index.rst b/docs/report/vpp_performance_tests/hoststack_testing/vsap/index.rst
index 7fcf0f41f6..322a687000 100644
--- a/docs/report/vpp_performance_tests/hoststack_testing/vsap/index.rst
+++ b/docs/report/vpp_performance_tests/hoststack_testing/vsap/index.rst
@@ -28,30 +28,169 @@
 
     </script>
 
+.. raw:: latex
+
+    \clearpage
+
 VSAP with ldpreload
 ~~~~~~~~~~~~~~~~~~~
 
-.. todo::
-    Add introduction
+2t1c-cx556a-rdma-base-cps
+-------------------------
+
+.. raw:: html
+
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+            \label{fig:2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+            \label{fig:2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+            \label{fig:2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+            \label{fig:2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+2t1c-cx556a-rdma-base-rps
+-------------------------
+
+.. raw:: html
+
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+            \label{fig:2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+            \label{fig:2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+            \label{fig:2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="14" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.html"></iframe>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+            \label{fig:2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+    \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-2t1c-cx556a-base-scale-cps
---------------------------
+2t1c-e810cq-base-cps
+--------------------
 
 .. raw:: html
 
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.html"></iframe>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
-            \label{fig:2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+            \label{fig:2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
     \end{figure}
 
 .. raw:: latex
@@ -60,15 +199,15 @@ VSAP with ldpreload
 
 .. raw:: html
 
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.html"></iframe>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
-            \label{fig:2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+            \label{fig:2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
     \end{figure}
 
 .. raw:: latex
@@ -77,15 +216,15 @@ VSAP with ldpreload
 
 .. raw:: html
 
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps.html"></iframe>
+    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.html"></iframe>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
-            \label{fig:2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+            \label{fig:2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
     \end{figure}
 
 .. raw:: latex
@@ -94,35 +233,35 @@ VSAP with ldpreload
 
 .. raw:: html
 
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps.html"></iframe>
+    <iframe id="24" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.html"></iframe>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
-            \label{fig:2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
+            \label{fig:2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-2t1c-cx556a-base-scale-rps
---------------------------
+2t1c-e810cq-base-rps
+--------------------
 
 .. raw:: html
 
-    <iframe id="ifrm01r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.html"></iframe>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps}
-            \label{fig:2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+            \label{fig:2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
     \end{figure}
 
 .. raw:: latex
@@ -131,15 +270,15 @@ VSAP with ldpreload
 
 .. raw:: html
 
-    <iframe id="ifrm02r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.html"></iframe>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps}
-            \label{fig:2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+            \label{fig:2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
     \end{figure}
 
 .. raw:: latex
@@ -148,15 +287,15 @@ VSAP with ldpreload
 
 .. raw:: html
 
-    <iframe id="ifrm03r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps.html"></iframe>
+    <iframe id="33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.html"></iframe>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps}
-            \label{fig:2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+            \label{fig:2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
     \end{figure}
 
 .. raw:: latex
@@ -165,13 +304,13 @@ VSAP with ldpreload
 
 .. raw:: html
 
-    <iframe id="ifrm04r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps.html"></iframe>
+    <iframe id="34" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.html"></iframe>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps}
-            \label{fig:2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
+            \label{fig:2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps}
     \end{figure}
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index f28ceebd86..64aab493e4 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -1202,15 +1202,15 @@ class ExecutionChecker(ResultVisitor):
             if test.status == u"PASS":
                 test_result[u"throughput"], test_result[u"status"] = \
                     self._get_plr_throughput(test.message)
+        elif u"LDP_NGINX" in tags:
+            test_result[u"type"] = u"LDP_NGINX"
+            test_result[u"result"], test_result[u"status"] = \
+                self._get_vsap_data(test.message, tags)
         elif u"HOSTSTACK" in tags:
             test_result[u"type"] = u"HOSTSTACK"
             if test.status == u"PASS":
                 test_result[u"result"], test_result[u"status"] = \
                     self._get_hoststack_data(test.message, tags)
-        elif u"LDP_NGINX" in tags:
-            test_result[u"type"] = u"LDP_NGINX"
-            test_result[u"result"], test_result[u"status"] = \
-                self._get_vsap_data(test.message, tags)
         # elif u"TCP" in tags:  # This might be not used
         #     test_result[u"type"] = u"TCP"
         #     if test.status == u"PASS":
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index dce8e48901..1a299863d1 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -8081,91 +8081,179 @@
 # VSAP tests 2n-clx
 
 - type: "plot"
-  title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
   layout:
-    title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
     - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
   layout:
-    title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  layout:
+    title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  layout:
+    title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  layout:
+    title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  layout:
+    title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  layout:
+    title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  layout:
+    title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  layout:
+    title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
+  layout:
+    title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
     layout: "plot-hoststack"
 
 # Hoststack tests 3n-skx