Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
feat(pxe): Migrate Ubuntu Jammy I.
[csit.git] / docs / lab / testbed_specifications.md
diff --git a/docs/lab/testbed_specifications.md b/docs/lab/testbed_specifications.md
index 73138ec..fad1bdc 100644 (file)
--- a/docs/lab/testbed_specifications.md
+++ b/docs/lab/testbed_specifications.md
@@ -1,48 +1,67 @@
 # FD.io CSIT Testbed Specifications
 
 # FD.io CSIT Testbed Specifications
 
-1. [FD.io CSIT Testbed Specifications](#fdio-csit-testbed-specifications)
+1. [Purpose](#purpose)
 1. [Testbeds Overview](#testbeds-overview)
    1. [Summary List](#summary-list)
    1. [1-Node-Skylake Xeon Intel (1n-skx)](#1-node-skylake-xeon-intel-1n-skx)
    1. [1-Node-ThunderX2 Arm Marvell (1n-tx2)](#1-node-thunderx2-arm-marvell-1n-tx2)
 1. [Testbeds Overview](#testbeds-overview)
    1. [Summary List](#summary-list)
    1. [1-Node-Skylake Xeon Intel (1n-skx)](#1-node-skylake-xeon-intel-1n-skx)
    1. [1-Node-ThunderX2 Arm Marvell (1n-tx2)](#1-node-thunderx2-arm-marvell-1n-tx2)
+   1. [1-Node-Cascadelake Xeon Intel (1n-clx)](#1-node-cascadelake-xeon-intel-1n-clx)
    1. [2-Node-Skylake Xeon Intel (2n-skx)](#2-node-skylake-xeon-intel-2n-skx)
    1. [2-Node-Denverton Atom Intel (2n-dnv)](#2-node-denverton-atom-intel-2n-dnv)
    1. [2-Node-IxiaPS1L47 Ixia PSOne L47 (2n-ps1)](#2-node-ixiaps1l47-ixia-psone-l47-2n-ps1)
    1. [2-Node-Skylake Xeon Intel (2n-skx)](#2-node-skylake-xeon-intel-2n-skx)
    1. [2-Node-Denverton Atom Intel (2n-dnv)](#2-node-denverton-atom-intel-2n-dnv)
    1. [2-Node-IxiaPS1L47 Ixia PSOne L47 (2n-ps1)](#2-node-ixiaps1l47-ixia-psone-l47-2n-ps1)
-   1. [3-Node-Haswell Xeon Intel (3n-skx)](#3-node-haswell-xeon-intel-3n-skx)
+   1. [2-Node-Cascadelake Xeon Intel (2n-clx)](#2-node-cascadelake-xeon-intel-2n-clx)
+   1. [2-Node-Zen2 EPYC AMD (2n-zn2)](#2-node-zen2-epyc-amd-2n-zn)
+   1. [2-Node-ThunderX2 Arm Marvell (2x-tx2)](#2-node-thunderx2-arm-marvell-2n-tx2)
+   1. [2-Node-Icelake Xeon Intel (2n-icx)](#2-node-icelake-xeon-intel-2n-icx)
    1. [3-Node-Skylake Xeon Intel (3n-skx)](#3-node-skylake-xeon-intel-3n-skx)
    1. [3-Node-Skylake Xeon Intel (3n-skx)](#3-node-skylake-xeon-intel-3n-skx)
-   1. [3-Node-TaiShan Arm Huawei (3n-tsh)](#3-node-taishan-arm-huawei-3n-tsh)
-   1. [3-Node-MACCHIATObin Arm Marvell](#3-node-macchiatobin-arm-marvell)
    1. [3-Node-Rangeley Atom Testbeds](#3-node-rangeley-atom-testbeds)
    1. [3-Node-Rangeley Atom Testbeds](#3-node-rangeley-atom-testbeds)
+   1. [3-Node-TaiShan Arm Huawei (3n-tsh)](#3-node-taishan-arm-huawei-3n-tsh)
+   1. [3-Node-Altra Arm Ampere (3n-alt)](#3-node-altra-arm-armpere-3n-alt)
+   1. [3-Node-Icelake Xeon Intel (3n-icx)](#3-node-icelake-xeon-intel-3n-icx)
+   1. [3-Node-SnowRidge Atom Intel (3n-snr)](#3-node-snowridge-atom-intel-3n-snr)
 1. [Server Management](#server-management)
    1. [Requirements](#requirements)
    1. [Addressing](#addressing)
    1. [LOM (IPMI) VLAN IP Addresses](#lom-ipmi-vlan-ip-addresses)
    1. [Management VLAN IP Addresses](#management-vlan-ip-addresses)
 1. [Server Management](#server-management)
    1. [Requirements](#requirements)
    1. [Addressing](#addressing)
    1. [LOM (IPMI) VLAN IP Addresses](#lom-ipmi-vlan-ip-addresses)
    1. [Management VLAN IP Addresses](#management-vlan-ip-addresses)
-1. [Server Type Specification](#server-type-specification)
-   1. [Server and Port Naming](#server-and-port-naming)
+1. [Server Specifications](#server-specifications)
+   1. [Server Types](#server-types)
+   1. [Naming Convention](#naming-convention)
 1. [Testbeds Configuration](#testbeds-configuration)
    1. [Per Testbed Server Allocation and Naming](#per-testbed-server-allocation-and-naming)
 1. [Testbeds Configuration](#testbeds-configuration)
    1. [Per Testbed Server Allocation and Naming](#per-testbed-server-allocation-and-naming)
-      1 [1-Node-Skylake (1n-skx) PROD](#1-node-skylake-1n-skx-prod)
-      1 [1-Node-Thunderx2 (1n-tx2) WIP](#1-node-thunderx2-1n-tx2-wip)
-      1 [2-Node-Skylake (2n-skx) PROD](#2-node-skylake-2n-skx-prod)
-      1 [2-Node-Denverton (2n-dnv) TODO](#2-node-denverton-2n-dnv-todo)
-      1 [2-Node-IxiaPS1L47 (2n-ps1) VERIFY](#2-node-ixiaps1l47-2n-ps1-verify)
-      1 [3-Node-Haswell (3n-hsw) PROD](#3-node-haswell-3n-hsw-prod)
-      1 [3-Node-Skylake (3n-skx) PROD](#3-node-skylake-3n-skx-prod)
-      1 [3-Node-Rangeley (3n-rng) VERIFY](#3-node-rangeley-3n-rng-verify)
-      1 [3-Node-Taishan (3n-tsh) WIP](#3-node-taishan-3n-tsh-wip)
-      1 [3-Node-Mcbin (3n-mcb) TODO](#3-node-mcbin-3n-mcb-todo)
+      1. [1-Node-Skylake Servers (1n-skx) PROD](#1-node-skylake-servers-1n-skx-prod)
+      1. [1-Node-ThunderX2 Servers (1n-tx2) PROD](#1-node-thunderx2-servers-1n-tx2-prod)
+      1. [1-Node-Cascadelake Servers (1n-clx) PROD](#1-node-cascadelake-servers-1n-clx-prod)
+      1. [2-Node-Skylake Servers (2n-skx) PROD](#2-node-skylake-servers-2n-skx-prod)
+      1. [2-Node-Denverton Servers (2n-dnv) PROD](#2-node-denverton-servers-2n-dnv-prod)
+      1. [2-Node-IxiaPS1L47 Servers (2n-ps1) VERIFY](#2-node-ixiaps1l47-servers-2n-ps1-verify)
+      1. [2-Node-Cascadelake Servers (2n-clx) PROD](#2-node-cascadelake-servers-2n-clx-prod)
+      1. [2-Node-Zen2 Servers (2n-zn2) PROD](#2-node-zen2-servers-2n-zn2-prod])
+      1. [2-Node-ThunderX2 Servers (2n-tx2) PROD](#2-node-thunderx2-servers-2n-tx2-prod)
+      1. [2-Node-Icelake Servers (2n-icx) PROD](#2-node-icelake-servers-2n-icx-prod)
+      1. [3-Node-Skylake Servers (3n-skx) PROD](#3-node-skylake-servers-3n-skx-prod)
+      1. [3-Node-Rangeley Servers (3n-rng) VERIFY](#3-node-rangeley-servers-3n-rng-verify)
+      1. [3-Node-Taishan Servers (3n-tsh) PROD](#3-node-taishan-servers-3n-tsh-prod)
+      1. [3-Node-Altra Servers (3n-alt) PROD](#3-node-altra-servers-3n-alt-prod)
+      1. [3-Node-Icelake Servers (3n-icx) PROD](#3-node-icelake-servers-3n-icx-prod)
+      1. [3-Node-SnowRidge Servers (3n-snr) PROD](#3-node-snowridge-servers-3n-snr-prod)
    1. [Per Testbed Wiring](#per-testbed-wiring)
    1. [Per Testbed Wiring](#per-testbed-wiring)
-      1 [1-Node-Skylake (1n-skx) PROD](#1-node-skylake-1n-skx-prod)
-      1 [1-Node-Thunderx2 (1n-tx2) WIP](#1-node-thunderx2-1n-tx2-wip)
-      1 [2-Node-Skylake (2n-skx) PROD](#2-node-skylake-2n-skx-prod)
-      1 [2-Node-Denverton (2n-dnv) TODO](#2-node-denverton-2n-dnv-todo)
-      1 [2-Node-IxiaPS1L47 (2n-ps1) VERIFY](#2-node-ixiaps1l47-2n-ps1-verify)
-      1 [3-Node-Haswell (3n-hsw) PROD](#3-node-haswell-3n-hsw-prod)
-      1 [3-Node-Skylake (3n-skx) PROD](#3-node-skylake-3n-skx-prod)
-      1 [3-Node-Rangeley (3n-rng) TODO](#3-node-rangeley-3n-rng-todo)
-      1 [3-Node-Taishan (3n-tsh) WIP](#3-node-taishan-3n-tsh-wip)
-      1 [3-Node-Mcbin (3n-mcb) WIP](#3-node-mcbin-3n-mcb-wip)
+      1. [1-Node-Skylake Wiring (1n-skx) PROD](#1-node-skylake-wiring-1n-skx-prod)
+      1. [1-Node-ThunderX2 Wiring (1n-tx2) PROD](#1-node-thunderx2-wiring-1n-tx2-prod)
+      1. [1-Node-Cascadelake Wiring (1n-clx) PROD](#1-node-cascadelake-wiring-1n-clx-prod)
+      1. [2-Node-Skylake Wiring (2n-skx) PROD](#2-node-skylake-wiring-2n-skx-prod)
+      1. [2-Node-Denverton Wiring (2n-dnv) PROD](#2-node-denverton-wiring-2n-dnv-prod)
+      1. [2-Node-IxiaPS1L47 Wiring (2n-ps1) VERIFY](#2-node-ixiaps1l47-wiring-2n-ps1-verify)
+      1. [2-Node-Cascadelake Wiring (2n-clx) PROD](#2-node-cascadelake-wiring-2n-clx-prod)
+      1. [2-Node-Zen2 Wiring (2n-zn2) PROD](#2-node-zen2-wiring-2n-zn2-prod])
+      1. [2-Node-ThunderX2 Wiring (2n-tx2) PROD](#2-node-thunderx2-wiring-2n-tx2-prod)
+      1. [2-Node-Icelake Servers (2n-icx) PROD](#2-node-icelake-servers-2n-icx-prod)
+      1. [3-Node-Skylake Wiring (3n-skx) PROD](#3-node-skylake-wiring-3n-skx-prod)
+      1. [3-Node-Rangeley Wiring (3n-rng) VERIFY](#3-node-rangeley-wiring-3n-rng-todo)
+      1. [3-Node-Taishan Wiring (3n-tsh) PROD](#3-node-taishan-wiring-3n-tsh-prod)
+      1. [3-Node-Altra Wiring (3n-alt) PROD](#3-node-altra-wiring-3n-alt-prod)
+      1. [3-Node-Icelake Wiring (3n-icx) PROD](#3-node-icelake-wiring-3n-icx-prod)
+      1. [3-Node-SnowRidge Wiring (3n-snr) PROD](#3-node-snowridge-wiring-3n-snr-prod)
 1. [Inventory](#inventory)
    1. [Appliances](#appliances)
    1. [Arm Servers](#arm-servers)
 1. [Inventory](#inventory)
    1. [Appliances](#appliances)
    1. [Arm Servers](#arm-servers)
@@ -51,7 +70,7 @@
    1. [Pluggables and Cables](#pluggables-and-cables)
    1. [Other Parts](#other-parts)
 
    1. [Pluggables and Cables](#pluggables-and-cables)
    1. [Other Parts](#other-parts)
 
-## FD.io CSIT Testbed Specifications
+## Purpose
 
 This note includes specification of the physical testbed infrastructure
 hosted by LFN FD.io CSIT project.
 
 This note includes specification of the physical testbed infrastructure
 hosted by LFN FD.io CSIT project.
@@ -61,77 +80,146 @@ hosted by LFN FD.io CSIT project.
 ### Summary List
 
 ```
 ### Summary List
 
 ```
- #. CSIT_tb          Purpose  SUT   TG    #TB  #SUT #TG  #hsw #skx #ps1 #rng #dnv #tx2 #tsh #mcb
- 1. 1-Node-Skylake     func   skx   na    2    2    0    0    2    0    0    0    0    0    0
- 2. 1-Node-Thunderx2   func   tx2   na    1    1    0    0    0    0    0    0    1    0    0
- 3. 2-Node-Skylake     perf   skx   skx   4    4    4    0    8    0    0    0    0    0    0
- 4. 2-Node-Denverton   perf   dnv   skx   1    1    1    0    .5   0    0    1    0    0    0
- 5. 2-Node-IxiaPS1L47  tcp    skx   ps1   1    1    1    0    1    1    0    0    0    0    0
- 6. 3-Node-Haswell     perf   hsw   hsw   3    6    3    9    0    0    0    0    0    0    0
- 7. 3-Node-Skylake     perf   skx   skx   2    4    2    0    6    0    0    0    0    0    0
- 8. 3-Node-Rangeley    perf   rng   skx   1    3    1    0    0    0    2    0    0    0    0
- 9. 3-Node-Taishan     perf   tsh   skx   1    2    1    0    .5   0    0    0    0    2    0
-10. 3-Node-Mcbin       perf   mcb   skx   1    2    1    0    .5   0    0    0    0    0    2
-11. 1-Node-VIRL        func   hsw   ---   3    3    0    3    0    0    0    0    0    0    0
-                                 Totals: 17   26   14   12   19    1    2    1    1    2    2
+ #. CSIT_tb          Purpose  SUT   TG    #TB  #SUT #TG  #hsw #skx #ps1 #rng #dnv #tx2 #tsh #alt #clx #zn2 #icx #snr
+ 1. 1-Node-Haswell     nomad  hsw   na    4    4    0    4    0    0    0    0    0    0    0    0    0    0    0
+ 2. 1-Node-Skylake     dev    skx   na    2    2    0    0    2    0    0    0    0    0    0    0    0    0    0
+ 3. 1-Node-ThunderX2   dev    tx2   na    2    2    0    0    0    0    0    0    2    0    0    0    0    0    0
+ 4. 1-Node-Cascadelake dev    clx   lcx   1    1    0    0    0    0    0    0    0    0    0    1    0    0    0
+ 5. 1-Node-AmpereAltra nomad  alt   na    2    2    0    0    0    0    0    0    0    0    2    0    0    0    0
+ 6. 2-Node-Skylake     perf   skx   skx   3    3    3    0    6    0    0    0    0    0    0    0    0    0    0
+ 7. 2-Node-Denverton   perf   dnv   skx   1    1    1    0    .5   0    0    1    0    0    0    0    0    0    0
+ 8. 2-Node-IxiaPS1L47  tcp    skx   ps1   1    1    1    0    1    1    0    0    0    0    0    0    0    0    0
+ 9. 2-Node-Cascadelake perf   clx   clx   3    3    3    0    0    0    0    0    0    0    0    6    0    0    0
+10. 2-Node-ThunderX2   perf   tx2   skx   1    1    .5   0    .5   0    0    0    1    0    0    0    0    0    0
+11. 2-Node-Icelake     perf   icx   icx   4    4    4    0    0    0    0    0    0    0    0    0    0    8    0
+12. 3-Node-Skylake     perf   skx   skx   2    4    2    0    6    0    0    0    0    0    0    0    0    0    0
+13. 3-Node-Rangeley    perf   rng   skx   1    3    1    0    0    0    2    0    0    0    0    0    0    0    0
+14. 3-Node-Taishan     perf   tsh   skx   1    2    .5   0    .5   0    0    0    0    2    0    0    0    0    0
+15. 3-Node-Altra       perf   alt   icx   1    2    1    0    0    0    0    0    0    0    2    0    0    1    0
+16. 3-Node-Denverton   perf   dnv   skx   1    2    1    0    .5   0    0    2    0    0    0    0    0    0    0
+17. 2-Node-Zen2        perf   zn2   zn2   1    1    1    0    0    0    0    0    0    0    0    0    2    0    0
+18. 3-Node-Icelake     perf   icx   icx   2    4    2    0    0    0    0    0    0    0    0    0    0    6    0
+19. 3-Node-SnowRidge   perf   snr   icx   1    2    .5   0    0    0    0    0    0    0    0    0    0    .5   2
+                                 Totals: 34   44  21.5   4   17    1    2    3    3    2    4    7    2  15.5   2
 ```
 
 ### 1-Node-Skylake Xeon Intel (1n-skx)
 
 ```
 
 ### 1-Node-Skylake Xeon Intel (1n-skx)
 
-Each 1-Node-Skylake testbed includes one SUT (Type-B6 server) with NIC
-ports connected back-to-back.
+Each 1-Node-Skylake testbed includes one SUT (Server-Type-B6) 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)
 
 Used for FD.io VPP_Device functional driver tests.
 
 ### 1-Node-ThunderX2 Arm Marvell (1n-tx2)
 
-Each 1-Node-ThunderX2 testbed includes one SUT (Type-B9 server) with NIC
-ports connected back-to-back.
+Each 1-Node-ThunderX2 testbed includes one SUT (Server-Type-E11) 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)).
+
 Used for FD.io VPP_Device functional driver tests.
 
 ### 2-Node-Skylake Xeon Intel (2n-skx)
 
 Used for FD.io VPP_Device functional driver tests.
 
 ### 2-Node-Skylake Xeon Intel (2n-skx)
 
-Each 2-Node-Skylake testbed includes one SUT (Type-B1 server) and one TG
-(Type-B2 server) connected back-to-back.
+Each 2-Node-Skylake testbed includes one SUT (Server-Type-B1) and one TG
+(Server-Type-B2) connected in a 2-node circular topology
+([Server Types](#server-types)).
 Used for FD.io performance tests.
 
 ### 2-Node-Denverton Atom Intel (2n-dnv)
 
 Used for FD.io performance tests.
 
 ### 2-Node-Denverton Atom Intel (2n-dnv)
 
-Each 2-Node-Skylake testbed includes one SUT (Type-B10 server) and one TG
-(Type-B2 server) connected back-to-back.
+Each 2-Node-Skylake testbed includes one SUT (Server-Type-B10) and one
+TG (Server-Type-B2) connected in a 2-node circular topology
+([Server Types](#server-types)).
 Used for FD.io performance tests.
 
 ### 2-Node-IxiaPS1L47 Ixia PSOne L47 (2n-ps1)
 
 Used for FD.io performance tests.
 
 ### 2-Node-IxiaPS1L47 Ixia PSOne L47 (2n-ps1)
 
-Each 2-Node-IxiaPS1L47 testbed includes one SUT (Type-B1 server) and one
-TG (Ixia PSOne appliance) with 10GE interfaces connected back-to-back.
+Each 2-Node-IxiaPS1L47 testbed includes one SUT (Server-Type-B1) and one
+TG (Ixia PSOne appliance) with 10GE interfaces connected in a 2-node
+circular topology ([Server Types](#server-types)).
 Used for FD.io TCP/IP and HTTP performance tests.
 
 Used for FD.io TCP/IP and HTTP performance tests.
 
-### 3-Node-Haswell Xeon Intel (3n-skx)
+### 2-Node-Cascadelake Xeon Intel (2n-clx)
+
+Each 2-Node-Cascadelake testbed includes one SUT (Server-Type-C2) and
+one TG (Server-Type-C3) connected in a 2-node circular topology
+([Server Types](#server-types)).
+Used for FD.io performance tests.
+
+### 2-Node-Zen2 EPYC AMD (2n-zn2)
+
+Each 2-Node-Zen2 testbed includes one SUT (Server-Type-D1) and
+one TG (Server-Type-D2) connected in a 2-node circular topology
+([Server Types](#server-types)).
+Used for FD.io performance tests.
+
+### 2-Node-ThunderX2 Arm Marvell (2x-tx2)
+
+Each 2-Node-ThunderX2 testbed includes one SUT (Server-Type-E22) and
+one TG (Server-Type-E31) connected in a 2-node circular topology
+([Server Types](#server-types)).
+Used for FD.io performance tests.
+
+### 2-Node-Icelake Xeon Intel (2n-icx)
+
+Each 2-Node-Icelake testbed includes one SUT (Server-Type-F1) and
+one TG (Server-Type-F2) connected in a 2-node circular topology
+([Server Types](#server-types)).
+Used for FD.io performance tests.
+
+### 3-Node-Haswell Xeon Intel (3n-hsw)
+
+Each 3-Node-Haswell testbed includes two SUTs (Server-Type-A1) and one
+TG (Server-Type-A2) connected in a 3-node circular topology
+([Server Types](#server-types)).
+Used for FD.io performance tests.
 
 ### 3-Node-Skylake Xeon Intel (3n-skx)
 
 
 ### 3-Node-Skylake Xeon Intel (3n-skx)
 
-Each 3-Node-Skylake testbed includes two SUTs (Type-B1 servers) and one
-TG (Type-B2 server) connected in full-mesh triangle.
+Each 3-Node-Skylake testbed includes two SUTs (Server-Type-B1) and one
+TG (Server-Type-B2) connected in a 3-node circular topology.
+Used for FD.io performance tests.
+
+### 3-Node-Rangeley Atom Testbeds
+
+Each 3-Node-Rangeley testbed includes two SUTs (Server-Type-B5) and one
+TG (Server-Type-2) connected in a 3-node circular topology
+([Server Types](#server-types)).
 Used for FD.io performance tests.
 
 ### 3-Node-TaiShan Arm Huawei (3n-tsh)
 
 Used for FD.io performance tests.
 
 ### 3-Node-TaiShan Arm Huawei (3n-tsh)
 
-Each 3-Node-TaiShan testbed includes two SUTs (Type-B3 server) and one TG
-(Type-B2 server) connected in full-mesh triangle.
+Each 3-Node-TaiShan testbed includes two SUTs (Server-Type-E21) and one
+TG (Server-Type-E31) connected in a 3-node circular topology
+([Server Types](#server-types)).
 Used for FD.io performance tests.
 
 Used for FD.io performance tests.
 
-### 3-Node-MACCHIATObin Arm Marvell
+### 3-Node-Altra Arm Ampere (3n-alt)
 
 
-Each 3-Node-MACCHIATObin testbed includes two SUTs (Type-B4 server) and
-one TG (Type-B2 server) connected in full-mesh triangle.
+Each 3-Node-Altra testbed includes two SUTs (Server-Type-E23) and one
+TG (Server-Type-F4) connected in a 3-node circular topology
+([Server Types](#server-types)).
 Used for FD.io performance tests.
 
 Used for FD.io performance tests.
 
-### 3-Node-Rangeley Atom Testbeds
+### 3-Node-Icelake Xeon Intel (3n-icx)
+
+Each 3-Node-Icelake testbed includes two SUTs (Server-Type-F1) 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)
 
 
-Each 3-Node-Rangeley testbed includes two SUTs (Type-B5 Netgate device)
-and one TG (Type-2 server) connected in full-mesh triangle.
+Each 3-Node-SnowRidge testbed includes two SUTs (Server-Type-G1) and one
+TG (Server-Type-F4) connected in a 3-node circular topology
+([Server Types](#server-types)).
 Used for FD.io performance tests.
 
 Used for FD.io performance tests.
 
+
 ## Server Management
 
 ### Requirements
 ## Server Management
 
 ### Requirements
@@ -142,16 +230,16 @@ connected to the management network:
 ```
 - 1GE IPMI port
   - IPMI - Intelligent Platform Management Interface.
 ```
 - 1GE IPMI port
   - IPMI - Intelligent Platform Management Interface.
-  - Required for access to embedded server management with WebUI, CLI, SNMPv3,
-    IPMIv2.0, for firmware (BIOS) and OS updates.
+  - Required for access to embedded server management with WebUI, CLI,
+    SNMPv3, IPMIv2.0, for firmware (BIOS) and OS updates.
 - 1GE/10GE/40GE management port
   - hostOS management port for general system management.
 ```
 
 ### Addressing
 
 - 1GE/10GE/40GE management port
   - hostOS management port for general system management.
 ```
 
 ### Addressing
 
-Each server has a LOM (Lights-Out-Management e.g. SM IPMI) and a Management
-port, which are connected to two different VLANs.
+Each server has a LOM (Lights-Out-Management e.g. SM IPMI) and a
+Management port, which are connected to two different VLANs.
 
 ```
 1. LOM (IPMI) VLAN:
 
 ```
 1. LOM (IPMI) VLAN:
@@ -190,26 +278,28 @@ Name         | Comment
 10.30.50.13  | LF Reserved
 10.30.50.14  | LF Reserved
 10.30.50.15  | LF Reserved
 10.30.50.13  | LF Reserved
 10.30.50.14  | LF Reserved
 10.30.50.15  | LF Reserved
-10.30.50.16  | t1-tg1
-10.30.50.17  | t1-sut1
-10.30.50.18  | t1-sut2
-10.30.50.20  | t2-tg1
-10.30.50.21  | t2-sut1
-10.30.50.22  | t2-sut2
-10.30.50.24  | t3-tg1
-10.30.50.25  | t3-sut1
-10.30.50.26  | t3-sut-2
-10.30.50.28  | t4-sut1
-10.30.50.29  | t4-sut2
-10.30.50.30  | t4-sut3
+10.30.50.16  | s16-nomad
+10.30.50.17  | s17-nomad
+10.30.50.18  | s18-nomad
+10.30.50.19  | s19-nomad
+10.30.50.20  | s20-nomad
+10.30.50.21  | s21-nomad
+10.30.50.22  | s22-nomad
+10.30.50.23  | s23-nomad
+10.30.50.24  | s24-nomad
+10.30.50.25  | s25-nomad
+10.30.50.26  | s26-nomad
 10.30.50.36  | s17-t33-sut1
 10.30.50.37  | s18-t33-sut2
 10.30.50.36  | s17-t33-sut1
 10.30.50.37  | s18-t33-sut2
+10.30.50.38  | fdio-marvell-dev
+10.30.50.39  | s53-nomad
+10.30.50.40  | s54-nomad
 10.30.50.41  | s3-t21-sut1
 10.30.50.42  | s4-t21-tg1
 10.30.50.43  | s11-t31-sut1
 10.30.50.44  | s12-t31-sut2
 10.30.50.45  | s13-t31-tg1
 10.30.50.41  | s3-t21-sut1
 10.30.50.42  | s4-t21-tg1
 10.30.50.43  | s11-t31-sut1
 10.30.50.44  | s12-t31-sut2
 10.30.50.45  | s13-t31-tg1
-10.30.50.46  | s19-t33t34-tg1
+10.30.50.46  | s19-t33t211-tg1
 10.30.50.47  | s1-t11-sut1
 10.30.50.48  | s2-t12-sut1
 10.30.50.49  | s5-t22-sut1
 10.30.50.47  | s1-t11-sut1
 10.30.50.48  | s2-t12-sut1
 10.30.50.49  | s5-t22-sut1
@@ -223,78 +313,156 @@ Name         | Comment
 10.30.50.57  | s16-t32-tg1
 10.30.50.58  | s25-t25-sut1
 10.30.50.59  | s26-t25-tg1
 10.30.50.57  | s16-t32-tg1
 10.30.50.58  | s25-t25-sut1
 10.30.50.59  | s26-t25-tg1
-10.30.50.69  | s27-t13-sut
+10.30.50.65  | s52-nomad
+10.30.50.66  | s51-nomad
+10.30.50.67  | s49-nomad
+10.30.50.68  | s50-nomad
+10.30.50.69  | s27-t211-sut1
+10.30.50.70  | s55-t13-sut1
+10.30.50.71  | s56-t14-sut1
+10.30.50.72  | s62-t34-sut1
+10.30.50.73  | s63-t34-sut2
+10.30.50.74  | s64-t34-tg1
+10.30.50.75  | s65-t37-sut1
+10.30.50.76  | s66-t37-sut2
+10.30.50.77  | s67-t37-tg1
+10.30.50.78  | s78-t38-sut1
+10.30.50.79  | s79-t38-sut2
+10.30.50.80  | s80-t38-tg1
+10.30.50.81  | s71-t212-sut1
+10.30.50.82  | s72-t212-tg1
+10.30.50.83  | s83-t213-sut1
+10.30.50.84  | s84-t213-tg1
+10.30.50.85  | s85-t214-sut1
+10.30.50.86  | s86-t214-tg1
+10.30.50.87  | s87-t215-sut1
+10.30.50.88  | s88-t215-tg1
+10.30.50.89  | s89-t39t310-tg1
+10.30.50.90  | s90-t311t312-tg1
+10.30.50.91  | s58-nomad
+10.30.50.92  | s59-nomad
+10.30.50.93  | s93-t39-sut1
+10.30.50.94  | s94-t39-sut2
 10.30.50.255 | Broadcast
 10.30.50.255 | Broadcast
+10.30.55.0   | network
+10.30.55.1   | Router
+10.30.55.10  | s28-t26t35-tg1
+10.30.55.11  | s29-t26-sut1
+10.30.55.12  | s30-t35-sut1
+10.30.55.13  | s31-t35-sut2
+10.30.55.18  | s33-t27-sut1
+10.30.55.19  | s34-t27-tg1
+10.30.55.20  | s35-t28-sut1
+10.30.55.21  | s36-t28-tg1
+10.30.55.22  | s37-t29-sut1
+10.30.55.23  | s38-t29-tg1
+10.30.55.24  | s60-t210-sut1
+10.30.55.25  | s61-t210-tg1
+10.30.55.255 | Broadcast
 
 ### Management VLAN IP Addresses
 
 
 ### Management VLAN IP Addresses
 
-Name                      | Comment
-------------------------- | -------
-10.30.51.0                | network
-10.30.51.1                | Router
-10.30.51.2                | LF Reserved
-10.30.51.3                | LF Reserved
-10.30.51.4                | LF Reserved
-10.30.51.5                | LF Reserved
-10.30.51.6                | LF Reserved
-10.30.51.7                | LF Reserved
-10.30.51.8                | LF Reserved
-10.30.51.9                | s22-t35-sut1 (netgate-1)
-10.30.51.10               | s23-t35-sut2 (netgate-2)
-10.30.51.11               | s24-t35-sut3 (netgate-3)
-10.30.51.12               | softiron-1
-10.30.51.13               | softiron-2
-10.30.51.14               | softiron-3
-10.30.51.15               | LF Reserved
-10.30.51.16               | t1-tg1
-10.30.51.17               | t1-sut1
-10.30.51.18               | t1-sut2
-10.30.51.20               | t2-tg1
-10.30.51.21               | t2-sut1
-10.30.51.22               | t2-sut2
-10.30.51.24               | t3-tg1
-10.30.51.25               | t3-sut1
-10.30.51.26               | t3-sut-2
-10.30.51.28               | t4-sut1
-10.30.51.29               | t4-sut2
-10.30.51.29               | s22-t35-sut1 screen -r /dev/ttyUSB0, TO BE VERIFIED
-10.30.51.30               | t4-sut3
-10.30.51.30               | s23-t35-sut2 screen -r /dev/ttyUSB1, TO BE VERIFIED
-10.30.51.30               | s24-t35-sut3 screen -r /dev/ttyUSB2, TO BE VERIFIED
-10.30.51.36               | s17-t33-sut1
-10.30.51.37               | s18-t33-sut2
-10.30.51.41               | s20-t34-sut1
-10.30.51.42               | s21-t34-sut2
-10.30.51.44               | s3-t21-sut1
-10.30.51.45               | s4-t21-tg1
-10.30.51.46               | s11-t31-sut1
-10.30.51.47               | s12-t31-sut2
-10.30.51.48               | s13-t31-tg1
-10.30.51.49               | s19-t33t34-tg1
-10.30.51.50               | s1-t11-sut1
-10.30.51.51               | s2-t12-sut1
-10.30.51.52               | s5-t22-sut1
-10.30.51.53               | s6-t22-tg1
-10.30.51.54               | s7-t23-sut1
-10.30.51.55               | s8-t23-tg1
-10.30.51.56               | s9-t24-sut1
-10.30.51.57               | s10-t24-tg1
-10.30.51.58               | s14-t32-sut1
-10.30.51.59               | s15-t32-sut2
-10.30.51.60               | s16-t32-tg1
-10.30.51.61               | s25-t25-sut1
-10.30.51.62               | s26-t25-tg1
-10.30.51.69               | s27-t13-sut1
-10.30.51.70-10.30.51.105  | VIRL1 TO BE VERIFIED
-10.30.51.106-10.30.51.180 | VIRL2
-10.30.51.181-10.30.51.254 | VIRL3
-10.30.51.255              | Broadcast
-
-## Server Type Specification
+Name         | Comment
+-------------| -------
+10.30.51.0   | network
+10.30.51.1   | Router
+10.30.51.2   | LF Reserved
+10.30.51.3   | LF Reserved
+10.30.51.4   | LF Reserved
+10.30.51.5   | LF Reserved
+10.30.51.6   | LF Reserved
+10.30.51.7   | LF Reserved
+10.30.51.8   | LF Reserved
+10.30.51.15  | LF Reserved
+10.30.51.16  | s16-nomad
+10.30.51.17  | s17-nomad
+10.30.51.18  | s18-nomad
+10.30.51.19  | s19-nomad
+10.30.51.20  | s20-nomad
+10.30.51.21  | s21-nomad
+10.30.51.22  | s22-nomad
+10.30.51.23  | s23-nomad
+10.30.51.24  | s24-nomad
+10.30.51.25  | s25-nomad
+10.30.51.26  | s26-nomad
+10.30.51.36  | s17-t33-sut1
+10.30.51.37  | s18-t33-sut2
+10.30.51.38  | fdio-marvell-dev
+10.30.51.39  | s53-nomad
+10.30.51.40  | s54-nomad
+10.30.51.44  | s3-t21-sut1
+10.30.51.45  | s4-t21-tg1
+10.30.51.46  | s11-t31-sut1
+10.30.51.47  | s12-t31-sut2
+10.30.51.48  | s13-t31-tg1
+10.30.51.49  | s19-t33t211-tg1
+10.30.51.50  | s1-t11-sut1
+10.30.51.51  | s2-t12-sut1
+10.30.51.52  | s5-t22-sut1
+10.30.51.53  | s6-t22-tg1
+10.30.51.54  | s7-t23-sut1
+10.30.51.55  | s8-t23-tg1
+10.30.51.56  | s9-t24-sut1
+10.30.51.57  | s10-t24-tg1
+10.30.51.58  | s14-t32-sut1
+10.30.51.59  | s15-t32-sut2
+10.30.51.60  | s16-t32-tg1
+10.30.51.61  | s25-t25-sut1
+10.30.51.62  | s26-t25-tg1
+10.30.51.65  | s52-nomad
+10.30.51.66  | s51-nomad
+10.30.51.67  | s49-nomad
+10.30.51.68  | s50-nomad
+10.30.51.69  | s27-t211-sut1
+10.30.51.70  | s55-t13-sut1
+10.30.51.71  | s56-t14-sut1
+10.30.51.72  | s62-t34-sut1
+10.30.51.73  | s63-t34-sut2
+10.30.51.74  | s64-t34-tg1
+10.30.51.75  | s65-t37-sut1
+10.30.51.76  | s66-t37-sut2
+10.30.51.77  | s67-t37-tg1
+10.30.51.78  | s78-t38-sut1
+10.30.51.79  | s79-t38-sut2
+10.30.51.80  | s80-t38-tg1
+10.30.51.81  | s71-t212-sut1
+10.30.51.82  | s72-t212-tg1
+10.30.51.83  | s83-t213-sut1
+10.30.51.84  | s84-t213-tg1
+10.30.51.85  | s85-t214-sut1
+10.30.51.86  | s86-t214-tg1
+10.30.51.87  | s87-t215-sut1
+10.30.51.88  | s88-t215-tg1
+10.30.51.89  | s89-t39t310-tg1
+10.30.51.90  | s90-t311t312-tg1
+10.30.51.91  | s58-nomad
+10.30.51.92  | s59-nomad
+10.30.51.93  | s93-t39-sut1
+10.30.51.94  | s94-t39-sut2
+10.30.51.255 | Broadcast
+10.32.8.0    | network
+10.32.8.1    | Router
+10.32.8.10   | s28-t26t35-tg1
+10.32.8.11   | s29-t26-sut1
+10.32.8.12   | s30-t35-sut1
+10.32.8.13   | s31-t35-sut2
+10.32.8.18   | s33-t27-sut1
+10.32.8.19   | s34-t27-tg1
+10.32.8.20   | s35-t28-sut1
+10.32.8.21   | s36-t28-tg1
+10.32.8.22   | s37-t29-sut1
+10.32.8.23   | s38-t29-tg1
+10.32.8.24   | s60-t210-sut1
+10.32.8.25   | s61-t210-tg1
+10.32.8.255  | Broadcast
+
+## Server Specifications
+
+### Server Types
 
 FD.io CSIT lab contains following server types:
 ```
 
 FD.io CSIT lab contains following server types:
 ```
-1. Type-A1: Purpose - Haswell Xeon SUT (Systems Under Test) for FD.io performance testing.
+1. Server-Type-A1: Purpose - Haswell Xeon SUT (Systems Under Test) for FD.io performance testing.
     - Quantity: 6 servers.
     - Physical connectivity:
         - CIMC and host management ports.
     - Quantity: 6 servers.
     - Physical connectivity:
         - CIMC and host management ports.
@@ -306,15 +474,15 @@ FD.io CSIT lab contains following server types:
         - Disks: 2* 2TB 12G SAS 7.2K RPM SFF HDD.
     - NICs configuration:
         - Numa0: Right PCIe Riser Board (Riser 1) (x8, x8, x8 PCIe3.0 lanes)
         - Disks: 2* 2TB 12G SAS 7.2K RPM SFF HDD.
     - NICs configuration:
         - Numa0: Right PCIe Riser Board (Riser 1) (x8, x8, x8 PCIe3.0 lanes)
-            - PCIe Slot1: Cisco VIC 1385 2p40GE.
-            - PCIe Slot2: Intel NIC x520 2p10GE.
+            - PCIe Slot1: empty.
+            - PCIe Slot2: empty.
             - PCIe Slot3: empty.
         - Numa1: Left PCIe Riser Board (Riser 2) (x8, x16, x8 PCIe3.0 lanes)
             - PCIe Slot3: empty.
         - Numa1: Left PCIe Riser Board (Riser 2) (x8, x16, x8 PCIe3.0 lanes)
-            - PCIe Slot4: Intel NIC xl710 2p40GE.
-            - PCIe Slot5: Intel NIC x710 2p10GE.
-            - PCIe Slot6: Intel QAT 8950 50G (Walnut Hill)
+            - PCIe Slot4: empty.
+            - PCIe Slot5: empty.
+            - PCIe Slot6: empty
         - MLOM slot: Cisco VIC 1227 2p10GE (x8 PCIe2.0 lanes).
         - MLOM slot: Cisco VIC 1227 2p10GE (x8 PCIe2.0 lanes).
-2. Type-A2: Purpose - Haswell Xeon TG (Traffic Generators) for FD.io performance testing.
+2. Server-Type-A2: Purpose - Haswell Xeon TG (Traffic Generators) for FD.io performance testing.
     - Quantity: 3 servers.
     - Physical connectivity:
         - CIMC and host management ports.
     - Quantity: 3 servers.
     - Physical connectivity:
         - CIMC and host management ports.
@@ -325,16 +493,16 @@ FD.io CSIT lab contains following server types:
         - RAM Memory: 16* 32GB DDR4-2133MHz.
         - Disks: 2* 2TB 12G SAS 7.2K RPM SFF HDD.
     - NICs configuration:
         - RAM Memory: 16* 32GB DDR4-2133MHz.
         - Disks: 2* 2TB 12G SAS 7.2K RPM SFF HDD.
     - NICs configuration:
-        - Numa0: Right PCIe Riser Board (Riser 1) (x8, x8, x8 lanes)
-            - PCIe Slot1: Intel NIC xl710 2p40GE.
-            - PCIe Slot2: Intel NIC x710 2p10GE.
-            - PCIe Slot3: Intel NIC x710 2p10GE.
-        - Numa1: Left PCIe Riser Board (Riser 2) (x8, x16, x8 lanes)
-            - PCIe Slot4: Intel NIC xl710 2p40GE.
-            - PCIe Slot5: Intel NIC x710 2p10GE.
-            - PCIe Slot6: Intel NIC x710 2p10GE.
+        - Numa0: Right PCIe Riser Board (Riser 1) (x8, x8, x8 PCIe3.0 lanes)
+            - PCIe Slot1: empty.
+            - PCIe Slot2: empty.
+            - PCIe Slot3: empty.
+        - Numa1: Left PCIe Riser Board (Riser 2) (x8, x16, x8 PCIe3.0 lanes)
+            - PCIe Slot4: empty.
+            - PCIe Slot5: empty.
+            - PCIe Slot6: empty
         - MLOM slot: empty.
         - MLOM slot: empty.
-3. Type-A3: Purpose - Haswell Xeon VIRL hosts for FD.io functional testing.
+3. Server-Type-A3: Purpose - Haswell Xeon VIRL hosts for FD.io functional testing.
     - Quantity: 3 servers.
     - Physical connectivity:
         - CIMC and host management ports.
     - Quantity: 3 servers.
     - Physical connectivity:
         - CIMC and host management ports.
@@ -350,7 +518,7 @@ FD.io CSIT lab contains following server types:
         - Numa1: Left PCIe Riser Board (Riser 2) (x8, x16, x8 lanes)
             - no cards.
         - MLOM slot: empty.
         - Numa1: Left PCIe Riser Board (Riser 2) (x8, x16, x8 lanes)
             - no cards.
         - MLOM slot: empty.
-4. Type-B1: Purpose - Skylake Xeon SUT for FD.io performance testing.
+4. Server-Type-B1: Purpose - Skylake Xeon SUT for FD.io performance testing.
     - Quantity: ---
     - Physical connectivity:
         - IPMI and host management ports.
     - Quantity: ---
     - Physical connectivity:
         - IPMI and host management ports.
@@ -358,19 +526,19 @@ FD.io CSIT lab contains following server types:
     - Main HW configuration:
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
     - Main HW configuration:
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
-        - Processors: 2* Intel Platinum 8180 2.3 GHz.
+        - Processors: 2* Intel Platinum 8180 2.5 GHz.
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
     - NICs configuration:
         - Numa0: (x16, x16, x16 PCIe3.0 lanes)
             - PCIe Slot2 18:00.xx: x710-4p10GE Intel.
             - PCIe Slot4 3b:00.xx: xxv710-DA2-2p25GE Intel.
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
     - NICs configuration:
         - Numa0: (x16, x16, x16 PCIe3.0 lanes)
             - PCIe Slot2 18:00.xx: x710-4p10GE Intel.
             - PCIe Slot4 3b:00.xx: xxv710-DA2-2p25GE Intel.
-            - PCIe Slot9 5e:00.xx: FUTURE ConnectX5-2p100GE Mellanox.
+            - 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.
         - 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.
-2. Type-B2: Purpose - Skylake Xeon TG for FD.io performance testing.
+5. Server-Type-B2: Purpose - Skylake Xeon TG for FD.io performance testing.
     - Quantity: ---
     - Physical connectivity:
         - IPMI and host management ports.
     - Quantity: ---
     - Physical connectivity:
         - IPMI and host management ports.
@@ -378,44 +546,19 @@ FD.io CSIT lab contains following server types:
     - Main HW configuration:
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
     - Main HW configuration:
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
-        - Processors: 2* Intel Platinum 8180 2.3 GHz.
+        - Processors: 2* Intel Platinum 8180 2.5 GHz.
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
     - NICs configuration:
         - Numa0: (x16, x16, x16 PCIe3.0 lanes)
             - PCIe Slot2 18:00.xx: x710-4p10GE Intel.
             - PCIe Slot4 3b:00.xx: xxv710-DA2 2p25GE Intel.
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
     - NICs configuration:
         - Numa0: (x16, x16, x16 PCIe3.0 lanes)
             - PCIe Slot2 18:00.xx: x710-4p10GE Intel.
             - PCIe Slot4 3b:00.xx: xxv710-DA2 2p25GE Intel.
-            - PCIe Slot9 5e:00.xx: FUTURE ConnectX5-2p100GE Mellanox.
+            - 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: x710-4p10GE Intel.
         - Numa1: (x16, x16, x16 PCIe3.0 lanes)
             - PCIe Slot6 86:00.xx: empty.
             - PCIe Slot8 af:00.xx: empty.
             - PCIe Slot10 d8:00.xx: x710-4p10GE Intel.
-3. Type-B3: 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.
-    - Main HW configuration:
-        - Chassis: Huawei TaiShan 2280.
-        - Processors: 1* hip07-d05 ~ 64* Arm Cortex-A72
-        - RAM Memory: 8* 16GB DDR4-2400MT/s
-        - Disks: 1* 4TB SATA HDD
-    - NICs configuration:
-        - PCIe Slot4 e9:00.xx: connectx4-2p25GE Mellanox.
-        - PCIe Slot6 11:00.xx: 82599-2p10GE Intel.
-4. Type-B4: Purpose - MACCHIATObin Arm Marvell SUT for FD.io performance testing.
-    - Quantity: 3
-    - Physical connectivity:
-        - Host management ports.
-        - NIC ports connected into 2-node and 3-node topologies.
-    - Main HW configuration:
-        - Chassis: MACCHIATObin.
-        - Processors: 1* Armada 8040 ~ 4* Arm Cortex-A72
-        - RAM Memory: 1* 16GB DDR4
-        - Disks: 1* 128GB(?) SATA SDD
-    - NICs configuration:
-        - pp2-2p10GE Marvell (on-chip Ethernet ports ; marvell plugin in VPP)
-5. Type-B5: Purpose - Rangeley Atom SUT for FD.io performance testing.
+6. Server-Type-B5: Purpose - Rangeley Atom SUT for FD.io performance testing.
     - Quantity: TBD based on testbed allocation.
     - Physical connectivity:
         - Management: serial Port (usb) for console
     - Quantity: TBD based on testbed allocation.
     - Physical connectivity:
         - Management: serial Port (usb) for console
@@ -428,15 +571,15 @@ FD.io CSIT lab contains following server types:
     - NICs configuration:
         - 2x 10Gb Intel 82599ES
         - 4x 1GB Intel I354
     - NICs configuration:
         - 2x 10Gb Intel 82599ES
         - 4x 1GB Intel I354
-6. Type-B6: Purpose - Skylake Xeon SUT for FD.io VPP_Device functional tests.
+7. Server-Type-B6: Purpose - Skylake Xeon SUT for FD.io VPP_Device functional tests.
     - Quantity: 2.
     - Physical connectivity:
         - IPMI and host management ports.
     - Quantity: 2.
     - Physical connectivity:
         - IPMI and host management ports.
-        - NIC ports connected into 2-node and 3-node topologies.
+        - NIC ports connected into 1-node topologies.
     - Main HW configuration:
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
     - Main HW configuration:
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
-        - Processors: 2* Intel Platinum 8180 2.3 GHz.
+        - Processors: 2* Intel Platinum 8180 2.5 GHz.
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
     - NICs configuration:
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
     - NICs configuration:
@@ -448,7 +591,7 @@ 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.
             - PCIe Slot6 86:00.xx: empty.
             - PCIe Slot8 af:00.xx: empty.
             - PCIe Slot10 d8:00.xx: empty.
-7. Type-B7: Purpose - Ixia PerfectStorm One Appliance TG for FD.io TCP/IP performance tests.
+8. Server-Type-B7: Purpose - Ixia PerfectStorm One Appliance TG for FD.io TCP/IP performance tests.
     - Quantity: 1.
     - Physical connectivity:
         - Host management interface: 10/100/1000-BaseT.
     - Quantity: 1.
     - Physical connectivity:
         - Host management interface: 10/100/1000-BaseT.
@@ -467,7 +610,7 @@ FD.io CSIT lab contains following server types:
         - Port-2: 10GE SFP+.
         - Port-3: 10GE SFP+.
         - Port-4: 10GE SFP+.
         - Port-2: 10GE SFP+.
         - Port-3: 10GE SFP+.
         - Port-4: 10GE SFP+.
-8. Type-B8: Purpose - Skylake Xeon SUT for TCP/IP host stack tests.
+9. Server-Type-B8: Purpose - Skylake Xeon SUT for TCP/IP host stack tests.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -475,7 +618,7 @@ FD.io CSIT lab contains following server types:
     - Main HW configuration:
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
     - Main HW configuration:
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
-        - Processors: 2* Intel Platinum 8180 2.3 GHz.
+        - Processors: 2* Intel Platinum 8180 2.5 GHz.
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
     - NICs configuration:
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
     - NICs configuration:
@@ -487,40 +630,318 @@ 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.
             - PCIe Slot6 86:00.xx: empty.
             - PCIe Slot8 af:00.xx: empty.
             - PCIe Slot10 d8:00.xx: empty.
-9. Type-B9: Purpose - ThunderX2 Arm Marvell SUT for FD.io VPP_Device functional tests.
-    - Quantity: 1
+10. Server-Type-B10: Purpose - Denverton Atom SUT for FD.io performance testing.
+    - Quantity: 4
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports.
+    - Main HW configuration:
+        - Chassis: SuperMicro SYS-E300-9A
+        - Processors: 1* Intel(R) Atom(TM) CPU C3858 @ 2.00GHz
+        - RAM Memory: 32GB ECC
+        - Disks: 480 GB
+    - NICs configuration:
+        - 2x 10Gb Intel x553 fiber ports
+        - 2x 10Gb Intel x553 copper ports
+        - 4x 1GB Intel I350 ports
+11. 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.
+12. Server-Type-C2: Purpose - Cascadelake Xeon SUT for FD.io performance testing.
+    - Quantity: 3
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 2-node testbed topologies.
+    - Main HW configuration:
+        - Chassis: SuperMicro SYS-7049GP-TRT.
+        - Motherboard: SuperMicro X11DPG-QT.
+        - Processors: 2* Intel Gold 6252N 2.3 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: xxv710-DA2-2p25GE Intel.
+            - PCIe Slot9 5e:00.xx: ConnectX5-2p100GE Mellanox.
+        - Numa1: (x16, x16, x16 PCIe3.0 lanes)
+            - PCIe Slot6 86:00.xx: e810-2p100GE Intel.
+            - PCIe Slot8 af:00.xx: empty.
+            - PCIe Slot10 d8:00.xx: empty.
+13. Server-Type-C3: Purpose - Cascadelake Xeon TG for FD.io performance testing.
+    - Quantity: 3.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 2-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: xxv710-DA2 2p25GE Intel.
+            - PCIe Slot9 5e:00.xx: ConnectX5-2p100GE Mellanox.
+        - Numa1: (x16, x16, x16 PCIe3.0 lanes)
+            - PCIe Slot6 86:00.xx: ConnectX5-2p100GE Mellanox.
+            - PCIe Slot8 af:00.xx: ConnectX5-2p100GE Mellanox.
+            - PCIe Slot10 d8:00.xx: empty.
+14. Server-Type-C4: Purpose - Cascadelake Xeon Backend hosts for FD.io builds and data processing.
+    - Quantity: 3.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - no NIC ports, standalone setup.
+    - Main HW configuration:
+        - Chassis: SuperMicro 1029P-WTRT.
+        - Motherboard: SuperMicro X11DDW-NT.
+        - Processors: 2* Intel Platinum 8280 2.7 GHz.
+        - RAM Memory: 12* 16GB DDR4-2933.
+        - Disks: 4* 1.92TB SATA SSD.
+    - NICs configuration:
+        - Numa0:
+            - no cards.
+        - Numa1:
+            - no cards.
+15. Server-Type-D1: Purpose - Zen2 EPYC SUT for FD.io performance testing.
+    - Quantity: 1.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 2-node testbed topologies.
+    - Main HW configuration:
+        - Chassis: SuperMicro AS-1114S-WTRT
+        - Processors: 1* AMD EPYC 7532 2.4 GHz.
+        - RAM Memory: 8* 32GB DDR4-2933.
+        - Disks: 1* 1TB SATA SSD.
+    - 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 Slot3 81:00.xx: mcx556a-edat ConnectX5-2p100GE Mellanox.
+16. Server-Type-D2: Purpose - Zen2 EPYC TG for FD.io performance testing.
+    - Quantity: 1.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 2-node testbed topologies.
+    - Main HW configuration:
+        - Chassis: SuperMicro AS-1114S-WTRT
+        - Processors: 1* AMD EPYC 7532 2.4 GHz.
+        - RAM Memory: 8* 32GB DDR4-2933.
+        - Disks: 1* 1TB SATA SSD.
+    - NICs configuration:
+        - 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.
+17.  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.
     - 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.
+18.  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.
+    - Main HW configuration:
+        - Chassis: Huawei TaiShan 2280.
+        - Processors: 2* hip07-d05 ~ 32* Arm Cortex-A72
+        - RAM Memory: 8* 16GB DDR4-2400MT/s
+        - Disks: 1* 4TB SATA HDD
+    - NICs configuration:
+        - PCIe Slot4 e9:00.xx: connectx4-2p25GE Mellanox.
+        - PCIe Slot6 11:00.xx: x520-2p10GE Intel.
+19.  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.
     - Main HW configuration:
         - Chassis: Gigabyte R181-T90 1U
     - Main HW configuration:
         - Chassis: Gigabyte R181-T90 1U
-        - Motheboard: MT91-FS1
-        - Processors: 1* ThunderX2 ARMv8 CN9975 2.0 GHz
+        - Motherboard: MT91-FS1
+        - Processors: 2* ThunderX2 ARMv8 CN9975 2.0 GHz
         - RAM Memory: 4* 32GB RDIMM
         - Disks: 1* 480GB SSD Micron, 1* 1000GB HDD Seagate_25
     - NICs configuration:
         - Numa0:
         - RAM Memory: 4* 32GB RDIMM
         - Disks: 1* 480GB SSD Micron, 1* 1000GB HDD Seagate_25
     - NICs configuration:
         - Numa0:
-            - PCIe Slot1 05:00.xx: XL710-QDA2.
-            - PCIe Slot3 08:00.xx: XL710-QDA2.
+            - no cards
         - Numa1:
         - Numa1:
-            - PCIe Slot6 85:00.xx: XL710-QDA2.
-10. Type-B10: Purpose - Denverton Atom SUT for FD.io performance testing.
-    - Quantity: 4
+            - PCIe Slot18 91:00.xx: XL710-QDA2-2p40GE Intel.
+20.  Server-Type-E23: Purpose - Altra Arm Ampere SUT for FD.io performance testing.
+    - Quantity: 2
     - Physical connectivity:
         - IPMI and host management ports.
     - Physical connectivity:
         - IPMI and host management ports.
-        - NIC ports.
+        - NIC ports connected into 3-node topologies.
     - Main HW configuration:
     - Main HW configuration:
-        - Chassis: SuperMicro SYS-E300-9A
-        - Processors: 1* Intel(R) Atom(TM) CPU C3858 @ 2.00GHz
-        - RAM Memory: 32GB ECC
-        - Disks: 480 GB
+        - Chassis: WIWYNN Mt.Jade Server System B81.030Z1.0007 2U
+        - Motherboard: Mt.Jade Motherboard
+        - Processors: 2* Ampere(R) Altra(R) Q80-30 Processor (Neoverse N1)
+        - Processor Signature: Implementor 0x41, Variant 0x3, Architecture 15, Part 0xd0c, Revision 1
+        - RAM Memory: 16* 8GB DDR4-3200MT/s
+        - Disks: 2* 960GB SSD Samsung M.2 NVMe PM983
     - NICs configuration:
     - NICs configuration:
-        - 2x 10Gb Intel x553 fiber ports
-        - 2x 10Gb Intel x553 copper ports
-        - 4x 1GB Intel I350 ports
+        - Numa0:
+            - PCIe Slot1 0004:04:00.x: xl710-QDA2-2p40GE Intel.
+        - Numa1:
+            - no cards.
+21. Server-Type-E24 : Purpose - Altra Arm Ampere for FD.io build.
+    - Quantity: 2.
+    - Physical connectivity:
+        - IPMI and host management ports.
+    - 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: 12* 16GB DDR4-3200MT/s
+        - Disks: 1* 960GB SSD Samsung M.2 NVMe PM983
+22.  Server-Type-E31: Purpose - Skylake Xeon 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.
+    - Main HW configuration:
+        - Chassis: SuperMicro SYS-7049GP-TRT.
+        - Motherboard: SuperMicro X11DPG-QT.
+        - Processors: 2* Intel Platinum 8180 2.5 GHz.
+        - RAM Memory: 16* 16GB DDR4-2666MHz.
+        - Disks: 2* 1.6TB 6G SATA SSD.
+    - NICs configuration:
+        - Numa0: (x16, x16, x16 PCIe3.0 lanes)
+            - PCIe Slot2 18:00.xx: x710-4p10GE Intel.
+            - PCIe Slot4 3b:00.xx: xxv710-DA2 2p25GE 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: XL710-QDA2-2p40GE Intel.
+            - PCIe Slot10 d8:00.xx: x710-4p10GE Intel.
+23. Server-Type-F1: Purpose - Icelake Xeon SUT for FD.io performance testing.
+    - Quantity: 8.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 2-node 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 PCIe3.0 lanes)
+            - PCIe Slot2 18:00.xx: xxv710-DA2-2p25GE Intel.
+            - PCIe Slot4 3b:00.xx: e810-XXVDA4-4p25GE Intel.
+            - PCIe Slot9 5e:00.xx: e810-2CQDA2-2p100GE Intel.
+        - 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.
+24. Server-Type-F2: Purpose - Icelake Xeon TG for FD.io performance testing.
+    - Quantity: 3.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 2-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 PCIe3.0 lanes)
+            - PCIe Slot2 18:00.xx: xxv710-DA2-2p25GE Intel.
+            - PCIe Slot4 3b:00.xx: e810-XXVDA4-4p25GE Intel.
+            - PCIe Slot9 5e:00.xx: e810-2CQDA2-2p100GE Intel.
+        - Numa1: (x16, x16, x16 PCIe3.0 lanes)
+            - PCIe Slot6 86:00.xx: e810-2CQDA2-2p100GE Intel.
+            - PCIe Slot8 af:00.xx: empty.
+            - PCIe Slot10 d8:00.xx: empty.
+25. Server-Type-F3: Purpose - Icelake Xeon TG for FD.io performance testing.
+    - Quantity: 3.
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 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 PCIe3.0 lanes)
+            - PCIe Slot2 18:00.xx: xxv710-DA2-2p25GE Intel.
+            - PCIe Slot4 3b:00.xx: e810-XXVDA4-4p25GE Intel.
+            - PCIe Slot9 5e:00.xx: e810-2CQDA2-2p100GE Intel.
+        - 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.
+26. Server-Type-F4: Purpose - Icelake Xeon Shared 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.
+    - 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 PCIe3.0 lanes)
+            - PCIe Slot2 18:00.xx: xxv710-DA2-2p25GE Intel.
+            - PCIe Slot4 3b:00.xx: empty.
+            - PCIe Slot9 5e:00.xx: empty.
+        - Numa1: (x16, x16, x16 PCIe3.0 lanes)
+            - PCIe Slot6 86:00.xx: e810-XXVDA4-4p25GE Intel.
+            - PCIe Slot8 af:00.xx: e810-2CQDA2-2p100GE Intel.
+            - PCIe Slot10 d8:00.xx: empty.
+27. Server-Type-G1: Purpose - SnowRidge Atom SUT for FD.io performance testing.
+    - Quantity: 2
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 3-node testbed topology.
+    - Main HW configuration:
+        - Chassis: Intel JACOBSVILLE SDP.
+        - Motherboard: Intel JACOBSVILLE E63448-400.
+        - Processors: 1* Intel Atom P5362B 2.2 GHz.
+        - RAM Memory: 2* 16GB DDR4-2933.
+        - Disks: ?* ? SATA SSD.
+    - NICs configuration:
+        - Numa0: (x16, PCIe3.0 lane)
+            - PCIe BuiltIn ec:00.xx: e810-XXVDA4-4p25GE Intel.
 ```
 
 ```
 
-### Server and Port Naming
+### Naming Convention
 
 Following naming convention is used within this page to specify physical
 connectivity and wiring across defined CSIT testbeds:
 
 Following naming convention is used within this page to specify physical
 connectivity and wiring across defined CSIT testbeds:
@@ -545,10 +966,10 @@ connectivity and wiring across defined CSIT testbeds:
 
 ### Per Testbed Server Allocation and Naming
 
 
 ### Per Testbed Server Allocation and Naming
 
-#### 1-Node-Skylake (1n-skx) PROD
+#### 1-Node-Skylake Servers (1n-skx) PROD
 
 ```
 
 ```
-- ServerB1 [Type-B6]:
+- SUT [Server-Type-B6]:
     - testbedname: testbed11.
     - hostname: s1-t11-sut1.
     - IPMI IP: 10.30.50.47
     - testbedname: testbed11.
     - hostname: s1-t11-sut1.
     - IPMI IP: 10.30.50.47
@@ -562,7 +983,7 @@ connectivity and wiring across defined CSIT testbeds:
         - 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.
         - 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.
-- ServerB2 [Type-B6]:
+- SUT [Server-Type-B6]:
     - testbedname: testbed12.
     - hostname: s2-t12-sut1.
     - IPMI IP: 10.30.50.48
     - testbedname: testbed12.
     - hostname: s2-t12-sut1.
     - IPMI IP: 10.30.50.48
@@ -578,27 +999,62 @@ connectivity and wiring across defined CSIT testbeds:
         - s2-t12-sut1-c4/p4 - 10GE-port4 x710-4p10GE.
 ```
 
         - s2-t12-sut1-c4/p4 - 10GE-port4 x710-4p10GE.
 ```
 
-#### 1-Node-Thunderx2 (1n-tx2) WIP
+#### 1-Node-ThunderX2 Servers (1n-tx2) PROD
 
 ```
 
 ```
-- ServerB17 [Type-B9]:
-    - testbedname: testbed13.
-    - hostname: s27-t13-sut1.
-    - IPMI IP: 10.30.50.69
-    - Host IP: 10.30.51.69
+- SUT [Server-Type-E11]:
+    - testbedname: testbed13
+    - hostname: s55-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]:
+    - testbedname: testbed14
+    - hostname: s56-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.
+```
+
+#### 1-Node-Cascadelake Servers (1n-clx) PROD
+
+```
+- SUT [Server-Type-C1]:
+    - testbedname: testbed11.
+    - hostname: s32-t14-sut1.
+    - IPMI IP: 10.30.55.17
+    - Host IP: 10.32.8.17
     - portnames:
     - portnames:
-        - s27-t13-sut1-c1/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s27-t13-sut1-c1/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s27-t13-sut1-c3/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s27-t13-sut1-c3/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s27-t13-sut1-c6/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s27-t13-sut1-c6/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - 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.
 ```
 
 ```
 
-#### 2-Node-Skylake (2n-skx) PROD
+#### 2-Node-Skylake Servers (2n-skx) PROD
 
 ```
 
 ```
-- ServerB3 [Type-B1]:
+- SUT [Server-Type-B1]:
     - testbedname: testbed21.
     - hostname: s3-t21-sut1.
     - IPMI IP: 10.30.50.41
     - testbedname: testbed21.
     - hostname: s3-t21-sut1.
     - IPMI IP: 10.30.50.41
@@ -610,9 +1066,7 @@ connectivity and wiring across defined CSIT testbeds:
         - s3-t21-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s3-t21-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s3-t21-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s3-t21-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s3-t21-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s3-t21-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s3-t21-sut1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s3-t21-sut1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB4 [Type-B2]:
+- TG [Server-Type-B2]:
     - testbedname: testbed21.
     - hostname: s4-t21-tg1.
     - IPMI IP: 10.30.50.42
     - testbedname: testbed21.
     - hostname: s4-t21-tg1.
     - IPMI IP: 10.30.50.42
@@ -624,9 +1078,11 @@ connectivity and wiring across defined CSIT testbeds:
         - s4-t21-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s4-t21-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s4-t21-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s4-t21-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s4-t21-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s4-t21-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s4-t21-tg1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s4-t21-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB5 [Type-B1]:
+        - s3-t21-tg1-c10/p1 - 10GE-port1 x710-4p10GE.
+        - s3-t21-tg1-c10/p2 - 10GE-port2 x710-4p10GE.
+        - s3-t21-tg1-c10/p3 - 10GE-port3 x710-4p10GE.
+        - s3-t21-tg1-c10/p4 - 10GE-port4 x710-4p10GE.
+- SUT [Server-Type-B1]:
     - testbedname: testbed22.
     - hostname: s5-t22-sut1.
     - IPMI IP: 10.30.50.49
     - testbedname: testbed22.
     - hostname: s5-t22-sut1.
     - IPMI IP: 10.30.50.49
@@ -638,9 +1094,7 @@ connectivity and wiring across defined CSIT testbeds:
         - s5-t22-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s5-t22-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s5-t22-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s5-t22-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s5-t22-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s5-t22-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s5-t22-sut1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s5-t22-sut1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB6 [Type-B2]:
+- TG [Server-Type-B2]:
     - testbedname: testbed22.
     - hostname: s6-t22-tg1.
     - IPMI IP: 10.30.50.50
     - testbedname: testbed22.
     - hostname: s6-t22-tg1.
     - IPMI IP: 10.30.50.50
@@ -652,9 +1106,11 @@ connectivity and wiring across defined CSIT testbeds:
         - s6-t22-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s6-t22-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s6-t22-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s6-t22-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s6-t22-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s6-t22-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s6-t22-tg1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s6-t22-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB7 [Type-B1]:
+        - s6-t22-tg1-c10/p1 - 10GE-port1 x710-4p10GE.
+        - s6-t22-tg1-c10/p2 - 10GE-port2 x710-4p10GE.
+        - s6-t22-tg1-c10/p3 - 10GE-port3 x710-4p10GE.
+        - s6-t22-tg1-c10/p4 - 10GE-port4 x710-4p10GE.
+- SUT [Server-Type-B1]:
     - testbedname: testbed23.
     - hostname: s7-t23-sut1.
     - IPMI IP: 10.30.50.51
     - testbedname: testbed23.
     - hostname: s7-t23-sut1.
     - IPMI IP: 10.30.50.51
@@ -666,9 +1122,7 @@ connectivity and wiring across defined CSIT testbeds:
         - s7-t23-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s7-t23-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s7-t23-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s7-t23-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s7-t23-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s7-t23-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s7-t23-sut1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s7-t23-sut1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB8 [Type-B2]:
+- TG [Server-Type-B2]:
     - testbedname: testbed23.
     - hostname: s8-t23-tg1.
     - IPMI IP: 10.30.50.52
     - testbedname: testbed23.
     - hostname: s8-t23-tg1.
     - IPMI IP: 10.30.50.52
@@ -680,9 +1134,11 @@ connectivity and wiring across defined CSIT testbeds:
         - s8-t23-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s8-t23-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s8-t23-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s8-t23-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s8-t23-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s8-t23-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s8-t23-tg1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s8-t23-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB9 [Type-B1]:
+        - s8-t23-tg1-c10/p1 - 10GE-port1 x710-4p10GE.
+        - s8-t23-tg1-c10/p2 - 10GE-port2 x710-4p10GE.
+        - s8-t23-tg1-c10/p3 - 10GE-port3 x710-4p10GE.
+        - s8-t23-tg1-c10/p4 - 10GE-port4 x710-4p10GE.
+- SUT [Server-Type-B1]:
     - testbedname: testbed24.
     - hostname: s9-t24-sut1.
     - IPMI IP: 10.30.50.53
     - testbedname: testbed24.
     - hostname: s9-t24-sut1.
     - IPMI IP: 10.30.50.53
@@ -694,9 +1150,7 @@ connectivity and wiring across defined CSIT testbeds:
         - s9-t24-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s9-t24-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s9-t24-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s9-t24-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s9-t24-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s9-t24-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s9-t24-sut1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s9-t24-sut1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB10 [Type-B2]:
+- TG [Server-Type-B2]:
     - testbedname: testbed24.
     - hostname: s10-t24-tg1.
     - IPMI IP: 10.30.50.54
     - testbedname: testbed24.
     - hostname: s10-t24-tg1.
     - IPMI IP: 10.30.50.54
@@ -708,20 +1162,51 @@ connectivity and wiring across defined CSIT testbeds:
         - s10-t24-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s10-t24-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s10-t24-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s10-t24-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s10-t24-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s10-t24-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s10-t24-tg1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s10-t24-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
+        - s10-t24-tg1-c10/p1 - 10GE-port1 x710-4p10GE.
+        - s10-t24-tg1-c10/p2 - 10GE-port2 x710-4p10GE.
+        - s10-t24-tg1-c10/p3 - 10GE-port3 x710-4p10GE.
+        - s10-t24-tg1-c10/p4 - 10GE-port4 x710-4p10GE.
 ```
 
 ```
 
-#### 2-Node-Denverton (2n-dnv) TODO
+#### 2-Node-Denverton Servers (2n-dnv) PROD
+
+Note: ServerB28 (TG) is shared between testbed26 & testbed35
 
 ```
 
 ```
-To be completed.
+- TG [Server-Type-B2]:
+    - testbednames: testbed26 and testbed35.
+    - hostname: s28-t26t35-tg1.
+    - IPMI IP: 10.30.55.10
+    - Host IP: 10.32.8.10
+    - portnames:
+        - s28-t26t35-tg1-c2/p1 - 10GE-port1 x710da2-2p10GE.
+        - s28-t26t35-tg1-c2/p2 - 10GE-port2 x710da2-2p10GE.
+        - s28-t26t35-tg1-c4/p1 - 10GE-port1 x550t2-2p10GE.
+        - s28-t26t35-tg1-c4/p2 - 10GE-port2 x550t2-2p10GE.
+        - s28-t26t35-tg1-c9/p1 - 10GE-port1 x550t2-2p10GE.
+        - s28-t26t35-tg1-c9/p2 - 10GE-port2 x550t2-2p10GE.
+        - s28-t26t35-tg1-c6/p1 - 10GE-port1 x710da2-2p10GE.
+        - s28-t26t35-tg1-c6/p2 - 10GE-port2 x710da2-2p10GE.
+        - s28-t26t35-tg1-c8/p1 - 10GE-port1 x550t2-2p10GE.
+        - s28-t26t35-tg1-c8/p2 - 10GE-port2 x550t2-2p10GE.
+        - s28-t26t35-tg1-c10/p1 - 10GE-port1 x550t2-2p10GE.
+        - s28-t26t35-tg1-c10/p2 - 10GE-port2 x550t2-2p10GE.
+- SUT [Server-Type-B10]:
+    - testbednames: testbed26.
+    - hostname: s29-t26-sut1.
+    - IPMI IP: 10.30.55.11
+    - Host IP: 10.32.8.11
+    - portnames:
+        - s29-t26-sut1-p1 - 10GE-port1 x553 copper port.
+        - s29-t26-sut1-p2 - 10GE-port2 x553 copper port.
+        - s29-t26-sut1-p3 - 10GE-port3 x553 fiber port.
+        - s29-t26-sut1-p4 - 10GE-port4 x553 fiber port.
 ```
 
 ```
 
-#### 2-Node-IxiaPS1L47 (2n-ps1) VERIFY
+#### 2-Node-IxiaPS1L47 Servers (2n-ps1) VERIFY
 
 ```
 
 ```
-- ServerB25 [Type-B8]:
+- SUT [Server-Type-B8]:
     - testbedname: testbed25.
     - hostname: s25-t25-sut1.
     - IPMI IP: 10.30.50.58
     - testbedname: testbed25.
     - hostname: s25-t25-sut1.
     - IPMI IP: 10.30.50.58
@@ -731,7 +1216,7 @@ To be completed.
         - s25-t25-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
         - s25-t25-sut1-c2/p3 - 10GE-port3 x710-4p10GE.
         - s25-t25-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s25-t25-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
         - s25-t25-sut1-c2/p3 - 10GE-port3 x710-4p10GE.
         - s25-t25-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
-- ServerB26 [Type-B7]:
+- TG [Server-Type-B7]:
     - testbedname: testbed25.
     - hostname: s26-t25-tg1.
     - IPMI IP: 10.30.50.59
     - testbedname: testbed25.
     - hostname: s26-t25-tg1.
     - IPMI IP: 10.30.50.59
@@ -743,165 +1228,306 @@ To be completed.
         - s26-t25-tg1-p4 - 10GE-port4.
 ```
 
         - s26-t25-tg1-p4 - 10GE-port4.
 ```
 
-#### 3-Node-Haswell (3n-hsw) PROD
+#### 2-Node-Cascadelake Servers (2n-clx) PROD
 
 ```
 
 ```
- 1. Server1 of Type-1:
-    - testbedname: testbed1.
-    - hostname: t1-sut1.
-    - CIMC IP: 10.30.50.17
-    - Host IP: 10.30.51.17
+- SUT [Server-Type-C2]:
+    - testbedname: testbed27.
+    - hostname: s33-t27-sut1.
+    - IPMI IP: 10.30.55.18
+    - Host IP: 10.32.8.18
     - portnames:
     - portnames:
-        - t1-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
-        - t1-sut1-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
-        - t1-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
-        - t1-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
-        - t1-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t1-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t1-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t1-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t1-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-        - t1-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
- 2. Server2 of Type-1:
-    - testbedname: testbed1.
-    - hostname: t1-sut2.
-    - CIMC IP: 10.30.50.18
-    - Host IP: 10.30.51.18
+        - s33-t27-sut1-c2/p1 - 10GE-port1 x710-4p10GE.
+        - s33-t27-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
+        - s33-t27-sut1-c2/p3 - 10GE-port3 x710-4p10GE.
+        - s33-t27-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
+        - s33-t27-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s33-t27-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s33-t27-sut1-c6/p1 - 100GE-port1 e810-2p100GE.
+        - s33-t27-sut1-c6/p2 - 100GE-port2 e810-2p100GE.
+        - s33-t27-sut1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s33-t27-sut1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
+- TG [Server-Type-C3]:
+    - testbedname: testbed27.
+    - hostname: s34-t27-tg1.
+    - IPMI IP: 10.30.55.19
+    - Host IP: 10.32.8.19
     - portnames:
     - portnames:
-        - t1-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
-        - t1-sut2-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
-        - t1-sut2-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
-        - t1-sut2-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
-        - t1-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t1-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t1-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t1-sut2-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t1-sut2-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-        - t1-sut2-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
- 3. Server3 of Type-2:
-    - testbedname: testbed1.
-    - hostname: t1-tg1.
-    - CIMC IP: 10.30.50.16
-    - Host IP: 10.30.51.16
+        - s34-t27-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
+        - s34-t27-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
+        - s34-t27-tg1-c2/p3 - 10GE-port3 x710-4p10GE.
+        - s34-t27-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
+        - s34-t27-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s34-t27-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s34-t27-tg1-c6/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s34-t27-tg1-c6/p2 - 100GE-port2 ConnectX5-2p100GE.
+        - s38-t27-tg1-c8/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s38-t27-tg1-c8/p2 - 100GE-port2 ConnectX5-2p100GE.
+        - s34-t27-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s34-t27-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
+- SUT [Server-Type-C2]:
+    - testbedname: testbed28.
+    - hostname: s35-t28-sut1.
+    - IPMI IP: 10.30.55.20
+    - Host IP: 10.32.8.20
     - portnames:
     - portnames:
-        - t1-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t1-tg1-c1/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t1-tg1-c2/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t1-tg1-c2/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t1-tg1-c3/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t1-tg1-c3/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t1-tg1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t1-tg1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t1-tg1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t1-tg1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t1-tg1-c6/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t1-tg1-c6/p2 - 10GE port2 on Intel NIC x710 2p10GE.
- 4. Server4 of Type-1:
-    - testbedname: testbed2.
-    - hostname: t2-sut1.
-    - CIMC IP: 10.30.50.21
-    - Host IP: 10.30.51.21
+        - s35-t28-sut1-c2/p1 - 10GE-port1 x710-4p10GE.
+        - s35-t28-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
+        - s35-t28-sut1-c2/p3 - 10GE-port3 x710-4p10GE.
+        - s35-t28-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
+        - s35-t28-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s35-t28-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s35-t28-sut1-c6/p1 - 100GE-port1 e810-2p100GE.
+        - s35-t28-sut1-c6/p2 - 100GE-port2 e810-2p100GE.
+        - s35-t28-sut1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s35-t28-sut1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
+- TG [Server-Type-C3]:
+    - testbedname: testbed28.
+    - hostname: s36-t28-tg1.
+    - IPMI IP: 10.30.55.21
+    - Host IP: 10.32.8.21
     - portnames:
     - portnames:
-        - t2-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
-        - t2-sut1-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
-        - t2-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
-        - t2-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
-        - t2-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t2-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t2-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t2-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t2-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-        - t2-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
- 5. Server5 of Type-1:
-    - testbedname: testbed2.
-    - hostname: t2-sut2.
-    - CIMC IP: 10.30.50.22
-    - Host IP: 10.30.51.22
+        - s36-t28-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
+        - s36-t28-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
+        - s36-t28-tg1-c2/p3 - 10GE-port3 x710-4p10GE.
+        - s36-t28-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
+        - s36-t28-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s36-t28-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s36-t28-tg1-c6/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s36-t28-tg1-c6/p2 - 100GE-port2 ConnectX5-2p100GE.
+        - s38-t28-tg1-c8/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s38-t28-tg1-c8/p2 - 100GE-port2 ConnectX5-2p100GE.
+        - s36-t28-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s36-t28-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
+- SUT [Server-Type-C2]:
+    - testbedname: testbed29.
+    - hostname: s37-t29-sut1.
+    - IPMI IP: 10.30.55.22
+    - Host IP: 10.32.8.22
     - portnames:
     - portnames:
-        - t2-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
-        - t2-sut2-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
-        - t2-sut2-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
-        - t2-sut2-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
-        - t2-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t2-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t2-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t2-sut2-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t2-sut2-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-        - t2-sut2-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
- 6. Server6 of Type-2:
-    - testbedname: testbed2.
-    - hostname: t2-tg1.
-    - CIMC IP: 10.30.50.20
-    - Host IP: 10.30.51.20
+        - s37-t29-sut1-c2/p1 - 10GE-port1 x710-4p10GE.
+        - s37-t29-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
+        - s37-t29-sut1-c2/p3 - 10GE-port3 x710-4p10GE.
+        - s37-t29-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
+        - s37-t29-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s37-t29-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s37-t29-sut1-c6/p1 - 100GE-port1 e810-2p100GE.
+        - s37-t29-sut1-c6/p2 - 100GE-port2 e810-2p100GE.
+        - s37-t29-sut1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s37-t29-sut1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
+- TG [Server-Type-C3]:
+    - testbedname: testbed29.
+    - hostname: s38-t29-tg1.
+    - IPMI IP: 10.30.55.23
+    - Host IP: 10.32.8.23
     - portnames:
     - portnames:
-        - t2-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t2-tg1-c1/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t2-tg1-c2/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t2-tg1-c2/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t2-tg1-c3/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t2-tg1-c3/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t2-tg1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t2-tg1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t2-tg1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t2-tg1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t2-tg1-c6/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t2-tg1-c6/p2 - 10GE port2 on Intel NIC x710 2p10GE.
- 7. Server7 of Type-1:
-    - testbedname: testbed3.
-    - hostname: t3-sut1.
-    - CIMC IP: 10.30.50.25
-    - Host IP: 10.30.51.25
+        - s38-t29-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
+        - s38-t29-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
+        - s38-t29-tg1-c2/p3 - 10GE-port3 x710-4p10GE.
+        - s38-t29-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
+        - s38-t29-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s38-t29-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s38-t29-tg1-c6/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s38-t29-tg1-c6/p2 - 100GE-port2 ConnectX5-2p100GE.
+        - s38-t29-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s38-t29-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
+```
+
+#### 2-Node-Zen2 Servers (2n-zn2) PROD
+
+```
+- SUT [Server-Type-D1]:
+    - testbedname: testbed210.
+    - hostname: s60-t210-sut1.
+    - IPMI IP: 10.30.55.24
+    - Host IP: 10.32.8.24
     - portnames:
     - portnames:
-        - t3-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
-        - t3-sut1-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
-        - t3-sut1-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
-        - t3-sut1-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
-        - t3-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t3-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t3-sut1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t3-sut1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t3-sut1-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-        - t3-sut1-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
- 8. Server8 of Type-1:
-    - testbedname: testbed3.
-    - hostname: t3-sut2.
-    - CIMC IP: 10.30.50.26
-    - Host IP: 10.30.51.26
+        - s60-t210-sut1-c1/p1 - 10GE-port1 x710-4p10GE.
+        - s60-t210-sut1-c1/p2 - 10GE-port2 x710-4p10GE.
+        - s60-t210-sut1-c1/p3 - 10GE-port3 x710-4p10GE.
+        - s60-t210-sut1-c1/p4 - 10GE-port4 x710-4p10GE.
+        - s60-t210-sut1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s60-t210-sut1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s60-t210-sut1-c3/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s60-t210-sut1-c3/p2 - 100GE-port2 ConnectX5-2p100GE.
+- TG [Server-Type-D2]:
+    - testbedname: testbed210.
+    - hostname: s61-t210-tg1.
+    - IPMI IP: 10.30.55.25
+    - Host IP: 10.32.8.25
     - portnames:
     - portnames:
-        - t3-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
-        - t3-sut2-c1/p2 - 10GE port2 on Intel NIC x520 2p10GE.
-        - t3-sut2-c2/p1 - 40GE port1 on Cisco VIC 1385 2p40GE.
-        - t3-sut2-c2/p2 - 40GE port2 on Cisco VIC 1385 2p40GE.
-        - t3-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t3-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t3-sut2-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t3-sut2-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t3-sut2-cm/p1 - 10GE port1 on Cisco VIC 1227 2p10GE.
-        - t3-sut2-cm/p2 - 10GE port2 on Cisco VIC 1227 2p10GE.
- 9. Server9 of Type-2:
-    - testbedname: testbed3.
-    - hostname: t3-tg1.
-    - CIMC IP: 10.30.50.24
-    - Host IP: 10.30.51.24
+        - s61-t210-tg1-c1/p1 - 100GE-port1 ConnectX5-2p100GE.
+        - s61-t210-tg1-c1/p2 - 100GE-port2 ConnectX5-2p100GE.
+        - s61-t210-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
+        - s61-t210-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
+        - s61-t210-tg1-c2/p3 - 10GE-port3 x710-4p10GE.
+        - s61-t210-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
+        - s61-t210-tg1-c3/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s61-t210-tg1-c3/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+```
+
+#### 2-Node-ThunderX2 Servers (2x-tx2) PROD
+
+Note: Server19 (TG) is shared between testbed33 & testbed211
+
+```
+- SUT [Server-Type-E22]:
+    - testbedname: testbed211.
+    - hostname: s27-t211-sut1.
+    - IPMI IP: 10.30.50.69
+    - Host IP: 10.30.51.69
     - portnames:
     - portnames:
-        - t3-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t3-tg1-c1/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t3-tg1-c2/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t3-tg1-c2/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t3-tg1-c3/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t3-tg1-c3/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t3-tg1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
-        - t3-tg1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
-        - t3-tg1-c5/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t3-tg1-c5/p2 - 10GE port2 on Intel NIC x710 2p10GE.
-        - t3-tg1-c6/p1 - 10GE port1 on Intel NIC x710 2p10GE.
-        - t3-tg1-c6/p2 - 10GE port2 on Intel NIC x710 2p10GE.
+        - 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.
+    - IPMI IP: 10.30.50.46
+    - Host IP: 10.30.51.49
+    - portnames:
+        - s19-t33t211-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
+        - s19-t33t211-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
+        - s19-t33t211-tg1-c2/p3 - 10GE-port3 x710-4p10GE.
+        - s19-t33t211-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
+        - s19-t33t211-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s19-t33t211-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s19-t33t211-tg1-c8/p1 - 40GE-port1 xl710-QDA2-2p40GE.
+        - s19-t33t211-tg1-c8/p2 - 40GE-port2 xl710-QDA2-2p40GE.
+        - s19-t33t211-tg1-c10/p1 - 10GE-port1 x710-4p10GE.
+        - s19-t33t211-tg1-c10/p2 - 10GE-port2 x710-4p10GE.
+        - s19-t33t211-tg1-c10/p3 - 10GE-port3 x710-4p10GE.
+        - s19-t33t211-tg1-c10/p4 - 10GE-port4 x710-4p10GE.
 ```
 
 ```
 
-#### 3-Node-Skylake (3n-skx) PROD
+#### 2-Node-Icelake Servers (2n-icx) PROD
 
 ```
 
 ```
-- ServerB11 [Type-B1]:
+- SUT [Server-Type-F1]:
+    - testbedname: testbed212.
+    - hostname: s71-t212-sut1.
+    - IPMI IP: 10.30.51.81
+    - Host IP: 10.30.50.81
+    - portnames:
+        - s71-t212-sut1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s71-t212-sut1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s71-t212-sut1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s71-t212-sut1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s71-t212-sut1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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.
+- TG [Server-Type-F2]:
+    - testbedname: testbed212.
+    - hostname: s72-t212-tg1.
+    - IPMI IP: 10.30.51.82
+    - Host IP: 10.30.50.82
+    - portnames:
+        - s72-t212-tg1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s72-t212-tg1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s72-t212-tg1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s72-t212-tg1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s72-t212-tg1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s72-t212-tg1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
+        - s72-t212-tg1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
+        - 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.
+- SUT [Server-Type-F1]:
+    - testbedname: testbed213.
+    - hostname: s83-t213-sut1.
+    - IPMI IP: 10.30.51.83
+    - Host IP: 10.30.50.83
+    - portnames:
+        - s83-t213-sut1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s83-t213-sut1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s83-t213-sut1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s83-t213-sut1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s83-t213-sut1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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.
+- TG [Server-Type-F2]:
+    - testbedname: testbed213.
+    - hostname: s84-t213-tg1.
+    - IPMI IP: 10.30.51.84
+    - Host IP: 10.30.50.84
+    - portnames:
+        - s84-t213-tg1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s84-t213-tg1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s84-t213-tg1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s84-t213-tg1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s84-t213-tg1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s84-t213-tg1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
+        - s84-t213-tg1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
+        - 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.
+- SUT [Server-Type-F1]:
+    - testbedname: testbed214.
+    - hostname: s85-t214-sut1.
+    - IPMI IP: 10.30.51.85
+    - Host IP: 10.30.50.85
+    - portnames:
+        - s85-t214-sut1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s85-t214-sut1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s85-t214-sut1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s85-t214-sut1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s85-t214-sut1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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.
+- TG [Server-Type-F2]:
+    - testbedname: testbed214.
+    - hostname: s86-t214-tg1.
+    - IPMI IP: 10.30.51.86
+    - Host IP: 10.30.50.86
+    - portnames:
+        - s86-t214-tg1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s86-t214-tg1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s86-t214-tg1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s86-t214-tg1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s86-t214-tg1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s86-t214-tg1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
+        - s86-t214-tg1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
+        - 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.
+- SUT [Server-Type-F1]:
+    - testbedname: testbed215.
+    - hostname: s87-t215-sut1.
+    - IPMI IP: 10.30.51.87
+    - Host IP: 10.30.50.87
+    - portnames:
+        - s87-t215-sut1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s87-t215-sut1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s87-t215-sut1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s87-t215-sut1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s87-t215-sut1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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.
+- TG [Server-Type-F2]:
+    - testbedname: testbed215.
+    - hostname: s88-t215-tg1.
+    - IPMI IP: 10.30.51.88
+    - Host IP: 10.30.50.88
+    - portnames:
+        - s88-t215-tg1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s88-t215-tg1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s88-t215-tg1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s88-t215-tg1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s88-t215-tg1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s88-t215-tg1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
+        - s88-t215-tg1-c9/p1 - 100GE-port1 e810-2CQDA2-2p100GE.
+        - 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-Skylake Servers (3n-skx) PROD
+
+```
+- ServerB11 [Server-Type-B1]:
     - testbedname: testbed31.
     - hostname: s11-t31-sut1.
     - IPMI IP: 10.30.50.43
     - testbedname: testbed31.
     - hostname: s11-t31-sut1.
     - IPMI IP: 10.30.50.43
@@ -913,9 +1539,7 @@ To be completed.
         - s11-t31-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s11-t31-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s11-t31-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s11-t31-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s11-t31-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s11-t31-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s11-t31-sut1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s11-t31-sut1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB12 [Type-B1]:
+- ServerB12 [Server-Type-B1]:
     - testbedname: testbed31.
     - hostname: s12-t31-sut2.
     - IPMI IP: 10.30.50.44
     - testbedname: testbed31.
     - hostname: s12-t31-sut2.
     - IPMI IP: 10.30.50.44
@@ -927,9 +1551,7 @@ To be completed.
         - s12-t31-sut2-c2/p4 - 10GE-port4 x710-4p10GE.
         - s12-t31-sut2-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s12-t31-sut2-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s12-t31-sut2-c2/p4 - 10GE-port4 x710-4p10GE.
         - s12-t31-sut2-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s12-t31-sut2-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s12-t31-sut2-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s12-t31-sut2-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB13 [Type-B2]:
+- ServerB13 [Server-Type-B2]:
     - testbedname: testbed31.
     - hostname: s13-t31-tg1.
     - IPMI IP: 10.30.50.45
     - testbedname: testbed31.
     - hostname: s13-t31-tg1.
     - IPMI IP: 10.30.50.45
@@ -941,9 +1563,11 @@ To be completed.
         - s13-t31-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s13-t31-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s13-t31-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s13-t31-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s13-t31-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s13-t31-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s13-t31-tg1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s13-t31-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB14 [Type-B1]:
+        - s13-t31-tg1-c10/p1 - 10GE-port1 x710-4p10GE.
+        - s13-t31-tg1-c10/p2 - 10GE-port2 x710-4p10GE.
+        - s13-t31-tg1-c10/p3 - 10GE-port3 x710-4p10GE.
+        - s13-t31-tg1-c10/p4 - 10GE-port4 x710-4p10GE.
+- ServerB14 [Server-Type-B1]:
     - testbedname: testbed32.
     - hostname: s14-t32-sut1.
     - IPMI IP: 10.30.50.55
     - testbedname: testbed32.
     - hostname: s14-t32-sut1.
     - IPMI IP: 10.30.50.55
@@ -955,9 +1579,7 @@ To be completed.
         - s14-t32-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s14-t32-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s14-t32-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s14-t32-sut1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s14-t32-sut1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s14-t32-sut1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s14-t32-sut1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s14-t32-sut1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB15 [Type-B1]:
+- ServerB15 [Server-Type-B1]:
     - testbedname: testbed32.
     - hostname: s15-t32-sut2.
     - IPMI IP: 10.30.50.56
     - testbedname: testbed32.
     - hostname: s15-t32-sut2.
     - IPMI IP: 10.30.50.56
@@ -969,9 +1591,7 @@ To be completed.
         - s15-t32-sut2-c2/p4 - 10GE-port4 x710-4p10GE.
         - s15-t32-sut2-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s15-t32-sut2-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s15-t32-sut2-c2/p4 - 10GE-port4 x710-4p10GE.
         - s15-t32-sut2-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s15-t32-sut2-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s15-t32-sut2-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s15-t32-sut2-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
-- ServerB16 [Type-B2]:
+- ServerB16 [Server-Type-B2]:
     - testbedname: testbed32.
     - hostname: s16-t32-tg1.
     - IPMI IP: 10.30.50.57
     - testbedname: testbed32.
     - hostname: s16-t32-tg1.
     - IPMI IP: 10.30.50.57
@@ -983,18 +1603,18 @@ To be completed.
         - s16-t32-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s16-t32-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s16-t32-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
         - s16-t32-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
         - s16-t32-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
         - s16-t32-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s16-t32-tg1-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s16-t32-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
+        - s16-t32-tg1-c10/p1 - 10GE-port1 x710-4p10GE.
+        - s16-t32-tg1-c10/p2 - 10GE-port2 x710-4p10GE.
+        - s16-t32-tg1-c10/p3 - 10GE-port3 x710-4p10GE.
+        - s16-t32-tg1-c10/p4 - 10GE-port4 x710-4p10GE.
 ```
 
 ```
 
-Note: ServerB19 (TG) is shared between testbed33 & testbed34
-
-#### 3-Node-Rangeley (3n-rng) VERIFY
+#### 3-Node-Rangeley Servers (3n-rng) VERIFY
 
 Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
 
 ```
 
 Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
 
 ```
-- ServerB22 [Type-B5]:
+- 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
     - testbedname: testbed35.
     - hostname: s22-t35-sut1 (vex-yul-rot-netgate-1).
     - IPMI IP: 10.30.51.29 - screen -r /dev/ttyUSB0
@@ -1003,7 +1623,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s22-t35-sut1-p1 - 10GE-port1 ix0 82599.
         - s22-t35-sut1-p2 - 10GE-port2 ix1 82599.
     - 1GB ports (tbd)
         - s22-t35-sut1-p1 - 10GE-port1 ix0 82599.
         - s22-t35-sut1-p2 - 10GE-port2 ix1 82599.
     - 1GB ports (tbd)
-- ServerB23 [Type-B5]:
+- 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
     - testbedname: testbed35.
     - hostname: s23-t35-sut2 (vex-yul-rot-netgate-2).
     - IPMI IP: 10.30.51.30 - screen -r /dev/ttyUSB1
@@ -1012,7 +1632,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s23-t35-sut1-p1 - 10GE-port1 ix0 82599.
         - s23-t35-sut1-p2 - 10GE-port2 ix1 82599.
     - 1GB ports (tbd)
         - s23-t35-sut1-p1 - 10GE-port1 ix0 82599.
         - s23-t35-sut1-p2 - 10GE-port2 ix1 82599.
     - 1GB ports (tbd)
-- ServerB24 [Type-B5]:
+- 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
     - testbedname: testbed35.
     - hostname: s24-t35-sut3 (vex-yul-rot-netgate-3).
     - IPMI IP: 10.30.51.30 - screen -r /dev/ttyUSB2
@@ -1023,72 +1643,240 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
     - 1GB ports (tbd)
 ```
 
     - 1GB ports (tbd)
 ```
 
-#### 3-Node-Taishan (3n-tsh) WIP
+#### 3-Node-Taishan Servers (3n-tsh) PROD
+
+Note: Server19 (TG) is shared between testbed33 & testbed211
 
 ```
 
 ```
-- ServerB17 [Type-B3]:
+- SUT [Server-Type-E21]:
     - testbedname: testbed33.
     - hostname: s17-t33-sut1.
     - IPMI IP: 10.30.50.36
     - Host IP: 10.30.51.36
     - portnames:
     - testbedname: testbed33.
     - hostname: s17-t33-sut1.
     - IPMI IP: 10.30.50.36
     - Host IP: 10.30.51.36
     - portnames:
-        - s17-t33-sut1-c6/p1 - 10GE-port1 82599-2p10GE.
-        - s17-t33-sut1-c6/p2 - 10GE-port2 82599-2p10GE.
+        - s17-t33-sut1-c6/p1 - 10GE-port1 x520-2p10GE.
+        - s17-t33-sut1-c6/p2 - 10GE-port2 x520-2p10GE.
         - s17-t33-sut1-c4/p1 - 25GE-port1 cx4-2p25GE.
         - s17-t33-sut1-c4/p2 - 25GE-port2 cx4-2p25GE.
         - s17-t33-sut1-c4/p1 - 25GE-port1 cx4-2p25GE.
         - s17-t33-sut1-c4/p2 - 25GE-port2 cx4-2p25GE.
-- ServerB18 [Type-B3]:
+- SUT [Server-Type-E21]:
     - testbedname: testbed33.
     - hostname: s18-t33-sut2.
     - IPMI IP: 10.30.50.37
     - Host IP: 10.30.51.37
     - portnames:
     - testbedname: testbed33.
     - hostname: s18-t33-sut2.
     - IPMI IP: 10.30.50.37
     - Host IP: 10.30.51.37
     - portnames:
-        - s18-t33-sut2-c6/p1 - 10GE-port1 82599-2p10GE.
-        - s18-t33-sut2-c6/p2 - 10GE-port2 82599-2p10GE.
+        - s18-t33-sut2-c6/p1 - 10GE-port1 x520-2p10GE.
+        - s18-t33-sut2-c6/p2 - 10GE-port2 x520-2p10GE.
         - s18-t33-sut2-c4/p1 - 25GE-port1 cx4-2p25GE.
         - s18-t33-sut2-c4/p2 - 25GE-port2 cx4-2p25GE.
         - s18-t33-sut2-c4/p1 - 25GE-port1 cx4-2p25GE.
         - s18-t33-sut2-c4/p2 - 25GE-port2 cx4-2p25GE.
-- ServerB19 [Type-B2]:
-    - testbednames: testbed33 and testbed34.
-    - hostname: s19-t33t34-tg1.
+- TG [Server-Type-E31]:
+    - testbedname: testbed33 and testbed211.
+    - hostname: s19-t33t211-tg1.
     - IPMI IP: 10.30.50.46
     - Host IP: 10.30.51.49
     - portnames:
     - IPMI IP: 10.30.50.46
     - Host IP: 10.30.51.49
     - portnames:
-        - s19-t33t34-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
-        - s19-t33t34-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
-        - s19-t33t34-tg1-c2/p3 - 10GE-port3 x710-4p10GE.
-        - s19-t33t34-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
-        - s19-t33t34-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
-        - s19-t33t34-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
-        - s19-t33t34-tg1-c10/p1 - 10GE-port1 x710-4p10GE.
-        - s19-t33t34-tg1-c10/p2 - 10GE-port2 x710-4p10GE.
-        - s19-t33t34-tg1-c10/p3 - 10GE-port3 x710-4p10GE.
-        - s19-t33t34-tg1-c10/p4 - 10GE-port4 x710-4p10GE.
-- ServerB20 [Type-B4]:
+        - s19-t33t211-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
+        - s19-t33t211-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
+        - s19-t33t211-tg1-c2/p3 - 10GE-port3 x710-4p10GE.
+        - s19-t33t211-tg1-c2/p4 - 10GE-port4 x710-4p10GE.
+        - s19-t33t211-tg1-c4/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s19-t33t211-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s19-t33t211-tg1-c8/p1 - 40GE-port1 xl710-QDA2-2p40GE.
+        - s19-t33t211-tg1-c8/p2 - 40GE-port2 xl710-QDA2-2p40GE.
+        - s19-t33t211-tg1-c10/p1 - 10GE-port1 x710-4p10GE.
+        - s19-t33t211-tg1-c10/p2 - 10GE-port2 x710-4p10GE.
+        - s19-t33t211-tg1-c10/p3 - 10GE-port3 x710-4p10GE.
+        - s19-t33t211-tg1-c10/p4 - 10GE-port4 x710-4p10GE.
+```
+
+#### 3-Node-Altra Servers (3n-alt) PROD
+
+```
+- SUT [Server-Type-E23]:
+    - testbedname: testbed34.
+    - hostname: s62-t34-sut1.
+    - IPMI IP: 10.30.50.72
+    - Host IP: 10.30.51.72
+    - portnames:
+        - s62-t34-sut1-c1/p1 - 40GE-port1 xl710-QDA2-2p40GE.
+        - s62-t34-sut1-c1/p2 - 40GE-port2 xl710-QDA2-2p40GE.
+- SUT [Server-Type-E23]:
     - testbedname: testbed34.
     - testbedname: testbed34.
-    - hostname: s20-t34-sut1.
-    - IPMI IP: N/A
-    - Host IP: 10.30.51.41
+    - hostname: s63-t34-sut2.
+    - IPMI IP: 10.30.50.73
+    - Host IP: 10.30.51.73
     - portnames:
     - portnames:
-        - s20-t34-sut1-ca/p1 - 10GE-port1 Marvell.
-        - s20-t34-sut1-ca/p2 - 10GE-port2 Marvell.
-- ServerB21 [Type-B4]:
+        - s63-t34-sut2-c1/p1 - 40GE-port1 xl710-QDA2-2p40GE.
+        - s63-t34-sut2-c1/p2 - 40GE-port2 xl710-QDA2-2p40GE.
+- TG [Server-Type-F4]:
     - testbedname: testbed34.
     - testbedname: testbed34.
-    - hostname: s21-t34-sut2.
-    - IPMI IP: N/A
-    - Host IP: 10.30.51.42
+    - hostname: s64-t34-tg1.
+    - IPMI IP: 10.30.50.74
+    - Host IP: 10.30.51.74
     - portnames:
     - portnames:
-        - s21-t34-sut2-ca/p1 - 10GE-port1 Marvell.
-        - s21-t34-sut2-ca/p2 - 10GE-port2 Marvell.
+        - s64-t34-tg1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - 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.
 ```
 
 ```
 
-#### 3-Node-Mcbin (3n-mcb) TODO
+#### 3-Node-Denverton Servers (3n-dnv) PROD
 
 ```
 
 ```
-To be completed.
+- ServerB30 [Server-Type-B10]:
+    - testbednames: testbed35.
+    - hostname: s30-t35-sut1.
+    - IPMI IP: 10.30.55.12
+    - Host IP: 10.32.8.12
+    - portnames:
+        - s30-t35-sut1-p1 - 10GE-port1 x553 copper port.
+        - s30-t35-sut1-p2 - 10GE-port2 x553 copper port.
+        - s30-t35-sut1-p3 - 10GE-port3 x553 fiber port.
+        - s30-t35-sut1-p4 - 10GE-port4 x553 fiber port.
+- ServerB31 [Server-Type-B10]:
+    - testbednames: testbed35.
+    - hostname: s31-t35-sut2.
+    - IPMI IP: 10.30.55.13
+    - Host IP: 10.32.8.13
+    - portnames:
+        - s31-t35-sut2-p1 - 10GE-port1 x553 copper port.
+        - s31-t35-sut2-p2 - 10GE-port2 x553 copper port.
+        - s31-t35-sut2-p3 - 10GE-port3 x553 fiber port.
+        - s31-t35-sut2-p4 - 10GE-port4 x553 fiber port.
+```
+
+#### 3-Node-Icelake Servers (3n-icx) PROD
+
+```
+- ServerF1 [Server-Type-F1]:
+    - testbedname: testbed37.
+    - hostname: s65-t37-sut1.
+    - IPMI IP: 10.30.50.75
+    - Host IP: 10.30.51.75
+    - portnames:
+        - s65-t37-sut1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s65-t37-sut1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s65-t37-sut1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s65-t37-sut1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s65-t37-sut1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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]:
+    - testbedname: testbed37.
+    - hostname: s66-t37-sut2.
+    - IPMI IP: 10.30.50.76
+    - Host IP: 10.30.51.76
+    - portnames:
+        - s66-t37-sut2-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s66-t37-sut2-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s66-t37-sut2-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s66-t37-sut2-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s66-t37-sut2-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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]:
+    - testbedname: testbed37.
+    - hostname: s67-t37-tg1.
+    - IPMI IP: 10.30.50.77
+    - Host IP: 10.30.51.77
+    - portnames:
+        - s67-t37-tg1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s67-t37-tg1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s67-t37-tg1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s67-t37-tg1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s67-t37-tg1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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]:
+    - testbedname: testbed38.
+    - hostname: s78-t38-sut1.
+    - IPMI IP: 10.30.50.78
+    - Host IP: 10.30.51.78
+    - portnames:
+        - s78-t38-sut1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s78-t38-sut1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s78-t38-sut1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s78-t38-sut1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s78-t38-sut1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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]:
+    - testbedname: testbed38.
+    - hostname: s79-t38-sut2.
+    - IPMI IP: 10.30.50.79
+    - Host IP: 10.30.51.79
+    - portnames:
+        - s79-t38-sut2-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s79-t38-sut2-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s79-t38-sut2-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s79-t38-sut2-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s79-t38-sut2-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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]:
+    - testbedname: testbed38.
+    - hostname: s80-t38-tg1.
+    - IPMI IP: 10.30.50.80
+    - Host IP: 10.30.51.80
+    - portnames:
+        - s80-t38-tg1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE.
+        - s80-t38-tg1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE.
+        - s80-t38-tg1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s80-t38-tg1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s80-t38-tg1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - 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.
+```
+
+#### 3-Node-SnowRidge Servers (3n-snr) PROD
+
+```
+- ServerG1 [Server-Type-G1]:
+    - testbedname: testbed39.
+    - hostname: s93-t39-sut1.
+    - IPMI IP: 10.30.50.93
+    - Host IP: 10.30.51.93
+    - portnames:
+        - s93-t39-sut1-c1/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s93-t39-sut1-c1/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s93-t39-sut1-c1/p2 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s93-t39-sut1-c1/p2 - 25GE-port4 e810-XXVDA4-4p25GE.
+- ServerG1 [Server-Type-G1]:
+    - testbedname: testbed39.
+    - hostname: s94-t39-sut2.
+    - IPMI IP: 10.30.50.94
+    - Host IP: 10.30.51.94
+    - portnames:
+        - s94-t39-sut2-c1/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - 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]:
+    - testbedname: testbed39.
+    - hostname: s89-t39t310-tg1.
+    - IPMI IP: 10.30.50.89
+    - Host IP: 10.30.51.89
+    - portnames:
+        - s89-t39t310-tg1-c6/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s89-t39t310-tg1-c6/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s89-t39t310-tg1-c6/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s89-t39t310-tg1-c6/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
 ```
 
 ### Per Testbed Wiring
 
 ```
 
 ### Per Testbed Wiring
 
-#### 1-Node-Skylake (1n-skx) PROD
+#### 1-Node-Skylake Wiring (1n-skx) PROD
 
 ```
 - testbed11:
 
 ```
 - testbed11:
@@ -1099,7 +1887,11 @@ To be completed.
     - ring3 10GE-ports x710-4p10GE:
         - s1-t11-sut1-c2/p3 to s1-t11-sut1-c4/p3.
     - ring4 10GE-ports x710-4p10GE:
     - ring3 10GE-ports x710-4p10GE:
         - s1-t11-sut1-c2/p3 to s1-t11-sut1-c4/p3.
     - ring4 10GE-ports x710-4p10GE:
-        - s1-t11-sut1-c2/p3 to s1-t11-sut1-c4/p3.
+        - s1-t11-sut1-c2/p4 to s1-t11-sut1-c4/p4.
+    - ring5 100GE-ports e810-2p100GE:
+        - s1-t11-sut1-c5/p1 to s1-t11-sut1-c6/p1.
+    - ring6 100GE-ports e810-2p100GE:
+        - s1-t11-sut1-c5/p2 to s1-t11-sut1-c6/p2.
 - testbed12:
     - ring1 10GE-ports x710-4p10GE:
         - s2-t12-sut1-c2/p1 to s2-t12-sut1-c4/p1.
 - testbed12:
     - ring1 10GE-ports x710-4p10GE:
         - s2-t12-sut1-c2/p1 to s2-t12-sut1-c4/p1.
@@ -1108,22 +1900,38 @@ To be completed.
     - ring3 10GE-ports x710-4p10GE:
         - s2-t12-sut1-c2/p3 to s2-t12-sut1-c4/p3.
     - ring4 10GE-ports x710-4p10GE:
     - ring3 10GE-ports x710-4p10GE:
         - s2-t12-sut1-c2/p3 to s2-t12-sut1-c4/p3.
     - ring4 10GE-ports x710-4p10GE:
-        - s2-t12-sut1-c2/p3 to s2-t12-sut1-c4/p3.
+        - s2-t12-sut1-c2/p4 to s2-t12-sut1-c4/p4.
+    - ring5 100GE-ports e810-2p100GE:
+        - s2-t12-sut1-c5/p1 to s2-t12-sut1-c6/p1.
+    - ring6 100GE-ports e810-2p100GE:
+        - s2-t12-sut1-c5/p2 to s2-t12-sut1-c6/p2.
 ```
 
 ```
 
-#### 1-Node-Thunderx2 (1n-tx2) WIP
+#### 1-Node-ThunderX2 Wiring (1n-tx2) PROD
 
 ```
 - testbed13:
     - ring1 40GE-ports XL710-QDA2-2p40GE on SUTs:
 
 ```
 - testbed13:
     - ring1 40GE-ports XL710-QDA2-2p40GE on SUTs:
-        - s27-t13-sut1-c1/p2 - s27-t13-sut1-c3/p1.
+        - s55-t13-sut1-c4/p1 - s55-t13-sut1-c14/p1.
     - ring2 40GE-ports XL710-QDA2-2p40GE on SUTs:
     - ring2 40GE-ports XL710-QDA2-2p40GE on SUTs:
-        - s27-t13-sut1-c3/p2 - s27-t13-sut1-c6/p1.
-    - ring3 40GE-ports XL710-QDA2-2p40GE on SUTs:
-        - s27-t13-sut1-c6/p2 - s27-t13-sut1-c1/p1.
+        - s55-t13-sut1-c4/p2 - s55-t13-sut1-c14/p2.
+    - ring3 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
+        - s55-t13-sut1-c8/p1 - s55-t13-sut1-c26/p1.
+    - ring4 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
+        - s55-t13-sut1-c8/p2 - s55-t13-sut1-c26/p2.
+
+- testbed14:
+    - ring1 40GE-ports XL710-QDA2-2p40GE on SUTs:
+        - s56-t14-sut1-c4/p1 - s56-t14-sut1-c14/p1.
+    - ring2 40GE-ports XL710-QDA2-2p40GE on SUTs:
+        - s56-t14-sut1-c4/p2 - s56-t14-sut1-c14/p2.
+    - ring3 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
+        - s56-t14-sut1-c8/p1 - s56-t14-sut1-c26/p1.
+    - ring4 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
+        - s56-t14-sut1-c8/p2 - s56-t14-sut1-c26/p2.
 ```
 
 ```
 
-#### 2-Node-Skylake (2n-skx) PROD
+#### 2-Node-Skylake Wiring (2n-skx) PROD
 
 ```
 - testbed21:
 
 ```
 - testbed21:
@@ -1136,10 +1944,7 @@ To be completed.
     - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
         - s4-t21-tg1-c4/p1 to s3-t21-sut1-c4/p1.
         - s3-t21-sut1-c4/p2 to s4-t21-tg1-c4/p2.
     - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
         - s4-t21-tg1-c4/p1 to s3-t21-sut1-c4/p1.
         - s3-t21-sut1-c4/p2 to s4-t21-tg1-c4/p2.
-    - FUTURE ring4 100GE-ports ConnectX5-2p100GE on SUT:
-        - s4-t21-tg1-c9/p1 to s3-t21-sut1-c9/p1.
-        - s3-t21-sut1-c9/p2 to s4-t21-tg1-c9/p2.
-    - ring5 10GE-ports x710-4p10GE loopbacks on TG for self-tests:
+    - ring4 10GE-ports x710-4p10GE loopbacks on TG for self-tests:
         - s4-t21-tg1-c10/p1 to s4-t21-tg1-c10/p2.
         - s4-t21-tg1-c10/p3 to s4-t21-tg1-c10/p4.
 - testbed22:
         - s4-t21-tg1-c10/p1 to s4-t21-tg1-c10/p2.
         - s4-t21-tg1-c10/p3 to s4-t21-tg1-c10/p4.
 - testbed22:
@@ -1152,10 +1957,7 @@ To be completed.
     - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
         - s6-t22-tg1-c4/p1 to s5-t22-sut1-c4/p1.
         - s5-t22-sut1-c4/p2 to s6-t22-tg1-c4/p2.
     - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
         - s6-t22-tg1-c4/p1 to s5-t22-sut1-c4/p1.
         - s5-t22-sut1-c4/p2 to s6-t22-tg1-c4/p2.
-    - FUTURE ring4 100GE-ports ConnectX5-2p100GE on SUT:
-        - t22-tg1-c9/p1 to s5-t22-sut1-c9/p1.
-        - s5-t22-sut1-c9/p2 to s6-t22-tg1-c9/p2.
-    - ring5 10GE-ports x710-4p10GE loopbacks on TG for self-tests:
+    - ring4 10GE-ports x710-4p10GE loopbacks on TG for self-tests:
         - s6-t22-tg1-c10/p1 to s6-t22-tg1-c10/p2.
         - s6-t22-tg1-c10/p3 to s6-t22-tg1-c10/p4.
 - testbed23:
         - s6-t22-tg1-c10/p1 to s6-t22-tg1-c10/p2.
         - s6-t22-tg1-c10/p3 to s6-t22-tg1-c10/p4.
 - testbed23:
@@ -1168,10 +1970,7 @@ To be completed.
     - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
         - s8-t23-tg1-c4/p1 to s7-t23-sut1-c4/p1.
         - s7-t23-sut1-c4/p2 to s8-t23-tg1-c4/p2.
     - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
         - s8-t23-tg1-c4/p1 to s7-t23-sut1-c4/p1.
         - s7-t23-sut1-c4/p2 to s8-t23-tg1-c4/p2.
-    - FUTURE ring4 100GE-ports ConnectX5-2p100GE on SUT:
-        - s8-t23-tg1-c9/p1 to s7-t23-sut1-c9/p1.
-        - s7-t23-sut1-c9/p2 to s8-t23-tg1-c9/p2.
-    - ring5 10GE-ports x710-4p10GE loopbacks on TG for self-tests:
+    - ring4 10GE-ports x710-4p10GE loopbacks on TG for self-tests:
         - s8-t23-tg1-c10/p1 to s8-t23-tg1-c10/p2.
         - s8-t23-tg1-c10/p3 to s8-t23-tg1-c10/p4.
 - testbed24:
         - s8-t23-tg1-c10/p1 to s8-t23-tg1-c10/p2.
         - s8-t23-tg1-c10/p3 to s8-t23-tg1-c10/p4.
 - testbed24:
@@ -1184,21 +1983,24 @@ To be completed.
     - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
         - s10-t24-tg1-c4/p1 to s9-t24-sut1-c4/p1.
         - s9-t24-sut1-c4/p2 to s10-t24-tg1-c4/p2.
     - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
         - s10-t24-tg1-c4/p1 to s9-t24-sut1-c4/p1.
         - s9-t24-sut1-c4/p2 to s10-t24-tg1-c4/p2.
-    - FUTURE ring4 100GE-ports ConnectX5-2p100GE on SUT:
-        - s10-t24-tg1-c9/p1 to s9-t24-sut1-c9/p1.
-        - s9-t24-sut1-c9/p2 to s10-t24-tg1-c9/p2.
-    - ring5 10GE-ports x710-4p10GE loopbacks on TG for self-tests:
+    - ring4 10GE-ports x710-4p10GE loopbacks on TG for self-tests:
         - s10-t24-tg1-c10/p1 to s10-t24-tg1-c10/p2.
         - s10-t24-tg1-c10/p3 to s10-t24-tg1-c10/p4.
 ```
 
         - s10-t24-tg1-c10/p1 to s10-t24-tg1-c10/p2.
         - s10-t24-tg1-c10/p3 to s10-t24-tg1-c10/p4.
 ```
 
-#### 2-Node-Denverton (2n-dnv) TODO
+#### 2-Node-Denverton Wiring (2n-dnv) PROD
 
 ```
 
 ```
-To be completed.
+- testbed26:
+    - ring1 10GE-ports x553 copper port on SUT:
+        - s28-t26t35-tg1-c4/p1 to s29-t26-sut1-p1.
+        - s28-t26t35-tg1-c9/p1 to s29-t26-sut1-p2.
+    - ring2 10GE-ports x553 fiber port on SUT:
+        - s28-t26t35-tg1-c2/p1 to s29-t26-sut1-p3.
+        - s28-t26t35-tg1-c2/p2 to s29-t26-sut1-p4.
 ```
 
 ```
 
-#### 2-Node-IxiaPS1L47 (2n-ps1) VERIFY
+#### 2-Node-IxiaPS1L47 Wiring (2n-ps1) VERIFY
 
 ```
 - testbed25:
 
 ```
 - testbed25:
@@ -1212,83 +2014,158 @@ To be completed.
         - t25-tg1-p4 to t25-sut1-c2/p4.
 ```
 
         - t25-tg1-p4 to t25-sut1-c2/p4.
 ```
 
-#### 3-Node-Haswell (3n-hsw) PROD
-
-```
- 1. testbed1:
-    - ring of 40GE ports on Cisco VIC 1385 2p40GE on SUTs
-        - t1-tg1-c1/p1 to t1-sut1-c1/p2.
-        - t1-sut1-c1/p1 to t1-sut2-c1/p2.
-        - t1-sut2-c1/p1 to t1-tg1-c1/p2.
-    - ring of 10GE ports on Intel NIC x520 2p10GE on SUTs
-        - t1-tg1-c2/p1 to t1-sut1-c2/p2.
-        - t1-sut1-c2/p1 to t1-sut2-c2/p2.
-        - t1-sut2-c2/p1 to t1-tg1-c2/p2.
-    - ring of 40GE ports on Intel NIC xl710 2p40GE on SUTs
-        - t1-tg1-c4/p1 to t1-sut1-c4/p2.
-        - t1-sut1-c4/p1 to t1-sut2-c4/p2.
-        - t1-sut2-c4/p1 to t1-tg1-c4/p2.
-    - ring of 10GE ports on Intel NIC x710 2p10GE on SUTs
-        - t1-tg1-c5/p1 to t1-sut1-c5/p2.
-        - t1-sut1-c5/p1 to t1-sut2-c5/p2.
-        - t1-sut2-c5/p1 to t1-tg1-c5/p2.
-    - ring of 10GE ports on Cisco VIC 1227 2p10GE on SUTs
-        - t1-tg1-c2/p1 to t1-sut1-cm/p2.
-        - t1-sut1-cm/p1 to t1-sut2-cm/p2.
-        - t1-sut2-cm/p1 to t1-tg1-c2/p2.
-    - TG loopback ports Intel NIC x710 2p10GE
-        - t1-tg1-c6/p1 to t1-tg1-c6/p2.
-
- 2. testbed2:
-    - ring of 40GE ports on Cisco VIC 1385 2p40GE on SUTs
-        - t2-tg1-c1/p1 to t2-sut1-c1/p2.
-        - t2-sut1-c1/p1 to t2-sut2-c1/p2.
-        - t2-sut2-c1/p1 to t2-tg1-c1/p2.
-    - ring of 10GE ports on Intel NIC x520 2p10GE on SUTs
-        - t2-tg1-c2/p1 to t2-sut1-c2/p2.
-        - t2-sut1-c2/p1 to t2-sut2-c2/p2.
-        - t2-sut2-c2/p1 to t2-tg1-c2/p2.
-    - ring of 40GE ports on Intel NIC xl710 2p40GE on SUTs
-        - t2-tg1-c4/p1 to t2-sut1-c4/p2.
-        - t2-sut1-c4/p1 to t2-sut2-c4/p2.
-        - t2-sut2-c4/p1 to t2-tg1-c4/p2.
-    - ring of 10GE ports on Intel NIC x710 2p10GE on SUTs
-        - t2-tg1-c5/p1 to t2-sut1-c5/p2.
-        - t2-sut1-c5/p1 to t2-sut2-c5/p2.
-        - t2-sut2-c5/p1 to t2-tg1-c5/p2.
-    - ring of 10GE ports on Cisco VIC 1227 2p10GE on SUTs
-        - t2-tg1-c2/p1 to t2-sut1-cm/p2.
-        - t2-sut1-cm/p1 to t2-sut2-cm/p2.
-        - t2-sut2-cm/p1 to t2-tg1-c2/p2.
-    - TG loopback ports Intel NIC x710 2p10GE
-        - t2-tg1-c6/p1 to t2-tg1-c6/p2.
-
- 3. testbed3:
-    - ring of 40GE ports on Cisco VIC 1385 2p40GE on SUTs
-        - t3-tg1-c1/p1 to t3-sut1-c1/p2.
-        - t3-sut1-c1/p1 to t3-sut2-c1/p2.
-        - t3-sut2-c1/p1 to t3-tg1-c1/p2.
-    - ring of 10GE ports on Intel NIC x520 2p10GE on SUTs
-        - t3-tg1-c2/p1 to t3-sut1-c2/p2.
-        - t3-sut1-c2/p1 to t3-sut2-c2/p2.
-        - t3-sut2-c2/p1 to t3-tg1-c2/p2.
-    - ring of 40GE ports on Intel NIC xl710 2p40GE on SUTs
-        - t3-tg1-c4/p1 to t3-sut1-c4/p2.
-        - t3-sut1-c4/p1 to t3-sut2-c4/p2.
-        - t3-sut2-c4/p1 to t3-tg1-c4/p2.
-    - ring of 10GE ports on Intel NIC x710 2p10GE on SUTs
-        - t3-tg1-c5/p1 to t3-sut1-c5/p2.
-        - t3-sut1-c5/p1 to t3-sut2-c5/p2.
-        - t3-sut2-c5/p1 to t3-tg1-c5/p2.
-    - ring of 10GE ports on Cisco VIC 1227 2p10GE on SUTs
-        - t3-tg1-c2/p1 to t3-sut1-cm/p2.
-        - t3-sut1-cm/p1 to t3-sut2-cm/p2.
-        - t3-sut2-cm/p1 to t3-tg1-c2/p2.
-    - TG loopback ports Intel NIC x710 2p10GE
-        - t3-tg1-c6/p1 to t3-tg1-c6/p2.
-```
-
-#### 3-Node-Skylake (3n-skx) PROD
+#### 2-Node-Cascadelake Wiring (2n-clx) PROD
+
+```
+- testbed27:
+    - ring1 10GE-ports x710-4p10GE on SUT:
+        - s34-t27-tg1-c2/p1 to s33-t27-sut1-c2/p1.
+        - s33-t27-sut1-c2/p2 to s34-t27-tg1-c2/p2.
+    - ring2 10GE-ports x710-4p10GE on SUT:
+        - s34-t27-tg1-c2/p3 to s33-t27-sut1-c2/p3.
+        - s33-t27-sut1-c2/p4 to s34-t27-tg1-c2/p4.
+    - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
+        - s34-t27-tg1-c4/p1 to s33-t27-sut1-c4/p1.
+        - s33-t27-sut1-c4/p2 to s34-t27-tg1-c4/p2.
+    - ring4 100GE-ports ConnectX5-2p100GE on SUT:
+        - s34-t27-tg1-c9/p1 to s33-t27-sut1-c9/p1.
+        - s33-t27-sut1-c9/p2 to s34-t27-tg1-c9/p2.
+    - ring5 100GE-ports e810-2p100GE on SUT 100GE-ports ConnectX5-2p100GE on TG:
+        - s34-t27-tg1-c6/p1 to s33-t27-sut1-c6/p1.
+        - s33-t27-sut1-c6/p2 to s34-t27-tg1-c6/p2.
+    - ring6 100GE-ports e810-2p100GE on TG:
+        - s34-t27-tg1-c8/p1 to s34-t27-tg1-c8/p2.
+        - s34-t27-tg1-c8/p2 to s34-t27-tg1-c8/p1.
+- testbed28:
+    - ring1 10GE-ports x710-4p10GE on SUT:
+        - s36-t28-tg1-c2/p1 to s35-t28-sut1-c2/p1.
+        - s35-t28-sut1-c2/p2 to s36-t28-tg1-c2/p2.
+    - ring2 10GE-ports x710-4p10GE on SUT:
+        - s36-t28-tg1-c2/p3 to s35-t28-sut1-c2/p3.
+        - s35-t28-sut1-c2/p4 to s36-t28-tg1-c2/p4.
+    - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
+        - s36-t28-tg1-c4/p1 to s35-t28-sut1-c4/p1.
+        - s35-t28-sut1-c4/p2 to s36-t28-tg1-c4/p2.
+    - ring4 100GE-ports ConnectX5-2p100GE on SUT:
+        - s36-t28-tg1-c9/p1 to s35-t28-sut1-c9/p1.
+        - s35-t28-sut1-c9/p2 to s36-t28-tg1-c9/p2.
+    - ring5 100GE-ports e810-2p100GE on SUT 100GE-ports ConnectX5-2p100GE on TG:
+        - s36-t28-tg1-c6/p1 to s35-t28-sut1-c6/p1.
+        - s35-t28-sut1-c6/p2 to s36-t28-tg1-c6/p2.
+    - ring6 100GE-ports e810-2p100GE on TG:
+        - s36-t28-tg1-c8/p1 to s36-t28-tg1-c8/p2.
+        - s36-t28-tg1-c8/p2 to s36-t28-tg1-c8/p1.
+- testbed29:
+    - ring1 10GE-ports x710-4p10GE on SUT:
+        - s38-t29-tg1-c2/p1 to s37-t29-sut1-c2/p1.
+        - s37-t29-sut1-c2/p2 to s38-t29-tg1-c2/p2.
+    - ring2 10GE-ports x710-4p10GE on SUT:
+        - s38-t29-tg1-c2/p3 to s37-t29-sut1-c2/p3.
+        - s37-t29-sut1-c2/p4 to s38-t29-tg1-c2/p4.
+    - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
+        - s38-t29-tg1-c4/p1 to s37-t29-sut1-c4/p1.
+        - s37-t29-sut1-c4/p2 to s38-t29-tg1-c4/p2.
+    - ring4 100GE-ports ConnectX5-2p100GE on SUT:
+        - s38-t29-tg1-c9/p1 to s37-t29-sut1-c9/p1.
+        - s37-t29-sut1-c9/p2 to s38-t29-tg1-c9/p2.
+    - ring5 100GE-ports e810-2p100GE on SUT 100GE-ports ConnectX5-2p100GE on TG:
+        - s38-t29-tg1-c6/p1 to s37-t29-sut1-c6/p1.
+        - s37-t29-sut1-c6/p2 to s38-t29-tg1-c6/p2.
+```
+
+#### 2-Node-Zen2 Wiring (2n-zn2) PROD
+
+```
+- testbed210:
+    - ring1 10GE-ports x710-4p10GE on SUT:
+        - s61-t210-tg1-c2/p1 to s60-t210-sut1-c1/p1.
+        - s60-t210-sut1-c1/p2 to s61-t210-tg1-c2/p2.
+    - ring2 10GE-ports x710-4p10GE on SUT:
+        - s61-t210-tg1-c2/p3 to s60-t210-sut1-c1/p3.
+        - s60-t210-sut1-c1/p4 to s61-t210-tg1-c2/p4.
+    - ring3 25GE-ports xxv710-DA2-2p25GE on SUT
+        - s61-t210-tg1-c3/p1 to s60-t210-sut1-c2/p1.
+        - s60-t210-sut1-c2/p2 to s61-t210-tg1-c3/p2.
+    - ring4 100GE-ports ConnectX5-2p100GE on SUT:
+        - s61-t210-tg1-c1/p1 to s60-t210-sut1-c3/p1.
+        - s60-t210-sut1-c3/p2 to s61-t210-tg1-c1/p2.
+```
+
+#### 2-Node-ThunderX2 Wiring (2n-tx2) PROD
+
+```
+- testbed211:
+    - ring1 10GE-ports x520-2p10GE on SUTs:
+        - s27-t211-sut1-c18/p1 - s19-t33t211-tg1-c8/p1.
+        - s27-t211-sut1-c18/p2 - s19-t33t211-tg1-c8/p2.
+```
+
+#### 2-Node-Icelake Wiring (2n-icx) PROD
+
+```
+- testbed212:
+    - ring1 25GE-ports xxv710-DA2-2p25GE on SUT
+        - 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:
+        - 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:
+        - 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:
+        - s72-t212-tg1-c6/p1 to s72-t212-tg1-c6/p2.
+        - s72-t212-tg1-c6/p2 to s72-t212-tg1-c6/p1.
+- testbed213:
+    - ring1 25GE-ports xxv710-DA2-2p25GE on SUT
+        - 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:
+        - 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:
+        - 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:
+        - s84-t213-tg1-c6/p1 to s84-t213-tg1-c6/p2.
+        - s84-t213-tg1-c6/p2 to s84-t213-tg1-c6/p1.
+- testbed214:
+    - ring1 25GE-ports xxv710-DA2-2p25GE on SUT
+        - 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:
+        - 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:
+        - 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:
+        - s86-t214-tg1-c6/p1 to s86-t214-tg1-c6/p2.
+        - s86-t214-tg1-c6/p2 to s86-t214-tg1-c6/p1.
+- testbed215:
+    - ring1 25GE-ports xxv710-DA2-2p25GE on SUT
+        - 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:
+        - 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:
+        - 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:
+        - s88-t215-tg1-c6/p1 to s88-t215-tg1-c6/p2.
+        - s88-t215-tg1-c6/p2 to s88-t215-tg1-c6/p1.
+```
+
+#### 3-Node-Skylake Wiring (3n-skx) PROD
 
 ```
 - testbed31:
 
 ```
 - testbed31:
@@ -1333,34 +2210,98 @@ To be completed.
         - s16-t32-tg1-c10/p3 to s16-t32-tg1-c10/p4.
 ```
 
         - s16-t32-tg1-c10/p3 to s16-t32-tg1-c10/p4.
 ```
 
-#### 3-Node-Rangeley (3n-rng) TODO
+#### 3-Node-Rangeley Wiring (3n-rng) VERIFY
 
 ```
 To be completed.
 ```
 
 
 ```
 To be completed.
 ```
 
-#### 3-Node-Taishan (3n-tsh) WIP
+#### 3-Node-Taishan Wiring (3n-tsh) PROD
 
 ```
 - testbed33:
 
 ```
 - testbed33:
-    - ring1 10GE-ports 82599-2p10GE on SUTs:
-        - t33t34-tg1-c2/p2 - t33-sut1-c6/p2.
-        - t33-sut1-c6/p1 - t33-sut2-c6/p2.
-        - t33-sut2-c6/p1 - t33t34-tg1-c2/p1.
+    - ring1 10GE-ports x520-2p10GE on SUTs:
+        - s19-t33t211-tg1-c2/p2 - s17-t33-sut1-c6/p2.
+        - s17-t33-sut1-c6/p1 - s18-t33-sut2-c6/p2.
+        - s18-t33-sut2-c6/p1 - s19-t33t211-tg1-c2/p1.
     - ring2 25GE-ports cx4-2p25GE on SUTs:
     - ring2 25GE-ports cx4-2p25GE on SUTs:
-        - t33t34-tg1-c4/p2 - t33-sut1-c4/p2.
-        - t33-sut1-c4/p1 - t33-sut2-c4/p2.
-        - t33-sut2-c4/p1 - t33t34-tg1-c4/p1.
+        - s19-t33t211-tg1-c4/p2 - s17-t33-sut1-c4/p2.
+        - s17-t33-sut1-c4/p1 - s18-t33-sut2-c4/p2.
+        - s18-t33-sut2-c4/p1 - s19-t33t211-tg1-c4/p1.
 ```
 
 ```
 
-#### 3-Node-Mcbin (3n-mcb) WIP
+#### 3-Node-Altra Wiring (3n-alt) PROD
 
 ```
 - testbed34:
 
 ```
 - testbed34:
-    - ring1 10GE-ports Marvell on SUTs:
-        - t33t34-tg1-c2/p3 - t34-sut1-ca/p1.
-        - t34-sut1-ca/p2 - t34-sut2-ca/p1.
-        - t34-sut2-ca/p2 - t33t34-tg1-c2/p4.
+    - ring1 40GE-ports xl710-QDA2-2p40GE on SUTs:
+        - 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.
+```
+
+#### 3-Node-Denverton Wiring (3n-dnv) PROD
+
+```
+- testbed35:
+    - ring1 10GE-ports x553 copper port on SUTs:
+        - s28-t26t35-tg1-c8/p1 to s30-t35-sut1-p2.
+        - s30-t35-sut1-p1 to s31-t35-sut2-p1.
+        - s28-t26t35-tg1-c10/p1 to s31-t35-sut2-p2.
+    - ring2 10GE-ports x553 fiber port on SUTs:
+        - s28-t26t35-tg1-c6/p1 to s30-t35-sut1-p4.
+        - s30-t35-sut1-p3 to s31-t35-sut2-p3.
+        - s28-t26t35-tg1-c6/p2 to s31-t35-sut2-p4.
+```
+
+#### 3-Node-Icelake Wiring (3n-icx) PROD
+
+```
+- testbed37:
+    - ring1 25GE-ports xxv710-DA2-2p25GE on SUTs:
+        - 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:
+        - 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
+        - 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.
+- testbed38:
+    - ring1 25GE-ports xxv710-DA2-2p25GE on SUTs:
+        - 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:
+        - 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
+        - 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.
+```
+
+#### 3-Node-SnowRidge Wiring (3n-snr) PROD
+
+```
+- testbed39:
+    - ring1 25GE-ports e810-XXVDA4-4p25GE on SUTs and TG:
+        - s89-t39t310-tg1-c6/p1 to s93-t39-sut1-c1/p1.
+        - s93-t39-sut1-c1/p2 to s94-t39-sut2-c1/p2.
+        - s94-t39-sut2-c1/p1 to s89-t39t310-tg1-c6/p2.
+        - s89-t39t310-tg1-c6/p3 to s93-t39-sut1-c1/p3.
+        - s93-t39-sut1-c1/p4 to s94-t39-sut2-c1/p4.
+        - s94-t39-sut2-c1/p3 to s89-t39t310-tg1-c6/p4.
 ```
 
 ## Inventory
 ```
 
 ## Inventory
@@ -1380,25 +2321,39 @@ To be completed.
         - Operating System: Native IxOS.
 ```
 
         - Operating System: Native IxOS.
 ```
 
-### Arm Servers
+### Arm Servers
 
 ```
 1. Arm Cortex A-72 servers
 
 ```
 1. Arm Cortex A-72 servers
-    - 1 * ThunderX2
-        - Chassis: Marvell ThunderX2
-        - Processors: 2* ThunderX2 CN9975 ~ 112* ThunderX2.
+    - 2 * ThunderX2 (VPP Device)
+        - Chassis: GIGABYTE Rack Mount
+        - Processors: 2* ThunderX2 CN9980 ~ 32* ThunderX2
+        - RAM Memory: 16* 16GB DIMM
+        - Disks: 2* 480GB 6G SATA SSD SAMSUNG MZ7LH480
+    - 1 * ThunderX2 (Performance)
+        - Chassis: GIGABYTE Rack Mount
+        - Processors: 2* ThunderX2 CN9975 ~ 28* ThunderX2.
         - RAM Memory: 4* 32GB RDIMM
         - Disks: 1* 480GB SSD Micron, 1* 1000GB HDD Seagate_25
     - 2 * Huawei TaiShan 2280.
         - Chassis: Huawei TaiShan 2280.
         - RAM Memory: 4* 32GB RDIMM
         - Disks: 1* 480GB SSD Micron, 1* 1000GB HDD Seagate_25
     - 2 * Huawei TaiShan 2280.
         - Chassis: Huawei TaiShan 2280.
-        - Processors: 1* hip07-d05 ~ 64* Arm Cortex-A72.
+        - Processors: 2* hip07-d05 ~ 32* Arm Cortex-A72.
         - RAM Memory: 8* 16GB DDR4-2400MT/s.
         - Disks: 1* 4TB SATA HDD.
         - RAM Memory: 8* 16GB DDR4-2400MT/s.
         - Disks: 1* 4TB SATA HDD.
-    - 3 * MACCHIATObin
-        - Chassis: MACCHIATObin.
-        - Processors: 1* Armada 8040 ~ 4* Arm Cortex-A72.
-        - RAM Memory: 1* 16GB DDR4.
-        - Disks: 1* 128GB(?) SATA SDD.
+2. Arm Neoverse N1 servers
+    - 2 * Ampere Altra (Performance)
+        - Chassis: WIWYNN Mt.Jade Server System B81.030Z1.0007 2U
+        - Processors: 2* Ampere(R) Altra(R) Q80-30 Processor (Neoverse N1)
+        - Processor Signature: Implementor 0x41, Variant 0x3, Architecture 15, Part 0xd0c, Revision 1
+        - RAM Memory: 16* 8GB DDR4-3200MT/s
+        - Disks: 2* 960GB SSD Samsung M.2 NVMe PM983
+    - 2 * Ampere Altra (Build)
+        - 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: 12* 16GB DDR4-3200MT/s
+        - Disks: 1* 960GB SSD Samsung M.2 NVMe PM983
 ```
 
 ### Xeon and Atom Servers
 ```
 
 ### Xeon and Atom Servers
@@ -1408,7 +2363,7 @@ To be completed.
     - 20 * SuperMicro SYS-7049GP-TRT with Xeon Skylake processors.
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
     - 20 * SuperMicro SYS-7049GP-TRT with Xeon Skylake processors.
         - Chassis: SuperMicro SYS-7049GP-TRT.
         - Motherboard: SuperMicro X11DPG-QT.
-        - Processors: 2* Intel Platinum 8180 2.3 GHz.
+        - Processors: 2* Intel Platinum 8180 2.5 GHz.
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
 2. Intel Atom servers with Rangely processors.
         - RAM Memory: 16* 16GB DDR4-2666MHz.
         - Disks: 2* 1.6TB 6G SATA SSD.
 2. Intel Atom servers with Rangely processors.
@@ -1423,15 +2378,13 @@ To be completed.
 
 ```
 1. 10GE NICs
 
 ```
 1. 10GE NICs
-    - 14 * Intel® Ethernet Converged Network Adapter X710-DA4
-    - 6 * Intel® Ethernet Converged Network Adapter X710-DA2
-    - 6 * Intel® Ethernet Converged Network Adapter X520-DA2
+    - ?
 2. 25GE NICs
 2. 25GE NICs
-    - 12 * Intel® Ethernet Network Adapter XXV710-DA2
+    - ?
 3. 40GE NICs
 3. 40GE NICs
-    - 2 * Intel® Ethernet Converged Network Adapter XL710-QDA2
+    - ?
 4. 100GE NICs
 4. 100GE NICs
-    - 4 * mcx556a-edat NICs (not on site yet, in transit)
+    - ?
 ```
 
 ### Pluggables and Cables
 ```
 
 ### Pluggables and Cables
@@ -1440,27 +2393,26 @@ Pluggables:
 
 ```
 1. 10GE SFP+
 
 ```
 1. 10GE SFP+
-    - 16 * Intel E10GSFPSR Ethernet SFP+ SR Optics
-    - 80 * 10G SR optic (generic, "Intel" compatible branded)
+    - ?
 2. 25GE SFP28
 2. 25GE SFP28
-    - None
+    - ?
 3. 40GE QSFP+
 3. 40GE QSFP+
-    - None
+    - ?
 4. 100GE
 4. 100GE
-    - 8 * mcp1600-c002 qsfp28 pluggables and cables (not on site yet, in transit)
+    - ?
 ```
 
 Standalone cables:
 
 ```
 1. 10GE
 ```
 
 Standalone cables:
 
 ```
 1. 10GE
-    - None
+    - ?
 2. 25GE
 2. 25GE
-    - None
+    - ?
 3. 40GE QSFP+
 3. 40GE QSFP+
-    - 20 * Intel XLDACBL5 40G QSFP+ Passive DAC Cable
+    - ?
 4. 100GE
 4. 100GE
-    - None
+    - ?
 ```
 
 ### Other Parts
 ```
 
 ### Other Parts
Integration tests