Report: Modify aws graphs

Change-Id: I00e67793b33cd5b643759c93cdabda6c215f4824
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 8ff3473d6111784490c5622c52073dd9c749307f)

14 files changed, 358 insertions, 183 deletions

diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-aws-nitro50g.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-aws-nitro50g.rst
index 8d4b124e70..d77574b937 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-2n-aws-nitro50g.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-2n-aws-nitro50g.rst
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale2m.html"></iframe>
+    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale20k.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale2m}
-            \label{fig:hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale2m}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale20k}
+            \label{fig:hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale20k}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4-3n-aws-nitro50g.rst b/docs/report/vpp_performance_tests/packet_latency/ip4-3n-aws-nitro50g.rst
index 46663bfb17..2b65d41a9a 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4-3n-aws-nitro50g.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4-3n-aws-nitro50g.rst
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale2m.html"></iframe>
+    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale20k.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,6 +66,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale2m}
-            \label{fig:hdrh-lat-percentile-3n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale2m}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-3n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale20k}
+            \label{fig:hdrh-lat-percentile-3n-aws-50ge1p1ena-ethip4-64b-2t1c-ethip4-ip4scale20k}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6-2n-aws-nitro50g.rst b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-aws-nitro50g.rst
new file mode 100644
index 0000000000..c8c6489c40
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6-2n-aws-nitro50g.rst
@@ -0,0 +1,71 @@
+
+.. 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-aws-nitro50g
+~~~~~~~~~~~~~~~
+
+1518b-2t1c-ip6routing-base-scale-ena
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip6-1518b-2t1c-ethip6-ip6base.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-aws-50ge1p1ena-ethip6-1518b-2t1c-ethip6-ip6base}
+            \label{fig:hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip6-1518b-2t1c-ethip6-ip6base}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip6-1518b-2t1c-ethip6-ip6scale20k.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-aws-50ge1p1ena-ethip6-1518b-2t1c-ethip6-ip6scale20k}
+            \label{fig:hdrh-lat-percentile-2n-aws-50ge1p1ena-ethip6-1518b-2t1c-ethip6-ip6scale20k}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6.rst b/docs/report/vpp_performance_tests/packet_latency/ip6.rst
index 2d1ca660d6..96380208e7 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6.rst
@@ -18,6 +18,7 @@ CSIT source code for the test cases used for plots can be found in
     ip6-2n-zn2-xxv710
     ip6-3n-tsh-x520
     ip6-2n-tx2-xl710
+    ip6-2n-aws-nitro50g
 
 ..
     ip6-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-aws-ena.rst b/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-aws-ena.rst
new file mode 100644
index 0000000000..a92e949207
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-aws-ena.rst
@@ -0,0 +1,50 @@
+
+.. 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';
+        }
+
+
+3n-aws-ena
+~~~~~~~~~~
+
+1518b-2t1c-ipsec-ip4routing-scale-sw-ena
+----------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="1" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/hdrh-lat-percentile-3n-aws-50ge1p1ena-1518b-2t1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm.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-3n-aws-50ge1p1ena-1518b-2t1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm}
+            \label{fig:hdrh-lat-percentile-3n-aws-50ge1p1ena-1518b-2t1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency/ipsec.rst b/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
index 29ca0fc6e0..d0460d0e5d 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
@@ -13,6 +13,7 @@ CSIT source code for the test cases used for plots can be found in
 
     ipsec-3n-skx-xxv710
     ipsec-3n-tsh-x520
+    ipsec-3n-aws-ena
 
 ..
     ipsec-3n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-aws-nitro50g.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-aws-nitro50g.rst
index f0e4a745b1..0365d91455 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-aws-nitro50g.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-aws-nitro50g.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-ena
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-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-aws-nitro50g-64b-2t1c-ip4routing-base-scale-ndr}
-            \label{fig:2n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-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-aws-nitro50g-64b-2t1c-ip4routing-base-scale-pdr}
-            \label{fig:2n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 1518b-2t1c-ip4routing-base-scale-ena
 ------------------------------------
 
@@ -155,46 +112,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-pdr}
             \label{fig:2n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-pdr}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-2t1c-ip4routing-base-scale-ena
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="311" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-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-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-ndr}
-            \label{fig:2n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="312" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-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-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-pdr}
-            \label{fig:2n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-aws-nitro50g.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-aws-nitro50g.rst
index 11639e7be1..dc040b34a8 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-aws-nitro50g.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-aws-nitro50g.rst
@@ -74,49 +74,6 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-ena
-----------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="111" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-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]{3n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-ndr}
-            \label{fig:3n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="112" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-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]{3n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-pdr}
-            \label{fig:3n-aws-nitro50g-64b-2t1c-ip4routing-base-scale-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
 1518b-2t1c-ip4routing-base-scale-ena
 ------------------------------------
 
@@ -155,46 +112,3 @@
             \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-pdr}
             \label{fig:3n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-pdr}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-1518b-2t1c-ip4routing-base-scale-ena
-------------------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="311" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-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]{3n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-ndr}
-            \label{fig:3n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="312" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-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]{3n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-pdr}
-            \label{fig:3n-aws-nitro50g-1518b-2t1c-ip4routing-base-scale-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-aws-nitro50g.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-aws-nitro50g.rst
new file mode 100644
index 0000000000..750f4fcc00
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-aws-nitro50g.rst
@@ -0,0 +1,71 @@
+
+.. 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-aws-nitro50g
+~~~~~~~~~~~~~~~
+
+1518b-2t1c-ip6routing-base-scale-ena
+------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="211" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-aws-nitro50g-1518b-2t1c-ip6routing-base-scale-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-aws-nitro50g-1518b-2t1c-ip6routing-base-scale-ndr}
+            \label{fig:2n-aws-nitro50g-1518b-2t1c-ip6routing-base-scale-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="212" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-aws-nitro50g-1518b-2t1c-ip6routing-base-scale-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-aws-nitro50g-1518b-2t1c-ip6routing-base-scale-pdr}
+            \label{fig:2n-aws-nitro50g-1518b-2t1c-ip6routing-base-scale-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
index ee475aafc4..16f5c52026 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6.rst
@@ -31,6 +31,7 @@ CSIT source code for the test cases used for plots can be found in
     ip6-2n-tx2-xl710
     ip6-2n-dnv-x553
     ip6-3n-dnv-x553
+    ip6-2n-aws-nitro50g
 
 ..
     ip6-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-ena.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-ena.rst
new file mode 100644
index 0000000000..3ab22efc08
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-ena.rst
@@ -0,0 +1,114 @@
+
+.. 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>
+
+3n-aws-nitro50g
+~~~~~~~~~~~~~~~
+
+imix-2t1c-ipsec-ip4routing-scale-sw-ena
+---------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-aws-nitro50g-imix-2t1c-ipsec-ip4routing-scale-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]{3n-aws-nitro50g-imix-2t1c-ipsec-ip4routing-scale-ndr}
+            \label{fig:3n-aws-nitro50g-imix-2t1c-ipsec-ip4routing-scale-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-aws-nitro50g-imix-2t1c-ipsec-ip4routing-scale-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]{3n-aws-nitro50g-imix-2t1c-ipsec-ip4routing-scale-pdr}
+            \label{fig:3n-aws-nitro50g-imix-2t1c-ipsec-ip4routing-scale-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+1518b-2t1c-ipsec-ip4routing-scale-sw-ena
+----------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="101" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-aws-nitro50g-1518b-2t1c-ipsec-ip4routing-scale-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]{3n-aws-nitro50g-1518b-2t1c-ipsec-ip4routing-scale-ndr}
+            \label{fig:3n-aws-nitro50g-1518b-2t1c-ipsec-ip4routing-scale-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="102" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-aws-nitro50g-1518b-2t1c-ipsec-ip4routing-scale-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]{3n-aws-nitro50g-1518b-2t1c-ipsec-ip4routing-scale-pdr}
+            \label{fig:3n-aws-nitro50g-1518b-2t1c-ipsec-ip4routing-scale-pdr}
+    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
index 1add2696c8..e6957fbb4b 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -23,6 +23,7 @@ CSIT source code for the test cases used for plots can be found in
     ipsec-3n-skx-xxv710
     ipsec-3n-tsh-x520
     ipsec-3n-dnv-x553
+    ipsec-2n-aws-nitro50g
 
 ..
     ipsec-3n-icx-e810cq
diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index f797b6939d..51e079d2bd 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -479,7 +479,7 @@
 
   vpp-2n-zn2-prev-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2110-2n-zn2:
-      - 33  # rls2110.rc2 MRR iter env 8 - REPLACE by 2106.rel
+      - 19  # rls2106.rel MRR iter env 8
 
   vpp-2n-zn2-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2110-2n-zn2:
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index f5f8d2c156..345e17c592 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -7435,7 +7435,7 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
   layout:
     title: "2n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
@@ -7448,12 +7448,25 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-ndrpdr.1518b-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.1518b-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.1518b-{core}-ethip4-ip4scale20k-ndrpdr"
   layout:
     title: "2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
+  title: "Throughput: 2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-{test_type}"
+  data: "vpp-2n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6base-ndrpdr.1518B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-ndrpdr.1518B-{core}-ethip6-ip6scale20k-ndrpdr"
+  layout:
+    title: "2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
   title: "Throughput: 3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-{test_type}"
@@ -7461,7 +7474,7 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
   layout:
     title: "3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
@@ -7474,12 +7487,36 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-ndrpdr.1518b-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.1518b-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.1518b-{core}-ethip4-ip4scale20k-ndrpdr"
   layout:
     title: "3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
+  title: "Throughput: 3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.50ge1p1ENA-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.50ge1p1ENA-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
   title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"