Fix bug 772. vim_thread tasks key params

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

diff --git a/test/test_vimconn.sh b/test/test_vimconn.sh
index aedf20a..0f84af3 100755 (executable)
--- a/test/test_vimconn.sh
+++ b/test/test_vimconn.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ##
-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U.
 # This file is part of openmano
 # All Rights Reserved.
 #
@@ -108,11 +108,11 @@ then
     [[ $force != y ]] && [[ $force != yes ]] && echo "aborted!" && $_exit
 
     echo "Stopping openmano"
-    $DIRscript/service-openmano.sh mano stop
+    $DIRscript/service-openmano mano stop
     echo "Initializing openmano database"
     $DIRmano/database_utils/init_mano_db.sh -u mano -p manopw --createdb
     echo "Starting openmano"
-    $DIRscript/service-openmano.sh mano start
+    $DIRscript/service-openmano mano start
 
 elif [[ $action == "delete" ]]
 then
@@ -268,13 +268,8 @@ then
     #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
+    #add user keys if present at .ssh    
+    ls ${HOME}/.ssh/*.pub > /dev/null 2>&1 && key_param1=--keypair-auto
 
     for sce in simple complex2
     do