Report: Add rls data

[csit.git] / resources / libraries / bash / function / device.sh

diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index a94244e..868fdb1 100644 (file)
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -98,15 +98,11 @@ function bind_interfaces_to_driver () {
 
     pci_path="/sys/bus/pci/devices/${ADDR}"
     drv_path="/sys/bus/pci/drivers/${DRIVER}"
-    vd=$(cat ${pci_path}/vendor ${pci_path}/device) || {
-        die "Failed to retrieve interface details!"
-    }
-    set +e
-    echo ${vd} | sudo tee ${drv_path}/new_id
-    set -e
-    echo ${ADDR} | sudo tee ${pci_path}/driver/unbind || {
-        die "Failed to unbind interface ${ADDR}!"
-    }
+    if [ -d "${pci_path}/driver" ]; then
+        echo ${ADDR} | sudo tee ${pci_path}/driver/unbind || {
+            die "Failed to unbind interface ${ADDR}!"
+        }
+    fi
     echo ${ADDR} | sudo tee ${drv_path}/bind || {
         die "Failed to bind interface ${ADDR}!"
     }
@@ -267,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
@@ -598,19 +588,24 @@ function start_topology_containers () {
     # Automatically remove the container when it exits.
     dcr_stc_params+="--rm "
     # Size of /dev/shm.
-    dcr_stc_params+="--shm-size 512M "
+    dcr_stc_params+="--shm-size 2G "
     # Override access to PCI bus by attaching a filesystem mount to the
     # container.
     dcr_stc_params+="--mount type=tmpfs,destination=/sys/bus/pci/devices "
     # 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.
     dcr_stc_params+="--volume /opt/boot/:/opt/boot/ "
     # Mount host hugepages for VMs.
     dcr_stc_params+="--volume /dev/hugepages/:/dev/hugepages/ "
+    # Disable IPv6.
+    dcr_stc_params+="--sysctl net.ipv6.conf.all.disable_ipv6=1 "
+    dcr_stc_params+="--sysctl net.ipv6.conf.default.disable_ipv6=1 "
 
     # Docker Container UUIDs.
     declare -gA DCR_UUIDS