Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Added amd 2n-zen2 testbed specification
[csit.git] / docs / lab / testbed_specifications.md
diff --git a/docs/lab/testbed_specifications.md b/docs/lab/testbed_specifications.md
index 6c04bfb..d636a69 100644 (file)
--- a/docs/lab/testbed_specifications.md
+++ b/docs/lab/testbed_specifications.md
@@ -10,6 +10,7 @@
    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. [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)
@@ -25,31 +26,33 @@
    1. [Naming Convention](#naming-convention)
 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. [1-Node-Cascadelake (1n-clx) SETUP](#1-node-cascadelake-1n-clx-setup)
-      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. [2-Node-Cascadelake (2n-clx) SETUP](#2-node-cascadelake-2n-clx-setup)
-      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) WIP](#1-node-thunderx2-servers-1n-tx2-wip)
+      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. [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. [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. [1-Node-Cascadelake (1n-clx) SETUP](#1-node-cascadelake-1n-clx-setup)
-      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. [2-Node-Cascadelake (2n-clx) SETUP](#2-node-cascadelake-2n-clx-setup)
-      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) WIP](#1-node-thunderx2-wiring-1n-tx2-wip)
+      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) PROD](#2-node-cascadelake-wiring-2n-clx-prod)
+      1. [2-Node-Zen2 Wiring (2n-zen2) SETUP](#2-node-zen2-wiring-2n-zen2-setup])
+      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. [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 #mcb #clx #zn2
+ 1. 1-Node-VIRL        dev    hsw   ---   3    3    0    3    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
+ 3. 1-Node-Thunderx2   dev    tx2   na    1    1    0    0    0    0    0    0    1    0    0    0    0
+ 4. 1-Node-Cascadelake dev    clx   lcx   1    1    0    0    0    0    0    0    0    0    0    1    0
+ 5. 2-Node-Skylake     perf   skx   skx   4    4    4    0    8    0    0    0    0    0    0    0    0
+ 6. 2-Node-Denverton   perf   dnv   skx   1    1    1    0    .5   0    0    1    0    0    0    0    0
+ 7. 2-Node-IxiaPS1L47  tcp    skx   ps1   1    1    1    0    1    1    0    0    0    0    0    0    0
+ 8. 2-Node-Cascadelake perf   clx   clx   3    3    3    0    0    0    0    0    0    0    0    6    0
+ 9. 3-Node-Haswell     perf   hsw   hsw   3    6    3    9    0    0    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    0    0
+11. 3-Node-Rangeley    perf   rng   skx   1    3    1    0    0    0    2    0    0    0    0    0    0
+12. 3-Node-Taishan     perf   tsh   skx   1    2    1    0    .5   0    0    0    0    2    0    0    0
+13. 3-Node-Mcbin       perf   mcb   skx   1    2    1    0    .5   0    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    0
+15. 2-Node-Zen2        perf   zn2   zn2   1    1    1    0    0    0    0    0    0    0    0    0    2
+                                 Totals: 22   35   18   12   19    1    2    3    1    2    2    7    2
 ```
 
 ### 1-Node-Skylake Xeon Intel (1n-skx)
@@ -133,6 +137,13 @@ 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.
+
 ### 3-Node-Haswell Xeon Intel (3n-hsw)
 
 Each 3-Node-Haswell testbed includes two SUTs (Server-Type-A1) and one
@@ -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,24 +279,33 @@ 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.65  | s52-nomad
+10.30.50.66  | s51-nomad (out of order)
+10.30.50.67  | s49-nomad
+10.30.50.68  | s50-nomad (out of order)
 10.30.50.69  | s27-t13-sut
+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
-x.x.x.x      | s32-t14-sut1
-x.x.x.x      | s33-t27-sut1
-x.x.x.x      | s34-t27-tg1
-x.x.x.x      | s35-t28-sut1
-x.x.x.x      | s36-t28-tg1
-x.x.x.x      | s37-t29-sut1
-x.x.x.x      | s38-t29-tg1
+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
+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
 
@@ -306,14 +336,18 @@ 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.38               | fdio-marvell-dev
+10.30.51.39               | s53-nomad
+10.30.51.40               | s54-nomad
 10.30.51.41               | s20-t34-sut1
 10.30.51.42               | s21-t34-sut2
 10.30.51.44               | s3-t21-sut1
@@ -335,22 +369,34 @@ 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.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-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.70-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
-x.x.x.x                   | s32-t14-sut1
-x.x.x.x                   | s33-t27-sut1
-x.x.x.x                   | s34-t27-tg1
-x.x.x.x                   | s35-t28-sut1
-x.x.x.x                   | s36-t28-tg1
-x.x.x.x                   | s37-t29-sut1
-x.x.x.x                   | s38-t29-tg1
+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
+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
 
@@ -434,7 +480,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.
-2. Server-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.
@@ -454,7 +500,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: x710-4p10GE Intel.
-3. Server-Type-B3: Purpose - TaiShan Arm Huawei SUT for FD.io performance testing.
+6. Server-Type-B3: Purpose - TaiShan Arm Huawei SUT for FD.io performance testing.
     - Quantity: 2
     - Physical connectivity:
         - IPMI(?) and host management ports.
@@ -467,7 +513,7 @@ FD.io CSIT lab contains following server types:
     - NICs configuration:
         - PCIe Slot4 e9:00.xx: connectx4-2p25GE Mellanox.
         - PCIe Slot6 11:00.xx: x520-2p10GE Intel.
-4. Server-Type-B4: Purpose - MACCHIATObin Arm Marvell SUT for FD.io performance testing.
+7. Server-Type-B4: Purpose - MACCHIATObin Arm Marvell SUT for FD.io performance testing.
     - Quantity: 3
     - Physical connectivity:
         - Host management ports.
@@ -479,7 +525,7 @@ FD.io CSIT lab contains following server types:
         - Disks: 1* 128GB(?) SATA SDD
     - NICs configuration:
         - pp2-2p10GE Marvell (on-chip Ethernet ports ; marvell plugin in VPP)
-5. Server-Type-B5: Purpose - Rangeley Atom SUT for FD.io performance testing.
+8. 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,7 +538,7 @@ FD.io CSIT lab contains following server types:
     - NICs configuration:
         - 2x 10Gb Intel 82599ES
         - 4x 1GB Intel I354
-6. Server-Type-B6: Purpose - Skylake Xeon SUT for FD.io VPP_Device functional tests.
+9. Server-Type-B6: Purpose - Skylake Xeon SUT for FD.io VPP_Device functional tests.
     - Quantity: 2.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -512,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.
-7. Server-Type-B7: Purpose - Ixia PerfectStorm One Appliance TG for FD.io TCP/IP performance tests.
+10. 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 +577,7 @@ FD.io CSIT lab contains following server types:
         - Port-2: 10GE SFP+.
         - Port-3: 10GE SFP+.
         - Port-4: 10GE SFP+.
-8. Server-Type-B8: Purpose - Skylake Xeon SUT for TCP/IP host stack tests.
+11. Server-Type-B8: Purpose - Skylake Xeon SUT for TCP/IP host stack tests.
     - Quantity: 1.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -551,7 +597,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.
-9. Server-Type-B9: Purpose - ThunderX2 Arm Marvell SUT for FD.io VPP_Device functional tests.
+12. Server-Type-B9: Purpose - ThunderX2 Arm Marvell SUT for FD.io VPP_Device functional tests.
     - Quantity: 1
     - Physical connectivity:
         - IPMI and host management ports.
@@ -568,7 +614,7 @@ FD.io CSIT lab contains following server types:
             - PCIe Slot3 08:00.xx: XL710-QDA2.
         - Numa1:
             - PCIe Slot6 85:00.xx: XL710-QDA2.
-10. Server-Type-B10: Purpose - Denverton Atom SUT for FD.io performance testing.
+13. Server-Type-B10: Purpose - Denverton Atom SUT for FD.io performance testing.
     - Quantity: 4
     - Physical connectivity:
         - IPMI and host management ports.
@@ -582,8 +628,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
-
-6. Server-Type-C1: Purpose - Cascadelake Xeon SUT for FD.io VPP_Device functional tests.
+14. 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 +648,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.
-
-4. Server-Type-C2: Purpose - Cascadelake Xeon SUT for FD.io performance testing.
+15. Server-Type-C2: Purpose - Cascadelake Xeon SUT for FD.io performance testing.
     - Quantity: 3
     - Physical connectivity:
         - IPMI and host management ports.
@@ -620,12 +664,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.
-2. Server-Type-C3: Purpose - Cascadelake Xeon TG for FD.io performance testing.
+16. Server-Type-C3: Purpose - Cascadelake Xeon TG for FD.io performance testing.
     - Quantity: 3.
     - Physical connectivity:
         - IPMI and host management ports.
@@ -641,13 +684,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.
-
-3. Server-Type-C4: Purpose - Cascadelake Xeon Backend hosts for FD.io builds and data processing.
+17. 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 +704,36 @@ FD.io CSIT lab contains following server types:
             - 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.
 ```
 
 ### Naming Convention
@@ -690,7 +761,7 @@ connectivity and wiring across defined CSIT testbeds:
 
 ### Per Testbed Server Allocation and Naming
 
-#### 1-Node-Skylake (1n-skx) PROD
+#### 1-Node-Skylake Servers (1n-skx) PROD
 
 ```
 - SUT [Server-Type-B6]:
@@ -723,7 +794,7 @@ connectivity and wiring across defined CSIT testbeds:
         - s2-t12-sut1-c4/p4 - 10GE-port4 x710-4p10GE.
 ```
 
-#### 1-Node-Thunderx2 (1n-tx2) WIP
+#### 1-Node-Thunderx2 Servers (1n-tx2) WIP
 
 ```
 - SUT [Server-Type-B9]:
@@ -740,14 +811,14 @@ connectivity and wiring across defined CSIT testbeds:
         - s27-t13-sut1-c6/p2 - 40GE-port2 XL710-QDA2-2p40GE.
 ```
 
-#### 1-Node-Cascadelake (1n-clx) SETUP
+#### 1-Node-Cascadelake Servers (1n-clx) PROD
 
 ```
 - SUT [Server-Type-C1]:
     - testbedname: testbed11.
     - hostname: s32-t14-sut1.
-    - IPMI IP: x.x.x.x
-    - Host IP: x.x.x.x
+    - IPMI IP: 10.30.55.17
+    - Host IP: 10.32.8.17
     - portnames:
         - s32-t14-sut1-c2/p1 - 10GE-port1 x710-4p10GE.
         - s32-t14-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
@@ -759,7 +830,7 @@ connectivity and wiring across defined CSIT testbeds:
         - s32-t14-sut1-c4/p4 - 10GE-port4 x710-4p10GE.
 ```
 
-#### 2-Node-Skylake (2n-skx) PROD
+#### 2-Node-Skylake Servers (2n-skx) PROD
 
 ```
 - SUT [Server-Type-B1]:
@@ -860,7 +931,7 @@ connectivity and wiring across defined CSIT testbeds:
         - s10-t24-tg1-c4/p2 - 25GE-port2 xxv710-DA2-2p25GE.
 ```
 
-#### 2-Node-Denverton (2n-dnv) WIP
+#### 2-Node-Denverton Servers (2n-dnv) WIP
 
 Note: ServerB28 (TG) is shared between testbed26 & testbed35
 
@@ -895,7 +966,7 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - s29-t26-sut1-p4 - 10GE-port4 x553 fiber port.
 ```
 
-#### 2-Node-IxiaPS1L47 (2n-ps1) VERIFY
+#### 2-Node-IxiaPS1L47 Servers (2n-ps1) VERIFY
 
 ```
 - SUT [Server-Type-B8]:
@@ -920,14 +991,14 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - s26-t25-tg1-p4 - 10GE-port4.
 ```
 
-#### 2-Node-Cascadelake (2n-clx) SETUP
+#### 2-Node-Cascadelake Servers (2n-clx) SETUP
 
 ```
 - SUT [Server-Type-C2]:
     - testbedname: testbed27.
     - hostname: s33-t27-sut1.
-    - IPMI IP: x.x.x.x
-    - Host IP: x.x.x.x
+    - IPMI IP: 10.30.55.18
+    - Host IP: 10.32.8.18
     - portnames:
         - s33-t27-sut1-c2/p1 - 10GE-port1 x710-4p10GE.
         - s33-t27-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
@@ -940,8 +1011,8 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
 - TG [Server-Type-C3]:
     - testbedname: testbed27.
     - hostname: s34-t27-tg1.
-    - IPMI IP: x.x.x.x
-    - Host IP: x.x.x.x
+    - IPMI IP: 10.30.55.19
+    - Host IP: 10.32.8.19
     - portnames:
         - s34-t27-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
         - s34-t27-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
@@ -954,8 +1025,8 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
 - SUT [Server-Type-C2]:
     - testbedname: testbed28.
     - hostname: s35-t28-sut1.
-    - IPMI IP: x.x.x.x
-    - Host IP: x.x.x.x
+    - IPMI IP: 10.30.55.20
+    - Host IP: 10.32.8.20
     - portnames:
         - s35-t28-sut1-c2/p1 - 10GE-port1 x710-4p10GE.
         - s35-t28-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
@@ -968,8 +1039,8 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
 - TG [Server-Type-C3]:
     - testbedname: testbed28.
     - hostname: s36-t28-tg1.
-    - IPMI IP: x.x.x.x
-    - Host IP: x.x.x.x
+    - IPMI IP: 10.30.55.21
+    - Host IP: 10.32.8.21
     - portnames:
         - s36-t28-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
         - s36-t28-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
@@ -982,8 +1053,8 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
 - SUT [Server-Type-C2]:
     - testbedname: testbed29.
     - hostname: s37-t29-sut1.
-    - IPMI IP: x.x.x.x
-    - Host IP: x.x.x.x
+    - IPMI IP: 10.30.55.22
+    - Host IP: 10.32.8.22
     - portnames:
         - s37-t29-sut1-c2/p1 - 10GE-port1 x710-4p10GE.
         - s37-t29-sut1-c2/p2 - 10GE-port2 x710-4p10GE.
@@ -996,8 +1067,8 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
 - TG [Server-Type-C3]:
     - testbedname: testbed29.
     - hostname: s38-t29-tg1.
-    - IPMI IP: x.x.x.x
-    - Host IP: x.x.x.x
+    - IPMI IP: 10.30.55.23
+    - Host IP: 10.32.8.23
     - portnames:
         - s38-t29-tg1-c2/p1 - 10GE-port1 x710-4p10GE.
         - s38-t29-tg1-c2/p2 - 10GE-port2 x710-4p10GE.
@@ -1009,7 +1080,40 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - s38-t29-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
 ```
 
-#### 3-Node-Haswell (3n-hsw) PROD
+#### 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.
+```
+
+#### 3-Node-Haswell Servers (3n-hsw) PROD
 
 ```
  1. SUT [Server-Type-A1]:
@@ -1164,7 +1268,7 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - t3-tg1-c6/p2 - 10GE port2 on Intel NIC x710 2p10GE.
 ```
 
-#### 3-Node-Skylake (3n-skx) PROD
+#### 3-Node-Skylake Servers (3n-skx) PROD
 
 ```
 - ServerB11 [Server-Type-B1]:
@@ -1253,7 +1357,7 @@ Note: ServerB28 (TG) is shared between testbed26 & testbed35
         - s16-t32-tg1-c9/p2 - FUTURE 100GE-port2 ConnectX5-2p100GE.
 ```
 
-#### 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.
 
@@ -1287,7 +1391,7 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
     - 1GB ports (tbd)
 ```
 
-#### 3-Node-Taishan (3n-tsh) WIP
+#### 3-Node-Taishan Servers (3n-tsh) WIP
 
 Note: ServerB19 (TG) is shared between testbed33 & testbed34
 
@@ -1346,7 +1450,7 @@ Note: ServerB19 (TG) is shared between testbed33 & testbed34
         - s21-t34-sut2-ca/p2 - 10GE-port2 Marvell.
 ```
 
-#### 3-Node-Denverton (3n-dnv) WIP
+#### 3-Node-Denverton Servers (3n-dnv) WIP
 
 ```
 - ServerB30 [Server-Type-B10]:
@@ -1371,7 +1475,7 @@ Note: ServerB19 (TG) is shared between testbed33 & testbed34
         - s31-t35-sut2-p4 - 10GE-port4 x553 fiber port.
 ```
 
-#### 3-Node-Mcbin (3n-mcb) TODO
+#### 3-Node-Mcbin Servers (3n-mcb) TODO
 
 ```
 To be completed.
@@ -1379,7 +1483,7 @@ To be completed.
 
 ### Per Testbed Wiring
 
-#### 1-Node-Skylake (1n-skx) PROD
+#### 1-Node-Skylake Wiring (1n-skx) PROD
 
 ```
 - testbed11:
@@ -1402,7 +1506,7 @@ To be completed.
         - s2-t12-sut1-c2/p3 to s2-t12-sut1-c4/p3.
 ```
 
-#### 1-Node-Thunderx2 (1n-tx2) WIP
+#### 1-Node-Thunderx2 Wiring (1n-tx2) WIP
 
 ```
 - testbed13:
@@ -1414,7 +1518,7 @@ To be completed.
         - s27-t13-sut1-c6/p2 - s27-t13-sut1-c1/p1.
 ```
 
-#### 1-Node-Cascadelake (1n-clx) SETUP
+#### 1-Node-Cascadelake Wiring (1n-clx) SETUP
 
 ```
 - testbed14:
@@ -1428,7 +1532,7 @@ To be completed.
         - s32-t14-sut1-c2/p3 to s32-t14-sut1-c4/p3.
 ```
 
-#### 2-Node-Skylake (2n-skx) PROD
+#### 2-Node-Skylake Wiring (2n-skx) PROD
 
 ```
 - testbed21:
@@ -1473,7 +1577,7 @@ To be completed.
         - s9-t24-sut1-c4/p2 to s10-t24-tg1-c4/p2.
 ```
 
-#### 2-Node-Denverton (2n-dnv) WIP
+#### 2-Node-Denverton Wiring (2n-dnv) WIP
 
 ```
 - testbed26:
@@ -1485,7 +1589,7 @@ To be completed.
         - s28-t26t35-tg1-c2/p2 to s29-t26-sut1-p4.
 ```
 
-#### 2-Node-IxiaPS1L47 (2n-ps1) VERIFY
+#### 2-Node-IxiaPS1L47 Wiring (2n-ps1) VERIFY
 
 ```
 - testbed25:
@@ -1499,7 +1603,7 @@ To be completed.
         - t25-tg1-p4 to t25-sut1-c2/p4.
 ```
 
-#### 2-Node-Cascadelake (2n-clx) SETUP
+#### 2-Node-Cascadelake Wiring (2n-clx) PROD
 
 ```
 - testbed27:
@@ -1543,7 +1647,25 @@ To be completed.
         - s37-t29-sut1-c9/p2 to s38-t29-tg1-c9/p2.
 ```
 
-#### 3-Node-Haswell (3n-hsw) PROD
+#### 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.
+```
+
+#### 3-Node-Haswell Wiring (3n-hsw) PROD
 
 ```
  1. testbed1:
@@ -1619,7 +1741,7 @@ To be completed.
         - t3-tg1-c6/p1 to t3-tg1-c6/p2.
 ```
 
-#### 3-Node-Skylake (3n-skx) PROD
+#### 3-Node-Skylake Wiring (3n-skx) PROD
 
 ```
 - testbed31:
@@ -1664,13 +1786,13 @@ To be completed.
         - s16-t32-tg1-c10/p3 to s16-t32-tg1-c10/p4.
 ```
 
-#### 3-Node-Rangeley (3n-rng) TODO
+#### 3-Node-Rangeley Wiring (3n-rng) TODO
 
 ```
 To be completed.
 ```
 
-#### 3-Node-Taishan (3n-tsh) WIP
+#### 3-Node-Taishan Wiring (3n-tsh) WIP
 
 ```
 - testbed33:
@@ -1684,7 +1806,7 @@ To be completed.
         - t33-sut2-c4/p1 - t33t34-tg1-c4/p1.
 ```
 
-#### 3-Node-Mcbin (3n-mcb) WIP
+#### 3-Node-Mcbin Wiring (3n-mcb) WIP
 
 ```
 - testbed34:
@@ -1694,7 +1816,7 @@ To be completed.
         - t34-sut2-ca/p2 - t33t34-tg1-c2/p4.
 ```
 
-#### 3-Node-Denverton (3n-dnv) WIP
+#### 3-Node-Denverton Wiring (3n-dnv) WIP
 
 ```
 - testbed35:
Integration tests