X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=test%2Fbasictest.sh;h=43267c3ec5c8a2751e3ce1df38ddbf28c9827791;hb=6460dfae2ad09b62ba0078eacea293ebf7bd6742;hp=ad243c63252ec7e36231f8074f689adde6d6ebf9;hpb=205d102de8f7d0bc69aacd323ef2386e71276da6;p=osm%2FRO.git

diff --git a/test/basictest.sh b/test/basictest.sh
index ad243c63..43267c3e 100755
--- a/test/basictest.sh
+++ b/test/basictest.sh
@@ -126,7 +126,7 @@ then
     echo "Stopping openmano"
     $DIRscript/service-openmano.sh mano stop
     echo "Initializing openmano database"
-    $DIRmano/database_utils/init_mano_db.sh -u mano -p manopw
+    $DIRmano/database_utils/init_mano_db.sh -u mano -p manopw --createdb
     echo "Starting openmano"
     $DIRscript/service-openmano.sh mano start
     echo
@@ -141,16 +141,22 @@ then
     ${DIRmano}/openmano instance-scenario-delete -f simple-instance     || echo "fail"
     ${DIRmano}/openmano instance-scenario-delete -f complex-instance    || echo "fail"
     ${DIRmano}/openmano instance-scenario-delete -f complex2-instance   || echo "fail"
-    ${DIRmano}/openmano scenario-delete -f simple       || echo "fail"
-    ${DIRmano}/openmano scenario-delete -f complex      || echo "fail"
-    ${DIRmano}/openmano scenario-delete -f complex2     || echo "fail"
-    ${DIRmano}/openmano vnf-delete -f linux             || echo "fail"
-    ${DIRmano}/openmano vnf-delete -f dataplaneVNF_2VMs || 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"
-    ${DIRmano}/openmano datacenter-delete -f TEST-dc     || echo "fail"
-    ${DIRmano}/openmano tenant-delete -f TEST-tenant     || echo "fail"
+    ${DIRmano}/openmano instance-scenario-delete -f complex3-instance   || echo "fail"
+    ${DIRmano}/openmano instance-scenario-delete -f complex4-instance   || echo "fail"
+    ${DIRmano}/openmano scenario-delete -f simple           || echo "fail"
+    ${DIRmano}/openmano scenario-delete -f complex          || echo "fail"
+    ${DIRmano}/openmano scenario-delete -f complex2         || echo "fail"
+    ${DIRmano}/openmano scenario-delete -f complex3         || echo "fail"
+    ${DIRmano}/openmano scenario-delete -f complex4         || echo "fail"
+    ${DIRmano}/openmano vnf-delete -f linux                 || echo "fail"
+    ${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 dataplaneVNF2         || echo "fail"
+    ${DIRmano}/openmano vnf-delete -f dataplaneVNF3         || echo "fail"
+    ${DIRmano}/openmano datacenter-detach TEST-dc           || echo "fail"
+    ${DIRmano}/openmano datacenter-delete -f TEST-dc        || echo "fail"
+    ${DIRmano}/openmano tenant-delete -f TEST-tenant        || echo "fail"
     echo
 
 elif [[ $action == "create" ]]
@@ -185,11 +191,11 @@ then
     printf "%-50s" "Updating external nets in openmano: "
     result=`${DIRmano}/openmano datacenter-netmap-delete -f --all`
     [[ $? != 0 ]] && echo  "FAIL" && echo "    $result"  && $_exit 1
-    result=`${DIRmano}/openmano datacenter-netmap-upload -f`
+    result=`${DIRmano}/openmano datacenter-netmap-import -f`
     [[ $? != 0 ]] && echo  "FAIL" && echo "    $result"  && $_exit 1
     echo OK
 
-    for VNF in linux dataplaneVNF1 dataplaneVNF2 dataplaneVNF_2VMs dataplaneVNF3
+    for VNF in linux dataplaneVNF1 dataplaneVNF2 dataplaneVNF_2VMs dataplaneVNF_2VMs_v02 dataplaneVNF3 linux_2VMs_v02
     do    
         printf "%-50s" "Creating VNF '${VNF}': "
         result=`$DIRmano/openmano vnf-create $DIRmano/vnfs/examples/${VNF}.yaml`
@@ -198,7 +204,7 @@ then
         ! is_valid_uuid $vnf && echo FAIL && echo "    $result" &&  $_exit 1
         echo $vnf
     done
-    for NS in simple complex complex2
+    for NS in simple complex complex2 complex3 complex4
     do
         printf "%-50s" "Creating scenario '${NS}':"
         result=`$DIRmano/openmano scenario-create $DIRmano/scenarios/examples/${NS}.yaml`
@@ -207,7 +213,7 @@ then
         echo $scenario
     done
 
-    for IS in simple complex complex2
+    for IS in simple complex complex2 complex3
     do
         printf "%-50s" "Creating instance-scenario '${IS}':"
         result=`$DIRmano/openmano instance-scenario-create  --scenario ${IS} --name ${IS}-instance`
@@ -216,6 +222,12 @@ then
         echo $instance
     done
 
+    printf "%-50s" "Creating instance-scenario 'complex4':"
+    result=`$DIRmano/openmano instance-scenario-create $DIRmano/instance-scenarios/examples/instance-creation-complex4.yaml`
+    instance=`echo $result |gawk '{print $1}'`
+    ! is_valid_uuid $instance && echo FAIL && echo "    $result" &&  $_exit 1
+    echo $instance
+
     echo
     #echo "Check virtual machines are deployed"
     #vms_error=`openvim vm-list | grep ERROR | wc -l`