From 8ff3473d6111784490c5622c52073dd9c749307f Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Tue, 26 Oct 2021 13:07:37 +0200
Subject: Report: Modify aws graphs

Change-Id: I00e67793b33cd5b643759c93cdabda6c215f4824
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 .../ip4-2n-aws-nitro50g.rst                        |  86 ----------------
 .../ip4-3n-aws-nitro50g.rst                        |  86 ----------------
 .../ip6-2n-aws-nitro50g.rst                        |  71 +++++++++++++
 .../packet_throughput_graphs/ip6.rst               |   1 +
 .../packet_throughput_graphs/ipsec-3n-aws-ena.rst  | 114 +++++++++++++++++++++
 .../packet_throughput_graphs/ipsec.rst             |   1 +
 6 files changed, 187 insertions(+), 172 deletions(-)
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-aws-nitro50g.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-ena.rst

(limited to 'docs/report/vpp_performance_tests/packet_throughput_graphs')

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
-- 
cgit 1.2.3-korg