Report: Add vsap

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

7 files changed, 400 insertions, 202 deletions

diff --git a/docs/report/vpp_performance_tests/hoststack_testing/index.rst b/docs/report/vpp_performance_tests/hoststack_testing/index.rst
index 1f4db156ef..1b0289531d 100644
--- a/docs/report/vpp_performance_tests/hoststack_testing/index.rst
+++ b/docs/report/vpp_performance_tests/hoststack_testing/index.rst
@@ -5,3 +5,4 @@ Hoststack Testing
 
     iperf3/index
     quic/index
+    vsap/index
diff --git a/docs/report/vpp_performance_tests/hoststack_testing/iperf3/index.rst b/docs/report/vpp_performance_tests/hoststack_testing/iperf3/index.rst
index eb9770db86..9d1a1bddec 100644
--- a/docs/report/vpp_performance_tests/hoststack_testing/iperf3/index.rst
+++ b/docs/report/vpp_performance_tests/hoststack_testing/iperf3/index.rst
@@ -38,8 +38,8 @@ TCP/IP with iperf3
 
     \clearpage
 
-1460b-2t1c-xxv710-base-scale
-----------------------------
+1460b-2t1c-xxv710-ip4tcp-base-scale
+-----------------------------------
 
 .. raw:: html
 
@@ -58,18 +58,18 @@ TCP/IP with iperf3
 
     \clearpage
 
-1460b-2t1c-xxv710-nsim-base-scale
----------------------------------
+1460b-2t1c-xxv710-ip4udp-base-scale
+-----------------------------------
 
 .. raw:: html
 
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps.html"></iframe>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3-bps.html"></iframe>
 
 .. raw:: latex
 
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps}
-            \label{fig:3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3-bps}
+            \label{fig:3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3-bps}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/hoststack_testing/vsap/index.rst b/docs/report/vpp_performance_tests/hoststack_testing/vsap/index.rst
new file mode 100644
index 0000000000..b9bd39abc4
--- /dev/null
+++ b/docs/report/vpp_performance_tests/hoststack_testing/vsap/index.rst
@@ -0,0 +1,177 @@
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <script type="text/javascript">
+
+        function getDocHeight(doc) {
+            doc = doc || document;
+            var body = doc.body, html = doc.documentElement;
+            var height = Math.max( body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight );
+            return height;
+        }
+
+        function setIframeHeight(id) {
+            var ifrm = document.getElementById(id);
+            var doc = ifrm.contentDocument? ifrm.contentDocument:
+                ifrm.contentWindow.document;
+            ifrm.style.visibility = 'hidden';
+            ifrm.style.height = "10px"; // reset to minimal height ...
+            // IE opt. for bing/msn needs a bit added or scrollbar appears
+            ifrm.style.height = getDocHeight( doc ) + 4 + "px";
+            ifrm.style.visibility = 'visible';
+        }
+
+    </script>
+
+VSAP with ldpreload
+~~~~~~~~~~~~~~~~~~~
+
+.. todo::
+    Add introduction
+
+.. raw:: latex
+
+    \clearpage
+
+2t1c-e810cq-base-scale-cps
+--------------------------
+
+.. raw:: html
+
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-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-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \label{fig:2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-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-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \label{fig:2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-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-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \label{fig:2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-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-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \label{fig:2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+2t1c-e810cq-base-scale-cps
+--------------------------
+
+.. raw:: html
+
+    <iframe id="ifrm01r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-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-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \label{fig:2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="ifrm02r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-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-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \label{fig:2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="ifrm03r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-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-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \label{fig:2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <iframe id="ifrm04r" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../../_static/vpp/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-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-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+            \label{fig:2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps}
+    \end{figure}
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index fb1b4734cf..8161a5a566 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -606,6 +606,19 @@ def plot_perf_box_name(plot, input_data):
                                 )
                             test_type = u"HOSTSTACK"
 
+                        elif test[u"type"] in (u"LDP_NGINX",):
+                            if u"TCP_CPS" in test[u"tags"]:
+                                test_type = u"VSAP_CPS"
+                                y_vals[test[u"parent"]].append(
+                                    test[u"result"][u"cps"] / 1e6
+                                )
+                            elif u"TCP_RPS" in test[u"tags"]:
+                                test_type = u"VSAP_RPS"
+                                y_vals[test[u"parent"]].append(
+                                    test[u"result"][u"rps"] / 1e6
+                                )
+                            else:
+                                continue
                         else:
                             continue
 
@@ -662,6 +675,12 @@ def plot_perf_box_name(plot, input_data):
         if layout.get(u"title", None):
             if test_type in (u"HOSTSTACK", ):
                 layout[u"title"] = f"<b>Bandwidth:</b> {layout[u'title']}"
+            elif test_type == u"VSAP_CPS":
+                layout[u"title"] = f"<b>CPS:</b> {layout[u'title']}"
+                layout[u"yaxis"][u"title"] = u"<b>Connection Rate [Mcps]</b>"
+            elif test_type == u"VSAP_RPS":
+                layout[u"title"] = f"<b>RPS:</b> {layout[u'title']}"
+                layout[u"yaxis"][u"title"] = u"<b>Connection Rate [Mrps]</b>"
             else:
                 layout[u"title"] = f"<b>Throughput:</b> {layout[u'title']}"
         if y_max:
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 364cdbdbad..2cc2447ec0 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -239,6 +239,15 @@ class ExecutionChecker(ResultVisitor):
     )
     REGEX_MRR_MSG_INFO = re.compile(r'.*\[(.*)\]')
 
+    REGEX_VSAP_MSG_INFO = re.compile(
+        r'Transfer Rate: (\d*.\d*).*\n'
+        r'Latency: (\d*.\d*).*\n'
+        r'Completed requests: (\d*).*\n'
+        r'Failed requests: (\d*).*\n'
+        r'Total data transferred: (\d*).*\n'
+        r'Connection [cr]ps rate:\s*(\d*.\d*)'
+    )
+
     # Needed for CPS and PPS tests
     REGEX_NDRPDR_LAT_BASE = re.compile(
         r'LATENCY.*\[\'(.*)\', \'(.*)\'\]\s\n.*\n.*\n'
@@ -927,6 +936,39 @@ class ExecutionChecker(ResultVisitor):
 
         return result, status
 
+    def _get_vsap_data(self, msg, tags):
+        """Get data from the vsap test message.
+
+        :param msg: The test message to be parsed.
+        :param tags: Test tags.
+        :type msg: str
+        :type tags: list
+        :returns: Parsed data as a JSON dict and the status (PASS/FAIL).
+        :rtype: tuple(dict, str)
+        """
+        result = dict()
+        status = u"FAIL"
+
+        groups = re.search(self.REGEX_VSAP_MSG_INFO, msg)
+        if groups is not None:
+            try:
+                result[u"transfer-rate"] = float(groups.group(1)) * 1e3
+                result[u"latency"] = float(groups.group(2))
+                result[u"completed-requests"] = int(groups.group(3))
+                result[u"failed-requests"] = int(groups.group(4))
+                result[u"bytes-transferred"] = int(groups.group(5))
+                if u"TCP_CPS"in tags:
+                    result[u"cps"] = float(groups.group(6))
+                elif u"TCP_RPS" in tags:
+                    result[u"rps"] = float(groups.group(6))
+                else:
+                    return result, status
+                status = u"PASS"
+            except (IndexError, ValueError):
+                pass
+
+        return result, status
+
     def visit_suite(self, suite):
         """Implements traversing through the suite and its direct children.
 
@@ -1125,6 +1167,10 @@ class ExecutionChecker(ResultVisitor):
             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/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 295fc93ca3..2d38c3bbb3 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -6,7 +6,7 @@
 
   vpp-device-results-ubuntu:
     csit-vpp-device-2101-ubuntu1804-1n-skx:
-      - 56  # rls2101.rc1 VPP DEV env 7
+      - 58  # rls2101.rc1 VPP DEV env 7
 
 ################################################################################
 
@@ -52,25 +52,12 @@
       - 12  # rls2101.rel NDRPDR iter env 7
 
   vpp-3n-skx-curr-iter:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-3n-skx:
-    csit-vpp-perf-report-iterative-2101-3n-skx:
-      - 36  # rls2101.rel NDRPDR iter env 6
-      - 37  # rls2101.rel NDRPDR iter env 6
-      - 38  # rls2101.rel NDRPDR iter env 6
-      - 39  # rls2101.rel NDRPDR iter env 6
-      - 40  # rls2101.rel NDRPDR iter env 6
-      - 41  # rls2101.rel NDRPDR iter env 6
-      - 42  # rls2101.rel NDRPDR iter env 6
-      - 47  # rls2101.rel NDRPDR iter env 6
-      - 48  # rls2101.rel NDRPDR iter env 6
-      - 50  # rls2101.rel NDRPDR iter env 6
+    csit-vpp-perf-report-iterative-2106-3n-skx:
+      - 20  # rls2106.rc1 NDRPDR iter env 7
 
   vpp-3n-skx-curr-iter-best:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-3n-skx:
-    csit-vpp-perf-report-iterative-2101-3n-skx:
-      - 36  # rls2101.rel NDRPDR iter env 6
+    csit-vpp-perf-report-iterative-2106-3n-skx:
+      - 20  # rls2106.rc1 NDRPDR iter env 7
 
   vpp-3n-skx-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-3n-skx:
@@ -85,15 +72,15 @@
       - 2   # rls2101.rel MRR iter env 7
 
   vpp-3n-skx-curr-iter-mrr:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-3n-skx:
-    csit-vpp-perf-report-iterative-2101-3n-skx:
-      - 35  # rls2101.rel MRR iter env 6
+    csit-vpp-perf-report-iterative-2106-3n-skx:
+      - 19  # rls2106.rc1 MRR iter env 7
 
   vpp-3n-skx-curr-iter-hoststack:
     csit-vpp-perf-report-iterative-2106-3n-skx:
       - 13  # rls2106.rc1 NDRPDR iter env 7
       - 14  # rls2106.rc1 NDRPDR iter env 7
+      - 21  # rls2106.rc1 NDRPDR iter env 7
+      - 22  # rls2106.rc1 NDRPDR iter env 7
 
   vpp-3n-skx-curr-cov:
     # TODO: Replace
@@ -294,10 +281,8 @@
       - 2   # rls2009 MRR iter env 7
 
   vpp-2n-skx-curr-iter-mrr:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-skx:
-    csit-vpp-perf-report-iterative-2101-2n-skx:
-      - 62  # rls2101.rel MRR iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-skx:
+      - 24  # rls2106.rc1 MRR iter env 7
 
   vpp-2n-skx-curr-soak:
     # TODO: Replace
@@ -337,38 +322,16 @@
       - 73  # rls2101.rel soak env 6
 
   vpp-2n-skx-curr-nfv-ndrpdr:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-skx:
-    csit-vpp-perf-report-iterative-2101-2n-skx:
-      - 67  # rls2101.rel NDRPDR nf-density iter env 6
-      - 72  # rls2101.rel NDRPDR nf-density iter env 6
-      - 79  # rls2101.rel NDRPDR nf-density iter env 6
-      - 83  # rls2101.rel NDRPDR nf-density iter env 6
-      - 88  # rls2101.rel NDRPDR nf-density iter env 6
-      - 97  # rls2101.rel NDRPDR nf-density iter env 6
-      - 103 # rls2101.rel NDRPDR nf-density iter env 6
-      - 108 # rls2101.rel NDRPDR nf-density iter env 6
-      - 109 # rls2101.rel NDRPDR nf-density iter env 6
-      - 110 # rls2101.rel NDRPDR nf-density iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-skx:
+      - 26  # rls2106.rc1 NDRPDR nf-density iter env 7
 
   vpp-2n-skx-curr-nfv-mrr:
     csit-vpp-perf-report-iterative-2106-2n-skx:
       - 13  # rls2106.rc1 MRR nf-density iter env 7
 
   vpp-2n-skx-curr-nfv-reconf:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-skx:
-    csit-vpp-perf-report-iterative-2101-2n-skx:
-      - 64  # rls2101.rel NDRPDR reconf iter env 6
-      - 66  # rls2101.rel NDRPDR reconf iter env 6
-      - 71  # rls2101.rel NDRPDR reconf iter env 6
-      - 74  # rls2101.rel NDRPDR reconf iter env 6
-      - 78  # rls2101.rel NDRPDR reconf iter env 6
-      - 87  # rls2101.rel NDRPDR reconf iter env 6
-      - 95  # rls2101.rel NDRPDR reconf iter env 6
-      - 100 # rls2101.rel NDRPDR reconf iter env 6
-      - 104 # rls2101.rel NDRPDR reconf iter env 6
-      - 106 # rls2101.rel NDRPDR reconf iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-skx:
+      - 27  # rls2106.rc1 NDRPDR nf-density iter env 7
 
   vpp-2n-skx-curr-gso:
     csit-vpp-perf-report-iterative-2106-2n-skx:
@@ -539,10 +502,8 @@
       - 2   # rls2101.rel MRR iter env 7
 
   vpp-2n-zn2-curr-iter-mrr:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-zn2:
-    csit-vpp-perf-report-iterative-2101-2n-zn2:
-      - 30  # rls2101.rel MRR iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-zn2:
+      - 1   # rls2106.rc1 MRR iter env 7
 
   vpp-2n-zn2-curr-cov:
     # TODO: Replace
@@ -691,55 +652,12 @@
       - 21  # rls2101.rel NDRPDR iter env 7
 
   vpp-2n-clx-curr-iter:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-clx:
-    csit-vpp-perf-report-iterative-2101-2n-clx:
-      - 54  # rls2101.rel NDRPDR iter env 6
-      - 59  # rls2101.rel NDRPDR iter env 6
-      - 60  # rls2101.rel NDRPDR iter env 6
-      - 63  # rls2101.rel NDRPDR iter env 6
-      - 66  # rls2101.rel NDRPDR iter env 6
-      - 68  # rls2101.rel NDRPDR iter env 6
-      - 73  # rls2101.rel NDRPDR iter env 6
-      - 75  # rls2101.rel NDRPDR iter env 6
-      - 86  # rls2101.rel NDRPDR iter env 6
-      - 90  # rls2101.rel NDRPDR iter env 6
-      - 80  # rls2101.rel NDRPDR iter RND env 6
-      - 87  # rls2101.rel NDRPDR iter RND env 6
-      - 91  # rls2101.rel NDRPDR iter RND env 6
-      - 92  # rls2101.rel NDRPDR iter RND env 6
-      - 93  # rls2101.rel NDRPDR iter RND env 6
-      - 94  # rls2101.rel NDRPDR iter RND env 6
-      - 95  # rls2101.rel NDRPDR iter RND env 6
-      - 100 # rls2101.rel NDRPDR iter RND env 6
-      - 106 # rls2101.rel NDRPDR iter RND env 6
-      - 108 # rls2101.rel NDRPDR iter RND env 6
-      - 112 # rls2101.rel NDRPDR iter NAT env 6
-      - 113 # rls2101.rel NDRPDR iter NAT env 6
-      - 114 # rls2101.rel NDRPDR iter NAT env 6
-      - 115 # rls2101.rel NDRPDR iter NAT env 6
-      - 116 # rls2101.rel NDRPDR iter NAT env 6
-      - 117 # rls2101.rel NDRPDR iter NAT env 6
-      - 118 # rls2101.rel NDRPDR iter NAT env 6
-      - 119 # rls2101.rel NDRPDR iter NAT env 6
-      - 120 # rls2101.rel NDRPDR iter NAT env 6
-      - 121 # rls2101.rel NDRPDR iter NAT env 6
-      - 122 # rls2101.rel NDRPDR iter MLX env 6
-      - 123 # rls2101.rel NDRPDR iter MLX env 6
-      - 124 # rls2101.rel NDRPDR iter MLX env 6
-      - 126 # rls2101.rel NDRPDR iter MLX env 6
-      - 127 # rls2101.rel NDRPDR iter MLX env 6
-      - 128 # rls2101.rel NDRPDR iter MLX env 6
-      - 129 # rls2101.rel NDRPDR iter MLX env 6
-      - 130 # rls2101.rel NDRPDR iter MLX env 6
-      - 131 # rls2101.rel NDRPDR iter MLX env 6
-      - 132 # rls2101.rel NDRPDR iter MLX env 6
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 35  # rls2106.rc1 NDRPDR iter env 7
 
   vpp-2n-clx-curr-iter-best:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-clx:
-    csit-vpp-perf-report-iterative-2101-2n-clx:
-      - 75  # rls2101.rel NDRPDR iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 35  # rls2106.rc1 NDRPDR iter env 7
 
   vpp-2n-clx-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-clx:
@@ -756,86 +674,40 @@
       - 8   # rls2101.rel MRR iter env 7
 
   vpp-2n-clx-curr-iter-mrr:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-clx:
-    csit-vpp-perf-report-iterative-2101-2n-clx:
-      - 53  # rls2101.rel MRR iter env 6
-      - 133 # rls2101.rel MRR MLX iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 34  # rls2106.rc1 MRR iter env 7
 
   vpp-2n-clx-curr-iter-gso:
     csit-vpp-perf-report-iterative-2106-2n-clx:
       - 25  # rls2106.rc1 MRR GSO iter env 7
 
+  vpp-2n-clx-curr-iter-vsap:
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 41  # rls2106.rc1 MRR GSO iter env 7
+      - 42  # rls2106.rc1 MRR GSO iter env 7
+
   vpp-2n-clx-curr-nfv-ndrpdr:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-clx:
-    csit-vpp-perf-report-iterative-2101-2n-clx:
-      - 57  # rls2101.rel NDRPDR nf-density iter env 6
-      - 62  # rls2101.rel NDRPDR nf-density iter env 6
-      - 70  # rls2101.rel NDRPDR nf-density iter env 6
-      - 71  # rls2101.rel NDRPDR nf-density iter env 6
-      - 82  # rls2101.rel NDRPDR nf-density iter env 6
-      - 88  # rls2101.rel NDRPDR nf-density iter env 6
-      - 89  # rls2101.rel NDRPDR nf-density iter env 6
-      - 96  # rls2101.rel NDRPDR nf-density iter env 6
-      - 97  # rls2101.rel NDRPDR nf-density iter env 6
-      - 98  # rls2101.rel NDRPDR nf-density iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 38  # rls2106.rc1 NDRPDR nf-density iter env 7
 
   vpp-2n-clx-curr-nfv-mrr:
     csit-vpp-perf-report-iterative-2106-2n-clx:
       - 23  # rls2106.rc1 MRR nf-density iter env 7
 
   vpp-2n-clx-curr-nfv-reconf:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-clx:
-    csit-vpp-perf-report-iterative-2101-2n-clx:
-      - 55  # rls2101.rel NDRPDR reconf iter env 6
-      - 64  # rls2101.rel NDRPDR reconf iter env 6
-      - 76  # rls2101.rel NDRPDR reconf iter env 6
-      - 83  # rls2101.rel NDRPDR reconf iter env 6
-      - 99  # rls2101.rel NDRPDR reconf iter env 6
-      - 101 # rls2101.rel NDRPDR reconf iter env 6
-      - 102 # rls2101.rel NDRPDR reconf iter env 6
-      - 107 # rls2101.rel NDRPDR reconf iter env 6
-      - 109 # rls2101.rel NDRPDR reconf iter env 6
-      - 110 # rls2101.rel NDRPDR reconf iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 37  # rls2106.rc1 NDRPDR reconf iter env 7
 
   vpp-2n-clx-curr-soak:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-clx:
-    csit-vpp-perf-report-iterative-2101-2n-clx:
-      - 58  # rls2101.rel soak env 6
-      - 61  # rls2101.rel soak env 6
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 24  # rls2106.rc1 soak env 7
   vpp-soak-vs-ndr-2n-clx-ref:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-clx:
-    csit-vpp-perf-report-iterative-2101-2n-clx:
-      - 54  # rls2101.rel NDRPDR iter env 6
-      - 59  # rls2101.rel NDRPDR iter env 6
-      - 60  # rls2101.rel NDRPDR iter env 6
-      - 63  # rls2101.rel NDRPDR iter env 6
-      - 66  # rls2101.rel NDRPDR iter env 6
-      - 68  # rls2101.rel NDRPDR iter env 6
-      - 73  # rls2101.rel NDRPDR iter env 6
-      - 75  # rls2101.rel NDRPDR iter env 6
-      - 86  # rls2101.rel NDRPDR iter env 6
-      - 90  # rls2101.rel NDRPDR iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 35  # rls2106.rc1 NDRPDR iter env 7
   vpp-soak-vs-ndr-2n-clx:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-clx:
-    csit-vpp-perf-report-iterative-2101-2n-clx:
-      - 54  # rls2101.rel NDRPDR iter env 6
-      - 59  # rls2101.rel NDRPDR iter env 6
-      - 60  # rls2101.rel NDRPDR iter env 6
-      - 63  # rls2101.rel NDRPDR iter env 6
-      - 66  # rls2101.rel NDRPDR iter env 6
-      - 68  # rls2101.rel NDRPDR iter env 6
-      - 73  # rls2101.rel NDRPDR iter env 6
-      - 75  # rls2101.rel NDRPDR iter env 6
-      - 86  # rls2101.rel NDRPDR iter env 6
-      - 90  # rls2101.rel NDRPDR iter env 6
-      - 58  # rls2101.rel soak env 6
-      - 61  # rls2101.rel soak env 6
+    csit-vpp-perf-report-iterative-2106-2n-clx:
+      - 35  # rls2106.rc1 NDRPDR iter env 7
+      - 24  # rls2106.rc1 soak env 7
 
   vpp-2n-clx-curr-cov:
     # TODO: Replace
@@ -977,10 +849,8 @@
       - 22  # rls2101.rel MRR iter env 6
 
   vpp-3n-tsh-curr-iter-mrr:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-3n-tsh:
-    csit-vpp-perf-report-iterative-2101-3n-tsh:
-      - 22  # rls2101.rel MRR iter env 6
+    csit-vpp-perf-report-iterative-2106-3n-tsh:
+      - 9   # rls2106.rc1 MRR iter env 7
 
   vpp-3n-tsh-curr-cov:
     # TODO: Replace
@@ -1092,25 +962,12 @@
       - 31  # rls2101.rel NDRPDR iter env 6
 
   vpp-2n-tx2-curr-iter:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-tx2:
-    csit-vpp-perf-report-iterative-2101-2n-tx2:
-      - 22  # rls2101.rel NDRPDR iter env 6
-      - 23  # rls2101.rel NDRPDR iter env 6
-      - 24  # rls2101.rel NDRPDR iter env 6
-      - 25  # rls2101.rel NDRPDR iter env 6
-      - 26  # rls2101.rel NDRPDR iter env 6
-      - 27  # rls2101.rel NDRPDR iter env 6
-      - 28  # rls2101.rel NDRPDR iter env 6
-      - 29  # rls2101.rel NDRPDR iter env 6
-      - 30  # rls2101.rel NDRPDR iter env 6
-      - 31  # rls2101.rel NDRPDR iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-tx2:
+      - 9   # rls2106.rc1 NDRPDR iter env 7
 
   vpp-2n-tx2-curr-iter-best:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-tx2:
-    csit-vpp-perf-report-iterative-2101-2n-tx2:
-      - 29  # rls2101.rel NDRPDR iter env 6
+    csit-vpp-perf-report-iterative-2106-2n-tx2:
+      - 9   # rls2106.rc1 NDRPDR iter env 7
 
   vpp-2n-tx2-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-tx2:
@@ -1234,8 +1091,8 @@
       - 21  # rls2106.rc1 NDRPDR iter env 7
       - 22  # rls2106.rc1 NDRPDR iter env 7
       - 23  # rls2106.rc1 NDRPDR iter env 7
-#       - 24  # rls2106.rc1 NDRPDR iter env 7
-#       - 25  # rls2106.rc1 NDRPDR iter env 7
+      - 24  # rls2106.rc1 NDRPDR iter env 7
+      - 26  # rls2106.rc1 NDRPDR iter env 7
 
   vpp-3n-dnv-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2009-3n-dnv:
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 0d88f48ff8..f7a964996e 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -5074,6 +5074,104 @@
 ###                                P L O T S                                 ###
 ################################################################################
 
+# VSAP tests 2n-clx
+
+- type: "plot"
+  title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
+    - "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-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
+    - "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-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
+    - "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-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
+    - "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-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
+    - "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-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
+    - "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-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
+    - "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-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    layout: "plot-hoststack"
+
+- type: "plot"
+  title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  data: "vpp-2n-clx-curr-iter-vsap"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
+    - "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-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    layout: "plot-hoststack"
+
 # Hoststack tests 3n-skx
 
 - type: "plot"
@@ -5089,15 +5187,15 @@
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "Bandwidth: 3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-nsim-ldpreload-iperf3"
+  title: "Bandwidth: 3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1460b-2t1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3-bps"
   data: "vpp-3n-skx-curr-iter-hoststack"
   include:
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Tcpbase-Nsim-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps"
-    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Tcpscale1Cl10S-Nsim-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpbase-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpbase-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1Xxv710-Eth-Ip4Udpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps"
   layout:
-    title: "3n-skx-xxv710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3"
+    title: "3n-skx-xxv710-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
     layout: "plot-hoststack"
 
 - type: "plot"