Report: Fix bugs in NAT44 graphs

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

4 files changed, 126 insertions, 824 deletions

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-clx-xxv710.rst
index ac815ff1b6..a6019fccc6 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-clx-xxv710.rst
@@ -117,13 +117,13 @@
 
     \clearpage
 
-64b-ip4routing-udp-stf-cps-avf
-------------------------------
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-ndr.html"></iframe>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-pdr.html"></iframe>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,8 +152,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -166,7 +166,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-ndr.html"></iframe>
+    <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +175,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-pdr.html"></iframe>
+    <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,108 +195,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr}
     \end{figure}
 
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-udp-stf-cps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="05n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-ndr.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]{2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-ndr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="05p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-pdr.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]{2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-pdr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-pdr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-udp-stf-pps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="06n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-ndr.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]{2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-ndr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="06p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-pdr.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]{2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-pdr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-pdr}
-        \end{figure}
-
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-tcp-stf-cps-avf
-------------------------------
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-ndr.html"></iframe>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -305,8 +218,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -316,7 +229,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-pdr.html"></iframe>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -325,8 +238,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
     \end{figure}
 
 
@@ -334,13 +247,13 @@
 
     \clearpage
 
-64b-ip4routing-tcp-stf-pps-avf
-------------------------------
+64b-nat44ed-ip4routing-tcp-stf-pps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="08n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-ndr.html"></iframe>
+    <iframe id="08n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -349,8 +262,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -360,7 +273,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="08p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-pdr.html"></iframe>
+    <iframe id="08p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -369,94 +282,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr}
     \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-tcp-stf-cps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="09n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-ndr.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]{2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-ndr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="09p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-pdr.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]{2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-pdr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-pdr}
-        \end{figure}
-
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-tcp-stf-pps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="10n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-ndr.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]{2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-ndr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-ndr}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="10p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-pdr.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]{2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-pdr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-pdr}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-skx-xxv710.rst
index 629cf76f56..7fc6d05d5d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-skx-xxv710.rst
@@ -117,13 +117,13 @@
 
     \clearpage
 
-64b-ip4routing-udp-stf-cps-avf
-------------------------------
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-ndr.html"></iframe>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-pdr.html"></iframe>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,21 +152,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-cps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-udp-stf-pps-avf
-------------------------------
+64b-nat44ed-ip4routing-udp-stf-pps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-ndr.html"></iframe>
+    <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +175,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-pdr.html"></iframe>
+    <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,108 +195,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-udp-stf-pps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr}
     \end{figure}
 
-..
-    .. raw:: latex
-    
-        \clearpage
-    
-    64b-ip4base-ip4routing-udp-stf-cps-avf
-    --------------------------------------
-    
-    .. raw:: html
-    
-        <center>
-        <iframe id="05n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-ndr.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]{2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-ndr}
-                \label{fig:2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-ndr}
-        \end{figure}
-    
-    .. raw:: latex
-    
-        \clearpage
-    
-    .. raw:: html
-    
-        <center>
-        <iframe id="05p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-pdr.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]{2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-pdr}
-                \label{fig:2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-cps-avf-pdr}
-        \end{figure}
-    
-    .. raw:: latex
-    
-        \clearpage
-    
-    64b-ip4base-ip4routing-udp-stf-pps-avf
-    --------------------------------------
-    
-    .. raw:: html
-    
-        <center>
-        <iframe id="06n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-ndr.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]{2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-ndr}
-                \label{fig:2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-ndr}
-        \end{figure}
-    
-    .. raw:: latex
-    
-        \clearpage
-    
-    .. raw:: html
-    
-        <center>
-        <iframe id="06p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-pdr.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]{2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-pdr}
-                \label{fig:2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-udp-stf-pps-avf-pdr}
-        \end{figure}
-
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-tcp-stf-cps-avf
-------------------------------
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-ndr.html"></iframe>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -305,8 +218,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -316,7 +229,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-pdr.html"></iframe>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -325,8 +238,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-cps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
     \end{figure}
 
 
@@ -334,13 +247,13 @@
 
     \clearpage
 
-64b-ip4routing-tcp-stf-pps-avf
-------------------------------
+64b-nat44ed-ip4routing-tcp-stf-pps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="08n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-ndr.html"></iframe>
+    <iframe id="08n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -349,8 +262,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -360,7 +273,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="08p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-pdr.html"></iframe>
+    <iframe id="08p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -369,94 +282,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-tcp-stf-pps-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr}
     \end{figure}
-
-..
-    .. raw:: latex
-    
-        \clearpage
-    
-    64b-ip4base-ip4routing-tcp-stf-cps-avf
-    --------------------------------------
-    
-    .. raw:: html
-    
-        <center>
-        <iframe id="09n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-ndr.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]{2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-ndr}
-                \label{fig:2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-ndr}
-        \end{figure}
-    
-    .. raw:: latex
-    
-        \clearpage
-    
-    .. raw:: html
-    
-        <center>
-        <iframe id="09p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-pdr.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]{2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-pdr}
-                \label{fig:2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-cps-avf-pdr}
-        \end{figure}
-    
-    
-    .. raw:: latex
-    
-        \clearpage
-    
-    64b-ip4base-ip4routing-tcp-stf-pps-avf
-    --------------------------------------
-    
-    .. raw:: html
-    
-        <center>
-        <iframe id="10n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-ndr.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]{2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-ndr}
-                \label{fig:2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-ndr}
-        \end{figure}
-    
-    .. raw:: latex
-    
-        \clearpage
-    
-    .. raw:: html
-    
-        <center>
-        <iframe id="10p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-pdr.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]{2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-pdr}
-                \label{fig:2n-skx-xxv710-64b-2t1c-ip4base-ip4routing-tcp-stf-pps-avf-pdr}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst
index 65e18fdfd4..b8779f786c 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst
@@ -117,13 +117,13 @@
 
     \clearpage
 
-64b-ip4routing-udp-stf-cps-avf
-------------------------------
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-udp-stf-cps-avf-ndr-tsa.html"></iframe>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-udp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-udp-stf-cps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-udp-stf-cps-avf-pdr-tsa.html"></iframe>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,21 +152,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-udp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-udp-stf-cps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-udp-stf-pps-avf
-------------------------------
+64b-nat44ed-ip4routing-udp-stf-pps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-udp-stf-pps-avf-ndr-tsa.html"></iframe>
+    <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +175,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-udp-stf-pps-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-udp-stf-pps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-udp-stf-pps-avf-pdr-tsa.html"></iframe>
+    <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,108 +195,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-udp-stf-pps-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-udp-stf-pps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa}
     \end{figure}
 
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-udp-stf-cps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="05p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-ndr-tsa.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]{2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-ndr-tsa}
-                \label{fig:2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="05n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-pdr-tsa.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]{2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-pdr-tsa}
-                \label{fig:2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-udp-stf-pps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="06p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-ndr-tsa.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]{2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-ndr-tsa}
-                \label{fig:2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="06n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-pdr-tsa.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]{2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-pdr-tsa}
-                \label{fig:2n-clx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-pdr-tsa}
-        \end{figure}
-
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-tcp-stf-cps-avf
-------------------------------
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-tcp-stf-cps-avf-ndr-tsa.html"></iframe>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -305,8 +218,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -316,7 +229,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-tcp-stf-cps-avf-pdr-tsa.html"></iframe>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -325,21 +238,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-tcp-stf-pps-avf
-------------------------------
+64b-nat44ed-ip4routing-tcp-stf-pps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="08p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-tcp-stf-pps-avf-ndr-tsa.html"></iframe>
+    <iframe id="08p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -348,8 +261,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-tcp-stf-pps-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-tcp-stf-pps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -359,7 +272,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="08n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4routing-tcp-stf-pps-avf-pdr-tsa.html"></iframe>
+    <iframe id="08n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -368,93 +281,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-tcp-stf-pps-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-tcp-stf-pps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa}
     \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-tcp-stf-cps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="09p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-ndr-tsa.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]{2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-                \label{fig:2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="09n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-pdr-tsa.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]{2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-                \label{fig:2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-tcp-stf-pps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="10p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-ndr-tsa.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]{2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-ndr-tsa}
-                \label{fig:2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="10n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-pdr-tsa.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]{2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-pdr-tsa}
-                \label{fig:2n-clx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-pdr-tsa}
-        \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-skx-xxv710.rst
index 6ca349ab07..e0b73733b1 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-skx-xxv710.rst
@@ -117,13 +117,13 @@
 
     \clearpage
 
-64b-ip4routing-udp-stf-cps-avf
-------------------------------
+64b-nat44ed-ip4routing-udp-stf-cps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-udp-stf-cps-avf-ndr-tsa.html"></iframe>
+    <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-udp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-udp-stf-cps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-udp-stf-cps-avf-pdr-tsa.html"></iframe>
+    <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,21 +152,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-udp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-udp-stf-cps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-udp-stf-pps-avf
-------------------------------
+64b-nat44ed-ip4routing-udp-stf-pps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-udp-stf-pps-avf-ndr-tsa.html"></iframe>
+    <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +175,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-udp-stf-pps-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-udp-stf-pps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-udp-stf-pps-avf-pdr-tsa.html"></iframe>
+    <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,108 +195,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-udp-stf-pps-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-udp-stf-pps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa}
     \end{figure}
 
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-udp-stf-cps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="05p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-ndr-tsa.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]{2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-ndr-tsa}
-                \label{fig:2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="05n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-pdr-tsa.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]{2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-pdr-tsa}
-                \label{fig:2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-cps-avf-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-udp-stf-pps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="06p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-ndr-tsa.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]{2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-ndr-tsa}
-                \label{fig:2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="06n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-pdr-tsa.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]{2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-pdr-tsa}
-                \label{fig:2n-skx-xxv710-64b-ip4base-ip4routing-udp-stf-pps-avf-pdr-tsa}
-        \end{figure}
-
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-tcp-stf-cps-avf
-------------------------------
+64b-nat44ed-ip4routing-tcp-stf-cps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-tcp-stf-cps-avf-ndr-tsa.html"></iframe>
+    <iframe id="07p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -305,8 +218,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -316,7 +229,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-tcp-stf-cps-avf-pdr-tsa.html"></iframe>
+    <iframe id="07n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -325,21 +238,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-ip4routing-tcp-stf-pps-avf
-------------------------------
+64b-nat44ed-ip4routing-tcp-stf-pps-avf
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="08p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-tcp-stf-pps-avf-ndr-tsa.html"></iframe>
+    <iframe id="08p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -348,8 +261,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-tcp-stf-pps-avf-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-tcp-stf-pps-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -359,7 +272,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="08n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4routing-tcp-stf-pps-avf-pdr-tsa.html"></iframe>
+    <iframe id="08n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -368,93 +281,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-tcp-stf-pps-avf-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-tcp-stf-pps-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa}
     \end{figure}
-
-..
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-tcp-stf-cps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="09p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-ndr-tsa.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]{2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-                \label{fig:2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="09n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-pdr-tsa.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]{2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-                \label{fig:2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    64b-ip4base-ip4routing-tcp-stf-pps-avf
-    --------------------------------------
-
-    .. raw:: html
-
-        <center>
-        <iframe id="10p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-ndr-tsa.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]{2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-ndr-tsa}
-                \label{fig:2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-ndr-tsa}
-        \end{figure}
-
-    .. raw:: latex
-
-        \clearpage
-
-    .. raw:: html
-
-        <center>
-        <iframe id="10n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-pdr-tsa.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]{2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-pdr-tsa}
-                \label{fig:2n-skx-xxv710-64b-ip4base-ip4routing-tcp-stf-pps-avf-pdr-tsa}
-        \end{figure}