From 9a241aa0b7825ce49e7d7822ce0d59b1a6cdc9eb Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 30 Sep 2016 12:25:59 +0200 Subject: [PATCH] Tests updated to test deployment of VNFs using image name instead of path Change-Id: I84ea680fae05b900715504b6ebdcef55e8937d28 Signed-off-by: garciadeblas --- test/basictest.sh | 10 ++++++---- ..._2VMs_v02_withimagename.yaml => dataplaneVNF4.yaml} | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) rename vnfs/examples/{dataplaneVNF_2VMs_v02_withimagename.yaml => dataplaneVNF4.yaml} (97%) diff --git a/test/basictest.sh b/test/basictest.sh index 11162dd9..9c7b8885 100755 --- a/test/basictest.sh +++ b/test/basictest.sh @@ -135,16 +135,18 @@ then ${DIRmano}/openmano instance-scenario-delete -f complex2-instance || echo "fail" ${DIRmano}/openmano instance-scenario-delete -f complex3-instance || echo "fail" ${DIRmano}/openmano instance-scenario-delete -f complex4-instance || echo "fail" + ${DIRmano}/openmano instance-scenario-delete -f complex5-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 scenario-delete -f complex5 || 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 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" @@ -188,7 +190,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` @@ -197,7 +199,7 @@ then ! is_valid_uuid $vnf && echo FAIL && echo " $result" && $_exit 1 echo $vnf done - for NS in simple complex complex2 complex3 complex4 + for NS in simple complex complex2 complex3 complex4 complex5 do printf "%-50s" "Creating scenario '${NS}':" result=`$DIRmano/openmano scenario-create $DIRmano/scenarios/examples/${NS}.yaml` @@ -206,7 +208,7 @@ then echo $scenario done - for IS in simple complex complex2 complex3 + for IS in simple complex complex2 complex3 complex5 do printf "%-50s" "Creating instance-scenario '${IS}':" result=`$DIRmano/openmano instance-scenario-create --scenario ${IS} --name ${IS}-instance` diff --git a/vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml b/vnfs/examples/dataplaneVNF4.yaml similarity index 97% rename from vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml rename to vnfs/examples/dataplaneVNF4.yaml index 674f36cc..5b2132dd 100644 --- a/vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml +++ b/vnfs/examples/dataplaneVNF4.yaml @@ -21,8 +21,8 @@ --- schema_version: "0.2" vnf: - name: dataplaneVNF_2VMs_v02_withimagename - description: "Example of a dataplane VNF consisting of two VMs for data plane workloads with one internal network" + name: dataplaneVNF4 + description: "Example of a dataplane VNF consisting of two VMs for data plane workloads with one internal network. VMs use image name instead of the path" # class: parent # Optional. Used to organize VNFs internal-connections: - name: datanet -- 2.25.1