Infra: Decommission 3n-hsw - docs
[csit.git] / docs / lab / testbed_specifications.md
index 69efbae..b52ada8 100644 (file)
@@ -11,7 +11,7 @@
    1. [2-Node-IxiaPS1L47 Ixia PSOne L47 (2n-ps1)](#2-node-ixiaps1l47-ixia-psone-l47-2n-ps1)
    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. [3-Node-Haswell Xeon Intel (3n-skx)](#3-node-haswell-xeon-intel-3n-skx)
+   1. [2-Node-ThunderX2 Arm Marvell (2x-tx2)](#2-node-thunderx2-arm-marvell-2n-tx2)
    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-Rangeley Atom Testbeds](#3-node-rangeley-atom-testbeds)
 1. [Testbeds Configuration](#testbeds-configuration)
    1. [Per Testbed Server Allocation and Naming](#per-testbed-server-allocation-and-naming)
       1. [1-Node-Skylake Servers (1n-skx) PROD](#1-node-skylake-servers-1n-skx-prod)
-      1. [1-Node-Thunderx2 Servers (1n-tx2) WIP](#1-node-thunderx2-servers-1n-tx2-wip)
+      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) TODO](#2-node-denverton-servers-2n-dnv-todo)
+      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) SETUP](#2-node-cascadelake-servers-2n-clx-setup)
-      1. [2-Node-Zen2 Servers (2n-zn2) SETUP](#2-node-zen2-servers-2n-zn2-setup])
-      1. [3-Node-Haswell Servers (3n-hsw) PROD](#3-node-haswell-servers-3n-hsw-prod)
+      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. [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-wip)
+      1. [3-Node-Taishan Servers (3n-tsh) PROD](#3-node-taishan-servers-3n-tsh-prod)
    1. [Per Testbed Wiring](#per-testbed-wiring)
       1. [1-Node-Skylake Wiring (1n-skx) PROD](#1-node-skylake-wiring-1n-skx-prod)
-      1. [1-Node-Thunderx2 Wiring (1n-tx2) WIP](#1-node-thunderx2-wiring-1n-tx2-wip)
-      1. [1-Node-Cascadelake Wiring (1n-clx) SETUP](#1-node-cascadelake-wiring-1n-clx-setup)
+      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) TODO](#2-node-denverton-wiring-2n-dnv-todo)
+      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-zen2) SETUP](#2-node-zen2-wiring-2n-zen2-setup])
+      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. [3-Node-Haswell Wiring (3n-hsw) PROD](#3-node-haswell-wiring-3n-hsw-prod)
       1. [3-Node-Skylake Wiring (3n-skx) PROD](#3-node-skylake-wiring-3n-skx-prod)
       1. [3-Node-Rangeley Wiring (3n-rng) TODO](#3-node-rangeley-wiring-3n-rng-todo)
-      1. [3-Node-Taishan Wiring (3n-tsh) PROD](#3-node-taishan-wiring-3n-tsh-wip)
+      1. [3-Node-Taishan Wiring (3n-tsh) PROD](#3-node-taishan-wiring-3n-tsh-prod)
 1. [Inventory](#inventory)
    1. [Appliances](#appliances)
    1. [Arm Servers](#arm-servers)
@@ -69,22 +70,21 @@ hosted by LFN FD.io CSIT project.
 
 ```
  #. CSIT_tb          Purpose  SUT   TG    #TB  #SUT #TG  #hsw #skx #ps1 #rng #dnv #tx2 #tsh #clx #zn2
- 1. 1-Node-VIRL        dev    hsw   ---   3    3    0    3    0    0    0    0    0    0    0    0
+ 1. 1-Node-Haswell     nomad  hsw   ---   4    4    0    4    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
- 3. 1-Node-Thunderx2   idle   tx2   na    1    1    0    0    0    0    0    0    1    0    0    0
- 4. 1-Node-Thunderx2   dev    tx2   na    2    2    0    0    0    0    0    0    2    0    0    0
+ 3. 1-Node-ThunderX2   perf   tx2   na    1    1    .5   0    .5   0    0    0    1    0    0    0
+ 4. 1-Node-ThunderX2   dev    tx2   na    2    2    0    0    0    0    0    0    2    0    0    0
  5. 1-Node-Cascadelake dev    clx   lcx   1    1    0    0    0    0    0    0    0    0    1    0
  6. 2-Node-Skylake     perf   skx   skx   4    4    4    0    8    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
  8. 2-Node-IxiaPS1L47  tcp    skx   ps1   1    1    1    0    1    1    0    0    0    0    0    0
  9. 2-Node-Cascadelake perf   clx   clx   3    3    3    0    0    0    0    0    0    0    6    0
-10. 3-Node-Haswell     perf   hsw   hsw   3    6    3    9    0    0    0    0    0    0    0    0
-11. 3-Node-Skylake     perf   skx   skx   2    4    2    0    6    0    0    0    0    0    0    0
-12. 3-Node-Rangeley    perf   rng   skx   1    3    1    0    0    0    2    0    0    0    0    0
-13. 3-Node-Taishan     perf   tsh   skx   1    2    .5   0    .5   0    0    0    0    2    0    0
-14. 3-Node-Denverton   perf   dnv   skx   1    2    1    0    .5   0    0    2    0    0    0    0
-15. 2-Node-Zen2        perf   zn2   zn2   1    1    1    0    0    0    0    0    0    0    0    2
-                                 Totals: 27   36 16.5   12 18.5    1    2    3    3    2    7    2
+10. 3-Node-Skylake     perf   skx   skx   2    4    2    0    6    0    0    0    0    0    0    0
+11. 3-Node-Rangeley    perf   rng   skx   1    3    1    0    0    0    2    0    0    0    0    0
+12. 3-Node-Taishan     perf   tsh   skx   1    2    .5   0    .5   0    0    0    0    2    0    0
+13. 3-Node-Denverton   perf   dnv   skx   1    2    1    0    .5   0    0    2    0    0    0    0
+14. 2-Node-Zen2        perf   zn2   zn2   1    1    1    0    0    0    0    0    0    0    0    2
+                                 Totals: 25   31   15    4   19    1    2    3    3    2    7    2
 ```
 
 ### 1-Node-Skylake Xeon Intel (1n-skx)
@@ -141,6 +141,13 @@ 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-B9) and
+one TG (Server-Type-B12) 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
@@ -157,7 +164,7 @@ Used for FD.io performance tests.
 ### 3-Node-TaiShan Arm Huawei (3n-tsh)
 
 Each 3-Node-TaiShan testbed includes two SUTs (Server-Type-B3) and one
-TG (Server-Type-B2) connected in a 3-node circular topology
+TG (Server-Type-B12) connected in a 3-node circular topology
 ([Server Types](#server-types)).
 Used for FD.io performance tests.
 
@@ -226,25 +233,16 @@ Name         | Comment
 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  | s41-nomad
 10.30.50.29  | s39-nomad
 10.30.51.29  | s22-t35-sut1 screen -r /dev/ttyusb0
 10.30.50.30  | s40-nomad
 10.30.51.30  | s23-t35-sut2 screen -r /dev/ttyusb1
 10.30.51.30  | s24-t35-sut3 screen -r /dev/ttyusb2
-10.30.50.32  | s42-nomad (formerly nomad1)
-10.30.50.33  | s43-nomad (formerly nomad2)
-10.30.50.34  | s44-nomad (formerly nomad3)
-10.30.50.35  | s45-nomad (formerly nomad4)
+10.30.50.32  | s42-nomad
+10.30.50.33  | s43-nomad
+10.30.50.34  | s44-nomad
+10.30.50.35  | s45-nomad
 10.30.50.36  | s17-t33-sut1
 10.30.50.37  | s18-t33-sut2
 10.30.50.38  | fdio-marvell-dev
@@ -273,7 +271,7 @@ Name         | Comment
 10.30.50.66  | s51-nomad
 10.30.50.67  | s49-nomad
 10.30.50.68  | s50-nomad
-10.30.50.69  | s27-t13-sut
+10.30.50.69  | s27-t34-sut1
 10.30.50.70  | s55-t36-sut1
 10.30.50.71  | s56-t37-sut1
 10.30.50.255 | Broadcast
@@ -285,10 +283,10 @@ n/a          | s21-t34-sut2
 10.30.55.11  | s29-t26-sut1
 10.30.55.12  | s30-t35-sut1
 10.30.55.13  | s31-t35-sut2
-10.30.55.14  | s46-nomad (formerly server-type-c4-1)
-10.30.55.15  | s47-nomad (formerly server-type-c4-2)
-10.30.55.16  | s48-nomad (formerly server-type-c4-3)
-10.30.55.17  | s32-t14-sut1
+10.30.55.14  | s46-nomad
+10.30.55.15  | s47-nomad
+10.30.55.16  | s48-nomad
+10.30.55.17  | s57-nomad
 10.30.55.18  | s33-t27-sut1
 10.30.55.19  | s34-t27-tg1
 10.30.55.20  | s35-t28-sut1
@@ -312,37 +310,19 @@ Name                      | Comment
 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 (decommissioned)
-10.30.51.13               | softiron-2 (decommissioned)
-10.30.51.14               | softiron-3 (decommissioned)
 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               | s41-nomad
 10.30.51.29               | s39-nomad
 10.30.51.30               | s40-nomad
-10.30.51.32               | s42-nomad (formerly nomad1)
-10.30.51.33               | s43-nomad (formerly nomad2)
-10.30.51.34               | s44-nomad (formerly nomad3)
-10.30.51.35               | s45-nomad (formerly nomad4)
+10.30.51.32               | s42-nomad
+10.30.51.33               | s43-nomad
+10.30.51.34               | s44-nomad
+10.30.51.35               | s45-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.41               | s20-t34-sut1 (decommissioned)
-10.30.51.42               | s21-t34-sut2 (decommissioned)
-10.30.51.43               | fdio-mcbin3 (decommissioned)
 10.30.51.44               | s3-t21-sut1
 10.30.51.45               | s4-t21-tg1
 10.30.51.46               | s11-t31-sut1
@@ -366,12 +346,10 @@ Name                      | Comment
 10.30.51.66               | s51-nomad
 10.30.51.67               | s49-nomad
 10.30.51.68               | s50-nomad
-10.30.51.69               | s27-t13-sut1
+10.30.51.69               | s27-t34-sut1
 10.30.51.70               | s55-t36-sut1
 10.30.51.71               | s56-t37-sut1
-10.30.51.72-10.30.51.105  | FREE
-10.30.51.106-10.30.51.180 | FREE
-10.30.51.181-10.30.51.254 | FREE
+10.30.51.72-10.30.51.254  | FREE
 10.30.51.255              | Broadcast
 10.32.8.0                 | network
 10.32.8.1                 | Router
@@ -379,10 +357,10 @@ Name                      | Comment
 10.32.8.11                | s29-t26-sut1
 10.32.8.12                | s30-t35-sut1
 10.32.8.13                | s31-t35-sut2
-10.32.8.14                | s46-nomad (formerly server-type-c4-1)
-10.32.8.15                | s47-nomad (formerly server-type-c4-2)
-10.32.8.16                | s48-nomad (formerly server-type-c4-3)
-10.32.8.17                | s32-t14-sut1
+10.32.8.14                | s46-nomad
+10.32.8.15                | s47-nomad
+10.32.8.16                | s48-nomad
+10.32.8.17                | s57-nomad
 10.32.8.18                | s33-t27-sut1
 10.32.8.19                | s34-t27-tg1
 10.32.8.20                | s35-t28-sut1
@@ -411,13 +389,13 @@ 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)
-            - 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 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).
 2. Server-Type-A2: Purpose - Haswell Xeon TG (Traffic Generators) for FD.io performance testing.
     - Quantity: 3 servers.
@@ -430,14 +408,14 @@ 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:
-        - 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.
 3. Server-Type-A3: Purpose - Haswell Xeon VIRL hosts for FD.io functional testing.
     - Quantity: 3 servers.
@@ -502,7 +480,7 @@ FD.io CSIT lab contains following server types:
         - NIC ports connected into 3-node topology.
     - Main HW configuration:
         - 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
     - NICs configuration:
@@ -580,7 +558,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.
-11. Server-Type-B9: Purpose - ThunderX2 Arm Marvell(Idle).
+11. Server-Type-B9: Purpose - ThunderX2 Arm Marvell SUT for FD.io performance testing.
     - Quantity: 1
     - Physical connectivity:
         - IPMI and host management ports.
@@ -588,15 +566,14 @@ FD.io CSIT lab contains following server types:
     - Main HW configuration:
         - Chassis: Gigabyte R181-T90 1U
         - Motherboard: MT91-FS1
-        - Processors: 1* ThunderX2 ARMv8 CN9975 2.0 GHz
+        - 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:
-            - PCIe Slot1 05:00.xx: XL710-QDA2.
-            - PCIe Slot3 08:00.xx: XL710-QDA2.
+            - PCIe Slot6 08:00.xx: XL710-QDA2-2p40GE Intel.
         - Numa1:
-            - PCIe Slot6 85:00.xx: XL710-QDA2.
+            - PCIe Slot18 91:00.xx: XL710-QDA2-2p40GE Intel.
 12. Server-Type-B10: Purpose - Denverton Atom SUT for FD.io performance testing.
     - Quantity: 4
     - Physical connectivity:
@@ -611,7 +588,7 @@ FD.io CSIT lab contains following server types:
         - 2x 10Gb Intel x553 fiber ports
         - 2x 10Gb Intel x553 copper ports
         - 4x 1GB Intel I350 ports
-13. Server-Type-B11: Purpose - Thunderx2 Arm Marvell SUT for FD.io VPP_Device functional tests.
+13. Server-Type-B11: Purpose - ThunderX2 Arm Marvell SUT for FD.io VPP_Device functional tests.
     - Quantity: 2
     - Physical connectivity:
         - IPMI and host management ports.
@@ -619,7 +596,7 @@ FD.io CSIT lab contains following server types:
     - Main HW configuration:
         - Chassis: GIGABYTE Rack Mount
         - Motherboard: MT91-FS4-00
-        - Processors: 2 * Thunderx2 ARMv8 CN9980 2.20 GHz
+        - Processors: 2 * ThunderX2 ARMv8 CN9980 2.20 GHz
         - RAM Memory: 16 * 16GB DIMM
         - Disks: 2 * 480GB 6G SATA SSD SAMSUNG MZ7LH480
     - NICs configuration:
@@ -629,8 +606,28 @@ FD.io CSIT lab contains following server types:
         - Numa1:
             - PCIe Slot14 91:00.xx: XL710-QDA2-2p40GE Intel.
             - PCIe Slot26 9a:00.xx: ConnectX5-2p10/25GE Mellanox.
+14. Server-Type-B12: Purpose - Skylake Xeon TG for FD.io performance testing.
+    - Quantity: ---
+    - 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.
 
-14. Server-Type-C1: Purpose - Cascadelake Xeon SUT for FD.io VPP_Device functional tests.
+15. Server-Type-C1: Purpose - Cascadelake Xeon SUT for FD.io VPP_Device functional tests.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -650,7 +647,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.
-15. Server-Type-C2: Purpose - Cascadelake Xeon SUT for FD.io performance testing.
+16. Server-Type-C2: Purpose - Cascadelake Xeon SUT for FD.io performance testing.
     - Quantity: 3
     - Physical connectivity:
         - IPMI and host management ports.
@@ -670,7 +667,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.
-16. Server-Type-C3: Purpose - Cascadelake Xeon TG for FD.io performance testing.
+17. Server-Type-C3: Purpose - Cascadelake Xeon TG for FD.io performance testing.
     - Quantity: 3.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -690,7 +687,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.
-17. Server-Type-C4: Purpose - Cascadelake Xeon Backend hosts for FD.io builds and data processing.
+18. Server-Type-C4: Purpose - Cascadelake Xeon Backend hosts for FD.io builds and data processing.
     - Quantity: 3.
     - Physical connectivity:
         - CIMC and host management ports.
@@ -706,8 +703,7 @@ FD.io CSIT lab contains following server types:
             - no cards.
         - Numa1:
             - no cards.
-
-18. Server-Type-D1: Purpose - Zen2 EPYC SUT for FD.io performance testing.
+19. Server-Type-D1: Purpose - Zen2 EPYC SUT for FD.io performance testing.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -722,7 +718,7 @@ FD.io CSIT lab contains following server types:
             - 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.
-19. Server-Type-D2: Purpose - Zen2 EPYC TG for FD.io performance testing.
+20. Server-Type-D2: Purpose - Zen2 EPYC TG for FD.io performance testing.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -797,7 +793,7 @@ connectivity and wiring across defined CSIT testbeds:
         - s2-t12-sut1-c4/p4 - 10GE-port4 x710-4p10GE.
 ```
 
-#### 1-Node-Thunderx2 Servers (1n-tx2) WIP
+#### 1-Node-ThunderX2 Servers (1n-tx2) PROD
 
 ```
 - SUT [Server-Type-B11]:
@@ -814,7 +810,6 @@ connectivity and wiring across defined CSIT testbeds:
         - s55-t36-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
         - s55-t36-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
         - s55-t36-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
-
 - SUT [Server-Type-B11]:
     - testbedname: testbed37
     - hostname: s56-t37-sut1
@@ -951,7 +946,7 @@ connectivity and wiring across defined CSIT testbeds:
         - s10-t24-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
 ```
 
-#### 2-Node-Denverton Servers (2n-dnv) WIP
+#### 2-Node-Denverton Servers (2n-dnv) PROD
 
 Note: ServerB28 (TG) is shared between testbed26 & testbed35
 
@@ -1011,7 +1006,7 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - s26-t25-tg1-p4 - 10GE-port4.
 ```
 
-#### 2-Node-Cascadelake Servers (2n-clx) SETUP
+#### 2-Node-Cascadelake Servers (2n-clx) PROD
 
 ```
 - SUT [Server-Type-C2]:
@@ -1026,6 +1021,8 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - 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]:
@@ -1040,6 +1037,8 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - 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 e810-2p100GE.
+        - s34-t27-tg1-c6/p2 - 100GE-port2 e810-2p100GE.
         - s34-t27-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
         - s34-t27-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
 - SUT [Server-Type-C2]:
@@ -1054,6 +1053,8 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - 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]:
@@ -1068,6 +1069,8 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - 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 e810-2p100GE.
+        - s36-t28-tg1-c6/p2 - 100GE-port2 e810-2p100GE.
         - s36-t28-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE.
         - s36-t28-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE.
 - SUT [Server-Type-C2]:
@@ -1082,8 +1085,10 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - 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-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s37-t29-sut1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
+        - 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.
@@ -1096,11 +1101,13 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - 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-c9/p1 - FUTURE 100GE-port1 ConnectX5-2p100GE.
-        - s38-t29-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
+        - s38-t29-tg1-c6/p1 - 100GE-port1 e810-2p100GE.
+        - s38-t29-tg1-c6/p2 - 100GE-port2 e810-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) SETUP
+#### 2-Node-Zen2 Servers (2n-zn2) PROD
 
 ```
 - SUT [Server-Type-D1]:
@@ -1133,159 +1140,39 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - s61-t210-tg1-c3/p2 - 25GE-port2 xxv710-DA2-2p25GE.
 ```
 
-#### 3-Node-Haswell Servers (3n-hsw) PROD
+#### 2-Node-ThunderX2 Servers (2x-tx2) PROD
+
+Note: Server19 (TG) is shared between testbed33 & testbed34
 
 ```
- 1. SUT [Server-Type-A1]:
-    - testbedname: testbed1.
-    - hostname: t1-sut1.
-    - CIMC IP: 10.30.50.17
-    - Host IP: 10.30.51.17
+- SUT [Server-Type-B9]:
+    - testbedname: testbed34.
+    - hostname: s27-t34-sut1.
+    - IPMI IP: 10.30.50.69
+    - Host IP: 10.30.51.69
     - 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. SUT [Server-Type-A1]:
-    - testbedname: testbed1.
-    - hostname: t1-sut2.
-    - CIMC IP: 10.30.50.18
-    - Host IP: 10.30.51.18
-    - 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. TG [Server-Type-A2]:
-    - testbedname: testbed1.
-    - hostname: t1-tg1.
-    - CIMC IP: 10.30.50.16
-    - Host IP: 10.30.51.16
-    - 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. SUT [Server-Type-A1]:
-    - testbedname: testbed2.
-    - hostname: t2-sut1.
-    - CIMC IP: 10.30.50.21
-    - Host IP: 10.30.51.21
-    - 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. SUT [Server-Type-A1]:
-    - testbedname: testbed2.
-    - hostname: t2-sut2.
-    - CIMC IP: 10.30.50.22
-    - Host IP: 10.30.51.22
-    - 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. TG [Server-Type-A2]:
-    - testbedname: testbed2.
-    - hostname: t2-tg1.
-    - CIMC IP: 10.30.50.20
-    - Host IP: 10.30.51.20
-    - 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. SUT [Server-Type-A1]:
-    - testbedname: testbed3.
-    - hostname: t3-sut1.
-    - CIMC IP: 10.30.50.25
-    - Host IP: 10.30.51.25
-    - 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. SUT [Server-Type-A1]:
-    - testbedname: testbed3.
-    - hostname: t3-sut2.
-    - CIMC IP: 10.30.50.26
-    - Host IP: 10.30.51.26
-    - 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. TG [Server-Type-A2]:
-    - testbedname: testbed3.
-    - hostname: t3-tg1.
-    - CIMC IP: 10.30.50.24
-    - Host IP: 10.30.51.24
+        - s27-t34-sut1-c6/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s27-t34-sut1-c6/p2 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s27-t34-sut1-c18/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s27-t34-sut1-c18/p2 - 40GE-port1 XL710-QDA2-2p40GE.
+- TG [Server-Type-B12]:
+    - testbedname: testbed33 and testbed34.
+    - hostname: s19-t33t34-tg1.
+    - IPMI IP: 10.30.50.46
+    - Host IP: 10.30.51.49
     - 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.
+        - 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-c8/p1 - 40GE-port1 xl710-QDA2-2p40GE.
+        - s19-t33t34-tg1-c8/p2 - 40GE-port1 xl710-QDA2-2p40GE.
+        - 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.
 ```
 
 #### 3-Node-Skylake Servers (3n-skx) PROD
@@ -1413,8 +1300,10 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
 
 #### 3-Node-Taishan Servers (3n-tsh) PROD
 
+Note: Server19 (TG) is shared between testbed33 & testbed34
+
 ```
-- ServerB17 [Server-Type-B3]:
+- SUT [Server-Type-B3]:
     - testbedname: testbed33.
     - hostname: s17-t33-sut1.
     - IPMI IP: 10.30.50.36
@@ -1424,7 +1313,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - 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.
-- ServerB18 [Server-Type-B3]:
+- SUT [Server-Type-B3]:
     - testbedname: testbed33.
     - hostname: s18-t33-sut2.
     - IPMI IP: 10.30.50.37
@@ -1434,7 +1323,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - 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.
-- ServerB19 [Server-Type-B2]:
+- TG [Server-Type-B12]:
     - testbedname: testbed33 and testbed34.
     - hostname: s19-t33t34-tg1.
     - IPMI IP: 10.30.50.46
@@ -1446,13 +1335,15 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - 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-c8/p1 - 40GE-port1 xl710-QDA2-2p40GE.
+        - s19-t33t34-tg1-c8/p2 - 40GE-port1 xl710-QDA2-2p40GE.
         - 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.
 ```
 
-#### 3-Node-Denverton Servers (3n-dnv) WIP
+#### 3-Node-Denverton Servers (3n-dnv) PROD
 
 ```
 - ServerB30 [Server-Type-B10]:
@@ -1502,7 +1393,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s2-t12-sut1-c2/p3 to s2-t12-sut1-c4/p3.
 ```
 
-#### 1-Node-Thunderx2 Wiring (1n-tx2) WIP
+#### 1-Node-ThunderX2 Wiring (1n-tx2) PROD
 
 ```
 - testbed36:
@@ -1526,7 +1417,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s55-t37-sut1-c8/p2 - s55-t37-sut1-c26/p2.
 ```
 
-#### 1-Node-Cascadelake Wiring (1n-clx) SETUP
+#### 1-Node-Cascadelake Wiring (1n-clx) PROD
 
 ```
 - testbed14:
@@ -1585,7 +1476,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s9-t24-sut1-c4/p2 to s10-t24-tg1-c4/p2.
 ```
 
-#### 2-Node-Denverton Wiring (2n-dnv) WIP
+#### 2-Node-Denverton Wiring (2n-dnv) PROD
 
 ```
 - testbed26:
@@ -1627,6 +1518,9 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
     - 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:
+        - s34-t27-tg1-c6/p1 to s33-t27-sut1-c6/p1.
+        - s33-t27-sut1-c6/p2 to s34-t27-tg1-c6/p2.
 - testbed28:
     - ring1 10GE-ports x710-4p10GE on SUT:
         - s36-t28-tg1-c2/p1 to s35-t28-sut1-c2/p1.
@@ -1637,9 +1531,12 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
     - 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.
-    - FUTURE ring4 100GE-ports ConnectX5-2p100GE on SUT:
+    - 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:
+        - s36-t28-tg1-c6/p1 to s35-t28-sut1-c6/p1.
+        - s35-t28-sut1-c6/p2 to s36-t28-tg1-c6/p2.
 - testbed29:
     - ring1 10GE-ports x710-4p10GE on SUT:
         - s38-t29-tg1-c2/p1 to s37-t29-sut1-c2/p1.
@@ -1650,12 +1547,15 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
     - 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.
-    - FUTURE ring4 100GE-ports ConnectX5-2p100GE on SUT:
+    - 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.
+    - ring6 100GE-ports e810-2p100GE on SUT:
+        - 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-zen2) SETUP
+#### 2-Node-Zen2 Wiring (2n-zn2) PROD
 
 ```
 - testbed210:
@@ -1673,80 +1573,13 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
         - s60-t210-sut1-c3/p2 to s61-t210-tg1-c1/p2.
 ```
 
-#### 3-Node-Haswell Wiring (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.
+#### 2-Node-ThunderX2 Wiring (2n-tx2) PROD
+
+```
+- testbed34:
+    - ring1 10GE-ports x520-2p10GE on SUTs:
+        - s27-t34-sut1-c18/p1 - s19-t33t34-tg1-c8/p1.
+        - s27-t34-sut1-c18/p2 - s19-t33t34-tg1-c8/p2.
 ```
 
 #### 3-Node-Skylake Wiring (3n-skx) PROD
@@ -1814,7 +1647,7 @@ To be completed.
         - s18-t33-sut2-c4/p1 - s19-t33t34-tg1-c4/p1.
 ```
 
-#### 3-Node-Denverton Wiring (3n-dnv) WIP
+#### 3-Node-Denverton Wiring (3n-dnv) PROD
 
 ```
 - testbed35:
@@ -1851,17 +1684,17 @@ To be completed.
 1. Arm Cortex A-72 servers
     - 2 * ThunderX2 (VPP Device)
         - Chassis: GIGABYTE Rack Mount
-        - Processors: 2* ThunderX2 CN9980 ~ 128* ThunderX2
+        - Processors: 2* ThunderX2 CN9980 ~ 32* ThunderX2
         - RAM Memory: 16* 16GB DIMM
         - Disks: 2* 480GB 6G SATA SSD SAMSUNG MZ7LH480
-    - 1 * ThunderX2 (Idle)
-        - Chassis: Marvell ThunderX2
-        - Processors: 2* ThunderX2 CN9975 ~ 112* ThunderX2.
+    - 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.
-        - 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.
 ```