X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=docs%2Flab%2Ftestbed_specifications.md;h=7d4f0e001aa186372cffb3d985dba383d8f5a1b4;hb=3a2c37ffa4755d89247684935fd27d8868fbfe4b;hp=6b401498ad565ef12fc2559133dba2020c7c4d01;hpb=4dd55c0d851818fbb6e03cd8b2792137b6455149;p=csit.git diff --git a/docs/lab/testbed_specifications.md b/docs/lab/testbed_specifications.md index 6b401498ad..7d4f0e001a 100644 --- a/docs/lab/testbed_specifications.md +++ b/docs/lab/testbed_specifications.md @@ -32,8 +32,8 @@ 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-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) 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) @@ -42,12 +42,12 @@ 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) PROD](#1-node-thunderx2-wiring-1n-tx2-prod) - 1. [1-Node-Cascadelake Wiring (1n-clx) SETUP](#1-node-cascadelake-wiring-1n-clx-setup) + 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-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) 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) @@ -251,10 +251,10 @@ Name | Comment 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 @@ -295,10 +295,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 @@ -341,10 +341,10 @@ Name | Comment 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 @@ -389,10 +389,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 @@ -1039,7 +1039,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]: @@ -1054,6 +1054,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]: @@ -1068,6 +1070,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]: @@ -1082,6 +1086,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]: @@ -1096,6 +1102,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]: @@ -1110,8 +1118,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. @@ -1124,11 +1134,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]: @@ -1593,7 +1605,7 @@ Note: Server19 (TG) is shared between testbed33 & testbed34 - 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: @@ -1694,6 +1706,9 @@ Note: Server19 (TG) is shared between testbed33 & testbed34 - 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. @@ -1704,9 +1719,12 @@ Note: Server19 (TG) is shared between testbed33 & testbed34 - 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. @@ -1717,12 +1735,15 @@ Note: Server19 (TG) is shared between testbed33 & testbed34 - 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: