Report: Add Trex tests

- 1n-aws
- 2n-icx

Signed-off-by: Tibor Frank <tifrank@cisco.com>
Change-Id: I31003746e8eed5718a760be1f1ad6e574c3f754e
(cherry picked from commit 32ec0b8cce48883be3f5e6e91b0797c1ab52351b)

13 files changed, 471 insertions, 191 deletions

diff --git a/docs/report/index.html.template b/docs/report/index.html.template
index e4ea7c8787..0e40ae6ad4 100644
--- a/docs/report/index.html.template
+++ b/docs/report/index.html.template
@@ -43,17 +43,16 @@ CSIT-2210
     dpdk_performance_tests/throughput_trending
     dpdk_performance_tests/test_environment
 
-..
-    .. toctree::
-        :maxdepth: 2
-        :caption: TRex Performance
-
-        trex_performance_tests/overview
-        trex_performance_tests/csit_release_notes
-        trex_performance_tests/packet_throughput_graphs/index
-        trex_performance_tests/packet_latency/index
-        trex_performance_tests/throughput_trending
-        trex_performance_tests/test_environment
+.. toctree::
+    :maxdepth: 2
+    :caption: TRex Performance
+
+    trex_performance_tests/overview
+    trex_performance_tests/csit_release_notes
+    trex_performance_tests/packet_throughput_graphs/index
+    trex_performance_tests/packet_latency/index
+    trex_performance_tests/throughput_trending
+    trex_performance_tests/test_environment
 
 .. toctree::
     :maxdepth: 2
diff --git a/docs/report/index.pdf.template b/docs/report/index.pdf.template
index ffc2b017ca..3f42728a71 100644
--- a/docs/report/index.pdf.template
+++ b/docs/report/index.pdf.template
@@ -7,8 +7,6 @@ CSIT-2210
     introduction/index
     vpp_performance_tests/index
     dpdk_performance_tests/index
+    trex_performance_tests/index
     vpp_device_tests/index
     csit_framework_documentation/index
-
-..
-    trex_performance_tests/index
diff --git a/docs/report/trex_performance_tests/csit_release_notes.rst b/docs/report/trex_performance_tests/csit_release_notes.rst
index d9e56a6a43..ce050b88ea 100644
--- a/docs/report/trex_performance_tests/csit_release_notes.rst
+++ b/docs/report/trex_performance_tests/csit_release_notes.rst
@@ -11,7 +11,7 @@ Changes in |csit-release|
 #. TEST FRAMEWORK
 
 #. TRex RELEASE VERSION
-   - **TRex version used: 2.97**
+   - **TRex version used: 3.00**
 
 
 .. _trex_known_issues:
diff --git a/docs/report/trex_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_skx.rst b/docs/report/trex_performance_tests/hdrh_packet_latency_by_percentile_graphs/1n_aws.rst
index 61baf8fcbf..eb6e82e6a7 100644
--- a/docs/report/trex_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_skx.rst
+++ b/docs/report/trex_performance_tests/hdrh_packet_latency_by_percentile_graphs/1n_aws.rst
@@ -1,3 +1,3 @@
-2n-skx
+1n-aws
 ======
 
diff --git a/docs/report/trex_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_icx.rst b/docs/report/trex_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_icx.rst
new file mode 100644
index 0000000000..4e6f59bd82
--- /dev/null
+++ b/docs/report/trex_performance_tests/hdrh_packet_latency_by_percentile_graphs/2n_icx.rst
@@ -0,0 +1,3 @@
+2n-icx
+======
+
diff --git a/docs/report/trex_performance_tests/packet_latency/1n-aws-nitro50g.rst b/docs/report/trex_performance_tests/packet_latency/1n-aws-nitro50g.rst
new file mode 100644
index 0000000000..683c96ac2c
--- /dev/null
+++ b/docs/report/trex_performance_tests/packet_latency/1n-aws-nitro50g.rst
@@ -0,0 +1,121 @@
+
+.. 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>
+
+1n-aws-nitro50g
+~~~~~~~~~~~~~~~
+
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/trex/perf?h=rls2210>`_.
+
+.. raw:: latex
+
+    \clearpage
+
+64b-ip4routing-base-scale
+-------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="hdrh-lat-percentile-1n-aws-50ge1P1ena-64b--ethip4-ip4base-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-1n-aws-50ge1P1ena-64b--ethip4-ip4base-tg.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/trex/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-1n-aws-50ge1P1ena-64b--ethip4-ip4base-tg}
+            \label{fig:hdrh-lat-percentile-1n-aws-50ge1P1ena-64b--ethip4-ip4base-tg}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="hdrh-lat-percentile-1n-aws-50ge1P1ena-64b--ethip4-ip4scale2m-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-1n-aws-50ge1P1ena-64b--ethip4-ip4scale2m-tg.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/trex/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-1n-aws-50ge1P1ena-64b--ethip4-ip4scale2m-tg}
+            \label{fig:hdrh-lat-percentile-1n-aws-50ge1P1ena-64b--ethip4-ip4scale2m-tg}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-ip6routing-base-scale
+-------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="hdrh-lat-percentile-1n-aws-50ge1P1ena-78b--ethip6-ip6base-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-1n-aws-50ge1P1ena-78b--ethip6-ip6base-tg.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/trex/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-1n-aws-50ge1P1ena-78b--ethip6-ip6base-tg}
+            \label{fig:hdrh-lat-percentile-1n-aws-50ge1P1ena-78b--ethip6-ip6base-tg}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="hdrh-lat-percentile-1n-aws-50ge1P1ena-78b--ethip6-ip6scale2m-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-1n-aws-50ge1P1ena-78b--ethip6-ip6scale2m-tg.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/trex/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-1n-aws-50ge1P1ena-78b--ethip6-ip6scale2m-tg}
+            \label{fig:hdrh-lat-percentile-1n-aws-50ge1P1ena-78b--ethip6-ip6scale2m-tg}
+    \end{figure}
diff --git a/docs/report/trex_performance_tests/packet_latency/2n-skx-x710.rst b/docs/report/trex_performance_tests/packet_latency/2n-icx-e810cq.rst
index 41cd688124..f12e1c7960 100644
--- a/docs/report/trex_performance_tests/packet_latency/2n-skx-x710.rst
+++ b/docs/report/trex_performance_tests/packet_latency/2n-icx-e810cq.rst
@@ -28,8 +28,8 @@
 
     </script>
 
-2n-skx-x710
-~~~~~~~~~~~
+2n-icx-e810cq
+~~~~~~~~~~~~~
 
 CSIT source code for the test cases used for plots can be found in
 `CSIT git repository <https://git.fd.io/csit/tree/tests/trex/perf?h=rls2210>`_.
@@ -44,7 +44,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--ethip4-ip4base-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--ethip4-ip4base-tg.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--ethip4-ip4base-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--ethip4-ip4base-tg.html"></iframe>
     <p><br></p>
     </center>
 
@@ -53,8 +53,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--ethip4-ip4base-tg}
-            \label{fig:hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--ethip4-ip4base-tg}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--ethip4-ip4base-tg}
+            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--ethip4-ip4base-tg}
     \end{figure}
 
 .. raw:: latex
@@ -64,7 +64,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--ethip4-ip4scale2m-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--ethip4-ip4scale2m-tg.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--ethip4-ip4scale2m-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--ethip4-ip4scale2m-tg.html"></iframe>
     <p><br></p>
     </center>
 
@@ -73,8 +73,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--ethip4-ip4scale2m-tg}
-            \label{fig:hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--ethip4-ip4scale2m-tg}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--ethip4-ip4scale2m-tg}
+            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--ethip4-ip4scale2m-tg}
     \end{figure}
 
 .. raw:: latex
@@ -87,7 +87,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-10ge2p1x710-78b--ethip6-ip6base-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-skx-10ge2p1x710-78b--ethip6-ip6base-tg.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b--ethip6-ip6base-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b--ethip6-ip6base-tg.html"></iframe>
     <p><br></p>
     </center>
 
@@ -96,8 +96,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-10ge2p1x710-78b--ethip6-ip6base-tg}
-            \label{fig:hdrh-lat-percentile-2n-skx-10ge2p1x710-78b--ethip6-ip6base-tg}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b--ethip6-ip6base-tg}
+            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b--ethip6-ip6base-tg}
     \end{figure}
 
 .. raw:: latex
@@ -107,7 +107,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-10ge2p1x710-78b--ethip6-ip6scale2m-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-skx-10ge2p1x710-78b--ethip6-ip6scale2m-tg.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b--ethip6-ip6scale2m-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b--ethip6-ip6scale2m-tg.html"></iframe>
     <p><br></p>
     </center>
 
@@ -116,8 +116,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-10ge2p1x710-78b--ethip6-ip6scale2m-tg}
-            \label{fig:hdrh-lat-percentile-2n-skx-10ge2p1x710-78b--ethip6-ip6scale2m-tg}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b--ethip6-ip6scale2m-tg}
+            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-78b--ethip6-ip6scale2m-tg}
     \end{figure}
 
 .. raw:: latex
@@ -130,7 +130,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--eth-l2bdscale1mmaclrn-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--eth-l2bdscale1mmaclrn-tg.html"></iframe>
+    <iframe id="hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--eth-l2bdscale1mmaclrn-tg" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--eth-l2bdscale1mmaclrn-tg.html"></iframe>
     <p><br></p>
     </center>
 
@@ -139,6 +139,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--eth-l2bdscale1mmaclrn-tg}
-            \label{fig:hdrh-lat-percentile-2n-skx-10ge2p1x710-64b--eth-l2bdscale1mmaclrn-tg}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--eth-l2bdscale1mmaclrn-tg}
+            \label{fig:hdrh-lat-percentile-2n-icx-100ge2p1e810cq-64b--eth-l2bdscale1mmaclrn-tg}
     \end{figure}
diff --git a/docs/report/trex_performance_tests/packet_latency/index.rst b/docs/report/trex_performance_tests/packet_latency/index.rst
index a4e0bdfd62..274b785085 100644
--- a/docs/report/trex_performance_tests/packet_latency/index.rst
+++ b/docs/report/trex_performance_tests/packet_latency/index.rst
@@ -34,9 +34,10 @@ Additional information about graph data:
 .. note::
 
     Test results are stored in
-    `build logs from FD.io trex performance job 2n-skx`_.
+    `build logs from FD.io trex performance job 2n-icx`_.
 
 .. toctree::
     :maxdepth: 3
 
-    2n-skx-x710
+    2n-icx-e810cq
+    1n-aws-nitro50g
diff --git a/docs/report/trex_performance_tests/packet_throughput_graphs/1n-aws-nitro50g.rst b/docs/report/trex_performance_tests/packet_throughput_graphs/1n-aws-nitro50g.rst
new file mode 100644
index 0000000000..c2e5cf680c
--- /dev/null
+++ b/docs/report/trex_performance_tests/packet_throughput_graphs/1n-aws-nitro50g.rst
@@ -0,0 +1,125 @@
+
+.. 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>
+
+1n-aws-nitro50g
+~~~~~~~~~~~~~~~
+
+Following sections include summary graphs of Phy-to-Phy performance with
+packet routed forwarding, including NDR throughput (zero packet loss)
+and PDR throughput (<0.5% packet loss).
+
+CSIT source code for the test cases used for plots can be found in
+`CSIT git repository <https://git.fd.io/csit/tree/tests/trex/perf?h=rls2210>`_.
+
+.. raw:: latex
+
+    \clearpage
+
+64b-ip4routing-base-scale
+-------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/1n-aws-nitro50g-64b--ip4-base-scale-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/trex/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{1n-aws-nitro50g-64b--ip4-base-scale-ndr}
+            \label{fig:1n-aws-nitro50g-64b--ip4-base-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/trex/1n-aws-nitro50g-64b--ip4-base-scale-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/trex/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{1n-aws-nitro50g-64b--ip4-base-scale-pdr}
+            \label{fig:1n-aws-nitro50g-64b--ip4-base-scale-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+78b-ip6routing-base-scale
+-------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/1n-aws-nitro50g-78b--ip6-base-scale-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/trex/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{1n-aws-nitro50g-78b--ip6-base-scale-ndr}
+            \label{fig:1n-aws-nitro50g-78b--ip6-base-scale-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/1n-aws-nitro50g-78b--ip6-base-scale-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/trex/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{1n-aws-nitro50g-78b--ip6-base-scale-pdr}
+            \label{fig:1n-aws-nitro50g-78b--ip6-base-scale-pdr}
+    \end{figure}
diff --git a/docs/report/trex_performance_tests/packet_throughput_graphs/2n-skx-x710.rst b/docs/report/trex_performance_tests/packet_throughput_graphs/2n-icx-e810cq.rst
index 20a7a44b79..8b4b124b2a 100644
--- a/docs/report/trex_performance_tests/packet_throughput_graphs/2n-skx-x710.rst
+++ b/docs/report/trex_performance_tests/packet_throughput_graphs/2n-icx-e810cq.rst
@@ -28,8 +28,8 @@
 
     </script>
 
-2n-skx-x710
-~~~~~~~~~~~
+2n-icx-e810cq
+~~~~~~~~~~~~~
 
 Following sections include summary graphs of Phy-to-Phy performance with
 packet routed forwarding, including NDR throughput (zero packet loss)
@@ -48,7 +48,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-64b--ip4-base-scale-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4-base-scale-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -57,8 +57,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b--ip4-base-scale-ndr}
-            \label{fig:2n-skx-x710-64b--ip4-base-scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4-base-scale-ndr}
+            \label{fig:2n-icx-e810cq-64b--ip4-base-scale-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -68,7 +68,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-64b--ip4-base-scale-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4-base-scale-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -77,8 +77,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b--ip4-base-scale-pdr}
-            \label{fig:2n-skx-x710-64b--ip4-base-scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4-base-scale-pdr}
+            \label{fig:2n-icx-e810cq-64b--ip4-base-scale-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -91,7 +91,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-64b--ip4routing-stf-cps-ndr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4routing-stf-cps-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -100,8 +100,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b--ip4routing-stf-cps-ndr}
-            \label{fig:2n-skx-x710-64b--ip4routing-stf-cps-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4routing-stf-cps-ndr}
+            \label{fig:2n-icx-e810cq-64b--ip4routing-stf-cps-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -111,7 +111,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-64b--ip4routing-stf-cps-pdr.html"></iframe>
+    <iframe id="04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4routing-stf-cps-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -120,8 +120,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b--ip4routing-stf-cps-pdr}
-            \label{fig:2n-skx-x710-64b--ip4routing-stf-cps-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4routing-stf-cps-pdr}
+            \label{fig:2n-icx-e810cq-64b--ip4routing-stf-cps-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -134,7 +134,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-64b--ip4routing-stf-pps-ndr.html"></iframe>
+    <iframe id="05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4routing-stf-pps-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -143,8 +143,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b--ip4routing-stf-pps-ndr}
-            \label{fig:2n-skx-x710-64b--ip4routing-stf-pps-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4routing-stf-pps-ndr}
+            \label{fig:2n-icx-e810cq-64b--ip4routing-stf-pps-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -154,7 +154,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-64b--ip4routing-stf-pps-pdr.html"></iframe>
+    <iframe id="06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4routing-stf-pps-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -163,8 +163,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b--ip4routing-stf-pps-pdr}
-            \label{fig:2n-skx-x710-64b--ip4routing-stf-pps-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4routing-stf-pps-pdr}
+            \label{fig:2n-icx-e810cq-64b--ip4routing-stf-pps-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -177,7 +177,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-78b--ip6-base-scale-ndr.html"></iframe>
+    <iframe id="07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-78b--ip6-base-scale-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -186,8 +186,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b--ip6-base-scale-ndr}
-            \label{fig:2n-skx-x710-78b--ip6-base-scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b--ip6-base-scale-ndr}
+            \label{fig:2n-icx-e810cq-78b--ip6-base-scale-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -197,7 +197,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-78b--ip6-base-scale-pdr.html"></iframe>
+    <iframe id="08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-78b--ip6-base-scale-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -206,8 +206,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b--ip6-base-scale-pdr}
-            \label{fig:2n-skx-x710-78b--ip6-base-scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-78b--ip6-base-scale-pdr}
+            \label{fig:2n-icx-e810cq-78b--ip6-base-scale-pdr}
     \end{figure}
 
 .. raw:: latex
@@ -220,7 +220,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-64b--l2-scale-ndr.html"></iframe>
+    <iframe id="09" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--l2-scale-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -229,8 +229,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b--l2-scale-ndr}
-            \label{fig:2n-skx-x710-64b--l2-scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--l2-scale-ndr}
+            \label{fig:2n-icx-e810cq-64b--l2-scale-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -240,7 +240,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-skx-x710-64b--l2-scale-pdr.html"></iframe>
+    <iframe id="10" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--l2-scale-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -249,10 +249,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b--l2-scale-pdr}
-            \label{fig:2n-skx-x710-64b--l2-scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--l2-scale-pdr}
+            \label{fig:2n-icx-e810cq-64b--l2-scale-pdr}
     \end{figure}
-
-.. raw:: latex
-
-    \clearpage
diff --git a/docs/report/trex_performance_tests/packet_throughput_graphs/index.rst b/docs/report/trex_performance_tests/packet_throughput_graphs/index.rst
index f1138c74ac..4f2033deb3 100644
--- a/docs/report/trex_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/trex_performance_tests/packet_throughput_graphs/index.rst
@@ -52,4 +52,5 @@ Additional information about graph data:
 .. toctree::
     :maxdepth: 3
 
-    2n-skx-x710
+    2n-icx-e810cq
+    1n-aws-nitro50g
diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 2576724dc3..502baf74ff 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -10,54 +10,51 @@
 
 ################################################################################
 
-  # TRex 2n-skx
+  # TRex 2n-icx
 
-  # trex-2n-skx-hist-iter:
-  #   csit-trex-perf-report-iterative-2110-2n-skx:
+  # trex-2n-icx-hist-iter:
+  #   csit-trex-perf-report-iterative-2110-2n-icx:
   #     - 8   # rls2110.rel NDRPDR iter env 8
-  #     - 9   # rls2110.rel NDRPDR iter env 8
-  #     - 10  # rls2110.rel NDRPDR iter env 8
-  #     - 11  # rls2110.rel NDRPDR iter env 8
-  #     - 12  # rls2110.rel NDRPDR iter env 8
-  #     - 13  # rls2110.rel NDRPDR iter env 8
-  #     - 14  # rls2110.rel NDRPDR iter env 8
-  #     - 15  # rls2110.rel NDRPDR iter env 8
-  #     - 16  # rls2110.rel NDRPDR iter env 8
-  #     - 17  # rls2110.rel NDRPDR iter env 8
-
-  # trex-2n-skx-prev-iter:
-  #   csit-trex-perf-report-iterative-2202-2n-skx:
+
+  # trex-2n-icx-prev-iter:
+  #   csit-trex-perf-report-iterative-2202-2n-icx:
+  #     - 1   # rls2202.rel NDRPDR iter env 9
+
+  trex-2n-icx-curr-iter:
+    csit-trex-perf-report-iterative-2210-2n-icx:
+      - 1   # rls2210.rel NDRPDR iter env 11
+
+  trex-2n-icx-curr-iter-best:
+    csit-trex-perf-report-iterative-2210-2n-icx:
+      - 1   # rls2210.rel NDRPDR iter env 11
+
+  trex-2n-icx-curr-cov:
+    # csit-trex-perf-report-coverage-2210-2n-icx:
+    csit-trex-perf-report-coverage-2206-2n-icx:
+      - 1   # rls2210.rel NDRPDR cov env 11
+
+  # TRex 1n-aws
+
+  # trex-1n-aws-hist-iter:
+  #   csit-trex-perf-report-iterative-2110-1n-aws:
+  #     - 8   # rls2110.rel NDRPDR iter env 8
+
+  # trex-1n-aws-prev-iter:
+  #   csit-trex-perf-report-iterative-2202-1n-aws:
   #     - 1   # rls2202.rel NDRPDR iter env 9
-  #     - 2   # rls2202.rel NDRPDR iter env 9
-  #     - 3   # rls2202.rel NDRPDR iter env 9
-  #     - 4   # rls2202.rel NDRPDR iter env 9
-  #     - 5   # rls2202.rel NDRPDR iter env 9
-  #     - 6   # rls2202.rel NDRPDR iter env 9
-  #     - 7   # rls2202.rel NDRPDR iter env 9
-  #     - 8   # rls2202.rel NDRPDR iter env 9
-  #     - 9   # rls2202.rel NDRPDR iter env 9
-  #     - 10  # rls2202.rel NDRPDR iter env 9
-
-  # trex-2n-skx-curr-iter:
-  #   csit-trex-perf-report-iterative-2206-2n-skx:
-  #     - 1   # rls2206.rel NDRPDR iter env 10
-  #     - 2   # rls2206.rel NDRPDR iter env 10
-  #     - 3   # rls2206.rel NDRPDR iter env 10
-  #     - 4   # rls2206.rel NDRPDR iter env 10
-  #     - 5   # rls2206.rel NDRPDR iter env 10
-  #     - 6   # rls2206.rel NDRPDR iter env 10
-  #     - 7   # rls2206.rel NDRPDR iter env 10
-  #     - 8   # rls2206.rel NDRPDR iter env 10
-  #     - 9   # rls2206.rel NDRPDR iter env 10
-  #     - 10  # rls2206.rel NDRPDR iter env 10
-
-  # trex-2n-skx-curr-iter-best:
-  #   csit-trex-perf-report-iterative-2206-2n-skx:
-  #     - 1   # rls2206.rel NDRPDR iter env 10
-
-  # trex-2n-skx-curr-cov:
-  #   csit-trex-perf-report-coverage-2206-2n-skx:
-  #     - 1   # rls2206.rel NDRPDR cov env 10
+
+  trex-1n-aws-curr-iter:
+    csit-trex-perf-report-iterative-2210-1n-aws:
+      - 5   # rls2210.rel NDRPDR iter env 11
+
+  trex-1n-aws-curr-iter-best:
+    csit-trex-perf-report-iterative-2210-1n-aws:
+      - 5   # rls2210.rel NDRPDR iter env 11
+
+  trex-1n-aws-curr-cov:
+    # csit-trex-perf-report-coverage-2210-1n-aws:
+    csit-trex-perf-report-coverage-2206-1n-aws:
+      - 1   # rls2210.rel NDRPDR cov env 11
 
   # 2n-zn2
 
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 3d9e1c4d85..b284e5a50b 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -11910,16 +11910,27 @@
 
 ################################################################################
 
-# - type: "plot"
-#   title: "Latency by percentile: TRex 2n-skx"
-#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-#   output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-2n-skx"
-#   output-file-links: "{DIR[LAT,TREX]}/2n_skx.rst"
-#   target-links: "../../_static/trex"
-#   data: "trex-2n-skx-curr-iter-best"
-#   filter: "'NIC_Intel-X710'"
-#   layout:
-#     layout: "plot-hdrh-latency-percentile-x-log"
+- type: "plot"
+  title: "Latency by percentile: TRex 2n-icx"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-2n-icx"
+  output-file-links: "{DIR[LAT,TREX]}/2n_icx.rst"
+  target-links: "../../_static/trex"
+  data: "trex-2n-icx-curr-iter-best"
+  filter: "'NIC_Intel-E810CQ'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: TRex 1n-aws"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-1n-aws"
+  output-file-links: "{DIR[LAT,TREX]}/1n_aws.rst"
+  target-links: "../../_static/trex"
+  data: "trex-1n-aws-curr-iter-best"
+  filter: "'2T1C'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: 2n-zn2"
@@ -12201,72 +12212,100 @@
 
 ###############################################################################
 
-# TRex 2n-skx
+# TRex 2n-icx
 
-# - type: "plot"
-#   title: "Throughput: 2n-skx-x710-64b--ip4-base-scale-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4-base-scale-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
-#   layout:
-#     title: "2n-skx-x710-64b--ip4-base-scale-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b--ip4-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--ip4-base-scale-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b--ip4-base-scale-{test_type}"
+    layout: "plot-throughput"
 
-# - type: "plot"
-#   title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
-#   layout:
-#     title: "2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b--ip4routing-stf-cps-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--ip4routing-stf-cps-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b--ip4routing-stf-cps-{test_type}"
+    layout: "plot-throughput"
 
-# - type: "plot"
-#   title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
-#   layout:
-#     title: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b--ip4routing-stf-pps-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--ip4routing-stf-pps-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b--ip4routing-stf-pps-{test_type}"
+    layout: "plot-throughput"
 
-# - type: "plot"
-#   title: "Throughput: 2n-skx-x710-78b--ip6-base-scale-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-78b--ip6-base-scale-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
-#   layout:
-#     title: "2n-skx-x710-78b--ip6-base-scale-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-78b--ip6-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-78b--ip6-base-scale-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip6.1N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip6.1N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-78b--ip6-base-scale-{test_type}"
+    layout: "plot-throughput"
 
-# - type: "plot"
-#   title: "Throughput: 2n-skx-x710-64b--l2-scale-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--l2-scale-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Trex.Perf.L2.1N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
-#   layout:
-#     title: "2n-skx-x710-64b--l2-scale-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b--l2-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--l2-scale-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.L2.1N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b--l2-scale-{test_type}"
+    layout: "plot-throughput"
+
+# TRex 1n-aws
+
+- type: "plot"
+  title: "Throughput: 1n-aws-nitro50g-64b--ip4-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/1n-aws-nitro50g-64b--ip4-base-scale-{test_type}"
+  data: "trex-1n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-50Ge1P1Ena-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-50Ge1P1Ena-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
+  layout:
+    title: "1n-aws-nitro50g-64b--ip4-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 1n-aws-nitro50g-78b--ip6-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/1n-aws-nitro50g-78b--ip6-base-scale-{test_type}"
+  data: "trex-1n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip6.1N1L-50Ge1P1Ena-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip6.1N1L-50Ge1P1Ena-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
+  layout:
+    title: "1n-aws-nitro50g-78b--ip6-base-scale-{test_type}"
+    layout: "plot-throughput"