aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/content/infrastructure/fdio_dc_testbed_specifications.md26
-rw-r--r--fdio.infra.ansible/roles/docker_images/files/base/Dockerfile1
-rw-r--r--fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j26
-rw-r--r--topologies/available/lf_3na_spr_testbed21.yaml108
4 files changed, 74 insertions, 67 deletions
diff --git a/docs/content/infrastructure/fdio_dc_testbed_specifications.md b/docs/content/infrastructure/fdio_dc_testbed_specifications.md
index 3daa3824e2..49f833b820 100644
--- a/docs/content/infrastructure/fdio_dc_testbed_specifications.md
+++ b/docs/content/infrastructure/fdio_dc_testbed_specifications.md
@@ -1375,16 +1375,16 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
- IPMI IP: 10.30.50.52
- Host IP: 10.30.51.52
- portnames:
- - s52-t21-sut1-c2/p1 - 200GE-port1 ConnectX7-2p200GE.
- - s52-t21-sut1-c2/p2 - 200GE-port2 ConnectX7-2p200GE.
- - s52-t21-sut1-c4/p1 - 200GE-port1 ConnectX7-2p200GE.
- - s52-t21-sut1-c4/p2 - 200GE-port2 ConnectX7-2p200GE.
- s52-t21-sut1-c10/p1 - 200GE-port1 ConnectX7-2p200GE.
- s52-t21-sut1-c10/p2 - 200GE-port2 ConnectX7-2p200GE.
- - s52-t21-sut1-c7/p1 - 200GE-port1 ConnectX7-2p200GE.
- - s52-t21-sut1-c7/p2 - 200GE-port2 ConnectX7-2p200GE.
+ - s52-t21-sut1-c4/p1 - 200GE-port1 ConnectX7-2p200GE.
+ - s52-t21-sut1-c4/p2 - 200GE-port2 ConnectX7-2p200GE.
+ - s52-t21-sut1-c2/p1 - 200GE-port1 ConnectX7-2p200GE.
+ - s52-t21-sut1-c2/p2 - 200GE-port2 ConnectX7-2p200GE.
- s52-t21-sut1-c9/p1 - 200GE-port1 ConnectX7-2p200GE.
- s52-t21-sut1-c9/p2 - 200GE-port2 ConnectX7-2p200GE.
+ - s52-t21-sut1-c7/p1 - 200GE-port1 ConnectX7-2p200GE.
+ - s52-t21-sut1-c7/p2 - 200GE-port2 ConnectX7-2p200GE.
- s52-t21-sut1-c11/p1 - 200GE-port1 ConnectX7-2p200GE.
- s52-t21-sut1-c11/p2 - 200GE-port2 ConnectX7-2p200GE.
- TG [Server-Type-H2]:
@@ -1393,16 +1393,16 @@ Note: There is no IPMI. Serial console is accessible via VIRL2 and VIRL3 USB.
- IPMI IP: 10.30.50.53
- Host IP: 10.30.51.53
- portnames:
- - s53-t21-tg1-c2/p1 - 200GE-port1 ConnectX7-2p200GE.
- - s53-t21-tg1-c2/p2 - 200GE-port2 ConnectX7-2p200GE.
- - s53-t21-tg1-c4/p1 - 200GE-port1 ConnectX7-2p200GE.
- - s53-t21-tg1-c4/p2 - 200GE-port2 ConnectX7-2p200GE.
- s53-t21-tg1-c10/p1 - 200GE-port1 ConnectX7-2p200GE.
- s53-t21-tg1-c10/p2 - 200GE-port2 ConnectX7-2p200GE.
- - s53-t21-tg1-c7/p1 - 200GE-port1 ConnectX7-2p200GE.
- - s53-t21-tg1-c7/p2 - 200GE-port2 ConnectX7-2p200GE.
+ - s53-t21-tg1-c4/p1 - 200GE-port1 ConnectX7-2p200GE.
+ - s53-t21-tg1-c4/p2 - 200GE-port2 ConnectX7-2p200GE.
+ - s53-t21-tg1-c2/p1 - 200GE-port1 ConnectX7-2p200GE.
+ - s53-t21-tg1-c2/p2 - 200GE-port2 ConnectX7-2p200GE.
- s53-t21-tg1-c9/p1 - 200GE-port1 ConnectX7-2p200GE.
- s53-t21-tg1-c9/p2 - 200GE-port2 ConnectX7-2p200GE.
+ - s53-t21-tg1-c7/p1 - 200GE-port1 ConnectX7-2p200GE.
+ - s53-t21-tg1-c7/p2 - 200GE-port2 ConnectX7-2p200GE.
- SUT [Server-Type-H3]:
- testbedname: testbed22.
- hostname: s54-t22-sut1.
@@ -1858,4 +1858,4 @@ To be completed.
- s59-t24-tg1-c7/p1 to s59-t24-tg1-c7/p2.
- ring5 100GE-ports e810-2CQDA2-2p100GE:
- s59-t24-tg1-c9/p1 to s59-t24-tg1-c9/p2.
-```
+``` \ No newline at end of file
diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
index cbbaf35f6f..31adddcbed 100644
--- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
+++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
@@ -27,6 +27,7 @@ RUN apt-get -q update \
cmake \
curl \
dkms \
+ ethtool \
gdb \
gfortran \
libapr1 \
diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
index 6dcbc9f871..f2be329516 100644
--- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
+++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2
@@ -29,6 +29,9 @@ services:
source: "/opt/"
target: "/opt/"
- type: "bind"
+ source: "/usr/bin/iperf3"
+ target: "/usr/bin/iperf3"
+ - type: "bind"
source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"
tg-1:
@@ -60,5 +63,8 @@ services:
source: "/opt/"
target: "/opt/"
- type: "bind"
+ source: "/usr/bin/iperf3"
+ target: "/usr/bin/iperf3"
+ - type: "bind"
source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"
diff --git a/topologies/available/lf_3na_spr_testbed21.yaml b/topologies/available/lf_3na_spr_testbed21.yaml
index f5dcdb2893..8e32563d56 100644
--- a/topologies/available/lf_3na_spr_testbed21.yaml
+++ b/topologies/available/lf_3na_spr_testbed21.yaml
@@ -16,22 +16,22 @@ nodes:
username: testuser
password: Csit1234
interfaces:
- port1:
- # s53-t21-tg1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
- mac_address: "b8:3f:d2:b7:a0:70"
- pci_address: "0000:17:00.0"
- ip4_address: "172.16.10.1"
- driver: mlx5_core
- link: link1
- model: Mellanox-CX7VEAT
- port2:
- # s53-t21-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
- mac_address: "b8:3f:d2:b7:a0:71"
- pci_address: "0000:17:00.1"
- ip4_address: "172.16.20.1"
- driver: mlx5_core
- link: link2
- model: Mellanox-CX7VEAT
+# port1:
+# # s53-t21-tg1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+# mac_address: "b8:3f:d2:b7:a0:70"
+# pci_address: "0000:17:00.0"
+# ip4_address: "172.16.10.1"
+# driver: mlx5_core
+# link: link1
+# model: Mellanox-CX7VEAT
+# port2:
+# # s53-t21-tg1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+# mac_address: "b8:3f:d2:b7:a0:71"
+# pci_address: "0000:17:00.1"
+# ip4_address: "172.16.20.1"
+# driver: mlx5_core
+# link: link2
+# model: Mellanox-CX7VEAT
port3:
# s53-t21-tg1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:e8"
@@ -40,16 +40,16 @@ nodes:
driver: mlx5_core
link: link3
model: Mellanox-CX7VEAT
- port4:
- # s53-t21-tg1-c4/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
- mac_address: "b8:3f:d2:b7:a0:e9"
- pci_address: "0000:2a:00.1"
- ip4_address: "172.16.40.1"
- driver: mlx5_core
- link: link4
- model: Mellanox-CX7VEAT
+# port4:
+# # s53-t21-tg1-c4/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+# mac_address: "b8:3f:d2:b7:a0:e9"
+# pci_address: "0000:2a:00.1"
+# ip4_address: "172.16.40.1"
+# driver: mlx5_core
+# link: link4
+# model: Mellanox-CX7VEAT
port5:
- # s53-t21-tg1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ # s53-t21-tg1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:58"
pci_address: "0000:3d:00.0"
ip4_address: "172.16.50.1"
@@ -57,7 +57,7 @@ nodes:
link: link5
model: Mellanox-CX7VEAT
port6:
- # s53-t21-tg1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+ # s53-t21-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:59"
pci_address: "0000:3d:00.1"
ip4_address: "172.16.60.1"
@@ -65,23 +65,23 @@ nodes:
link: link6
model: Mellanox-CX7VEAT
port7:
- # s53-t21-tg1-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ # s53-t21-tg1-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:48"
pci_address: "0000:ab:00.0"
ip4_address: "172.16.70.1"
driver: mlx5_core
link: link7
model: Mellanox-CX7VEAT
- port8:
- # s53-t21-tg1-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
- mac_address: "b8:3f:d2:b7:a0:49"
- pci_address: "0000:ab:00.1"
- ip4_address: "172.16.80.1"
- driver: mlx5_core
- link: link8
- model: Mellanox-CX7VEAT
+# port8:
+# # s53-t21-tg1-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+# mac_address: "b8:3f:d2:b7:a0:49"
+# pci_address: "0000:ab:00.1"
+# ip4_address: "172.16.80.1"
+# driver: mlx5_core
+# link: link8
+# model: Mellanox-CX7VEAT
port9:
- # s53-t21-tg1-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ # s53-t21-tg1-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:f8"
pci_address: "0000:bd:00.0"
ip4_address: "172.16.90.1"
@@ -89,7 +89,7 @@ nodes:
link: link9
model: Mellanox-CX7VEAT
port10:
- # s53-t21-tg1-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+ # s53-t21-tg1-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:f9"
pci_address: "0000:bd:00.1"
ip4_address: "172.16.100.1"
@@ -106,20 +106,20 @@ nodes:
uio_driver: vfio-pci
interfaces:
port1:
- # s52-t21-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ # s52-t21-sut1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:50"
pci_address: "0000:17:00.0"
ip4_address: "172.16.10.2"
driver: mlx5_core
- link: link1
+ link: link610
model: Mellanox-CX7VEAT
port2:
- # s52-t21-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+ # s52-t21-sut1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:51"
pci_address: "0000:17:00.1"
ip4_address: "172.16.20.2"
driver: mlx5_core
- link: link2
+ link: link37
model: Mellanox-CX7VEAT
port3:
# s52-t21-sut1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
@@ -135,23 +135,23 @@ nodes:
pci_address: "0000:2a:00.1"
ip4_address: "172.16.40.2"
driver: mlx5_core
- link: link17
+ link: link59
model: Mellanox-CX7VEAT
port5:
- # s52-t21-sut1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ # s52-t21-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a1:88"
pci_address: "0000:3d:00.0"
ip4_address: "172.16.50.2"
driver: mlx5_core
- link: link28
+ link: link5
model: Mellanox-CX7VEAT
port6:
- # s52-t21-sut1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+ # s52-t21-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a1:89"
pci_address: "0000:3d:00.1"
ip4_address: "172.16.60.2"
driver: mlx5_core
- link: link39
+ link: link6
model: Mellanox-CX7VEAT
DUT2:
type: DUT
@@ -163,7 +163,7 @@ nodes:
uio_driver: vfio-pci
interfaces:
port1:
- # s52-t21-sut2-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ # s52-t21-sut2-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:f0"
pci_address: "0000:ab:00.0"
ip4_address: "172.16.10.3"
@@ -171,15 +171,15 @@ nodes:
link: link7
model: Mellanox-CX7VEAT
port2:
- # s52-t21-sut2-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+ # s52-t21-sut2-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a0:f1"
pci_address: "0000:ab:00.1"
ip4_address: "172.16.20.3"
driver: mlx5_core
- link: link8
+ link: link59
model: Mellanox-CX7VEAT
port3:
- # s52-t21-sut2-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ # s52-t21-sut2-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a1:20"
pci_address: "0000:bd:00.0"
ip4_address: "172.16.30.3"
@@ -187,12 +187,12 @@ nodes:
link: link9
model: Mellanox-CX7VEAT
port4:
- # s52-t21-sut2-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+ # s52-t21-sut2-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
mac_address: "b8:3f:d2:b7:a1:21"
pci_address: "0000:bd:00.1"
ip4_address: "172.16.40.3"
driver: mlx5_core
- link: link17
+ link: link10
model: Mellanox-CX7VEAT
port5:
# s52-t21-sut2-c11/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
@@ -200,7 +200,7 @@ nodes:
pci_address: "0000:cf:00.0"
ip4_address: "172.16.50.3"
driver: mlx5_core
- link: link28
+ link: link610
model: Mellanox-CX7VEAT
port6:
# s52-t21-sut2-c11/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
@@ -208,5 +208,5 @@ nodes:
pci_address: "0000:cf:00.1"
ip4_address: "172.16.60.3"
driver: mlx5_core
- link: link39
+ link: link37
model: Mellanox-CX7VEAT \ No newline at end of file