From e4decebc66f13d18e7218e8bba441d326e66783b Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 4 Jun 2021 10:34:42 +0000 Subject: Infra: vpp_device -> Ubuntu 20.04 Signed-off-by: pmikus Change-Id: If24c385b93e1ba310ea258984c97494b4cab467c (cherry picked from commit f754eac4faf76fdbffac648769c03f5668f9f6a2) --- resources/libraries/bash/function/device.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'resources') diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh index cd987cafd2..4af52670e4 100644 --- a/resources/libraries/bash/function/device.sh +++ b/resources/libraries/bash/function/device.sh @@ -263,8 +263,8 @@ function get_available_interfaces () { # Add Intel Corporation XL710/X710 Virtual Function to the # whitelist. pci_id="0x154c" - tg_netdev=(enp24) - dut1_netdev=(enp59) + tg_netdev=(ens1 enp24) + dut1_netdev=(ens5 enp59) ;; "1n_tx2") # Add Intel Corporation XL710/X710 Virtual Function to the @@ -601,6 +601,8 @@ function start_topology_containers () { # Mount vfio to be able to bind to see bound interfaces. We cannot use # --device=/dev/vfio as this does not see newly bound interfaces. dcr_stc_params+="--volume /dev/vfio:/dev/vfio " + # Disable manipulation with hugepages by VPP. + dcr_stc_params+="--volume /dev/null:/etc/sysctl.d/80-vpp.conf " # Mount docker.sock to be able to use docker deamon of the host. dcr_stc_params+="--volume /var/run/docker.sock:/var/run/docker.sock " # Mount /opt/boot/ where VM kernel and initrd are located. -- cgit 1.2.3-korg