X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Ftest_ovs_rpm.sh;h=6fff26ae5754c4ecddeda44cf368a9f14e292264;hb=5be83facc4d003b1d34afbd887865317cfdfd5ef;hp=264cd6ee1a003c22abf87f0ce7c8d3be6eae3576;hpb=e6eee91433297cc61314412bf7b81c969f806aeb;p=ovsnfv.git

diff --git a/build/test_ovs_rpm.sh b/build/test_ovs_rpm.sh
index 264cd6e..6fff26a 100755
--- a/build/test_ovs_rpm.sh
+++ b/build/test_ovs_rpm.sh
@@ -17,28 +17,19 @@
 set -e
 
 echo "==============================="
+echo "Requires sudo privileges"
 echo executing $0 $@
 echo executing on machine `uname -a`
 
 
 usage() {
-    echo run BuildAndTest -h for help
+    echo $0 [-d] [-k]
+    echo -d -- Test with DPDK
+    echo -k -- Load linux kernel module
 }
 
-function delrpm() {
-    set +e
-    rpm -q $1
-    if [ $? -eq 0 ]; then
-        sudo rpm -e --allmatches $1
-    fi
-    set -e
-}
-function cleanrpms() {
-    delrpm openvswitch
-    delrpm dpdk-devel
-    delrpm dpdk-tools
-    delrpm dpdk-examples
-    delrpm dpdk
+function uninstallrpms() {
+    cleanrpms
 }
 
 while getopts "dg:hkp:u:v" opt; do
@@ -69,6 +60,9 @@ HOME=`pwd`
 TOPDIR=$HOME
 TMPDIR=$TOPDIR/ovsrpm
 
+BUILDDIR=$HOME
+source $BUILDDIR/functions.sh
+
 if [ -d $TMPDIR ]
 then
     rm -rf $TMPDIR
@@ -102,12 +96,15 @@ stopovs
 cleanrpms
 
 if [ ! -z $DPDK ]; then
+    if [ -z $DPDK_VERSION ]; then
+        DPDK_VERSION=16.04.0
+    fi
     echo "-----------------------------------"
-    echo "Install DPDK RPMs"
+    echo "Install DPDK RPMs for version $DPDK_VERSION"
     echo
-    sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-2*.rpm
-    sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-tools-2*.rpm
-    sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-examples-2*.rpm
+    sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-${DPDK_VERSION:0:1}*.rpm
+    sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-tools-${DPDK_VERSION:0:1}*.rpm
+    sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-examples-${DPDK_VERSION:0:1}*.rpm
 fi
 
 if [ ! -z $kmod ]; then
@@ -131,5 +128,6 @@ sudo ovs-vsctl add-br brtest
 sudo ovs-ofctl dump-flows brtest
 sudo ovs-vsctl del-br brtest
 sudo service openvswitch stop
+uninstallrpms
 
 exit 0