X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=test%2Ftest_vimconn.sh;h=0f84af33e15b2dbb76993593701e133f1f6c6824;hb=0aa0e2fcec7f5c7dcd6d56e2a38f72db327cee50;hp=57be314c7c7ddfcefe1dbb7475a86f07ecbea901;hpb=a4e1a6ed87de04788ec6855fc8a5e722914e4f03;p=osm%2FRO.git

diff --git a/test/test_vimconn.sh b/test/test_vimconn.sh
index 57be314c..0f84af33 100755
--- 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
@@ -123,9 +123,13 @@ then
     export OPENMANO_TENANT=$nfvotenant
     openmano instance-scenario-delete -f simple-instance     || echo "fail"
     openmano instance-scenario-delete -f complex2-instance   || echo "fail"
+    openmano instance-scenario-delete -f complex4-instance   || echo "fail"
     openmano scenario-delete -f simple       || echo "fail"
     openmano scenario-delete -f complex2     || echo "fail"
+    openmano scenario-delete -f complex3     || echo "fail"
+    openmano scenario-delete -f complex4     || echo "fail"
     openmano vnf-delete -f linux             || echo "fail"
+    openmano vnf-delete -f linux_2VMs_v02    || echo "fail"
     openmano vnf-delete -f dataplaneVNF_2VMs || echo "fail"
     openmano vnf-delete -f dataplaneVNF3     || echo "fail"
     openmano vnf-delete -f TESTVIM-VNF1          || echo "fail"
@@ -240,7 +244,19 @@ then
     ! is_valid_uuid $vnf && echo FAIL && echo "    $result" && $_exit 1
     echo $vnf
 
-    for sce in simple complex2
+    printf "%-50s" "Creating VNF 'dataplaneVNF_2VMs_v02': "
+    result=`openmano vnf-create $DIRmano/vnfs/examples/dataplaneVNF_2VMs_v02.yaml "--image-path=$VIM_TEST_IMAGE_PATH_NFV,$VIM_TEST_IMAGE_PATH_NFV"`
+    vnf=`echo $result |gawk '{print $1}'`
+    ! is_valid_uuid $vnf && echo FAIL && echo "    $result" && $_exit 1
+    echo $vnf
+
+    printf "%-50s" "Creating VNF 'linux_2VMs_v02': "
+    result=`openmano vnf-create $DIRmano/vnfs/examples/linux_2VMs_v02.yaml "--image-path=$VIM_TEST_IMAGE_PATH_NFV,$VIM_TEST_IMAGE_PATH_NFV"`
+    vnf=`echo $result |gawk '{print $1}'`
+    ! is_valid_uuid $vnf && echo FAIL && echo "    $result" && $_exit 1
+    echo $vnf
+
+    for sce in simple complex2 complex3 complex4
     do
       printf "%-50s" "Creating scenario '$sce':"
       result=`openmano scenario-create $DIRmano/scenarios/examples/${sce}.yaml`
@@ -252,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 
@@ -269,6 +280,13 @@ then
       echo $instance
     done
 
+    #Testing IP parameters in networks
+    printf "%-50s" "Deploying scenario 'complex4' with IP parameters in networks:"
+    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
+
     echo
     echo DONE
 fi