Report: Add 3n-icx - fixes

Change-Id: I130405cd96630e8384d67da02a8bfd1449ff4c85
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 3110a6a982012a90b1b8e02c552894824a2ab568)

3 files changed, 84 insertions, 83 deletions

diff --git a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
index 52f9c50689..a5dd15a84a 100644
--- a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
+++ b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-icx_testbeds.rst
@@ -23,24 +23,24 @@ NDR Comparison
 
 Comparison tables in HTML, ASCII and CSV formats:
 
-  - `HTML 1c NDR comparison <performance-compare-topologies-3n-skx-3n-icx-1c-ndr.html>`_
-  - `HTML 2c NDR comparison <performance-compare-topologies-3n-skx-3n-icx-2c-ndr.html>`_
-  - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-ndr.txt>`_
-  - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-ndr.txt>`_
-  - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-ndr-csv.csv>`_
-  - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-ndr-csv.csv>`_
+  - `HTML 1c NDR comparison <performance-compare-testbeds-3n-skx-3n-icx-1c-ndr.html>`_
+  - `HTML 2c NDR comparison <performance-compare-testbeds-3n-skx-3n-icx-2c-ndr.html>`_
+  - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-ndr.txt>`_
+  - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-ndr.txt>`_
+  - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-ndr-csv.csv>`_
+  - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-ndr-csv.csv>`_
 
 PDR Comparison
 ~~~~~~~~~~~~~~
 
 Comparison tables in HTML, ASCII and CSV formats:
 
-  - `HTML 1c PDR comparison <performance-compare-topologies-3n-skx-3n-icx-1c-pdr.html>`_
-  - `HTML 2c PDR comparison <performance-compare-topologies-3n-skx-3n-icx-2c-pdr.html>`_
-  - `ASCII 1c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-pdr.txt>`_
-  - `ASCII 2c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-pdr.txt>`_
-  - `CSV 1c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-pdr-csv.csv>`_
-  - `CSV 2c PDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-pdr-csv.csv>`_
+  - `HTML 1c PDR comparison <performance-compare-testbeds-3n-skx-3n-icx-1c-pdr.html>`_
+  - `HTML 2c PDR comparison <performance-compare-testbeds-3n-skx-3n-icx-2c-pdr.html>`_
+  - `ASCII 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-pdr.txt>`_
+  - `ASCII 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-pdr.txt>`_
+  - `CSV 1c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-pdr-csv.csv>`_
+  - `CSV 2c PDR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-pdr-csv.csv>`_
 
 ..
   MRR Comparison
@@ -48,12 +48,12 @@ Comparison tables in HTML, ASCII and CSV formats:
 
   Comparison tables in HTML, ASCII and CSV formats:
 
-    - `HTML 1c MRR comparison <performance-compare-topologies-3n-skx-3n-icx-1c-mrr.html>`_
-    - `HTML 2c MRR comparison <performance-compare-topologies-3n-skx-3n-icx-2c-mrr.html>`_
-    - `HTML 4c MRR comparison <performance-compare-topologies-3n-skx-3n-icx-4c-mrr.html>`_
-    - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-mrr.txt>`_
-    - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-mrr.txt>`_
-    - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-4c-mrr.txt>`_
-    - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-1c-mrr-csv.csv>`_
-    - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-2c-mrr-csv.csv>`_
-    - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-3n-icx-4c-mrr-csv.csv>`_
+    - `HTML 1c MRR comparison <performance-compare-testbeds-3n-skx-3n-icx-1c-mrr.html>`_
+    - `HTML 2c MRR comparison <performance-compare-testbeds-3n-skx-3n-icx-2c-mrr.html>`_
+    - `HTML 4c MRR comparison <performance-compare-testbeds-3n-skx-3n-icx-4c-mrr.html>`_
+    - `ASCII 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-mrr.txt>`_
+    - `ASCII 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-mrr.txt>`_
+    - `ASCII 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-4c-mrr.txt>`_
+    - `CSV 1c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-1c-mrr-csv.csv>`_
+    - `CSV 2c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-2c-mrr-csv.csv>`_
+    - `CSV 4c MRR comparison <../../_static/vpp/performance-compare-testbeds-3n-skx-3n-icx-4c-mrr-csv.csv>`_
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
index eab475d6fa..1c6e9d16dc 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-icx-e810cq.rst
@@ -57,7 +57,7 @@ imix-2t1c-ipsec-ip4routing-scale-avf
 .. raw:: html
 
     <center>
-    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avfv-pdr-tsa.html"></iframe>
+    <iframe id="2" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -113,88 +113,89 @@ imix-2t1c-ipsec-ip4routing-scale-avf
             \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-pdr-tsa}
     \end{figure}
 
-.. raw:: latex
+..
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-imix-2t1c-ipsec-ip4routing-scale-dpdk
--------------------------------------
+    imix-2t1c-ipsec-ip4routing-scale-dpdk
+    -------------------------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="5" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
+                \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="6" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-avf-pdr-tsa}
+                \label{fig:3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-1518b-2t1c-ipsec-ip4routing-scale-avf
--------------------------------------
+    1518b-2t1c-ipsec-ip4routing-scale-dpdk
+    --------------------------------------
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="7" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
+                \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
+        \end{figure}
 
-.. raw:: latex
+    .. raw:: latex
 
-    \clearpage
+        \clearpage
 
-.. raw:: html
+    .. raw:: html
 
-    <center>
-    <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
-    <p><br></p>
-    </center>
+        <center>
+        <iframe id="8" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
+        <p><br></p>
+        </center>
 
-.. raw:: latex
+    .. raw:: latex
 
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-avf-pdr-tsa}
-            \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
-    \end{figure}
+        \begin{figure}[H]
+            \centering
+                \graphicspath{{../_build/_static/vpp/}}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-avf-pdr-tsa}
+                \label{fig:3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
+        \end{figure}
diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index cb0d62ecc3..57b75b838f 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -1417,5 +1417,5 @@
       - 1   # rls2110.rel NDRPDR iter env 8
 
   vpp-3n-icx-curr-iter-best:
-    intel-csit-vpp-perf-report-iterative-2101-3n-icx:
+    intel-csit-vpp-perf-report-iterative-2110-3n-icx:
       - 1   # rls2110.rel NDRPDR iter env 8