From 51f2df5d4ccbe3e6513d984fce8a42b07f31874c Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 21 Aug 2023 09:06:32 +0000 Subject: [PATCH] feat(pxe): Add RMAed server Signed-off-by: pmikus Change-Id: I73880085b9d31780dcd25a4bf6d615e5b511f9a7 --- .../lf_inventory/host_vars/10.30.51.58.yaml | 2 +- .../lf_inventory/host_vars/10.30.51.59.yaml | 7 +- fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf | 2 +- .../tftpboot/grub/grub.cfg-7c:c2:55:27:58:5c | 4 + .../ubuntu_jammy_amd64/7c:c2:55:27:58:5c/meta-data | 0 .../ubuntu_jammy_amd64/7c:c2:55:27:58:5c/user-data | 120 +++++++++++ topologies/available/lf_2n_spr_testbed24.yaml | 231 +++++++++++++++++++++ 7 files changed, 363 insertions(+), 3 deletions(-) create mode 100644 fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:27:58:5c create mode 100644 fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/7c:c2:55:27:58:5c/meta-data create mode 100644 fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/7c:c2:55:27:58:5c/user-data create mode 100644 topologies/available/lf_2n_spr_testbed24.yaml diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml index 51a901d4f9..e49ab16af1 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml @@ -33,4 +33,4 @@ docker_sut: true intel_800_matrix: "dpdk23.07" mellanox_matrix: "dpdk23.07" intel_dsa_matrix: true -intel_qat_matrix: true \ No newline at end of file +#intel_qat_matrix: true \ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml index d5896b8a94..5b9cd9b98c 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml @@ -33,4 +33,9 @@ docker_tg: true intel_800_matrix: "dpdk22.07" mellanox_matrix: "dpdk23.07" intel_dsa_matrix: true -intel_qat_matrix: true \ No newline at end of file +#intel_qat_matrix: true + +kernel_version_by_distro: + ubuntu: + jammy: + - "5.15.0-72" \ No newline at end of file diff --git a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf index 5776634853..a6d6cd0502 100755 --- a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf +++ b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf @@ -56,7 +56,7 @@ dhcp-host=7c:c2:55:27:58:1c,10.30.51.55,s55-t22-tg1,infinite # eno1 dhcp-host=7c:c2:55:25:3b:4c,10.30.51.56,s56-t23-sut1,infinite # eno1 dhcp-host=7c:c2:55:25:3b:2e,10.30.51.57,s57-t23-tg1,infinite # eno1 dhcp-host=7c:c2:55:27:58:42,10.30.51.58,s58-t24-sut1,infinite # eno1 -dhcp-host=7c:c2:55:27:58:aa,10.30.51.59,s59-t24-tg1,infinite # eno1 ########### +dhcp-host=7c:c2:55:27:58:5c,10.30.51.59,s59-t24-tg1,infinite # eno1 dhcp-host=e0:d5:5e:ae:70:26,10.30.51.69,s27-t211-sut1,infinite # eno1 dhcp-host=b4:2e:99:ab:1d:e8,10.30.51.70,s55-t13-sut1,infinite # enp8s0f0 dhcp-host=b4:2e:99:ab:1d:dc,10.30.51.71,s56-t14-sut1,infinite # enp8s0f0 diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:27:58:5c b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:27:58:5c new file mode 100644 index 0000000000..6edb009e11 --- /dev/null +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-7c:c2:55:27:58:5c @@ -0,0 +1,4 @@ +menuentry "Install s59-t24-tg1" { + linux /casper/ubuntu-jammy-amd64/vmlinuz ip=:::::eno1:dhcp url=https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/7c:c2:55:27:58:5c/ --- + initrd /casper/ubuntu-jammy-amd64/initrd +} diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/7c:c2:55:27:58:5c/meta-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/7c:c2:55:27:58:5c/meta-data new file mode 100644 index 0000000000..e69de29bb2 diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/7c:c2:55:27:58:5c/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/7c:c2:55:27:58:5c/user-data new file mode 100644 index 0000000000..7038e2ec4f --- /dev/null +++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/7c:c2:55:27:58:5c/user-data @@ -0,0 +1,120 @@ +#cloud-config +autoinstall: + version: 1 + apt: + geoip: true + preserve_sources_list: false + primary: + - arches: [amd64, i386] + uri: http://ca.archive.ubuntu.com/ubuntu + - arches: [default] + uri: http://ports.ubuntu.com/ubuntu-ports + identity: + hostname: s59-t24-tg1 + password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 + realname: testuser + username: testuser + keyboard: + layout: us + toggle: null + variant: '' + locale: en_US.UTF-8 + network: + ethernets: + eno1: + addresses: [ 10.30.51.59/24 ] + dhcp4: false + gateway4: 10.30.51.1 + nameservers: + addresses: [ 1.1.1.1, 8.8.8.8 ] + version: 2 + packages: + - python3 + refresh-installer: + update: no + ssh: + allow-pw: true + authorized-keys: [] + install-server: true + storage: + config: + - grub_device: false + id: disk-sda + path: /dev/sda + ptable: gpt + preserve: false + type: disk + wipe: superblock-recursive + - grub_device: false + id: disk-sdb + path: /dev/sdb + ptable: gpt + preserve: false + type: disk + wipe: superblock-recursive + - device: disk-sda + grub_device: true + id: partition-0 + flag: boot + number: 1 + preserve: false + size: 536870912 + type: partition + wipe: superblock + - device: disk-sdb + grub_device: true + id: partition-1 + flag: boot + number: 1 + preserve: false + size: 536870912 + type: partition + wipe: superblock + - id: format-0 + fstype: fat32 + preserve: false + type: format + volume: partition-0 + - id: format-1 + fstype: fat32 + preserve: false + type: format + volume: partition-1 + - device: disk-sda + flag: '' + grub_device: false + id: partition-2 + number: 2 + preserve: false + size: -1 + type: partition + wipe: superblock + - device: disk-sdb + flag: '' + grub_device: false + id: partition-3 + number: 2 + preserve: false + size: -1 + type: partition + wipe: superblock + - name: md0 + raidlevel: raid1 + devices: [partition-2, partition-3] + spare_devices: [] + preserve: false + type: raid + id: raid-0 + - fstype: ext4 + id: format-2 + preserve: false + type: format + volume: raid-0 + - device: format-2 + id: mount-1 + path: / + type: mount + - device: format-0 + id: mount-0 + path: /boot/efi + type: mount \ No newline at end of file diff --git a/topologies/available/lf_2n_spr_testbed24.yaml b/topologies/available/lf_2n_spr_testbed24.yaml new file mode 100644 index 0000000000..6fa5a988a0 --- /dev/null +++ b/topologies/available/lf_2n_spr_testbed24.yaml @@ -0,0 +1,231 @@ +--- +metadata: + version: 0.1 + schema: + - resources/topology_schemas/2_node_topology.sch.yaml + - resources/topology_schemas/topology.sch.yaml + tags: [hw, 2-node] + +nodes: + TG: + type: TG + subtype: TREX + host: "10.30.51.59" + arch: x86_64 + port: 22 + username: testuser + password: Csit1234 + bus: + device1: + pci_address: "0000:75:01.0" + driver: idxd + model: Intel-DSA + device2: + pci_address: "0000:f2:01.0" + driver: idxd + model: Intel-DSA + cryptodev: + device1: + pci_address: "0000:76:00.0" + driver: "4xxx" + model: "HW_4xxx" + module: "qat_4xxx" + numvfs: 8 + device2: + pci_address: "0000:7a:00.0" + driver: "4xxx" + model: "HW_4xxx" + module: "qat_4xxx" + numvfs: 8 + interfaces: + port1: + # s59-t24-tg1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. + mac_address: "b8:3f:d2:b7:a0:60" + pci_address: "0000:3d:00.0" + ip4_address: "172.16.10.2" + driver: mlx5_core + link: link1 + model: Mellanox-CX7VEAT + port2: + # s59-t24-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. + mac_address: "b8:3f:d2:b7:a0:61" + pci_address: "0000:3d:00.1" + ip4_address: "172.16.20.2" + driver: mlx5_core + link: link2 + model: Mellanox-CX7VEAT + port3: + # s59-t24-tg1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e3:58" + pci_address: "0000:2a:00.0" + ip4_address: "172.16.30.2" + driver: ice + link: link3 + model: Intel-E810CQ + port4: + # s59-t24-tg1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e3:5c" + pci_address: "0000:2c:00.0" + ip4_address: "172.16.40.2" + driver: ice + link: link4 + model: Intel-E810CQ + port5: + # s59-t24-tg1-c10/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:41:a8" + pci_address: "0000:17:00.0" + ip4_address: "172.16.50.2" + driver: ice + link: link5 + model: Intel-E810XXV + port6: + # s59-t24-tg1-c10/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:41:a9" + pci_address: "0000:17:00.1" + ip4_address: "172.16.60.2" + driver: ice + link: link6 + model: Intel-E810XXV + port7: + # s59-t24-tg1-c10/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:41:aa" + pci_address: "0000:17:00.2" + ip4_address: "172.16.70.2" + driver: ice + link: link7 + model: Intel-E810XXV + port8: + # s59-t24-tg1-c10/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:41:ab" + pci_address: "0000:17:00.3" + ip4_address: "172.16.80.2" + driver: ice + link: link8 + model: Intel-E810XXV + port9: + # s59-t24-tg1-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. + mac_address: "b8:3f:d2:b7:a0:58" + pci_address: "0000:ab:00.0" + ip4_address: "172.16.90.2" + driver: mlx5_core + link: link9 + model: Mellanox-CX7VEAT + port10: + # s59-t24-tg1-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. + mac_address: "b8:3f:d2:b7:a0:59" + pci_address: "0000:ab:00.1" + ip4_address: "172.16.100.2" + driver: mlx5_core + link: link9 + model: Mellanox-CX7VEAT + port11: + # s59-t24-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:67:21:48" + pci_address: "0000:bd:00.0" + ip4_address: "172.16.110.2" + driver: ice + link: link10 + model: Intel-E810CQ + port12: + # s59-t24-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:67:21:4c" + pci_address: "0000:bf:00.0" + ip4_address: "172.16.120.2" + driver: ice + link: link10 + model: Intel-E810CQ + DUT1: + type: DUT + host: "10.30.51.58" + arch: x86_64 + port: 22 + username: testuser + password: Csit1234 + uio_driver: vfio-pci + bus: + device1: + pci_address: "0000:75:01.0" + driver: idxd + model: Intel-DSA + device2: + pci_address: "0000:f2:01.0" + driver: idxd + model: Intel-DSA + cryptodev: + device1: + pci_address: "0000:76:00.0" + driver: "4xxx" + model: "HW_4xxx" + module: "qat_4xxx" + numvfs: 8 + device2: + pci_address: "0000:7a:00.0" + driver: "4xxx" + model: "HW_4xxx" + module: "qat_4xxx" + numvfs: 8 + interfaces: + port1: + # s58-t24-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. + mac_address: "b8:3f:d2:b7:a0:d0" + pci_address: "0000:3d:00.0" + ip4_address: "172.16.10.1" + driver: mlx5_core + link: link1 + model: Mellanox-CX7VEAT + port2: + # s58-t24-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. + mac_address: "b8:3f:d2:b7:a0:d1" + pci_address: "0000:3d:00.1" + ip4_address: "172.16.20.1" + driver: mlx5_core + link: link2 + model: Mellanox-CX7VEAT + port3: + # s58-t24-sut1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e9:98" + pci_address: "0000:2a:00.0" + ip4_address: "172.16.30.1" + driver: ice + link: link3 + model: Intel-E810CQ + port4: + # s58-t24-sut1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e9:9c" + pci_address: "0000:2c:00.0" + ip4_address: "172.16.40.1" + driver: ice + link: link4 + model: Intel-E810CQ + port5: + # s58-t24-sut1-c10/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:46:44" + pci_address: "0000:17:00.0" + ip4_address: "172.16.50.1" + driver: ice + link: link5 + model: Intel-E810XXV + port6: + # s58-t24-sut1-c10/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:46:45" + pci_address: "0000:17:00.1" + ip4_address: "172.16.60.1" + driver: ice + link: link6 + model: Intel-E810XXV + port7: + # s58-t24-sut1-c10/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:46:46" + pci_address: "0000:17:00.2" + ip4_address: "172.16.70.1" + driver: ice + link: link7 + model: Intel-E810XXV + port8: + # s58-t24-sut1-c10/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:46:47" + pci_address: "0000:17:00.3" + ip4_address: "172.16.80.1" + driver: ice + link: link8 + model: Intel-E810XXV -- 2.16.6