docs(infra): 1n-alt
[csit.git] / docs / content / infrastructure / fdio_dc_testbed_specifications.md
index 3daa382..d157d29 100644 (file)
@@ -19,7 +19,6 @@ Each server has a LOM (Lights-Out-Management e.g. SM IPMI) and a
 Management port, which are connected to two different VLANs.
 
 #### LOM (IPMI) VLAN
-
    - Subnet: 10.30.50.0/24
    - Gateway: 10.30.50.1
    - Broadcast: 10.30.50.255
@@ -40,41 +39,42 @@ To access these hosts, VPN connection is required.
 ### Summary List
 
 ```
- #. Type                 Purpose  SUT   TG    #TB  #SUT #TG  #skx #ps1 #rng #tx2 #tsh #alt #clx #zn2 #icx #snr #spr
- 1. 1-Node-Skylake         nomad  skx   na    5    5    0    5    0    0    0    0    0    0    0    0    0    0
- 2. 1-Node-Cascadelake     nomad  clx   na    1    1    0    0    0    0    0    0    0    1    0    0    0    0
- 3. 1-Node-AmpereAltra     nomad  alt   na    2    2    0    0    0    0    0    0    2    0    0    0    0    0
- 4. 2-Node-IxiaPS1L47      tcp    skx   ps1   1    1    1    1    1    0    0    0    0    0    0    0    0    0
- 5. 2-Node-Cascadelake     perf   clx   clx   3    3    3    0    0    0    0    0    0    6    0    0    0    0
- 6. 2-Node-ThunderX2       perf   tx2   skx   1    1    .5   .5   0    0    1    0    0    0    0    0    0    0
- 7. 2-Node-Icelake         perf   icx   icx   4    4    4    0    0    0    0    0    0    0    0    8    0    0
- 8. 3-Node-Rangeley        perf   rng   skx   1    3    1    0    0    2    0    0    0    0    0    0    0    0
- 9. 3-Node-Taishan         perf   tsh   skx   1    2    .5   .5   0    0    0    2    0    0    0    0    0    0
-10. 3-Node-Altra           perf   alt   icx   1    2    1    0    0    0    0    0    2    0    0    1    0    0
-11. 2-Node-Zen2            perf   zn2   zn2   1    1    1    0    0    0    0    0    0    0    2    0    0    0
-12. 3-Node-Icelake         perf   icx   icx   2    4    2    0    0    0    0    0    0    0    0    6    0    0
-13. 3-Node-SnowRidge       perf   snr   icx   1    2    .5   0    0    0    0    0    0    0    0    .5   2    0
-13. 2-Node-SapphireRapids  perf   spr   spr   4    4    4    0    0    0    0    0    0    0    0    0    0    8
-                                     Totals: 28   35  18.5   7    1    2    1    2    4    7    2   15.5  2    8
+ #. Type                 Purpose  SUT   TG    #TB  #SUT #TG  #skx #ps1 #rng #tx2 #tsh #alt #clx #zn2 #icx #snr #spr #icxd
+ 1. 1-Node-Skylake         nomad  skx   na    5    5    0    5    0    0    0    0    0    0    0    0    0    0    0
+ 2. 1-Node-Cascadelake     nomad  clx   na    4    4    0    0    0    0    0    0    0    4    0    0    0    0    0
+ 3. 1-Node-AmpereAltra     nomad  alt   na    4    4    0    0    0    0    0    0    4    0    0    0    0    0    0
+ 4. 2-Node-IxiaPS1L47      tcp    skx   ps1   1    1    1    1    1    0    0    0    0    0    0    0    0    0    0
+ 5. 2-Node-Cascadelake     perf   clx   clx   3    3    3    0    0    0    0    0    0    6    0    0    0    0    0
+ 6. 2-Node-ThunderX2       perf   tx2   skx   1    1    .5   .5   0    0    1    0    0    0    0    0    0    0    0
+ 7. 2-Node-Icelake         perf   icx   icx   4    4    4    0    0    0    0    0    0    0    0    8    0    0    0
+ 8. 3-Node-Rangeley        perf   rng   skx   1    3    1    0    0    2    0    0    0    0    0    0    0    0    0
+ 9. 3-Node-Taishan         perf   tsh   skx   1    2    .5   .5   0    0    0    2    0    0    0    0    0    0    0
+10. 3-Node-Altra           perf   alt   icx   1    2    1    0    0    0    0    0    2    0    0    1    0    0    0
+11. 2-Node-Zen2            perf   zn2   zn2   1    1    1    0    0    0    0    0    0    0    2    0    0    0    0
+12. 3-Node-Icelake         perf   icx   icx   2    4    2    0    0    0    0    0    0    0    0    6    0    0    0
+13. 3-Node-SnowRidge       perf   snr   icx   1    2    .5   0    0    0    0    0    0    0    0    .5   2    0    0
+14. 2-Node-SapphireRapids  perf   spr   spr   4    4    4    0    0    0    0    0    0    0    0    0    0    8    0
+15. 1-Node-SapphireRapids  nomad  spr   na    4    4    0    0    0    0    0    0    0    0    0    0    0    4    0
+16. 3-Node-IcelakeD        perf   icxd  icx   4    6    1    0    0    0    0    0    0    0    0    1    0    0    4
+                                     Totals: 39   48  19.5   7    1    2    1    2    6   10    2   16.5  2   12    4
 ```
 
 ### 1-Node-Skylake Xeon Intel (1n-skx)
 
-Each 1-Node-Skylake testbed includes one SUT (Server-Type-B6) with NIC
+Each 1-Node-Skylake testbed includes one SUT (Server-Type-B2) with NIC
 ports connected back-to-back ([Server Types](#server-types)).
 Used for FD.io VPP_Device functional driver tests.
 
-### 1-Node-ThunderX2 Arm Marvell (1n-tx2)
+### 1-Node-Altra Arm Ampere (1n-alt)
 
-Each 1-Node-ThunderX2 testbed includes one SUT (Server-Type-E11) with NIC
+Each 1-Node-Altra testbed includes one SUT (Server-Type-E25) with NIC
 ports connected back-to-back ([Server Types](#server-types)).
 Used for FD.io VPP_Device functional driver tests.
 
-### 1-Node-Cascadelake Xeon Intel (1n-clx)
-
-Each 1-Node-Cascadelake testbed includes one SUT (Server-Type-C1) with
-NIC ports connected back-to-back ([Server Types](#server-types)).
+### 1-Node-Skylake Xeon Intel (1n-spr)
 
+Each 1-Node-SapphireRapids testbed includes one SUT (Server-Type-H7) with NIC
+ports connected back-to-back ([Server Types](#server-types)).
 Used for FD.io VPP_Device functional driver tests.
 
 ### 2-Node-IxiaPS1L47 Ixia PSOne L47 (2n-ps1)
@@ -129,38 +129,36 @@ Used for FD.io performance tests.
 ### 3-Node-Altra Arm Ampere (3n-alt)
 
 Each 3-Node-Altra testbed includes two SUTs (Server-Type-E23) and one
-TG (Server-Type-F4) connected in a 3-node circular topology
+TG (Server-Type-E32) connected in a 3-node circular topology
 ([Server Types](#server-types)).
 Used for FD.io performance tests.
 
 ### 3-Node-Icelake Xeon Intel (3n-icx)
 
-Each 3-Node-Icelake testbed includes two SUTs (Server-Type-F1) and one
+Each 3-Node-Icelake testbed includes two SUTs (Server-Type-F3) and one
 TG (Server-Type-F3) connected in a 3-node circular topology
 ([Server Types](#server-types)).
 Used for FD.io performance tests.
 
-### 3-Node-SnowRidge Atom Intel (3n-snr)
+### 3-Node-IcelakeD Xeon Intel (3n-icxd)
 
-Each 3-Node-SnowRidge testbed includes two SUTs (Server-Type-G1) and one
-TG (Server-Type-F4) connected in a 3-node circular topology
+Each 3-Node-IcelakeD testbed includes two SUTs (Server-Type-I1) and one numa of
+TG (Server-Type-F5) connected in a 3-node circular topology
 ([Server Types](#server-types)).
 Used for FD.io performance tests.
 
-### 2-Node-Full-SapphireRapids Xeon Intel (2nf-spr)
+### 3-Node-SnowRidge Atom Intel (3n-snr)
 
-One 2-Node-Full-SapphireRapids testbed includes one SUT (Server-Type-H1) and
-one TG (Server-Type-H2) connected in a 2-node physical topology
-with NUMA (socket) daisy chaining. For more detail see
-[Server Types](#server-types) and [Testbed Topology-TODO](#TODO).
-Used for FD.io performance tests in a full system SUT setup with all PCIe
-Gen5 x16 lane slots populated with 2p200GbE NICs.
+Each 3-Node-SnowRidge testbed includes two SUTs (Server-Type-G1) and one
+TG (Server-Type-F5) connected in a 3-node circular topology
+([Server Types](#server-types)).
+Used for FD.io performance tests.
 
 ### 2-Node-SapphireRapids Xeon Intel (2n-spr)
 
 Each 2-Node-SapphireRapids testbed includes one SUT (Server-Type-H5) and
-one TG (Server-Type-H6) connected in a 2-node circular topology. For more
-detail see [Server Types](#server-types) and [Testbed Topology-TODO](#TODO).
+one TG (Server-Type-H6) connected in a 2-node or 3-node circular topology
+([Server Types](#server-types)).
 Used for FD.io performance tests.
 
 
@@ -187,7 +185,7 @@ connectivity and wiring across defined CSIT testbeds:
 
 FD.io CSIT lab contains following server types:
 
-1. **Server-Type-B2**: Purpose - Skylake Xeon hosts for FD.io builds and data processing.
+1. **Server-Type-B1**: Purpose - Skylake Xeon hosts for FD.io builds and data processing.
     - Quantity: 2
     - Physical connectivity:
         - IPMI and host management ports.
@@ -207,7 +205,7 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot8 af:00.xx: empty.
             - PCIe Slot10 d8:00.xx: empty.
 
-2. **Server-Type-B6**: Purpose - Skylake Xeon SUT for FD.io VPP_Device functional tests.
+2. **Server-Type-B2**: Purpose - Skylake Xeon SUT for FD.io VPP_Device functional tests.
     - Quantity: 2.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -224,8 +222,8 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot4 3b:00.xx: x710-4p10GE Intel.
             - PCIe Slot9 5e:00.xx: empty.
         - Numa1: (x16, x16, x16 PCIe3.0 lanes)
-            - PCIe Slot6 86:00.xx: empty.
-            - PCIe Slot8 af:00.xx: empty.
+            - PCIe Slot6 86:00.xx: e810-2CQDA2-2p100GE Intel.
+            - PCIe Slot8 af:00.xx: e810-2CQDA2-2p100GE Intel.
             - PCIe Slot10 d8:00.xx: empty.
 
 3. **Server-Type-B7**: Purpose - Ixia PerfectStorm One Appliance TG for FD.io TCP/IP performance tests.
@@ -268,28 +266,8 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot6 86:00.xx: empty.
             - PCIe Slot8 af:00.xx: empty.
             - PCIe Slot10 d8:00.xx: empty.
-5. Server-Type-C1: Purpose - Cascadelake Xeon SUT for FD.io VPP_Device functional tests.
-    - Quantity: 1.
-    - Physical connectivity:
-        - IPMI and host management ports.
-        - NIC ports connected into 1-node testbed topologies.
-    - Main HW configuration:
-        - Chassis: SuperMicro SYS-7049GP-TRT.
-        - Motherboard: SuperMicro X11DPG-QT.
-        - Processors: 2* Intel Platinum 8280 2.7 GHz.
-        - RAM Memory: 12* 16GB DDR4-2933.
-        - Disks: 2* 1.92TB SATA SSD.
-    - NICs configuration:
-        - Numa0: (x16, x16, x16 PCIe3.0 lanes)
-            - PCIe Slot2 18:00.xx: x710-4p10GE Intel.
-            - PCIe Slot4 3b:00.xx: x710-4p10GE Intel.
-            - PCIe Slot9 5e:00.xx: empty.
-        - Numa1: (x16, x16, x16 PCIe3.0 lanes)
-            - PCIe Slot6 86:00.xx: empty.
-            - PCIe Slot8 af:00.xx: empty.
-            - PCIe Slot10 d8:00.xx: empty.
 
-6. **Server-Type-C2**: Purpose - Cascadelake Xeon SUT for FD.io performance testing.
+5. **Server-Type-C2**: Purpose - Cascadelake Xeon SUT for FD.io performance testing.
     - Quantity: 3
     - Physical connectivity:
         - IPMI and host management ports.
@@ -310,7 +288,7 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot8 af:00.xx: empty.
             - PCIe Slot10 d8:00.xx: empty.
 
-7. **Server-Type-C3**: Purpose - Cascadelake Xeon TG for FD.io performance testing.
+6. **Server-Type-C3**: Purpose - Cascadelake Xeon TG for FD.io performance testing.
     - Quantity: 3.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -331,8 +309,8 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot8 af:00.xx: ConnectX5-2p100GE Mellanox.
             - PCIe Slot10 d8:00.xx: empty.
 
-8. **Server-Type-C4**: Purpose - Cascadelake Xeon Backend hosts for FD.io builds and data processing.
-    - Quantity: 3.
+7. **Server-Type-C4**: Purpose - Cascadelake Xeon Backend hosts for FD.io builds and data processing.
+    - Quantity: 4.
     - Physical connectivity:
         - IPMI and host management ports.
         - no NIC ports, standalone setup.
@@ -343,12 +321,16 @@ FD.io CSIT lab contains following server types:
         - RAM Memory: 12* 16GB DDR4-2933.
         - Disks: 4* 1.92TB SATA SSD.
     - NICs configuration:
-        - Numa0:
-            - no cards.
-        - Numa1:
-            - no cards.
+        - Numa0: (x16, x16, x16 PCIe3.0 lanes)
+            - PCIe Slot2 18:00.xx: empty.
+            - PCIe Slot4 3b:00.xx: empty.
+            - PCIe Slot9 5e:00.xx: empty.
+        - Numa1: (x16, x16, x16 PCIe3.0 lanes)
+            - PCIe Slot6 86:00.xx: empty.
+            - PCIe Slot8 af:00.xx: empty.
+            - PCIe Slot10 d8:00.xx: empty.
 
-9. **Server-Type-D1**: Purpose - Zen2 EPYC SUT for FD.io performance testing.
+8. **Server-Type-D1**: Purpose - Zen2 EPYC SUT for FD.io performance testing.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -361,10 +343,10 @@ FD.io CSIT lab contains following server types:
     - NICs configuration:
         - Numa0: (x16, x16, x16 PCIe3.0 lanes)
             - PCIe Slot1 01:00.xx: x710-4p10GE Intel.
-            - PCIe Slot2 41:00.xx: xxv710-DA2-2p25GE Intel.
+            - PCIe Slot2 41:00.xx: xxv710-da2-2p25GE Intel.
             - PCIe Slot3 81:00.xx: mcx556a-edat ConnectX5-2p100GE Mellanox.
 
-10. **Server-Type-D2**: Purpose - Zen2 EPYC TG for FD.io performance testing.
+9. **Server-Type-D2**: Purpose - Zen2 EPYC TG for FD.io performance testing.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -378,29 +360,10 @@ FD.io CSIT lab contains following server types:
         - Numa0: (x16, x16, x16 PCIe3.0 lanes)
             - PCIe Slot1 01:00.xx: mcx556a-edat ConnectX5-2p100GE Mellanox.
             - PCIe Slot2 41:00.xx: x710-4p10GE Intel.
-            - PCIe Slot3 81:00.xx: xxv710-DA2 2p25GE Intel.
+            - PCIe Slot3 81:00.xx: xxv710-da2 2p25GE Intel.
 
-11. **Server-Type-E11**: Purpose - ThunderX2 Arm Marvell SUT for FD.io VPP_Device functional tests.
-    - Quantity: 2
-    - Physical connectivity:
-        - IPMI and host management ports.
-        - NIC ports connected into 1-node topologies.
-    - Main HW configuration:
-        - Chassis: GIGABYTE Rack Mount
-        - Motherboard: MT91-FS4-00
-        - Processors: 2 * ThunderX2 ARMv8 CN9980 2.20 GHz
-        - RAM Memory: 16 * 16GB DIMM
-        - Disks: 2 * 480GB 6G SATA SSD SAMSUNG MZ7LH480
-    - NICs configuration:
-        - Numa0:
-            - PCIe Slot4 05:00.xx: XL710-QDA2-2p40GE Intel.
-            - PCIe Slot8 0b:00.xx: ConnectX5-2p10/25GE Mellanox.
-        - Numa1:
-            - PCIe Slot14 91:00.xx: XL710-QDA2-2p40GE Intel.
-            - PCIe Slot26 9a:00.xx: ConnectX5-2p10/25GE Mellanox.
-
-12. **Server-Type-E21**: Purpose - TaiShan Arm Huawei SUT for FD.io performance testing.
-    - Quantity: 2
+10. **Server-Type-E21**: Purpose - TaiShan Arm Huawei SUT for FD.io performance testing.
+    - Quantity: 2.
     - Physical connectivity:
         - IPMI(?) and host management ports.
         - NIC ports connected into 3-node topology.
@@ -413,8 +376,8 @@ FD.io CSIT lab contains following server types:
         - PCIe Slot4 e9:00.xx: connectx4-2p25GE Mellanox.
         - PCIe Slot6 11:00.xx: x520-2p10GE Intel.
 
-13. **Server-Type-E22**: Purpose - ThunderX2 Arm Marvell SUT for FD.io performance testing.
-    - Quantity: 1
+11. **Server-Type-E22**: Purpose - ThunderX2 Arm Marvell SUT for FD.io performance testing.
+    - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
         - NIC ports connected into 2-node topologies.
@@ -430,8 +393,8 @@ FD.io CSIT lab contains following server types:
         - Numa1:
             - PCIe Slot18 91:00.xx: XL710-QDA2-2p40GE Intel.
 
-14. **Server-Type-E23**: Purpose - Altra Arm Ampere SUT for FD.io performance testing.
-    - Quantity: 2
+12. **Server-Type-E23**: Purpose - Altra Arm Ampere SUT for FD.io performance testing.
+    - Quantity: 2.
     - Physical connectivity:
         - IPMI and host management ports.
         - NIC ports connected into 3-node topologies.
@@ -443,11 +406,13 @@ FD.io CSIT lab contains following server types:
         - RAM Memory: 16* 8GB DDR4-3200MT/s
         - Disks: 2* 960GB SSD Samsung M.2 NVMe PM983
     - NICs configuration:
-        - Numa0:
+        - Numa0: (x16, x16 PCIe4.0 lanes)
             - PCIe Slot1 0004:04:00.x: xl710-QDA2-2p40GE Intel.
+            - PCIe Slot8 0001:00:00.x: ConnectX6-2p100GE Mellanox.
         - Numa1:
             - no cards.
-15. **Server-Type-E24**: Purpose - Altra Arm Ampere for FD.io build.
+
+13. **Server-Type-E24**: Purpose - Altra Arm Ampere for FD.io build.
     - Quantity: 2.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -459,8 +424,29 @@ FD.io CSIT lab contains following server types:
         - RAM Memory: 12* 16GB DDR4-3200MT/s
         - Disks: 1* 960GB SSD Samsung M.2 NVMe PM983
 
-16. **Server-Type-E31**: Purpose - Skylake Xeon TG for FD.io performance testing.
-    - Quantity: 1
+14. **Server-Type-E25**: Purpose - Altra Arm Ampere SUT for FD.io VPP_Device functional tests.
+    - Quantity: 2.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 1-node topologies.
+    - Main HW configuration:
+        - Chassis: Gigabyte R152-P30-00 1U
+        - Motherboard: MP32-AR1-00
+        - Processors: 1* Ampere(R) Altra(R) Q80-30 Processor (Neoverse N1)
+        - Processor Signature: Implementor 0x0a, Variant 0x1, Architecture 6, Part 0x000, Revision 1
+        - RAM Memory: 16* 32GB DDR4-3200MT/s
+        - Disks: 2* 960GB SSD Samsung U.2 NVMe PM9A3
+    - NICs configuration:
+        - Numa0:
+            - PCIe Slot0 0000:01:00.xx: XL710-QDA2-2p40GE Intel.
+            - PCIe Slot1 0001:01:00.xx: ConnectX6-2p100GE Mellanox.
+            - PCIe Slot2 0002:03:00.xx: ConnectX5-2p10/25GE Mellanox.
+        - Numa1:
+            - PCIe Slot3 0003:02:00.xx: XL710-QDA2-2p40GE Intel.
+            - PCIe Slot5 0005:02:00.xx: ConnectX5-2p10/25GE Mellanox.
+
+15. **Server-Type-E31**: Purpose - Skylake Xeon Shared TG for FD.io performance testing.
+    - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
         - NIC ports connected into 2-node and 3-node topologies.
@@ -477,14 +463,35 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot9 5e:00.xx: empty.
         - Numa1: (x16, x16, x16 PCIe3.0 lanes)
             - PCIe Slot6 86:00.xx: empty.
-            - PCIe Slot8 af:00.xx: XL710-QDA2-2p40GE Intel.
+            - PCIe Slot8 af:00.xx: xl710-QDA2-2p40GE Intel.
             - PCIe Slot10 d8:00.xx: x710-4p10GE Intel.
 
+16. **Server-Type-E32**: Purpose - Icelake Xeon Shared TG for FD.io performance testing.
+    - Quantity: 1.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 2-node and/or 3-node testbed topologies.
+    - Main HW configuration:
+        - Chassis: SuperMicro SYS-740GP-TNRT.
+        - Motherboard: Super X12DPG-QT6.
+        - Processors: 2* Intel Platinum 8358 2.6 GHz.
+        - RAM Memory: 16* 16GB DDR4-3200.
+        - Disks: 2* 960GB SATA SSD.
+    - NICs configuration:
+        - Numa0: (x16, x16, x16 PCIe4.0 lanes)
+            - PCIe Slot2 4b:00.xx: xxv710-DA2-2p25GE Intel.
+            - PCIe Slot4 31:00.xx: xl710-QDA2-2p40GE Intel.
+            - PCIe Slot9 ff:00.xx: empty.
+        - Numa1: (x16, x16, x16 PCIe4.0 lanes)
+            - PCIe Slot6 ca:00.xx: empty.
+            - PCIe Slot8 b1:00.xx: e810-2CQDA2-2p100GE Intel.
+            - PCIe Slot10 ff:00.xx: empty.
+
 17. **Server-Type-F1**: Purpose - Icelake Xeon SUT for FD.io performance testing.
-    - Quantity: 8.
+    - Quantity: 4.
     - Physical connectivity:
         - IPMI and host management ports.
-        - NIC ports connected into 2-node or 3-node testbed topologies.
+        - NIC ports connected into 2-node topology.
     - Main HW configuration:
         - Chassis: SuperMicro SYS-740GP-TNRT.
         - Motherboard: Super X12DPG-QT6.
@@ -498,11 +505,11 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot9 5e:00.xx: e810-2CQDA2-2p100GE Intel.
         - Numa1: (x16, x16, x16 PCIe4.0 lanes)
             - PCIe Slot6 86:00.xx: empty.
-            - PCIe Slot8 af:00.xx: empty.
+            - PCIe Slot8 af:00.xx: ConnectX7-2p200GE Mellanox.
             - PCIe Slot10 d8:00.xx: empty.
 
 18. **Server-Type-F2**: Purpose - Icelake Xeon TG for FD.io performance testing.
-    - Quantity: 3.
+    - Quantity: 4.
     - Physical connectivity:
         - IPMI and host management ports.
         - NIC ports connected into 2-node testbed topologies.
@@ -519,11 +526,11 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot9 5e:00.xx: e810-2CQDA2-2p100GE Intel.
         - Numa1: (x16, x16, x16 PCIe4.0 lanes)
             - PCIe Slot6 86:00.xx: e810-2CQDA2-2p100GE Intel.
-            - PCIe Slot8 af:00.xx: empty.
+            - PCIe Slot8 af:00.xx: ConnectX7-2p200GE Mellanox.
             - PCIe Slot10 d8:00.xx: empty.
 
-19. **Server-Type-F3**: Purpose - Icelake Xeon TG for FD.io performance testing.
-    - Quantity: 3.
+19. **Server-Type-F3**: Purpose - Icelake Xeon TG or SUT for FD.io performance testing.
+    - Quantity: 6.
     - Physical connectivity:
         - IPMI and host management ports.
         - NIC ports connected into 3-node testbed topologies.
@@ -539,14 +546,15 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot4 3b:00.xx: e810-XXVDA4-4p25GE Intel.
             - PCIe Slot9 5e:00.xx: e810-2CQDA2-2p100GE Intel.
         - Numa1: (x16, x16, x16 PCIe4.0 lanes)
-            - PCIe Slot6 86:00.xx: empty.
+            - PCIe Slot6 86:00.xx: ConnectX6-2p100GE Mellanox.
             - PCIe Slot8 af:00.xx: empty.
             - PCIe Slot10 d8:00.xx: empty.
-20. **Server-Type-F4**: Purpose - Icelake Xeon Shared TG for FD.io performance testing.
+
+20. **Server-Type-F4**: Purpose - Icelake Xeon TG for FD.io performance testing.
     - Quantity: 3.
     - Physical connectivity:
         - IPMI and host management ports.
-        - NIC ports connected into 2-node and/or 3-node testbed topologies.
+        - NIC ports connected into 3-node testbed topologies.
     - Main HW configuration:
         - Chassis: SuperMicro SYS-740GP-TNRT.
         - Motherboard: Super X12DPG-QT6.
@@ -556,14 +564,35 @@ FD.io CSIT lab contains following server types:
     - NICs configuration:
         - Numa0: (x16, x16, x16 PCIe4.0 lanes)
             - PCIe Slot2 18:00.xx: xxv710-DA2-2p25GE Intel.
-            - PCIe Slot4 3b:00.xx: empty.
-            - PCIe Slot9 5e:00.xx: empty.
+            - PCIe Slot4 3b:00.xx: e810-XXVDA4-4p25GE Intel.
+            - PCIe Slot9 5e:00.xx: e810-2CQDA2-2p100GE Intel.
         - Numa1: (x16, x16, x16 PCIe4.0 lanes)
-            - PCIe Slot6 86:00.xx: e810-XXVDA4-4p25GE Intel.
-            - PCIe Slot8 af:00.xx: e810-2CQDA2-2p100GE Intel.
+            - PCIe Slot6 86:00.xx: ConnectX6-2p100GE Mellanox.
+            - PCIe Slot8 af:00.xx: empty.
             - PCIe Slot10 d8:00.xx: empty.
 
-21. **Server-Type-G1**: Purpose - SnowRidge Atom SUT for FD.io performance testing.
+21. **Server-Type-F5**: Purpose - Icelake Xeon Shared TG for FD.io performance testing.
+    - Quantity: 2.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 2-node and/or 3-node testbed topologies.
+    - Main HW configuration:
+        - Chassis: SuperMicro SYS-740GP-TNRT.
+        - Motherboard: Super X12DPG-QT6.
+        - Processors: 2* Intel Platinum 8358 2.6 GHz.
+        - RAM Memory: 16* 16GB DDR4-3200.
+        - Disks: 2* 960GB SATA SSD.
+    - NICs configuration:
+        - Numa0: (x16, x16, x16 PCIe4.0 lanes)
+            - PCIe Slot2 4b:00.xx: xxv710-DA2-2p25GE Intel.
+            - PCIe Slot4 31:00.xx: empty.
+            - PCIe Slot9 ff:00.xx: empty.
+        - Numa1: (x16, x16, x16 PCIe4.0 lanes)
+            - PCIe Slot6 ca:00.xx: e810-XXVDA4-4p25GE Intel.
+            - PCIe Slot8 b1:00.xx: e810-2CQDA2-2p100GE Intel.
+            - PCIe Slot10 ff:00.xx: empty.
+
+22. **Server-Type-G1**: Purpose - SnowRidge Atom SUT for FD.io performance testing.
     - Quantity: 2
     - Physical connectivity:
         - IPMI and host management ports.
@@ -578,7 +607,7 @@ FD.io CSIT lab contains following server types:
         - Numa0: (x16, PCIe3.0 lane)
             - PCIe BuiltIn ec:00.xx: e810-XXVDA4-4p25GE Intel.
 
-22. **Server-Type-H1**: Purpose - SapphireRapids Xeon SUT for FD.io full system performance testing.
+23. **Server-Type-H1**: Purpose - SapphireRapids Xeon SUT for FD.io full system performance testing.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -591,15 +620,15 @@ FD.io CSIT lab contains following server types:
         - Disks: 2* 960GB SATA SSD.
     - NICs configuration:
         - Numa0: (x16, x16, x16 PCIe5.0 lanes)
-            - PCIe Slot2 18:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
-            - PCIe Slot4 3b:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
-            - PCIe Slot10 5e:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
+            - PCIe Slot2 18:00.xx: ConnectX7-2p200GE Nvidia.
+            - PCIe Slot4 3b:00.xx: ConnectX7-2p200GE Nvidia.
+            - PCIe Slot10 5e:00.xx: ConnectX7-2p200GE Nvidia.
         - Numa1: (x16, x16, x16 PCIe5.0 lanes)
-            - PCIe Slot7 86:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
-            - PCIe Slot9 af:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
-            - PCIe Slot11 d8:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
+            - PCIe Slot7 86:00.xx: ConnectX7-2p200GE Nvidia.
+            - PCIe Slot9 af:00.xx: ConnectX7-2p200GE Nvidia.
+            - PCIe Slot11 d8:00.xx: ConnectX7-2p200GE Nvidia.
 
-23. **Server-Type-H2**: Purpose - SapphireRapids Xeon TG for FD.io full system performance testing.
+24. **Server-Type-H2**: Purpose - SapphireRapids Xeon TG for FD.io full system performance testing.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -612,15 +641,15 @@ FD.io CSIT lab contains following server types:
         - Disks: 2* 960GB SATA SSD.
     - NICs configuration:
         - Numa0: (x16, x16, x16 PCIe5.0 lanes)
-            - PCIe Slot2 18:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
-            - PCIe Slot4 3b:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
-            - PCIe Slot10 5e:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
+            - PCIe Slot2 18:00.xx: ConnectX7-2p200GE Nvidia.
+            - PCIe Slot4 3b:00.xx: ConnectX7-2p200GE Nvidia.
+            - PCIe Slot10 5e:00.xx: ConnectX7-2p200GE Nvidia.
         - Numa1: (x16, x16, x16 PCIe5.0 lanes)
-            - PCIe Slot7 86:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
-            - PCIe Slot9 af:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
+            - PCIe Slot7 86:00.xx: ConnectX7-2p200GE Nvidia.
+            - PCIe Slot9 af:00.xx: ConnectX7-2p200GE Nvidia.
             - PCIe Slot11 d8:00.xx: empty.
 
-24. **Server-Type-H3**: Purpose - SapphireRapids Xeon SUT for FD.io performance testing.
+25. **Server-Type-H3**: Purpose - SapphireRapids Xeon SUT for FD.io performance testing.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -641,7 +670,7 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot9 af:00.xx: e810-XXVDA4-4p25GE Intel.
             - PCIe Slot11 d8:00.xx: empty.
 
-25. **Server-Type-H4**: Purpose - SapphireRapids Xeon TG for FD.io performance testing.
+26. **Server-Type-H4**: Purpose - SapphireRapids Xeon TG for FD.io performance testing.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -662,7 +691,7 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot9 af:00.xx: empty.
             - PCIe Slot11 d8:00.xx: empty.
 
-26. **Server-Type-H5**: Purpose - SapphireRapids Xeon SUT for FD.io performance testing.
+27. **Server-Type-H5**: Purpose - SapphireRapids Xeon SUT for FD.io performance testing.
     - Quantity: 2.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -675,15 +704,15 @@ FD.io CSIT lab contains following server types:
         - Disks: 2* 960GB SATA SSD.
     - NICs configuration:
         - Numa0: (x16, x16, x16 PCIe5.0 lanes)
-            - PCIe Slot2 18:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
-            - PCIe Slot4 3b:00.xx: e810-2CQDA2-2p100GE Intel.
-            - PCIe Slot10 5e:00.xx: e810-XXVDA4-4p25GE Intel.
+            - PCIe Slot2 3d:00.xx: MCX713106AS-VEAT ConnectX7-2p200GE Nvidia.
+            - PCIe Slot4 2c:00.xx: e810-2CQDA2-2p100GE Intel.
+            - PCIe Slot10 17:00.xx: e810-XXVDA4-4p25GE Intel.
         - Numa1: (x16, x16, x16 PCIe5.0 lanes)
             - PCIe Slot7 86:00.xx: empty.
             - PCIe Slot9 af:00.xx: empty.
             - PCIe Slot11 d8:00.xx: empty.
 
-27. **Server-Type-H6**: Purpose - SapphireRapids Xeon TG for FD.io performance testing.
+28. **Server-Type-H6**: Purpose - SapphireRapids Xeon TG for FD.io performance testing.
     - Quantity: 2.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -704,12 +733,48 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot9 af:00.xx: e810-2CQDA2-2p100GE Intel.
             - PCIe Slot11 d8:00.xx: empty.
 
+29. **Server-Type-H7**: Purpose - SapphireRapids SUT for FD.io VPP_Device functional tests.
+    - Quantity: 2.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 1-node topologies.
+    - Main HW configuration:
+        - Chassis: SuperMicro SYS-741GE-TNRT.
+        - Motherboard: Super X13DEG-QT-P.
+        - Processors: 2* Intel Platinum 8462Y+ 32 core 2.8 GHz 300W TDP.
+        - RAM Memory: 16* 32GB DDR5-4800.
+        - Disks: 2* 960GB SATA SSD.
+    - NICs configuration:
+        - Numa0: (x16, x16, x16 PCIe5.0 lanes)
+            - PCIe Slot2 18:00.xx: e810-2CQDA2-2p100GE Intel.
+            - PCIe Slot4 3b:00.xx: e810-2CQDA2-2p100GE Intel.
+            - PCIe Slot10 5e:00.xx: empty.
+        - Numa1: (x16, x16, x16 PCIe5.0 lanes)
+            - PCIe Slot7 86:00.xx: empty.
+            - PCIe Slot9 af:00.xx: empty.
+            - PCIe Slot11 d8:00.xx: empty.
+
+30. **Server-Type-I1**: Purpose - IcelakeD Xeon SUT for FD.io performance testing.
+    - Quantity: 4
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 3-node testbed topology.
+    - Main HW configuration:
+        - Chassis: SuperMicro SYS-110D-20C-FRDN8TP.
+        - Motherboard: Super X12SDV-20C-SPT8F.
+        - Processors: 1* Intel Xeon D-2796NT.
+        - RAM Memory: 4* 32GB DDR4-3200 MEM-DR432MD-ER32.
+        - Disks: 1* 960GB SATA SSD HDS-25T0.
+    - NICs configuration:
+        - Numa0: (x16, PCIe4.0 lane)
+            - PCIe BuiltIn ??:00.xx: e810-XXVDA2-2p25GE Intel.
+
 ## Testbeds Configuration
 
 ### 1-Node-Skylake (1n-skx)
 
 ```
-- SUT [Server-Type-B6]:
+- SUT [Server-Type-B2]:
     - testbedname: testbed11.
     - hostname: s1-t11-sut1.
     - IPMI IP: 10.30.50.47
@@ -723,7 +788,11 @@ FD.io CSIT lab contains following server types:
         - s1-t11-sut1-c4/p2 - 10GE-port2 x710-4p10GE.
         - s1-t11-sut1-c4/p3 - 10GE-port3 x710-4p10GE.
         - s1-t11-sut1-c4/p4 - 10GE-port4 x710-4p10GE.
-- SUT [Server-Type-B6]:
+        - s1-t11-sut1-c6/p1 - 100GE-port1 e810-2p100GE.
+        - s1-t11-sut1-c6/p2 - 100GE-port2 e810-2p100GE.
+        - s1-t11-sut1-c8/p1 - 100GE-port1 e810-2p100GE.
+        - s1-t11-sut1-c8/p2 - 100GE-port2 e810-2p100GE.
+- SUT [Server-Type-B2]:
     - testbedname: testbed12.
     - hostname: s2-t12-sut1.
     - IPMI IP: 10.30.50.48
@@ -737,58 +806,72 @@ FD.io CSIT lab contains following server types:
         - s2-t12-sut1-c4/p2 - 10GE-port2 x710-4p10GE.
         - s2-t12-sut1-c4/p3 - 10GE-port3 x710-4p10GE.
         - s2-t12-sut1-c4/p4 - 10GE-port4 x710-4p10GE.
+        - s2-t12-sut1-c6/p1 - 100GE-port1 e810-2p100GE.
+        - s2-t12-sut1-c6/p2 - 100GE-port2 e810-2p100GE.
+        - s2-t12-sut1-c8/p1 - 100GE-port1 e810-2p100GE.
+        - s2-t12-sut1-c8/p2 - 100GE-port2 e810-2p100GE.
 ```
 
-### 1-Node-ThunderX2 (1n-tx2)
+### 1-Node-Altra (1n-alt)
 
 ```
-- SUT [Server-Type-E11]:
+- SUT [Server-Type-E25]:
     - testbedname: testbed13
-    - hostname: s55-t13-sut1
+    - hostname: s70-t13-sut1
     - IPMI IP: 10.30.50.70
     - Host IP: 10.30.51.70
     - portnames:
-        - s55-t13-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s55-t13-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s55-t13-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
-        - s55-t13-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
-        - s55-t13-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s55-t13-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s55-t13-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
-        - s55-t13-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
-- SUT [Server-Type-E11]:
+        - s70-t13-sut1-c1/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s70-t13-sut1-c1/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s70-t13-sut1-c2/p1 - 25GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s70-t13-sut1-c2/p2 - 25GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s70-t13-sut1-c3/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s70-t13-sut1-c3/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s70-t13-sut1-c4/p1 - 25GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s70-t13-sut1-c4/p2 - 25GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s70-t13-sut1-c5/p1 - 100GE-port1 ConnectX6-2p100GE Mellanox.
+        - s70-t13-sut1-c5/p2 - 100GE-port2 ConnectX6-2p100GE Mellanox.
+- SUT [Server-Type-E25]:
     - testbedname: testbed14
-    - hostname: s56-t14-sut1
+    - hostname: s71-t14-sut1
     - IPMI IP: 10.30.50.71
     - Host IP: 10.30.51.71
     - portnames:
-        - s56-t14-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s56-t14-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s56-t14-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
-        - s56-t14-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
-        - s56-t14-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s56-t14-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s56-t14-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
-        - s56-t14-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c1/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s71-t14-sut1-c1/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s71-t14-sut1-c2/p1 - 25GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c2/p2 - 25GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c3/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s71-t14-sut1-c3/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s71-t14-sut1-c4/p1 - 25GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c4/p2 - 25GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c5/p1 - 100GE-port1 ConnectX6-2p100GE Mellanox.
+        - s71-t14-sut1-c5/p2 - 100GE-port2 ConnectX6-2p100GE Mellanox.
 ```
 
-### 1-Node-Cascadelake (1n-clx)
+### 1-Node-SapphireRapids (1n-spr)
 
 ```
-- SUT [Server-Type-C1]:
-    - testbedname: testbed11.
-    - hostname: s32-t14-sut1.
-    - IPMI IP: 10.30.55.17
-    - Host IP: 10.32.8.17
+- SUT [Server-Type-H7]:
+    - testbedname: testbed15.
+    - hostname: s30-t15-sut1.
+    - IPMI IP: 10.30.50.30
+    - Host IP: 10.30.51.31
     - portnames:
-        - s32-t14-sut1-c2/p1 - 10GE-port1 x710-4p10GE.
-        - s32-t14-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
-        - s32-t14-sut1-c2/p3 - 10GE-port3 x710-4p10GE.
-        - s32-t14-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
-        - s32-t14-sut1-c4/p1 - 10GE-port1 x710-4p10GE.
-        - s32-t14-sut1-c4/p2 - 10GE-port2 x710-4p10GE.
-        - s32-t14-sut1-c4/p3 - 10GE-port3 x710-4p10GE.
-        - s32-t14-sut1-c4/p4 - 10GE-port4 x710-4p10GE.
+        - s30-t15-sut1-c1/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
+        - s30-t15-sut1-c1/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s30-t15-sut1-c2/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
+        - s30-t15-sut1-c2/p2 - 100GE-port1 e810-2CQDA2-2p100GE.
+- SUT [Server-Type-H7]:
+    - testbedname: testbed16.
+    - hostname: s31-t16-sut1.
+    - IPMI IP: 10.30.50.31
+    - Host IP: 10.30.51.31
+    - portnames:
+        - s31-t16-sut1-c1/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
+        - s31-t16-sut1-c1/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s31-t16-sut1-c2/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
+        - s31-t16-sut1-c2/p2 - 100GE-port1 e810-2CQDA2-2p100GE.
 ```
 
 ### 2-Node-IxiaPS1L47 (2n-ps1)
@@ -969,8 +1052,8 @@ FD.io CSIT lab contains following server types:
     - IPMI IP: 10.30.50.69
     - Host IP: 10.30.51.69
     - portnames:
-        - s27-t211-sut1-c18/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s27-t211-sut1-c18/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s27-t211-sut1-c18/p1 - 40GE-port1 xl710-QDA2-2p40GE.
+        - s27-t211-sut1-c18/p2 - 40GE-port2 xl710-QDA2-2p40GE.
 - TG [Server-Type-E31]:
     - testbedname: testbed33 and testbed211.
     - hostname: s19-t33t211-tg1.
@@ -1010,6 +1093,8 @@ FD.io CSIT lab contains following server types:
         - s71-t212-sut1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s71-t212-sut1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s71-t212-sut1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s71-t212-sut1-c8/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s71-t212-sut1-c8/p2 - 200GE-port2 ConnectX7-2p200GE.
 - TG [Server-Type-F2]:
     - testbedname: testbed212.
     - hostname: s72-t212-tg1.
@@ -1026,6 +1111,8 @@ FD.io CSIT lab contains following server types:
         - s72-t212-tg1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
         - s72-t212-tg1-c6/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s72-t212-tg1-c6/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s72-t212-tg1-c8/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s72-t212-tg1-c8/p2 - 200GE-port2 ConnectX7-2p200GE.
 - SUT [Server-Type-F1]:
     - testbedname: testbed213.
     - hostname: s83-t213-sut1.
@@ -1040,6 +1127,8 @@ FD.io CSIT lab contains following server types:
         - s83-t213-sut1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s83-t213-sut1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s83-t213-sut1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s83-t213-sut1-c8/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s83-t213-sut1-c8/p2 - 200GE-port2 ConnectX7-2p200GE.
 - TG [Server-Type-F2]:
     - testbedname: testbed213.
     - hostname: s84-t213-tg1.
@@ -1056,6 +1145,8 @@ FD.io CSIT lab contains following server types:
         - s84-t213-tg1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
         - s84-t213-tg1-c6/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s84-t213-tg1-c6/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s84-t213-tg1-c8/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s84-t213-tg1-c8/p2 - 200GE-port2 ConnectX7-2p200GE.
 - SUT [Server-Type-F1]:
     - testbedname: testbed214.
     - hostname: s85-t214-sut1.
@@ -1070,6 +1161,8 @@ FD.io CSIT lab contains following server types:
         - s85-t214-sut1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s85-t214-sut1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s85-t214-sut1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s85-t214-sut1-c8/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s85-t214-sut1-c8/p2 - 200GE-port2 ConnectX7-2p200GE.
 - TG [Server-Type-F2]:
     - testbedname: testbed214.
     - hostname: s86-t214-tg1.
@@ -1086,6 +1179,8 @@ FD.io CSIT lab contains following server types:
         - s86-t214-tg1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
         - s86-t214-tg1-c6/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s86-t214-tg1-c6/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s86-t214-tg1-c8/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s86-t214-tg1-c8/p2 - 200GE-port2 ConnectX7-2p200GE.
 - SUT [Server-Type-F1]:
     - testbedname: testbed215.
     - hostname: s87-t215-sut1.
@@ -1100,6 +1195,8 @@ FD.io CSIT lab contains following server types:
         - s87-t215-sut1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s87-t215-sut1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s87-t215-sut1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s87-t215-sut1-c8/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s87-t215-sut1-c8/p2 - 200GE-port2 ConnectX7-2p200GE.
 - TG [Server-Type-F2]:
     - testbedname: testbed215.
     - hostname: s88-t215-tg1.
@@ -1116,40 +1213,8 @@ FD.io CSIT lab contains following server types:
         - s88-t215-tg1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
         - s88-t215-tg1-c6/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s88-t215-tg1-c6/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
-```
-
-### 3-Node-Rangeley (3n-rng)
-
-Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
-
-```
-- ServerB22 [Server-Type-B5]:
-    - testbedname: testbed35.
-    - hostname: s22-t35-sut1 (vex-yul-rot-netgate-1).
-    - IPMI IP: 10.30.51.29 - screen -r /dev/ttyUSB0
-    - Host IP: 10.30.51.9
-    - portnames:
-        - s22-t35-sut1-p1 - 10GE-port1 ix0 82599.
-        - s22-t35-sut1-p2 - 10GE-port2 ix1 82599.
-    - 1GB ports (tbd)
-- ServerB23 [Server-Type-B5]:
-    - testbedname: testbed35.
-    - hostname: s23-t35-sut2 (vex-yul-rot-netgate-2).
-    - IPMI IP: 10.30.51.30 - screen -r /dev/ttyUSB1
-    - Host IP: 10.30.51.10
-    - portnames:
-        - s23-t35-sut1-p1 - 10GE-port1 ix0 82599.
-        - s23-t35-sut1-p2 - 10GE-port2 ix1 82599.
-    - 1GB ports (tbd)
-- ServerB24 [Server-Type-B5]:
-    - testbedname: testbed35.
-    - hostname: s24-t35-sut3 (vex-yul-rot-netgate-3).
-    - IPMI IP: 10.30.51.30 - screen -r /dev/ttyUSB2
-    - Host IP: 10.30.51.11
-    - portnames:
-        - s24-t35-sut1-p1 - 10GE-port1 ix0 82599.
-        - s24-t35-sut1-p2 - 10GE-port2 ix1 82599.
-    - 1GB ports (tbd)
+        - s88-t215-tg1-c8/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s88-t215-tg1-c8/p2 - 200GE-port2 ConnectX7-2p200GE.
 ```
 
 ### 3-Node-Taishan (3n-tsh)
@@ -1210,6 +1275,8 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
     - portnames:
         - s62-t34-sut1-c1/p1 - 40GE-port1 xl710-QDA2-2p40GE.
         - s62-t34-sut1-c1/p2 - 40GE-port2 xl710-QDA2-2p40GE.
+        - s62-t34-sut1-c8/p1 - 100GE-port1 ConnectX6-2p100GE.
+        - s62-t34-sut1-c8/p2 - 100GE-port2 ConnectX6-2p100GE.
 - SUT [Server-Type-E23]:
     - testbedname: testbed34.
     - hostname: s63-t34-sut2.
@@ -1218,7 +1285,9 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
     - portnames:
         - s63-t34-sut2-c1/p1 - 40GE-port1 xl710-QDA2-2p40GE.
         - s63-t34-sut2-c1/p2 - 40GE-port2 xl710-QDA2-2p40GE.
-- TG [Server-Type-F4]:
+        - s63-t34-sut2-c8/p1 - 100GE-port1 ConnectX6-2p100GE.
+        - s63-t34-sut2-c8/p2 - 100GE-port2 ConnectX6-2p100GE.
+- TG [Server-Type-E32]:
     - testbedname: testbed34.
     - hostname: s64-t34-tg1.
     - IPMI IP: 10.30.50.74
@@ -1228,10 +1297,6 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s64-t34-tg1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s64-t34-tg1-c4/p1 - 40GE-port1 xl710-QDA2-2p40GE.
         - s64-t34-tg1-c4/p2 - 40GE-port2 xl710-QDA2-2p40GE.
-        - s64-t34-tg1-c6/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
-        - s64-t34-tg1-c6/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
-        - s64-t34-tg1-c6/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
-        - s64-t34-tg1-c6/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s64-t34-tg1-c8/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s64-t34-tg1-c8/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
 ```
@@ -1241,7 +1306,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
 {{< figure src="/cdocs/testbed-3n-icx.svg" >}}
 
 ```
-- ServerF1 [Server-Type-F1]:
+- SUT1 [Server-Type-F3]:
     - testbedname: testbed37.
     - hostname: s65-t37-sut1.
     - IPMI IP: 10.30.50.75
@@ -1255,7 +1320,9 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s65-t37-sut1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s65-t37-sut1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s65-t37-sut1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
-- ServerF1 [Server-Type-F1]:
+        - s65-t37-sut1-c10/p1 - 100GE-port1 ConnectX6-2p100GE.
+        - s65-t37-sut1-c10/p2 - 100GE-port2 ConnectX6-2p100GE.
+- SUT2 [Server-Type-F3]:
     - testbedname: testbed37.
     - hostname: s66-t37-sut2.
     - IPMI IP: 10.30.50.76
@@ -1269,7 +1336,9 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s66-t37-sut2-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s66-t37-sut2-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s66-t37-sut2-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
-- ServerF3 [Server-Type-F3]:
+        - s65-t37-sut1-c10/p1 - 100GE-port1 ConnectX6-2p100GE.
+        - s65-t37-sut1-c10/p2 - 100GE-port2 ConnectX6-2p100GE.
+- TG [Server-Type-F3]:
     - testbedname: testbed37.
     - hostname: s67-t37-tg1.
     - IPMI IP: 10.30.50.77
@@ -1283,7 +1352,9 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s67-t37-tg1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s67-t37-tg1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s67-t37-tg1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
-- ServerF1 [Server-Type-F1]:
+        - s67-t37-tg1-c10/p1 - 100GE-port1 ConnectX6-2p100GE.
+        - s67-t37-tg1-c10/p2 - 100GE-port2 ConnectX6-2p100GE.
+- SUT1 [Server-Type-F3]:
     - testbedname: testbed38.
     - hostname: s78-t38-sut1.
     - IPMI IP: 10.30.50.78
@@ -1297,7 +1368,9 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s78-t38-sut1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s78-t38-sut1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s78-t38-sut1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
-- ServerF1 [Server-Type-F1]:
+        - s78-t38-sut1-c10/p1 - 100GE-port1 ConnectX6-2p100GE.
+        - s78-t38-sut1-c10/p2 - 100GE-port2 ConnectX6-2p100GE.
+- SUT2 [Server-Type-F3]:
     - testbedname: testbed38.
     - hostname: s79-t38-sut2.
     - IPMI IP: 10.30.50.79
@@ -1311,7 +1384,9 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s79-t38-sut2-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s79-t38-sut2-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s79-t38-sut2-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
-- ServerF3 [Server-Type-F3]:
+        - s79-t38-sut2-c10/p1 - 100GE-port1 ConnectX6-2p100GE.
+        - s79-t38-sut2-c10/p2 - 100GE-port2 ConnectX6-2p100GE.
+- TG [Server-Type-F3]:
     - testbedname: testbed38.
     - hostname: s80-t38-tg1.
     - IPMI IP: 10.30.50.80
@@ -1325,6 +1400,8 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s80-t38-tg1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
         - s80-t38-tg1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
         - s80-t38-tg1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
+        - s80-t38-tg1-c10/p1 - 100GE-port1 ConnectX6-2p100GE.
+        - s80-t38-tg1-c10/p2 - 100GE-port2 ConnectX6-2p100GE.
 ```
 
 ### 3-Node-SnowRidge (3n-snr)
@@ -1352,7 +1429,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s94-t39-sut2-c1/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
         - s94-t39-sut2-c1/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
         - s94-t39-sut2-c1/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
-- ServerF4 [Server-Type-F4]:
+- ServerF4 [Server-Type-F5]:
     - testbedname: testbed39.
     - hostname: s89-t39t310-tg1.
     - IPMI IP: 10.30.50.89
@@ -1375,34 +1452,32 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
     - IPMI IP: 10.30.50.52
     - Host IP: 10.30.51.52
     - portnames:
-        - s52-t21-sut1-c2/p1 - 200GE-port1 ConnectX7-2p200GE.
-        - s52-t21-sut1-c2/p2 - 200GE-port2 ConnectX7-2p200GE.
-        - s52-t21-sut1-c4/p1 - 200GE-port1 ConnectX7-2p200GE.
-        - s52-t21-sut1-c4/p2 - 200GE-port2 ConnectX7-2p200GE.
         - s52-t21-sut1-c10/p1 - 200GE-port1 ConnectX7-2p200GE.
         - s52-t21-sut1-c10/p2 - 200GE-port2 ConnectX7-2p200GE.
-        - s52-t21-sut1-c7/p1 - 200GE-port1 ConnectX7-2p200GE.
-        - s52-t21-sut1-c7/p2 - 200GE-port2 ConnectX7-2p200GE.
+        - s52-t21-sut1-c4/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s52-t21-sut1-c4/p2 - 200GE-port2 ConnectX7-2p200GE.
+        - s52-t21-sut1-c2/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s52-t21-sut1-c2/p2 - 200GE-port2 ConnectX7-2p200GE.
         - s52-t21-sut1-c9/p1 - 200GE-port1 ConnectX7-2p200GE.
         - s52-t21-sut1-c9/p2 - 200GE-port2 ConnectX7-2p200GE.
-        - s52-t21-sut1-c11/p1 - 200GE-port1 ConnectX7-2p200GE.
-        - s52-t21-sut1-c11/p2 - 200GE-port2 ConnectX7-2p200GE.
+        - s52-t21-sut1-c7/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s52-t21-sut1-c7/p2 - 200GE-port2 ConnectX7-2p200GE.
 - TG [Server-Type-H2]:
     - testbedname: testbed21.
     - hostname: s53-t21-tg1.
     - IPMI IP: 10.30.50.53
     - Host IP: 10.30.51.53
     - portnames:
-        - s53-t21-tg1-c2/p1 - 200GE-port1 ConnectX7-2p200GE.
-        - s53-t21-tg1-c2/p2 - 200GE-port2 ConnectX7-2p200GE.
-        - s53-t21-tg1-c4/p1 - 200GE-port1 ConnectX7-2p200GE.
-        - s53-t21-tg1-c4/p2 - 200GE-port2 ConnectX7-2p200GE.
         - s53-t21-tg1-c10/p1 - 200GE-port1 ConnectX7-2p200GE.
         - s53-t21-tg1-c10/p2 - 200GE-port2 ConnectX7-2p200GE.
-        - s53-t21-tg1-c7/p1 - 200GE-port1 ConnectX7-2p200GE.
-        - s53-t21-tg1-c7/p2 - 200GE-port2 ConnectX7-2p200GE.
+        - s53-t21-tg1-c4/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s53-t21-tg1-c4/p2 - 200GE-port2 ConnectX7-2p200GE.
+        - s53-t21-tg1-c2/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s53-t21-tg1-c2/p2 - 200GE-port2 ConnectX7-2p200GE.
         - s53-t21-tg1-c9/p1 - 200GE-port1 ConnectX7-2p200GE.
         - s53-t21-tg1-c9/p2 - 200GE-port2 ConnectX7-2p200GE.
+        - s53-t21-tg1-c7/p1 - 200GE-port1 ConnectX7-2p200GE.
+        - s53-t21-tg1-c7/p2 - 200GE-port2 ConnectX7-2p200GE.
 - SUT [Server-Type-H3]:
     - testbedname: testbed22.
     - hostname: s54-t22-sut1.
@@ -1499,6 +1574,65 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s59-t24-tg1-c9/p2 - 100GE-port2 e810-2CQDA2-2p100GE.
 ```
 
+### 3-Node-IcelakeD (3n-icxd)
+
+{{< figure src="/cdocs/testbed-3n-icxd.svg" >}}
+
+```
+- ServerI1 [Server-Type-I1]:
+    - testbedname: testbed31.
+    - hostname: s32-t31-sut1.
+    - IPMI IP: 10.30.50.32
+    - Host IP: 10.30.51.32
+    - portnames:
+        - s32-t31-sut1-c1/p1 - 25GE-port1 e822cq-2p25GE.
+        - s32-t31-sut1-c1/p2 - 25GE-port2 e822cq-2p25GE.
+- ServerI1 [Server-Type-I1]:
+    - testbedname: testbed31.
+    - hostname: s33-t31-sut2.
+    - IPMI IP: 10.30.50.33
+    - Host IP: 10.30.51.33
+    - portnames:
+        - s33-t31-sut2-c1/p1 - 25GE-port1 e822cq-2p25GE.
+        - s33-t31-sut2-c1/p2 - 25GE-port2 e822cq-2p25GE.
+- ServerF3 [Server-Type-F5]:
+    - testbedname: testbed31.
+    - hostname: s90-t31t32-tg1.
+    - IPMI IP: 10.30.50.90
+    - Host IP: 10.30.51.90
+    - portnames:
+        - s90-t31t32-tg1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
+- ServerI1 [Server-Type-I1]:
+    - testbedname: testbed32.
+    - hostname: s34-t32-sut1.
+    - IPMI IP: 10.30.50.34
+    - Host IP: 10.30.51.34
+    - portnames:
+        - s34-t32-sut1-c1/p1 - 25GE-port1 e822cq-2p25GE.
+        - s34-t32-sut1-c1/p2 - 25GE-port2 e822cq-2p25GE.
+- ServerI1 [Server-Type-I1]:
+    - testbedname: testbed32.
+    - hostname: s35-t32-sut2.
+    - IPMI IP: 10.30.50.35
+    - Host IP: 10.30.51.35
+    - portnames:
+        - s35-t32-sut2-c1/p1 - 25GE-port1 e822cq-2p25GE.
+        - s35-t32-sut2-c1/p2 - 25GE-port2 e822cq-2p25GE.
+- ServerF3 [Server-Type-F5]:
+    - testbedname: testbed32.
+    - hostname: s90-t31t32-tg1.
+    - IPMI IP: 10.30.50.90
+    - Host IP: 10.30.51.90
+    - portnames:
+        - s90-t31t32-tg1-c6/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c6/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c6/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c6/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
+```
+
 ## Testbed Wiring
 
 ### 1-Node-Skylake (1n-skx)
@@ -1532,28 +1666,51 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s2-t12-sut1-c5/p2 to s2-t12-sut1-c6/p2.
 ```
 
-### 1-Node-ThunderX2 (1n-tx2)
+### 1-Node-Altra (1n-alt)
 
 ```
 - testbed13:
     - ring1 40GE-ports XL710-QDA2-2p40GE on SUTs:
-        - s55-t13-sut1-c4/p1 - s55-t13-sut1-c14/p1.
+        - s70-t13-sut1-c1/p1 - s70-t13-sut1-c2/p1.
     - ring2 40GE-ports XL710-QDA2-2p40GE on SUTs:
-        - s55-t13-sut1-c4/p2 - s55-t13-sut1-c14/p2.
+        - s70-t13-sut1-c1/p2 - s70-t13-sut1-c2/p2.
     - ring3 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
-        - s55-t13-sut1-c8/p1 - s55-t13-sut1-c26/p1.
+        - s70-t13-sut1-c3/p1 - s70-t13-sut1-c4/p1.
     - ring4 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
-        - s55-t13-sut1-c8/p2 - s55-t13-sut1-c26/p2.
+        - s70-t13-sut1-c3/p2 - s70-t13-sut1-c4/p2.
+    - ring5 100GE-ports ConnectX6-2p100GE on SUTs:
+        - s70-t13-sut1-c5/p1 - s70-t13-sut1-c6/p1.
+    - ring6 100GE-ports ConnectX6-2p100GE on SUTs:
+        - s70-t13-sut1-c5/p2 - s70-t13-sut1-c6/p2.
 
 - testbed14:
     - ring1 40GE-ports XL710-QDA2-2p40GE on SUTs:
-        - s56-t14-sut1-c4/p1 - s56-t14-sut1-c14/p1.
+        - s71-t14-sut1-c1/p1 - s71-t14-sut1-c2/p1.
     - ring2 40GE-ports XL710-QDA2-2p40GE on SUTs:
-        - s56-t14-sut1-c4/p2 - s56-t14-sut1-c14/p2.
+        - s71-t14-sut1-c1/p2 - s71-t14-sut1-c2/p2.
     - ring3 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
-        - s56-t14-sut1-c8/p1 - s56-t14-sut1-c26/p1.
+        - s71-t14-sut1-c3/p1 - s71-t14-sut1-c4/p1.
     - ring4 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
-        - s56-t14-sut1-c8/p2 - s56-t14-sut1-c26/p2.
+        - s71-t14-sut1-c3/p2 - s71-t14-sut1-c4/p2.
+    - ring5 100GE-ports ConnectX6-2p100GE on SUTs:
+        - s71-t14-sut1-c5/p1 - s71-t14-sut1-c6/p1.
+    - ring6 100GE-ports ConnectX6-2p100GE on SUTs:
+        - s71-t14-sut1-c5/p2 - s71-t14-sut1-c6/p2.
+```
+
+### 1-Node-SapphireRapids (1n-spr)
+
+```
+- testbed15:
+    - ring1 100GE-ports e810-2p100GE:
+        - s30-t15-sut1-c1/p1 to s30-t15-sut1-c2/p1.
+    - ring2 100GE-ports e810-2p100GE:
+        - s30-t15-sut1-c1/p2 to s30-t15-sut1-c2/p2.
+- testbed16:
+    - ring1 100GE-ports e810-2p100GE:
+        - s31-t16-sut1-c1/p1 to s31-t16-sut1-c2/p1.
+    - ring2 100GE-ports e810-2p100GE:
+        - s31-t16-sut1-c1/p2 to s31-t16-sut1-c2/p2.
 ```
 
 ### 2-Node-IxiaPS1L47 (2n-ps1)
@@ -1660,65 +1817,77 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
 
 ```
 - testbed212:
-    - ring1 25GE-ports xxv710-DA2-2p25GE on SUT
+    - ring1 25GE-ports xxv710-DA2-2p25GE:
         - s72-t212-tg1-c2/p1 to s71-t212-sut1-c2/p1.
         - s71-t212-sut1-c2/p2 to s72-t212-tg1-c2/p2.
-    - ring2 25GE-ports e810-XXVDA4-2p25GE on SUT:
+    - ring2 25GE-ports e810-XXVDA4-2p25GE:
         - s72-t212-tg1-c4/p1 to s71-t212-sut1-c4/p1.
         - s71-t212-sut1-c4/p2 to s72-t212-tg1-c4/p2.
         - s72-t212-tg1-c4/p3 to s71-t212-sut1-c4/p3.
         - s71-t212-sut1-c4/p4 to s72-t212-tg1-c4/p4.
-    - ring3 100GE-ports e810-2CQDA2-2p100GE on SUT:
+    - ring3 100GE-ports e810-2CQDA2-2p100GE:
         - s72-t212-tg1-c9/p1 to s71-t212-sut1-c9/p1.
         - s71-t212-sut1-c9/p2 to s72-t212-tg1-c9/p2.
-    - ring4 100GE-ports e810-2CQDA2-2p100GE on SUT:
+    - ring4 100GE-ports e810-2CQDA2-2p100GE:
         - s72-t212-tg1-c6/p1 to s72-t212-tg1-c6/p2.
         - s72-t212-tg1-c6/p2 to s72-t212-tg1-c6/p1.
+    - ring5 200GE-ports ConnectX7-2p200GE:
+        - s72-t212-tg1-c8/p1 to s71-t212-sut1-c8/p1.
+        - s71-t212-sut1-c8/p2 to s72-t212-tg1-c8/p2.
 - testbed213:
-    - ring1 25GE-ports xxv710-DA2-2p25GE on SUT
+    - ring1 25GE-ports xxv710-DA2-2p25GE:
         - s84-t213-tg1-c2/p1 to s83-t213-sut1-c2/p1.
         - s83-t213-sut1-c2/p2 to s84-t213-tg1-c2/p2.
-    - ring2 25GE-ports e810-XXVDA4-2p25GE on SUT:
+    - ring2 25GE-ports e810-XXVDA4-2p25GE:
         - s84-t213-tg1-c4/p1 to s83-t213-sut1-c4/p1.
         - s83-t213-sut1-c4/p2 to s84-t213-tg1-c4/p2.
         - s84-t213-tg1-c4/p3 to s83-t213-sut1-c4/p3.
         - s83-t213-sut1-c4/p4 to s84-t213-tg1-c4/p4.
-    - ring3 100GE-ports e810-2CQDA2-2p100GE on SUT:
+    - ring3 100GE-ports e810-2CQDA2-2p100GE:
         - s84-t213-tg1-c9/p1 to s83-t213-sut1-c9/p1.
         - s83-t213-sut1-c9/p2 to s84-t213-tg1-c9/p2.
-    - ring4 100GE-ports e810-2CQDA2-2p100GE on SUT:
+    - ring4 100GE-ports e810-2CQDA2-2p100GE:
         - s84-t213-tg1-c6/p1 to s84-t213-tg1-c6/p2.
         - s84-t213-tg1-c6/p2 to s84-t213-tg1-c6/p1.
+    - ring5 200GE-ports ConnectX7-2p200GE:
+        - s84-t213-tg1-c8/p1 to s83-t213-sut1-c8/p1.
+        - s83-t213-sut1-c8/p2 to s84-t213-tg1-c8/p2.
 - testbed214:
-    - ring1 25GE-ports xxv710-DA2-2p25GE on SUT
+    - ring1 25GE-ports xxv710-DA2-2p25GE:
         - s86-t214-tg1-c2/p1 to s85-t214-sut1-c2/p1.
         - s85-t214-sut1-c2/p2 to s86-t214-tg1-c2/p2.
-    - ring2 25GE-ports e810-XXVDA4-2p25GE on SUT:
+    - ring2 25GE-ports e810-XXVDA4-2p25GE:
         - s86-t214-tg1-c4/p1 to s85-t214-sut1-c4/p1.
         - s85-t214-sut1-c4/p2 to s86-t214-tg1-c4/p2.
         - s86-t214-tg1-c4/p3 to s85-t214-sut1-c4/p3.
         - s85-t214-sut1-c4/p4 to s86-t214-tg1-c4/p4.
-    - ring3 100GE-ports e810-2CQDA2-2p100GE on SUT:
+    - ring3 100GE-ports e810-2CQDA2-2p100GE:
         - s86-t214-tg1-c9/p1 to s85-t214-sut1-c9/p1.
         - s85-t214-sut1-c9/p2 to s86-t214-tg1-c9/p2.
-    - ring4 100GE-ports e810-2CQDA2-2p100GE on SUT:
+    - ring4 100GE-ports e810-2CQDA2-2p100GE:
         - s86-t214-tg1-c6/p1 to s86-t214-tg1-c6/p2.
         - s86-t214-tg1-c6/p2 to s86-t214-tg1-c6/p1.
+    - ring5 200GE-ports ConnectX7-2p200GE:
+        - s86-t214-tg1-c8/p1 to s85-t214-sut1-c8/p1.
+        - s85-t214-sut1-c8/p2 to s86-t214-tg1-c8/p2.
 - testbed215:
-    - ring1 25GE-ports xxv710-DA2-2p25GE on SUT
+    - ring1 25GE-ports xxv710-DA2-2p25GE:
         - s88-t215-tg1-c2/p1 to s87-t215-sut1-c2/p1.
         - s87-t215-sut1-c2/p2 to s88-t215-tg1-c2/p2.
-    - ring2 25GE-ports e810-XXVDA4-2p25GE on SUT:
+    - ring2 25GE-ports e810-XXVDA4-2p25GE:
         - s88-t215-tg1-c4/p1 to s87-t215-sut1-c4/p1.
         - s87-t215-sut1-c4/p2 to s88-t215-tg1-c4/p2.
         - s88-t215-tg1-c4/p3 to s87-t215-sut1-c4/p3.
         - s87-t215-sut1-c4/p4 to s88-t215-tg1-c4/p4.
-    - ring3 100GE-ports e810-2CQDA2-2p100GE on SUT:
+    - ring3 100GE-ports e810-2CQDA2-2p100GE:
         - s88-t215-tg1-c9/p1 to s87-t215-sut1-c9/p1.
         - s87-t215-sut1-c9/p2 to s88-t215-tg1-c9/p2.
-    - ring4 100GE-ports e810-2CQDA2-2p100GE on SUT:
+    - ring4 100GE-ports e810-2CQDA2-2p100GE:
         - s88-t215-tg1-c6/p1 to s88-t215-tg1-c6/p2.
         - s88-t215-tg1-c6/p2 to s88-t215-tg1-c6/p1.
+    - ring5 200GE-ports ConnectX7-2p200GE:
+        - s88-t215-tg1-c8/p1 to s87-t215-sut1-c8/p1.
+        - s87-t215-sut1-c8/p2 to s88-t215-tg1-c8/p2.
 ```
 
 ### 3-Node-Rangeley (3n-rng)
@@ -1749,43 +1918,55 @@ To be completed.
         - s64-t34-tg1-c4/p1 - s62-t34-sut1-c1/p2.
         - s62-t34-sut1-c1/p1 - s63-t34-sut2-c1/p2.
         - s63-t34-sut2-c1/p1 - s64-t34-tg1-c4/p2.
+    - ring2 100GE-ports ConnectX6-2p100GE Mellanox on SUTs:
+        - s64-t34-tg1-c8/p1 - s62-t34-sut2-c8/p1.
+        - s62-t34-sut1-c8/p1 - s63-t34-sut2-c8/p2.
+        - s63-t34-sut1-c8/p2 - s64-t34-tg1-c8/p2.
 ```
 
 ### 3-Node-Icelake (3n-icx)
 
 ```
 - testbed37:
-    - ring1 25GE-ports xxv710-DA2-2p25GE on SUTs:
+    - ring1 25GE-ports xxv710-DA2-2p25GE:
         - s67-t37-tg1-c2/p1 to s65-t37-sut1-c2/p1.
         - s65-t37-sut1-c2/p2 to s66-t37-sut2-c2/p2.
         - s66-t37-sut2-c2/p1 to s67-t37-tg1-c2/p2.
-    - ring2 25GE-ports e810-XXVDA4-4p25GE on SUT:
+    - ring2 25GE-ports e810-XXVDA4-4p25GE:
         - s67-t37-tg1-c4/p1 to s65-t37-sut1-c4/p1.
         - s65-t37-sut1-c4/p2 to s66-t37-sut2-c4/p2.
         - s66-t37-sut2-c4/p1 to s67-t37-tg1-c4/p2.
         - s67-t37-tg1-c4/p3 to s65-t37-sut1-c4/p3.
         - s65-t37-sut1-c4/p4 to s66-t37-sut2-c4/p4.
         - s66-t37-sut2-c4/p3 to s67-t37-tg1-c4/p4.
-    - ring3 100GE-ports e810-2CQDA2-2p100GE on SUT
+    - ring3 100GE-ports e810-2CQDA2-2p100GE:
         - s67-t37-tg1-c9/p1 to s65-t37-sut1-c9/p1.
         - s65-t37-sut1-c9/p2 to s66-t37-sut2-c9/p2.
         - s66-t37-sut2-c9/p1 to s67-t37-tg1-c9/p2.
+    - ring4 200GE-ports ConnectX6-2p200GE:
+        - s67-t37-tg1-c10/p1 - s65-t37-sut1-c10/p2.
+        - s65-t37-sut1-c10/p1 - s66-t37-sut2-c10/p2.
+        - s66-t37-sut2-c10/p1 - s67-t37-tg1-c10/p2.
 - testbed38:
-    - ring1 25GE-ports xxv710-DA2-2p25GE on SUTs:
+    - ring1 25GE-ports xxv710-DA2-2p25GE:
         - s80-t38-tg1-c2/p1 to s78-t38-sut1-c2/p1.
         - s78-t38-sut1-c2/p2 to s79-t38-sut2-c2/p2.
         - s79-t38-sut2-c2/p1 to s80-t38-tg1-c2/p2.
-    - ring2 25GE-ports e810-XXVDA4-4p25GE on SUT:
+    - ring2 25GE-ports e810-XXVDA4-4p25GE:
         - s80-t38-tg1-c4/p1 to s78-t38-sut1-c4/p1.
         - s78-t38-sut1-c4/p2 to s79-t38-sut2-c4/p2.
         - s79-t38-sut2-c4/p1 to s80-t38-tg1-c4/p2.
         - s80-t38-tg1-c4/p3 to s78-t38-sut1-c4/p3.
         - s78-t38-sut1-c4/p4 to s79-t38-sut2-c4/p4.
         - s79-t38-sut2-c4/p3 to s80-t38-tg1-c4/p4.
-    - ring3 100GE-ports e810-2CQDA2-2p100GE on SUT
+    - ring3 100GE-ports e810-2CQDA2-2p100GE:
         - s80-t38-tg1-c9/p1 to s78-t38-sut1-c9/p1.
         - s78-t38-sut1-c9/p2 to s79-t38-sut2-c9/p2.
         - s79-t38-sut2-c9/p1 to s80-t38-tg1-c9/p2.
+    - ring4 200GE-ports ConnectX6-2p200GE:
+        - s80-t38-tg1-c10/p1 to s78-t38-sut1-c10/p1.
+        - s78-t38-sut1-c10/p2 to s79-t38-sut2-c10/p2.
+        - s79-t38-sut2-c10/p1 to s80-t38-tg1-c10/p2.
 ```
 
 ### 3-Node-SnowRidge (3n-snr)
@@ -1833,7 +2014,7 @@ To be completed.
     - ring2 100GE-ports e810-2CQDA2-2p100GE:
         - s56-t23-sut1-c4/p1 to s57-t23-tg1-c4/p1.
         - s57-t23-tg1-c4/p2 to s56-t23-sut1-c4/p2.
-    - ring3 25GE-ports e810-XXVDA4-2p25GE:
+    - ring3 25GE-ports e810-XXVDA4-4p25GE:
         - s56-t23-sut1-c10/p1 to s57-t23-tg1-c10/p1.
         - s56-t23-sut1-c10/p2 to s57-t23-tg1-c10/p2.
         - s56-t23-sut1-c10/p3 to s57-t23-tg1-c10/p3.
@@ -1849,7 +2030,7 @@ To be completed.
     - ring2 100GE-ports e810-2CQDA2-2p100GE:
         - s58-t24-sut1-c4/p1 to s59-t24-tg1-c4/p1.
         - s59-t24-tg1-c4/p2 to s58-t24-sut1-c4/p2.
-    - ring3 25GE-ports e810-XXVDA4-2p25GE:
+    - ring3 25GE-ports e810-XXVDA4-4p25GE:
         - s58-t24-sut1-c10/p1 to s59-t24-tg1-c10/p1.
         - s58-t24-sut1-c10/p2 to s59-t24-tg1-c10/p2.
         - s58-t24-sut1-c10/p3 to s59-t24-tg1-c10/p3.
@@ -1859,3 +2040,18 @@ To be completed.
     - ring5 100GE-ports e810-2CQDA2-2p100GE:
         - s59-t24-tg1-c9/p1 to s59-t24-tg1-c9/p2.
 ```
+
+### 3-Node-IcelakeD (3n-icxd)
+
+```
+- testbed31:
+    - ring1 25GE-ports e822cq-2p25GE:
+        - s90-t31t32-tg1-c4/p1 to s32-t31-sut1-c1/p1.
+        - s32-t31-sut1-c1/p2 to s33-t31-sut2-c1/p2.
+        - s33-t31-sut2-c1/p1 to s90-t31t32-tg1-c4/p2.
+- testbed32:
+    - ring1 25GE-ports e822cq-2p25GE:
+        - s90-t31t32-tg1-c6/p1 to s34-t32-sut1-c1/p1.
+        - s34-t32-sut1-c1/p2 to s35-t32-sut2-c1/p2.
+        - s35-t32-sut2-c1/p1 to s90-t31t32-tg1-c6/p2.
+```
\ No newline at end of file