X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=test%2Ftest_vimconn.sh;h=7542d6c255b1a25b30a26f0ce6d57f99c3c1069a;hb=250954aa848b895a999e2f33175118649ee65d24;hp=7b96d86726fd6dabf4f9f8a86092d058650f9511;hpb=9f8456e62b915ecad8424a2ccfd734db8e777fc9;p=osm%2FRO.git diff --git a/test/test_vimconn.sh b/test/test_vimconn.sh index 7b96d867..7542d6c2 100755 --- a/test/test_vimconn.sh +++ b/test/test_vimconn.sh @@ -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 @@ -287,7 +282,7 @@ then #Testing IP parameters in networks printf "%-50s" "Deploying scenario 'complex4' with IP parameters in networks:" - result=`openmano instance-scenario-create --scenario complex4 --name complex4-instance $DIRmano/instance-scenarios/examples/instance-creation-complex4.yaml` + result=`openmano instance-scenario-create $DIRmano/instance-scenarios/examples/instance-creation-complex4.yaml "$key_param1" "$key_param2"` instance=`echo $result |gawk '{print $1}'` ! is_valid_uuid $instance && echo FAIL && echo " $result" && $_exit 1 echo $instance