v0.4.48 multisite implementation

[osm/RO.git] / test / test_vimconn.sh

diff --git a/test/test_vimconn.sh b/test/test_vimconn.sh
index 7a7d897..57be314 100755 (executable)
--- a/test/test_vimconn.sh
+++ b/test/test_vimconn.sh
@@ -94,7 +94,7 @@ done
 
 DIRNAME=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
 DIRmano=$(dirname $DIRNAME)
-DIRscript=$(dirname $DIRmano)/scripts
+DIRscript=${DIRmano}/scripts
 #by default action should be reset and create
 [[ -z $action_list ]] && action_list="reset create"
 
@@ -110,7 +110,7 @@ then
     echo "Stopping openmano"
     $DIRscript/service-openmano.sh mano stop
     echo "Initializing openmano database"
-    $DIRmano/database_utils/init_mano_db.sh -u mano -p manopw
+    $DIRmano/database_utils/init_mano_db.sh -u mano -p manopw --createdb
     echo "Starting openmano"
     $DIRscript/service-openmano.sh mano start
 
@@ -168,7 +168,7 @@ then
     printf "%-50s" "Updating external nets in openmano: "
     result=`openmano datacenter-netmap-delete -f --all`
     [[ $? != 0 ]] && echo  "FAIL" && echo "    $result"  && $_exit 1
-    result=`openmano datacenter-netmap-upload -f`
+    result=`openmano datacenter-netmap-import -f`
     [[ $? != 0 ]] && echo  "FAIL" && echo "    $result"  && $_exit 1
     echo OK
 
@@ -248,11 +248,22 @@ then
       ! is_valid_uuid $scenario && echo FAIL && echo "    $result" &&  $_exit 1
       echo $scenario
     done
+    
+    #USER_KEY=""
+    key_param1=""
+    key_param2=""
+    #for file_key in ${HOME}/.ssh/*.pub
+    #do
+    #    [[ -n ${USER_KEY} ]] && USER_KEY="${USER_KEY},"
+    #    USER_KEY="${USER_KEY}$(cat $file_key)"
+    #done
+    #[[  -n ${USER_KEY} ]] && key_param1="--keypair=${USER}:${USER_KEY}" && key_param2="--keypair=${USER_KEY}"
+    key_param1=--keypair-auto
 
     for sce in simple complex2
     do 
       printf "%-50s" "Deploying scenario '$sce':"
-      result=`openmano instance-scenario-create --scenario $sce --name ${sce}-instance`
+      result=`openmano instance-scenario-create --scenario $sce --name ${sce}-instance "$key_param1" "$key_param2"`
       instance=`echo $result |gawk '{print $1}'`
       ! is_valid_uuid $instance && echo FAIL && echo "    $result" && $_exit 1
       echo $instance