diff options
14 files changed, 109 insertions, 107 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml index 2d4584c724..da85d7661f 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.30.yaml @@ -92,7 +92,7 @@ vault_version: "1.17.2" # Docker settings. docker_daemon: default-shm-size: "1073741824" - dns: ["172.17.0.1"] - dns-opts: [] - dns-search: ["{{ ansible_hostname }}"] + # dns: ["172.17.0.1"] + #dns-opts: [] + #dns-search: ["{{ ansible_hostname }}"] host: ["172.17.0.1:/var/run/docker.sock"] diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml index 7c85cfd266..608e959e2a 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml @@ -1,7 +1,7 @@ --- # file: host_vars/10.30.51.50.yaml -hostname: "s1-t11-sut1" +hostname: "s50-nomad" inventory_ipmi_hostname: "10.30.50.47" # User management. @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -54,8 +54,9 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -77,7 +78,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml index 135b5ea049..e778a9e9f6 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml @@ -1,7 +1,7 @@ --- # file: host_vars/10.30.51.51.yaml -hostname: "s2-t12-sut1" +hostname: "s51-nomad" inventory_ipmi_hostname: "10.30.50.48" # User management. @@ -19,7 +19,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -54,8 +54,9 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - - src: "{{ file_consul_agent_ca_pem }}" + - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" - src: "{{ file_consul_server_0_pem }}" dest: "{{ consul_cert_file }}" @@ -77,7 +78,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml index 3dbdeaaf15..71c6522bdd 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml @@ -10,7 +10,7 @@ inventory_ipmi_hostname: "10.30.50.70" vfs_data_file: "csit-initialize-vfs-alt.sh" cpu_microarchitecture: "altra" -intel_700_matrix: "dpdk22.07" +intel_700_matrix: "dpdk22.03" mellanox_matrix: "dpdk23.11" # User management. diff --git a/fdio.infra/pxe/docker-dnsmasq/Dockerfile b/fdio.infra/pxe/docker-dnsmasq/Dockerfile index aa342975e0..8b2cc2bd41 100644 --- a/fdio.infra/pxe/docker-dnsmasq/Dockerfile +++ b/fdio.infra/pxe/docker-dnsmasq/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 as ubuntu_noble +FROM ubuntu:24.04 AS ubuntu_noble LABEL Description="ubuntu intermediate image" LABEL Version="2.0" diff --git a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf index 320eba64e2..9e9bad23ca 100755 --- a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf +++ b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf @@ -55,8 +55,8 @@ dhcp-host=a0:a3:3b:c1:14:28,10.30.51.36,s17-t33-sut1,infinite # enahisic2i0 dhcp-host=a0:a3:3b:c1:12:fa,10.30.51.37,s18-t33-sut2,infinite # enahisic2i0 dhcp-host=40:8d:5c:e7:b2:6e,10.30.51.38,fdio-marvell-dev,infinite # enP2p1s0v0 dhcp-host=ac:1f:6b:8b:53:60,10.30.51.49,s19-t33t211-tg1,infinite # eno1 -dhcp-host=ac:1f:6b:8a:8c:76,10.30.51.50,s1-t11-sut1,infinite # eno1 -dhcp-host=ac:1f:6b:8b:53:96,10.30.51.51,s2-t12-sut1,infinite # eno1 +dhcp-host=ac:1f:6b:8a:8c:76,10.30.51.50,s50-nomad,infinite # eno1 +dhcp-host=ac:1f:6b:8b:53:96,10.30.51.51,s51-nomad,infinite # eno1 dhcp-host=7c:c2:55:27:58:36,10.30.51.52,s52-t21-sut1,infinite # eno1 dhcp-host=7c:c2:55:25:3b:4a,10.30.51.53,s53-t21-tg1,infinite # eno1 dhcp-host=7c:c2:55:27:58:44,10.30.51.54,s54-t22-sut1,infinite # eno1 diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76 index 7c3f2591e1..be16a76382 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76 +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76 @@ -1,4 +1,4 @@ -menuentry "Install s1-t11-sut1" { - linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8c:76 url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8a:8c:76/ --- console=ttyS0,115200n8 quiet - initrd /casper/ubuntu-jammy-amd64/initrd +menuentry "Install s50-nomad" { + linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/ --- + initrd /casper/ubuntu-noble-amd64/initrd } diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96 index ed430b3148..d07c894c2a 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96 +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96 @@ -1,4 +1,4 @@ -menuentry "Install s2-t12-sut1" { - linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:53:96 url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:53:96/ --- console=ttyS0,115200n8 quiet - initrd /casper/ubuntu-jammy-amd64/initrd +menuentry "Install s51-nomad" { + linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/ --- + initrd /casper/ubuntu-noble-amd64/initrd } diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c index 632c6b96a7..474a512d4b 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c @@ -1,4 +1,4 @@ menuentry "Install s70-t13-sut1" { - linux /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.01-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:e7:aa:4c/ --- + linux /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:e7:aa:4c/ --- initrd /casper/ubuntu-noble-arm64/initrd } diff --git a/fdio.infra/pxe/docker-nginx/Dockerfile b/fdio.infra/pxe/docker-nginx/Dockerfile index 39f47b73d6..b71d4d7771 100644 --- a/fdio.infra/pxe/docker-nginx/Dockerfile +++ b/fdio.infra/pxe/docker-nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 as ubuntu_noble +FROM ubuntu:24.04 AS ubuntu_noble LABEL Description="ubuntu intermediate image" LABEL Version="2.0" diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/user-data index c7c1e3ff44..3d15291d93 100644 --- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/user-data +++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/user-data @@ -10,7 +10,7 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: s1-t11-sut1 + hostname: s50-nomad password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 realname: localadmin username: localadmin @@ -117,4 +117,4 @@ autoinstall: - device: format-0 id: mount-0 path: /boot/efi - type: mount
\ No newline at end of file + type: mount diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/user-data index 2be2225ad5..782727f1d5 100644 --- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/user-data +++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/user-data @@ -10,7 +10,7 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: s2-t12-sut1 + hostname: s51-nomad password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 realname: localadmin username: localadmin @@ -117,4 +117,4 @@ autoinstall: - device: format-0 id: mount-0 path: /boot/efi - type: mount
\ No newline at end of file + type: mount diff --git a/resources/job_specs/vpp_device/vpp-1n-spr.md b/resources/job_specs/vpp_device/vpp-1n-spr.md index d5ab8d7ae3..ac3c7aa725 100644 --- a/resources/job_specs/vpp_device/vpp-1n-spr.md +++ b/resources/job_specs/vpp_device/vpp-1n-spr.md @@ -1,151 +1,151 @@ # 1n-spr ## ./container_memif -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-l2xcbase-eth-2memif-1dcr 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-eth-2memif-1dcr ##### ethip4-l2bdbasemaclrn-eth-2memif-1dcr 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2memif-1dcr ##### ethip4-ip4base-eth-2memif-1dcr -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-eth-2memif-1dcr +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-eth-2memif-1dcr ## ./crypto/ethip4 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha ##### ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha ##### ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha ##### ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4ipsec1tptsw-ip4base-policy-aes128cbc-hmac512sha ## ./crypto/ethip6 ### intel-e810 #### dpdk-vfio-pci ##### ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ipsec1tnlsw-ip6base-policy-aes128cbc-hmac512sha ##### ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ipsec1tptsw-ip6base-policy-aes128cbc-hmac512sha ## ./flow -### intel-e810cq +### intel-x710 #### avf ##### ethip4-flow-ip4-ipsec-ah -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ipsec-ah +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-ipsec-ah ##### ethip4-flow-ip4-ipsec-esp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ipsec-esp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-ipsec-esp ##### ethip4-flow-ip4-l2tpv3oip -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-l2tpv3oip +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-l2tpv3oip ##### ethip4-flow-ip4-ntuple-tcp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ntuple-tcp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-ntuple-tcp ##### ethip4-flow-ip4-ntuple-udp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-ntuple-udp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-ntuple-udp ##### ethip4-flow-ip4-tcp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-tcp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-tcp ##### ethip4-flow-ip4-udp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-flow-ip4-udp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-flow-ip4-udp ##### ethip6-flow-ip6-ntuple-tcp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-ntuple-tcp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip6-flow-ip6-ntuple-tcp ##### ethip6-flow-ip6-ntuple-udp -# k0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-ntuple-udp +# k0c AND 64b AND scapy AND x710 AND drv_avf AND ethip6-flow-ip6-ntuple-udp ##### ethip6-flow-ip6-tcp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-tcp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip6-flow-ip6-tcp ##### ethip6-flow-ip6-udp -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip6-flow-ip6-udp +# 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip6-flow-ip6-udp #### dpdk-vfio-pci ##### ethip4-flow-ip4-gtpu -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-gtpu +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-flow-ip4-gtpu ##### ethip4-flow-ip4-ipsec-ah -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-ah +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-ah ##### ethip4-flow-ip4-ipsec-esp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-esp +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-flow-ip4-ipsec-esp ##### ethip4-flow-ip4-l2tpv3oip -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-l2tpv3oip +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-flow-ip4-l2tpv3oip ##### ethip4-flow-ip4-ntuple-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-tcp +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-tcp ##### ethip4-flow-ip4-ntuple-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-udp +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-flow-ip4-ntuple-udp ##### ethip4-flow-ip4-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-tcp +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-flow-ip4-tcp ##### ethip4-flow-ip4-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-flow-ip4-udp +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-flow-ip4-udp ##### ethip6-flow-ip6-ntuple-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-tcp +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-tcp ##### ethip6-flow-ip6-ntuple-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-udp +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip6-flow-ip6-ntuple-udp ##### ethip6-flow-ip6-tcp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-tcp +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip6-flow-ip6-tcp ##### ethip6-flow-ip6-udp -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-flow-ip6-udp +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip6-flow-ip6-udp ## ./interfaces -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethicmp4-ip4base-eth-1tap -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap ##### ethicmp4-ip4base-eth-1tap-namespace -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap-namespace +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap-namespace ##### ethip4-l2bdbasemaclrn-eth-2tap 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2tap ## ./ip4 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-ip4base-adlalwlistbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-adlalwlistbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-adlalwlistbase ##### ethip4-ip4base-adlblklistbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-adlblklistbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-adlblklistbase ##### ethip4-ip4base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base ##### ethip4-ip4base-iacldstbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-iacldstbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-iacldstbase ##### ethip4-ip4base-ipolicemarkbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-ipolicemarkbase ##### ethip4tcp-nat44det -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4tcp-nat44det +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4tcp-nat44det ##### ethip4tcp-nat44ed -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4tcp-nat44ed +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4tcp-nat44ed ##### ethip4udp-nat44det -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4udp-nat44det +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4udp-nat44det ##### ethip4udp-nat44ed -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4udp-nat44ed +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4udp-nat44ed ## ./ip4_tunnel/lisp -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4lisp-ip4base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4lisp-ip4base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lisp-ip4base ##### ethip4lispgpe-ip4base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4lispgpe-ip4base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lispgpe-ip4base ##### ethip4lispgpe-ip6base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4lispgpe-ip6base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4lispgpe-ip6base ## ./ip4_tunnel -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4--ethip4udpgeneve-1tun-ip4base -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4--ethip4udpgeneve-1tun-ip4base +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4--ethip4udpgeneve-1tun-ip4base ##### ethip4vxlan-l2bdbasemaclrn 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2bdbasemaclrn ##### ethip4vxlan-l2xcbase 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2xcbase ## ./ip6 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip6-ip6base-adlalwlistbase -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-adlalwlistbase +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-adlalwlistbase ##### ethip6-ip6base-adlblklistbase -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-adlblklistbase +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-adlblklistbase ##### ethip6-ip6base-iacldstbase -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-iacldstbase +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-iacldstbase ##### ethip6-ip6base-ipolicemarkbase -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-ipolicemarkbase +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-ipolicemarkbase ##### ethip6-ip6base -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base ## ./ip6_tunnels/lisp -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip6lispgpe-ip4base -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6lispgpe-ip4base +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6lispgpe-ip4base ##### ethip6lispgpe-ip6base -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6lispgpe-ip6base +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6lispgpe-ip6base ## ./l2bd -### intel-e810cq +### intel-x710 #### avf ##### ethip4-l2bdbasemaclrn 0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-l2bdbasemaclrn @@ -163,46 +163,46 @@ ##### ethip4-l2bdbasemaclrn-oacl1sl 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sl ## ./l2patch -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-l2patch 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2patch ## ./l2xc -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-l2xcbase 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase ## ./srv6 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip6ip6-ip6base-srv6enc1sid -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6ip6-ip6base-srv6enc1sid +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6ip6-ip6base-srv6enc1sid ##### ethip6srhip6-ip6base-srv6enc2sids -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids ##### ethip6srhip6-ip6base-srv6enc2sids-nodecaps -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids-nodecaps +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6enc2sids-nodecaps ##### ethip6srhip6-ip6base-srv6proxy-dyn -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-dyn +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-dyn ##### ethip6srhip6-ip6base-srv6proxy-masq -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-masq +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-masq ##### ethip6srhip6-ip6base-srv6proxy-stat -0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-stat +0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6srhip6-ip6base-srv6proxy-stat ## ./stats -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-l2xcbase-stats 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-stats ## ./vm/ethip4 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip4-ip4base-eth-2vhost-1vm -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-eth-2vhost-1vm +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-ip4base-eth-2vhost-1vm ##### ethip4-l2bdbasemaclrn-eth-2vhost-1vm -# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2vhost-1vm +# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2vhost-1vm ##### ethip4-l2xcbase-eth-2vhost-1vm -# 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2xcbase-eth-2vhost-1vm +# 0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-eth-2vhost-1vm ## ./vm/ethip6 -### intel-e810cq +### intel-x710 #### dpdk-vfio-pci ##### ethip6-ip6base-eth-2vhost-1vm -# 0c AND 78b AND scapy AND e810cq AND drv_vfio_pci AND ethip6-ip6base-eth-2vhost-1vm +# 0c AND 78b AND scapy AND x710 AND drv_vfio_pci AND ethip6-ip6base-eth-2vhost-1vm diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh index a0ba5a67a9..7a6f5aaa13 100644 --- a/resources/libraries/bash/function/device.sh +++ b/resources/libraries/bash/function/device.sh @@ -332,8 +332,8 @@ function get_available_interfaces () { # Add Intel Corporation E810 Virtual Function to the # whitelist. pci_id="0x154c\|0x1889" - tg_netdev=(enp42s0 ens5) - dut1_netdev=(enp61s0 ens7) + tg_netdev=(ens2 ens5) + dut1_netdev=(ens4 ens7) ports_per_nic=2 ;; "1n_vbox") |