Merge "allow running test_vimconn without user ssh keys. Change installation to copy...

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

diff --git a/test/basictest.sh b/test/basictest.sh
index 11162dd..5b7dca5 100755 (executable)
--- a/test/basictest.sh
+++ b/test/basictest.sh
@@ -144,7 +144,7 @@ then
     ${DIRmano}/openmano vnf-delete -f linux_2VMs_v02        || echo "fail"
     ${DIRmano}/openmano vnf-delete -f dataplaneVNF_2VMs     || echo "fail"
     ${DIRmano}/openmano vnf-delete -f dataplaneVNF_2VMs_v02 || echo "fail"
-    ${DIRmano}/openmano vnf-delete -f dataplaneVNF_2VMs_v02_withimagename || echo "fail"
+    ${DIRmano}/openmano vnf-delete -f dataplaneVNF4 || echo "fail"
     ${DIRmano}/openmano vnf-delete -f dataplaneVNF2         || echo "fail"
     ${DIRmano}/openmano vnf-delete -f dataplaneVNF3         || echo "fail"
     ${DIRmano}/openmano datacenter-detach TEST-dc           || echo "fail"
@@ -167,7 +167,7 @@ then
     [[ -z $OPENVIM_HOST ]] && OPENVIM_HOST=localhost
     [[ -z $OPENVIM_PORT ]] && OPENVIM_PORT=9080
     URL_ADMIN_PARAM=""
-    [[ -n $OPENVIM_ADMIN_PORT ]] && URL_ADMIN_PARAM="--url_admin=http://${$OPENVIM_HOST}:${OPENVIM_ADMIN_PORT}/openvim"
+    [[ -n $OPENVIM_ADMIN_PORT ]] && URL_ADMIN_PARAM="--url_admin=http://${OPENVIM_HOST}:${OPENVIM_ADMIN_PORT}/openvim"
     result=`${DIRmano}/openmano datacenter-create TEST-dc "http://${OPENVIM_HOST}:${OPENVIM_PORT}/openvim" --type=openvim $URL_ADMIN_PARAM`
     datacenter=`echo $result |gawk '{print $1}'`
     #check a valid uuid is obtained
@@ -188,7 +188,7 @@ then
     [[ $? != 0 ]] && echo  "FAIL" && echo "    $result"  && $_exit 1
     echo OK
 
-    for VNF in linux dataplaneVNF1 dataplaneVNF2 dataplaneVNF_2VMs dataplaneVNF_2VMs_v02 dataplaneVNF3 linux_2VMs_v02 dataplaneVNF_2VMs_v02_withimagename
+    for VNF in linux dataplaneVNF1 dataplaneVNF2 dataplaneVNF_2VMs dataplaneVNF_2VMs_v02 dataplaneVNF3 linux_2VMs_v02 dataplaneVNF4
     do    
         printf "%-50s" "Creating VNF '${VNF}': "
         result=`$DIRmano/openmano vnf-create $DIRmano/vnfs/examples/${VNF}.yaml`