From e06a1aeeeeb04761aa0cdb39ba4f879798afa32a Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Wed, 27 Oct 2021 14:42:34 +0200
Subject: Report: Add data

Change-Id: I51e809322d652e1f410c5674883bdd86e730af41
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit d4bcfe35de5e9d1f99f8f56d958dc00d615e1a3f)
---
 .../vpp_performance_tests/packet_latency/ip4.rst   |   2 -
 .../vpp_performance_tests/packet_latency/ip6.rst   |   1 -
 .../packet_latency/ipsec-3n-aws-ena.rst            |  50 ---------
 .../packet_latency/ipsec-3n-aws-nitro50g.rst       |  50 +++++++++
 .../vpp_performance_tests/packet_latency/ipsec.rst |   1 -
 .../packet_throughput_graphs/ipsec-3n-aws-ena.rst  | 114 ---------------------
 .../ipsec-3n-aws-nitro50g.rst                      | 114 +++++++++++++++++++++
 .../packet_throughput_graphs/ipsec.rst             |   2 +-
 .../specifications/report/data_sets.yaml           |  24 ++---
 9 files changed, 175 insertions(+), 183 deletions(-)
 delete mode 100644 docs/report/vpp_performance_tests/packet_latency/ipsec-3n-aws-ena.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_latency/ipsec-3n-aws-nitro50g.rst
 delete mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-ena.rst
 create mode 100644 docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-nitro50g.rst

diff --git a/docs/report/vpp_performance_tests/packet_latency/ip4.rst b/docs/report/vpp_performance_tests/packet_latency/ip4.rst
index c12ed297d3..094906c803 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip4.rst
@@ -18,8 +18,6 @@ CSIT source code for the test cases used for plots can be found in
     ip4-2n-zn2-xxv710
     ip4-3n-tsh-x520
     ip4-2n-tx2-xl710
-    ip4-2n-aws-nitro50g
-    ip4-3n-aws-nitro50g
 
 ..
     ip4-2n-icx-e810cq
diff --git a/docs/report/vpp_performance_tests/packet_latency/ip6.rst b/docs/report/vpp_performance_tests/packet_latency/ip6.rst
index 96380208e7..2d1ca660d6 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ip6.rst
@@ -18,7 +18,6 @@ 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
deleted file mode 100644
index a92e949207..0000000000
--- a/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-aws-ena.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-
-.. 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-3n-aws-nitro50g.rst b/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-aws-nitro50g.rst
new file mode 100644
index 0000000000..594b653359
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_latency/ipsec-3n-aws-nitro50g.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-nitro50g
+~~~~~~~~~~~~~~~
+
+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 d0460d0e5d..29ca0fc6e0 100644
--- a/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_latency/ipsec.rst
@@ -13,7 +13,6 @@ 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/ipsec-3n-aws-ena.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-ena.rst
deleted file mode 100644
index 3ab22efc08..0000000000
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-ena.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-
-.. 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-3n-aws-nitro50g.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-nitro50g.rst
new file mode 100644
index 0000000000..3ab22efc08
--- /dev/null
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-aws-nitro50g.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 e6957fbb4b..cd14703836 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec.rst
@@ -23,7 +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-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 51e079d2bd..0dbdb93ced 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -1185,15 +1185,13 @@
 
   vpp-2n-aws-curr-iter:
     csit-vpp-perf-report-iterative-2110-2n-aws:
-      - 9   # rls2110.rc2 NDRPDR iter env 8
-      - 10  # rls2110.rc2 NDRPDR iter env 8
-      - 19  # rls2110.rc2 NDRPDR iter env 8
-      - 20  # rls2110.rc2 NDRPDR iter env 8
-      - 21  # rls2110.rc2 NDRPDR iter env 8
+      - 22  # rls2110.rc2 NDRPDR iter env 8
+      - 23  # rls2110.rc2 NDRPDR iter env 8
+      - 24  # rls2110.rc2 NDRPDR iter env 8
 
   vpp-2n-aws-curr-iter-best:
     csit-vpp-perf-report-iterative-2110-2n-aws:
-      - 9   # rls2110.rc2 NDRPDR iter env 8
+      - 23  # rls2110.rc2 NDRPDR iter env 8
 
   vpp-2n-aws-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2110-2n-aws:
@@ -1202,21 +1200,19 @@
   vpp-2n-aws-curr-cov:
     # csit-vpp-perf-report-coverage-2110-2n-aws:
     csit-vpp-perf-report-iterative-2110-2n-aws:
-      - 9   # rls2110.rc2 NDRPDR iter env 8
+      - 23  # rls2110.rc2 NDRPDR iter env 8
 
   # 3n-aws
 
   vpp-3n-aws-curr-iter:
     csit-vpp-perf-report-iterative-2110-3n-aws:
-      - 24  # rls2110.rc2 NDRPDR iter env 8
-      - 26  # rls2110.rc2 NDRPDR iter env 8
-      - 27  # rls2110.rc2 NDRPDR iter env 8
-      - 28  # rls2110.rc2 NDRPDR iter env 8
-      - 29  # rls2110.rc2 NDRPDR iter env 8
+      - 30  # rls2110.rc2 NDRPDR iter env 8
+      - 31  # rls2110.rc2 NDRPDR iter env 8
+      - 32  # rls2110.rc2 NDRPDR iter env 8
 
   vpp-3n-aws-curr-iter-best:
     csit-vpp-perf-report-iterative-2110-3n-aws:
-      - 24  # rls2110.rc2 NDRPDR iter env 8
+      - 30  # rls2110.rc2 NDRPDR iter env 8
 
   vpp-3n-aws-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2110-3n-aws:
@@ -1225,7 +1221,7 @@
   vpp-3n-aws-curr-cov:
     # csit-vpp-perf-report-coverage-2110-3n-aws:
     csit-vpp-perf-report-iterative-2110-3n-aws:
-      - 24  # rls2110.rc2 NDRPDR iter env 8
+      - 30  # rls2110.rc2 NDRPDR iter env 8
 
   # 2n-icx
 
-- 
cgit 1.2.3-korg