X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fdevice.sh;h=868fdb1342a161451627dc1e7b51a93e9efa0719;hp=cd987cafd23534886db8bfff5567d3e5ff0383b4;hb=39957a024d1fff87403aacc34aaaa5a922b6639f;hpb=2f4b14bc83437afcc242190a121ba47a6d10bd09

diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index cd987cafd2..868fdb1342 100644
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -263,21 +263,15 @@ 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
             # whitelist.
             pci_id="0x154c"
-            tg_netdev=(enp5s2 enp5s3 enp5s4 enp5s5
-                       enp5s6 enp5s7 enp5s8 enp5s9)
-            tg_netdev+=(enp5s10 enp5s11 enp5s12 enp5s13
-                        enp5s14 enp5s15 enp5s16 enp5s17)
-            dut1_netdev=(enp145s2 enp145s3 enp145s4 enp145s5
-                         enp145s6 enp145s7 enp145s8 enp145s9)
-            dut1_netdev+=(enp145s10 enp145s11 enp145s12 enp145s13
-                          enp145s14 enp145s15 enp145s16 enp145s17)
+            tg_netdev=(enp5)
+            dut1_netdev=(enp145)
             ;;
        "1n_vbox")
             # Add Intel Corporation 82545EM Gigabit Ethernet Controller to the
@@ -601,6 +595,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.