ansible: update 3n-tsh hugepages
[csit.git] / docs / lab / testbed_specifications.md
index bff6383..6b40149 100644 (file)
    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-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. [3-Node-Haswell Xeon Intel (3n-skx)](#3-node-haswell-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. [Server Management](#server-management)
    1. [Requirements](#requirements)
 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-Cascadelake Servers (1n-clx) SETUP](#1-node-cascadelake-servers-1n-clx-setup)
+      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-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. [2-Node-ThunderX2 Servers (2n-tx2) WIP](#2-node-thunderx2-servers-2n-tx2-wip)
       1. [3-Node-Haswell Servers (3n-hsw) PROD](#3-node-haswell-servers-3n-hsw-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) WIP](#3-node-taishan-servers-3n-tsh-wip)
-      1. [3-Node-Mcbin Servers (3n-mcb) TODO](#3-node-mcbin-servers-3n-mcb-todo)
+      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-ThunderX2 Wiring (1n-tx2) PROD](#1-node-thunderx2-wiring-1n-tx2-prod)
       1. [1-Node-Cascadelake Wiring (1n-clx) SETUP](#1-node-cascadelake-wiring-1n-clx-setup)
       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-IxiaPS1L47 Wiring (2n-ps1) VERIFY](#2-node-ixiaps1l47-wiring-2n-ps1-verify)
-      1. [2-Node-Cascadelake Wiring (2n-clx) SETUP](#2-node-cascadelake-wiring-2n-clx-setup)
+      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-ThunderX2 Wiring (2n-tx2) WIP](#2-node-thunderx2-wiring-2n-tx2-wip)
       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) WIP](#3-node-taishan-wiring-3n-tsh-wip)
-      1. [3-Node-Mcbin Wiring (3n-mcb) WIP](#3-node-mcbin-wiring-3n-mcb-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)
@@ -68,22 +71,23 @@ hosted by LFN FD.io CSIT project.
 ### Summary List
 
 ```
- #. CSIT_tb          Purpose  SUT   TG    #TB  #SUT #TG  #hsw #skx #ps1 #rng #dnv #tx2 #tsh #mcb
- 1. 1-Node-VIRL        dev    hsw   ---   3    3    0    3    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
- 3. 1-Node-Thunderx2   dev    tx2   na    1    1    0    0    0    0    0    0    1    0    0
- 4. 1-Node-Cascadelake dev    clx   lcx   1    1    0    0    0    0    0    0    0    0    0
- 5. 2-Node-Skylake     perf   skx   skx   4    4    4    0    8    0    0    0    0    0    0
- 6. 2-Node-Denverton   perf   dnv   skx   1    1    1    0    .5   0    0    1    0    0    0
- 7. 2-Node-IxiaPS1L47  tcp    skx   ps1   1    1    1    0    1    1    0    0    0    0    0
- 8. 2-Node-Cascadelake perf   clx   clx   3    3    3    0    0    0    0    0    0    0    0
- 9. 3-Node-Haswell     perf   hsw   hsw   3    6    3    9    0    0    0    0    0    0    0
-10. 3-Node-Skylake     perf   skx   skx   2    4    2    0    6    0    0    0    0    0    0
-11. 3-Node-Rangeley    perf   rng   skx   1    3    1    0    0    0    2    0    0    0    0
-12. 3-Node-Taishan     perf   tsh   skx   1    2    1    0    .5   0    0    0    0    2    0
-13. 3-Node-Mcbin       perf   mcb   skx   1    2    1    0    .5   0    0    0    0    0    2
-14. 3-Node-Denverton   perf   dnv   skx   1    2    1    0    .5   0    0    2    0    0    0
-                                 Totals: 22   35   18   12   19    1    2    3    1    2    2
+ #. 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
+ 2. 1-Node-Skylake     dev    skx   na    2    2    0    0    2    0    0    0    0    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   18   12   19    1    2    3    3    2    7    2
 ```
 
 ### 1-Node-Skylake Xeon Intel (1n-skx)
@@ -94,7 +98,7 @@ Used for FD.io VPP_Device functional driver tests.
 
 ### 1-Node-ThunderX2 Arm Marvell (1n-tx2)
 
-Each 1-Node-ThunderX2 testbed includes one SUT (Server-Type-B9) with NIC
+Each 1-Node-ThunderX2 testbed includes one SUT (Server-Type-B11) with NIC
 ports connected back-to-back ([Server Types](#server-types)).
 Used for FD.io VPP_Device functional driver tests.
 
@@ -133,6 +137,20 @@ 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-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
@@ -149,14 +167,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
-([Server Types](#server-types)).
-Used for FD.io performance tests.
-
-### 3-Node-MACCHIATObin Arm Marvell
-
-Each 3-Node-MACCHIATObin testbed includes two SUTs (Server-Type-B4) 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.
 
@@ -234,11 +245,21 @@ Name         | Comment
 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.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.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
@@ -258,17 +279,25 @@ 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.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-t34-sut1
+10.30.50.70  | s55-t36-sut1
+10.30.50.71  | s56-t37-sut1
+10.30.50.255 | Broadcast
 n/a          | s20-t34-sut1
 n/a          | s21-t34-sut2
-10.30.51.29  | s22-t35-sut1 screen -r /dev/ttyUSB0
-10.30.51.30  | s23-t35-sut2 screen -r /dev/ttyUSB1
-10.30.51.30  | s24-t35-sut3 screen -r /dev/ttyUSB2
+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.50.255 | Broadcast
+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.18  | s33-t27-sut1
 10.30.55.19  | s34-t27-tg1
@@ -276,6 +305,9 @@ n/a          | s21-t34-sut2
 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
 
@@ -293,9 +325,9 @@ Name                      | Comment
 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.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
@@ -306,16 +338,21 @@ Name                      | Comment
 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.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.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.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
@@ -335,15 +372,26 @@ Name                      | Comment
 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.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-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.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.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.18                | s33-t27-sut1
 10.32.8.19                | s34-t27-tg1
@@ -351,6 +399,9 @@ Name                      | Comment
 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
 
@@ -461,25 +512,13 @@ 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:
         - PCIe Slot4 e9:00.xx: connectx4-2p25GE Mellanox.
         - PCIe Slot6 11:00.xx: x520-2p10GE Intel.
-7. Server-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)
-8. Server-Type-B5: Purpose - Rangeley Atom SUT for FD.io performance testing.
+7. 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
@@ -492,11 +531,11 @@ FD.io CSIT lab contains following server types:
     - NICs configuration:
         - 2x 10Gb Intel 82599ES
         - 4x 1GB Intel I354
-9. Server-Type-B6: Purpose - Skylake Xeon SUT for FD.io VPP_Device functional tests.
+8. Server-Type-B6: Purpose - Skylake Xeon SUT for FD.io VPP_Device functional tests.
     - 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.
@@ -512,7 +551,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.
-10. Server-Type-B7: Purpose - Ixia PerfectStorm One Appliance TG for FD.io TCP/IP performance tests.
+9. 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.
@@ -531,7 +570,7 @@ FD.io CSIT lab contains following server types:
         - Port-2: 10GE SFP+.
         - Port-3: 10GE SFP+.
         - Port-4: 10GE SFP+.
-11. Server-Type-B8: Purpose - Skylake Xeon SUT for TCP/IP host stack tests.
+10. Server-Type-B8: Purpose - Skylake Xeon SUT for TCP/IP host stack tests.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -551,24 +590,23 @@ 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.
-12. Server-Type-B9: Purpose - ThunderX2 Arm Marvell SUT for FD.io VPP_Device functional tests.
+11. Server-Type-B9: Purpose - ThunderX2 Arm Marvell SUT for FD.io performance testing.
     - Quantity: 1
     - Physical connectivity:
         - IPMI and host management ports.
         - NIC ports connected into 1-node topologies.
     - 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:
-            - 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.
-13. Server-Type-B10: Purpose - Denverton Atom SUT for FD.io performance testing.
+            - 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:
         - IPMI and host management ports.
@@ -582,8 +620,46 @@ 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.
+    - Quantity: 2
+    - Physical connectivity:
+        - IPMI and host management ports.
+        - NIC ports connected into 1-node topologies.
+    - Main HW configuration:
+        - Chassis: GIGABYTE Rack Mount
+        - Motherboard: MT91-FS4-00
+        - Processors: 2 * ThunderX2 ARMv8 CN9980 2.20 GHz
+        - RAM Memory: 16 * 16GB DIMM
+        - Disks: 2 * 480GB 6G SATA SSD SAMSUNG MZ7LH480
+    - NICs configuration:
+        - Numa0:
+            - PCIe Slot4 05:00.xx: XL710-QDA2-2p40GE Intel.
+            - PCIe Slot8 0b:00.xx: ConnectX5-2p10/25GE Mellanox.
+        - Numa1:
+            - PCIe Slot14 91:00.xx: XL710-QDA2-2p40GE Intel.
+            - PCIe Slot26 9a:00.xx: ConnectX5-2p10/25GE Mellanox.
+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.
@@ -603,8 +679,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.
@@ -620,12 +695,11 @@ FD.io CSIT lab contains following server types:
             - 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.
-              - Only 4 of mcx556a-edat ConnectX5-2p100GE NICs are in the lab, so only two out of three 2-node testbeds are equipped with them.
         - 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.
-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.
@@ -641,13 +715,11 @@ FD.io CSIT lab contains following server types:
             - 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.
-              - Only 4 of mcx556a-edat ConnectX5-2p100GE NICs are in the lab, so only two out of three 2-node testbeds are equipped with them.
         - 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.
-
-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.
@@ -663,6 +735,37 @@ FD.io CSIT lab contains following server types:
             - no cards.
         - Numa1:
             - no cards.
+
+19. 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.
+20. 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.
 ```
 
 ### Naming Convention
@@ -723,24 +826,40 @@ 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-B9]:
-    - testbedname: testbed13.
-    - hostname: s27-t13-sut1.
-    - IPMI IP: 10.30.50.69
-    - Host IP: 10.30.51.69
+- SUT [Server-Type-B11]:
+    - testbedname: testbed36
+    - hostname: s55-t36-sut1
+    - IPMI IP: 10.30.50.70
+    - Host IP: 10.30.51.70
+    - portnames:
+        - s55-t36-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s55-t36-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s55-t36-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s55-t36-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s55-t36-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - 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
+    - IPMI IP: 10.30.50.71
+    - Host IP: 10.30.51.71
     - 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.
+        - s56-t37-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s56-t37-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s56-t37-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s56-t37-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s56-t37-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s56-t37-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s56-t37-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s56-t37-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
 ```
 
-#### 1-Node-Cascadelake Servers (1n-clx) SETUP
+#### 1-Node-Cascadelake Servers (1n-clx) PROD
 
 ```
 - SUT [Server-Type-C1]:
@@ -1009,6 +1128,74 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - s38-t29-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
 ```
 
+#### 2-Node-Zen2 Servers (2n-zn2) SETUP
+
+```
+- SUT [Server-Type-D1]:
+    - testbedname: testbed210.
+    - hostname: s60-t210-sut1.
+    - IPMI IP: 10.30.55.24
+    - Host IP: 10.32.8.24
+    - portnames:
+        - 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:
+        - 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) WIP
+
+Note: Server19 (TG) is shared between testbed33 & testbed34
+
+```
+- SUT [Server-Type-B9]:
+    - testbedname: testbed34.
+    - hostname: s27-t34-sut1.
+    - IPMI IP: 10.30.50.69
+    - Host IP: 10.30.51.69
+    - portnames:
+        - 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:
+        - 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-Haswell Servers (3n-hsw) PROD
 
 ```
@@ -1287,12 +1474,12 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
     - 1GB ports (tbd)
 ```
 
-#### 3-Node-Taishan Servers (3n-tsh) WIP
+#### 3-Node-Taishan Servers (3n-tsh) PROD
 
-Note: ServerB19 (TG) is shared between testbed33 & testbed34
+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
@@ -1302,7 +1489,7 @@ Note: ServerB19 (TG) is shared between testbed33 & testbed34
         - 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
@@ -1312,8 +1499,8 @@ Note: ServerB19 (TG) is shared between testbed33 & testbed34
         - 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]:
-    - testbednames: testbed33 and testbed34.
+- TG [Server-Type-B12]:
+    - testbedname: testbed33 and testbed34.
     - hostname: s19-t33t34-tg1.
     - IPMI IP: 10.30.50.46
     - Host IP: 10.30.51.49
@@ -1324,26 +1511,12 @@ Note: ServerB19 (TG) is shared between testbed33 & testbed34
         - 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.
-- ServerB20 [Server-Type-B4]:
-    - testbedname: testbed34.
-    - hostname: s20-t34-sut1.
-    - IPMI IP: N/A
-    - Host IP: 10.30.51.41
-    - portnames:
-        - s20-t34-sut1-ca/p1 - 10GE-port1 Marvell.
-        - s20-t34-sut1-ca/p2 - 10GE-port2 Marvell.
-- ServerB21 [Server-Type-B4]:
-    - testbedname: testbed34.
-    - hostname: s21-t34-sut2.
-    - IPMI IP: N/A
-    - Host IP: 10.30.51.42
-    - portnames:
-        - s21-t34-sut2-ca/p1 - 10GE-port1 Marvell.
-        - s21-t34-sut2-ca/p2 - 10GE-port2 Marvell.
 ```
 
 #### 3-Node-Denverton Servers (3n-dnv) WIP
@@ -1371,12 +1544,6 @@ Note: ServerB19 (TG) is shared between testbed33 & testbed34
         - s31-t35-sut2-p4 - 10GE-port4 x553 fiber port.
 ```
 
-#### 3-Node-Mcbin Servers (3n-mcb) TODO
-
-```
-To be completed.
-```
-
 ### Per Testbed Wiring
 
 #### 1-Node-Skylake Wiring (1n-skx) PROD
@@ -1402,16 +1569,28 @@ To be completed.
         - 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
 
 ```
-- testbed13:
+- testbed36:
+    - ring1 40GE-ports XL710-QDA2-2p40GE on SUTs:
+        - s55-t36-sut1-c4/p1 - s55-t36-sut1-c14/p1.
+    - ring2 40GE-ports XL710-QDA2-2p40GE on SUTs:
+        - s55-t36-sut1-c4/p2 - s55-t36-sut1-c14/p2.
+    - ring3 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
+        - s55-t36-sut1-c8/p1 - s55-t36-sut1-c26/p1.
+    - ring4 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
+        - s55-t36-sut1-c8/p2 - s55-t36-sut1-c26/p2.
+
+- testbed37:
     - ring1 40GE-ports XL710-QDA2-2p40GE on SUTs:
-        - s27-t13-sut1-c1/p2 - s27-t13-sut1-c3/p1.
+        - s56-t37-sut1-c4/p1 - s56-t37-sut1-c14/p1.
     - 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.
+        - s56-t37-sut1-c4/p2 - s56-t37-sut1-c14/p2.
+    - ring3 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
+        - s55-t37-sut1-c8/p1 - s55-t37-sut1-c26/p1.
+    - ring4 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
+        - s55-t37-sut1-c8/p2 - s55-t37-sut1-c26/p2.
 ```
 
 #### 1-Node-Cascadelake Wiring (1n-clx) SETUP
@@ -1499,7 +1678,7 @@ To be completed.
         - t25-tg1-p4 to t25-sut1-c2/p4.
 ```
 
-#### 2-Node-Cascadelake Wiring (2n-clx) SETUP
+#### 2-Node-Cascadelake Wiring (2n-clx) PROD
 
 ```
 - testbed27:
@@ -1543,6 +1722,34 @@ To be completed.
         - s37-t29-sut1-c9/p2 to s38-t29-tg1-c9/p2.
 ```
 
+#### 2-Node-Zen2 Wiring (2n-zen2) SETUP
+
+```
+- 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) WIP
+
+```
+- 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-Haswell Wiring (3n-hsw) PROD
 
 ```
@@ -1670,28 +1877,18 @@ To be completed.
 To be completed.
 ```
 
-#### 3-Node-Taishan Wiring (3n-tsh) WIP
+#### 3-Node-Taishan Wiring (3n-tsh) PROD
 
 ```
 - testbed33:
     - ring1 10GE-ports x520-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.
+        - s19-t33t34-tg1-c2/p2 - s17-t33-sut1-c6/p2.
+        - s17-t33-sut1-c6/p1 - s18-t33-sut2-c6/p2.
+        - s18-t33-sut2-c6/p1 - s19-t33t34-tg1-c2/p1.
     - 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.
-```
-
-#### 3-Node-Mcbin Wiring (3n-mcb) WIP
-
-```
-- 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.
+        - s19-t33t34-tg1-c4/p2 - s17-t33-sut1-c4/p2.
+        - s17-t33-sut1-c4/p1 - s18-t33-sut2-c4/p2.
+        - s18-t33-sut2-c4/p1 - s19-t33t34-tg1-c4/p1.
 ```
 
 #### 3-Node-Denverton Wiring (3n-dnv) WIP
@@ -1729,21 +1926,21 @@ To be completed.
 
 ```
 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.
-        - 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.
-    - 3 * MACCHIATObin
-        - Chassis: MACCHIATObin.
-        - Processors: 1* Armada 8040 ~ 4* Arm Cortex-A72.
-        - RAM Memory: 1* 16GB DDR4.
-        - Disks: 1* 128GB(?) SATA SDD.
 ```
 
 ### Xeon and Atom Servers