aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml2
-rw-r--r--fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j219
-rw-r--r--fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml2
-rw-r--r--topologies/available/lf_3na_spr_testbed21.yaml212
4 files changed, 223 insertions, 12 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
index 1fe061605a..b74d6d66e9 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
@@ -30,5 +30,5 @@ inventory_ipmi_hostname: "10.30.50.53"
cpu_microarchitecture: "sapphirerapids"
docker_tg: true
-mellanox_matrix: "dpdk22.07"
+mellanox_matrix: "dpdk23.03"
intel_dsa_matrix: true
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 1fd365eec0..6dcbc9f871 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
@@ -8,15 +8,15 @@ services:
expose:
- "6001"
hostname: "{{ ansible_hostname }}"
- networks:
- tg-nw-0:
+ network_mode: "host"
privileged: true
- ports:
- - "6001:6001"
restart: "always"
shm_size: "4G"
volumes:
- type: "bind"
+ source: "/usr/bin/ofed_info"
+ target: "/usr/bin/ofed_info"
+ - type: "bind"
source: "/dev/hugepages"
target: "/dev/hugepages"
- type: "bind"
@@ -39,15 +39,15 @@ services:
expose:
- "6002"
hostname: "{{ ansible_hostname }}"
- networks:
- tg-nw-1:
+ network_mode: "host"
privileged: true
- ports:
- - "6002:6002"
restart: "always"
shm_size: "4G"
volumes:
- type: "bind"
+ source: "/usr/bin/ofed_info"
+ target: "/usr/bin/ofed_info"
+ - type: "bind"
source: "/dev/hugepages"
target: "/dev/hugepages"
- type: "bind"
@@ -62,6 +62,3 @@ services:
- type: "bind"
source: "/usr/lib/firmware/"
target: "/usr/lib/firmware/"
-networks:
- tg-nw-0:
- tg-nw-1: \ No newline at end of file
diff --git a/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml b/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml
index 1084156412..177705c503 100644
--- a/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml
+++ b/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml
@@ -31,6 +31,8 @@
- name: Inst - Switch Infiniband to Ethernet
ansible.builtin.command: "mlxconfig --yes --dev {{ item }} set LINK_TYPE_P1=2 LINK_TYPE_P2=2"
with_items: "{{ mellanox_pcis.stdout_lines }}"
+ failed_when: false
+ changed_when: false
tags:
- mellanox-inst-drivers
diff --git a/topologies/available/lf_3na_spr_testbed21.yaml b/topologies/available/lf_3na_spr_testbed21.yaml
new file mode 100644
index 0000000000..f5dcdb2893
--- /dev/null
+++ b/topologies/available/lf_3na_spr_testbed21.yaml
@@ -0,0 +1,212 @@
+---
+metadata:
+ version: 0.1
+ schema:
+ - resources/topology_schemas/3_node_topology.sch.yaml
+ - resources/topology_schemas/topology.sch.yaml
+ tags: [hw, 3-node]
+
+nodes:
+ TG:
+ type: TG
+ subtype: TREX
+ host: "10.30.51.53"
+ arch: x86_64
+ port: 6001
+ 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
+ port3:
+ # s53-t21-tg1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ mac_address: "b8:3f:d2:b7:a0:e8"
+ pci_address: "0000:2a:00.0"
+ ip4_address: "172.16.30.1"
+ 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
+ port5:
+ # s53-t21-tg1-c10/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"
+ driver: mlx5_core
+ link: link5
+ model: Mellanox-CX7VEAT
+ port6:
+ # s53-t21-tg1-c10/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"
+ driver: mlx5_core
+ link: link6
+ model: Mellanox-CX7VEAT
+ port7:
+ # s53-t21-tg1-c7/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
+ port9:
+ # s53-t21-tg1-c9/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"
+ driver: mlx5_core
+ link: link9
+ model: Mellanox-CX7VEAT
+ port10:
+ # s53-t21-tg1-c9/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"
+ driver: mlx5_core
+ link: link10
+ model: Mellanox-CX7VEAT
+ DUT1:
+ type: DUT
+ host: "10.30.51.52"
+ arch: x86_64
+ port: 6001
+ username: testuser
+ password: Csit1234
+ uio_driver: vfio-pci
+ interfaces:
+ port1:
+ # s52-t21-sut1-c2/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
+ model: Mellanox-CX7VEAT
+ port2:
+ # s52-t21-sut1-c2/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
+ model: Mellanox-CX7VEAT
+ port3:
+ # s52-t21-sut1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ mac_address: "b8:3f:d2:b7:a1:08"
+ pci_address: "0000:2a:00.0"
+ ip4_address: "172.16.30.2"
+ driver: mlx5_core
+ link: link3
+ model: Mellanox-CX7VEAT
+ port4:
+ # s52-t21-sut1-c4/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+ mac_address: "b8:3f:d2:b7:a1:09"
+ pci_address: "0000:2a:00.1"
+ ip4_address: "172.16.40.2"
+ driver: mlx5_core
+ link: link17
+ model: Mellanox-CX7VEAT
+ port5:
+ # s52-t21-sut1-c10/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
+ model: Mellanox-CX7VEAT
+ port6:
+ # s52-t21-sut1-c10/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
+ model: Mellanox-CX7VEAT
+ DUT2:
+ type: DUT
+ host: "10.30.51.52"
+ arch: x86_64
+ port: 6002
+ username: testuser
+ password: Csit1234
+ uio_driver: vfio-pci
+ interfaces:
+ port1:
+ # s52-t21-sut2-c7/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"
+ driver: mlx5_core
+ link: link7
+ model: Mellanox-CX7VEAT
+ port2:
+ # s52-t21-sut2-c7/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
+ model: Mellanox-CX7VEAT
+ port3:
+ # s52-t21-sut2-c9/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"
+ driver: mlx5_core
+ link: link9
+ model: Mellanox-CX7VEAT
+ port4:
+ # s52-t21-sut2-c9/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
+ model: Mellanox-CX7VEAT
+ port5:
+ # s52-t21-sut2-c11/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+ mac_address: "b8:3f:d2:b7:a1:10"
+ pci_address: "0000:cf:00.0"
+ ip4_address: "172.16.50.3"
+ driver: mlx5_core
+ link: link28
+ model: Mellanox-CX7VEAT
+ port6:
+ # s52-t21-sut2-c11/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+ mac_address: "b8:3f:d2:b7:a1:11"
+ pci_address: "0000:cf:00.1"
+ ip4_address: "172.16.60.3"
+ driver: mlx5_core
+ link: link39
+ model: Mellanox-CX7VEAT \ No newline at end of file