Report: Various fixes

Change-Id: Ib3fcf5b9a839ce397970761c717310da9c8a63b7
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 5cbe9912f188bcad4956b212dfed12af5dccf065)

11 files changed, 171 insertions, 267 deletions

diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-zn2-x710.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-zn2-x710.rst
index 55301f6c67..c929280655 100644
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-zn2-x710.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-zn2-x710.rst
@@ -45,26 +45,25 @@ CSIT source code for the test cases used for plots can be found in
 64b-2t1c-base
 -------------
 
-..
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-zn2-x710-64b-2t1c-base-ndr.html"></iframe>
-        <p><br></p>
-        </center>
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-zn2-x710-64b-2t1c-base-ndr.html"></iframe>
+    <p><br></p>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/dpdk/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-x710-64b-2t1c-base-ndr}
-                \label{fig:2n-zn2-x710-64b-2t1c-base-ndr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-x710-64b-2t1c-base-ndr}
+            \label{fig:2n-zn2-x710-64b-2t1c-base-ndr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 .. raw:: html
 
@@ -89,26 +88,25 @@ CSIT source code for the test cases used for plots can be found in
 64b-4t2c-base
 -------------
 
-..
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-zn2-x710-64b-4t2c-base-ndr.html"></iframe>
-        <p><br></p>
-        </center>
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-zn2-x710-64b-4t2c-base-ndr.html"></iframe>
+    <p><br></p>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/dpdk/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-x710-64b-4t2c-base-ndr}
-                \label{fig:2n-zn2-x710-64b-4t2c-base-ndr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-x710-64b-4t2c-base-ndr}
+            \label{fig:2n-zn2-x710-64b-4t2c-base-ndr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 .. raw:: html
 
diff --git a/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-zn2-xxv710.rst b/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-zn2-xxv710.rst
index 3f6f009c9f..8d9bd51a98 100644
--- a/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-zn2-xxv710.rst
+++ b/docs/report/dpdk_performance_tests/packet_throughput_graphs/2n-zn2-xxv710.rst
@@ -45,26 +45,25 @@ CSIT source code for the test cases used for plots can be found in
 64b-2t1c-base
 -------------
 
-..
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-zn2-xxv710-64b-2t1c-base-ndr.html"></iframe>
-        <p><br></p>
-        </center>
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-zn2-xxv710-64b-2t1c-base-ndr.html"></iframe>
+    <p><br></p>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/dpdk/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-2t1c-base-ndr}
-                \label{fig:2n-zn2-xxv710-64b-2t1c-base-ndr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-2t1c-base-ndr}
+            \label{fig:2n-zn2-xxv710-64b-2t1c-base-ndr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 .. raw:: html
 
@@ -89,26 +88,25 @@ CSIT source code for the test cases used for plots can be found in
 64b-4t2c-base
 -------------
 
-..
-    .. raw:: html
+.. raw:: html
 
-        <center>
-        <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-zn2-xxv710-64b-4t2c-base-ndr.html"></iframe>
-        <p><br></p>
-        </center>
+    <center>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/dpdk/2n-zn2-xxv710-64b-4t2c-base-ndr.html"></iframe>
+    <p><br></p>
+    </center>
 
-    .. raw:: latex
+.. raw:: latex
 
-        \begin{figure}[H]
-            \centering
-                \graphicspath{{../_build/_static/dpdk/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-4t2c-base-ndr}
-                \label{fig:2n-zn2-xxv710-64b-4t2c-base-ndr}
-        \end{figure}
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/dpdk/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-zn2-xxv710-64b-4t2c-base-ndr}
+            \label{fig:2n-zn2-xxv710-64b-4t2c-base-ndr}
+    \end{figure}
 
-    .. raw:: latex
+.. raw:: latex
 
-        \clearpage
+    \clearpage
 
 .. raw:: html
 
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 47ebadcae8..c1330c7062 100644
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -7,7 +7,7 @@ below.
 +----------------+------------------------------------------------------------+
 | .[ww] Revision | Changes                                                    |
 +================+============================================================+
-| .04            | Initial revision                                           |
+| .06            | Initial revision                                           |
 +----------------+------------------------------------------------------------+
 
 FD.io CSIT Reports follow CSIT-[yy][mm].[ww] numbering format, with version
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst
index fcd99f7764..a4b6b91374 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-clx-xxv710.rst
@@ -277,46 +277,6 @@
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
@@ -476,26 +436,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale2m-rnd}
             \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale2m-rnd}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4routing-base-scale-dpdk
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
-            \label{fig:hdrh-lat-percentile-2n-clx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
index 26843f407d..f9a936b955 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-skx-xxv710.rst
@@ -240,26 +240,6 @@
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
     <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows.html"></iframe>
     <p><br></p>
     </center>
@@ -297,26 +277,6 @@
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
@@ -476,26 +436,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale2m-rnd}
             \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale2m-rnd}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4routing-features-dpdk
----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
-            \label{fig:hdrh-lat-percentile-2n-skx-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-zn2-xxv710.rst
index cfa0f83180..0f7ce28bd9 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-zn2-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-zn2-xxv710.rst
@@ -277,46 +277,6 @@
 
     \clearpage
 
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
@@ -476,26 +436,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale2m-rnd}
             \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4-ip4scale2m-rnd}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-64b-2t1c-ip4routing-base-scale-dpdk
------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
-            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/nat44-2n-zn2-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency/nat44-2n-zn2-xxv710.rst
new file mode 100644
index 0000000000..4c22c9b269
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency/nat44-2n-zn2-xxv710.rst
@@ -0,0 +1,94 @@
+
+.. 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>
+
+2n-zn2-xxv710
+~~~~~~~~~~~~~
+
+64b-2t1c-ethip4udp-nat44det-avf
+-------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
+            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1-p1-s1}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
+            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-2t1c-ethip4udp-nat44det-dpdk
+--------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4udp-ip4base-nat44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
+            \label{fig:hdrh-lat-percentile-2n-zn2-25ge2p1xxv710-64b-2t1c-ethip4udp-nat44det-h1-p1-s1}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/nat44.rst b/docs/report/vpp_performance_tests/packet_latency/nat44.rst
index c7e30bbbab..1d4ba15384 100644
--- a/docs/report/vpp_performance_tests/packet_latency/nat44.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/nat44.rst
@@ -13,3 +13,4 @@ CSIT source code for the test cases used for plots can be found in
 
     nat44-2n-skx-xxv710
     nat44-2n-clx-xxv710
+    nat44-2n-zn2-xxv710
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
index a5ce6f685a..dd821c9fad 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6.rst
@@ -20,4 +20,6 @@ CSIT source code for the test cases used for plots can be found in
     srv6-3n-skx-xxv710
     srv6-3n-hsw-xl710
     srv6-3n-tsh-x520
+
+..
     srv6-3n-dnv-x553
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index d652cdce91..79ac23de60 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -116,7 +116,7 @@ rst_epilog = u"""
            dpdk_prev_release=u'20.08',
            sdpdkrelease=u'2011',
            trex_version=u'v2.86',
-           vpp_release_commit_id=u'072def4738f149a6e3f2f3884fae55690d6ad3a1')
+           vpp_release_commit_id=u'3d2d96e5547484290c9368bac0a420afa8c4c068')
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index f8491cf6a8..ce971c44ae 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -15610,7 +15610,7 @@
 - type: "plot"
   title: "Throughput: 2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-ndr"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
   data: "plot-vpp-throughput-lat-tsa-2n-tx2"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
@@ -15620,13 +15620,13 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-1t1c-ethip6-ip6base-iacldstbase-ndrpdr"
   layout:
-    title: "2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-ndr"
+    title: "2n-tx2-xl710-78b-1t1c-ip4routing-base-scale-dpdk-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-pdr"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
   data: "plot-vpp-throughput-lat-tsa-2n-tx2"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
@@ -15636,7 +15636,7 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-1t1c-ethip6-ip6base-iacldstbase-ndrpdr"
   layout:
-    title: "2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-pdr"
+    title: "2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -18704,7 +18704,7 @@
 - type: "plot"
   title: "Speedup: 2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-tx2"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
@@ -18714,13 +18714,13 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-.t.c-ethip6-ip6base-iacldstbase-ndrpdr"
   layout:
-    title: "2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-ndr-tsa"
+    title: "2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-tx2"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
@@ -18730,7 +18730,7 @@
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-.t.c-ethip6-ip6base-iacldstbase-ndrpdr"
   layout:
-    title: "2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-pdr-tsa"
+    title: "2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -19283,8 +19283,8 @@
   output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-1t1c-base-ndr"
   data: "plot-dpdk-throughput-latency-2n-tx2"
   include:
-    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
     title: "2n-tx2-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
@@ -19295,8 +19295,8 @@
   output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-2t2c-base-ndr"
   data: "plot-dpdk-throughput-latency-2n-tx2"
   include:
-    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
     title: "2n-tx2-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
@@ -19307,8 +19307,8 @@
   output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-1t1c-base-pdr"
   data: "plot-dpdk-throughput-latency-2n-tx2"
   include:
-    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
     title: "2n-tx2-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
@@ -19319,8 +19319,8 @@
   output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-2t2c-base-pdr"
   data: "plot-dpdk-throughput-latency-2n-tx2"
   include:
-    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
     title: "2n-tx2-xl710-64b-2t2c-base-pdr"
     layout: "plot-throughput"