X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=dpdk-tests%2Fdpdk_scripts%2Finit_dpdk.sh;h=bc4870e73e41229610ef074a70bcba0158239faa;hp=b0bd4260217eeb35ac4b1ab4750e554ea283b2b8;hb=383e197b63457b070da297474278f9848b6f1403;hpb=b633f4ebf7878ae968e27b71da69b6cde0265904

diff --git a/dpdk-tests/dpdk_scripts/init_dpdk.sh b/dpdk-tests/dpdk_scripts/init_dpdk.sh
index b0bd426021..bc4870e73e 100755
--- a/dpdk-tests/dpdk_scripts/init_dpdk.sh
+++ b/dpdk-tests/dpdk_scripts/init_dpdk.sh
@@ -1,17 +1,35 @@
 #!/bin/bash
 
+set -x
+
+# Setting variables
+DPDK_VERSION=dpdk-17.05
 ROOTDIR=/tmp/openvpp-testing
 PWDDIR=$(pwd)
+cd ${ROOTDIR}/${DPDK_VERSION}/
 
-cd ${ROOTDIR}/dpdk-16.07/
 modprobe uio
+echo "RC = $?"
+
 lsmod | grep igb_uio
-if [ $? -eq 1 ];
+if [ $? -ne 1 ];
+then
+    rmmod igb_uio || \
+        { echo "Failed to remove igb_uio module"; exit 1; }
+fi
+
+lsmod | grep uio_pci_generic
+if [ $? -ne 1 ];
 then
-    insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko || exit 1
-else
-    rmmod igb_uio
-    insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko || exit 1
+    rmmod uio_pci_generic || \
+        { echo "Failed to remove uio_pci_generic module"; exit 1; }
 fi
-./tools/dpdk-devbind.py -b igb_uio $1 $2
+
+insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko || \
+    { echo "Failed to insert igb_uio module"; exit 1; }
+
+# Binding
+./usertools/dpdk-devbind.py -b igb_uio $1 $2 || \
+    { echo "Failed to bind interface $1 and $2 to igb_uio"; exit 1; }
+
 cd ${PWDDIR}