X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=test%2Ftest_vimconn.sh;h=1933251d2a8595ae9fe05cc90a5eadf5c75b6455;hb=1f7d9d8e4e87be8c104fb93f133c2e68880a77c8;hp=aedf20ac7ede973bb2382f27ba4f13e6e963e092;hpb=4319dadf7254c118456c5c692ae9ca84fc5e60fc;p=osm%2FRO.git diff --git a/test/test_vimconn.sh b/test/test_vimconn.sh index aedf20ac..1933251d 100755 --- a/test/test_vimconn.sh +++ b/test/test_vimconn.sh @@ -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