Merge branch 'v1.1'

[osm/openvim.git] / scripts / initopenvim.sh

diff --git a/scripts/initopenvim.sh b/scripts/initopenvim.sh
index 7d04f6c..ae839ba 100755 (executable)
--- a/scripts/initopenvim.sh
+++ b/scripts/initopenvim.sh
@@ -60,14 +60,13 @@ function is_valid_uuid(){
 #process options
 source ${DIRNAME}/get-options.sh "force:f delete:d delete-all port:p= admin-port:P= screen-name= help:h dbname= insert-bashrc" $* || $_exit 1
 
-
 #check correct arguments
 action_list=""
 for param in $params
 do
     if [[ "$param" == reset ]] || [[ "$param" == create ]] || [[ "$param" == delete ]] || [[ "$param" == delete-all ]]
     then
-        action_list="$action_list $argument"
+        action_list="$action_list $param"
         continue
     else
         echo "invalid argument '$param'?  Type -h for help" >&2 && $_exit 1
@@ -196,7 +195,7 @@ then
     ${DIRvim}/openvim net-create $DIRvim/test/networks/net-example3.yaml || ! echo "fail" >&2 || $_exit 1
 
     printf "%-50s" "Creating openvim tenant 'TEST-admin': "
-    result=`openvim tenant-create '{"tenant": {"name":"TEST-admin", "description":"admin"}}'`
+    result=`${DIRvim}/openvim tenant-create '{"tenant": {"name":"TEST-admin", "description":"admin"}}'`
     vimtenant=`echo $result |gawk '{print $1}'`
     #check a valid uuid is obtained
     ! is_valid_uuid $vimtenant && echo "FAIL" && echo "    $result" && $_exit 1