From: garciadeblas Date: Fri, 30 Sep 2016 10:25:59 +0000 (+0200) Subject: Tests updated to test deployment of VNFs using image name instead of path X-Git-Tag: v1.0.0~11 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=9a241aa0b7825ce49e7d7822ce0d59b1a6cdc9eb;p=osm%2FRO.git Tests updated to test deployment of VNFs using image name instead of path Change-Id: I84ea680fae05b900715504b6ebdcef55e8937d28 Signed-off-by: garciadeblas --- 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/dataplaneVNF4.yaml b/vnfs/examples/dataplaneVNF4.yaml new file mode 100644 index 00000000..5b2132dd --- /dev/null +++ b/vnfs/examples/dataplaneVNF4.yaml @@ -0,0 +1,113 @@ +## +# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# This file is part of openmano +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# For those usages not covered by the Apache License, Version 2.0 please +# contact with: nfvlabs@tid.es +## +--- +schema_version: "0.2" +vnf: + 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 + description: datanet + type: e-lan + implementation: underlay + ip-profile: + ip-version: IPv4 + subnet-address: 192.168.1.0/24 + gateway-address: 192.168.1.1 + dns-address: 8.8.8.8 + dhcp: + enabled: true + start-address: 192.168.1.100 + count: 100 + elements: + - VNFC: VNF_2VMs-VM1 + local_iface_name: xe0 + ip_address: 192.168.1.2 + - VNFC: VNF_2VMs-VM2 + local_iface_name: xe0 + ip_address: 192.168.1.3 + external-connections: + - name: control0 + type: mgmt + VNFC: VNF_2VMs-VM1 + local_iface_name: eth0 + description: control interface VM1 + - name: control1 + type: mgmt + VNFC: VNF_2VMs-VM2 + local_iface_name: eth0 + description: control interface VM2 + - name: in + type: data + VNFC: VNF_2VMs-VM1 + local_iface_name: xe1 + description: Dataplane interface input + - name: out + type: data + VNFC: VNF_2VMs-VM2 + local_iface_name: xe1 + description: Dataplane interface output + VNFC: + - name: VNF_2VMs-VM1 + description: "Dataplane VM1 with 4 threads, 2 GB hugepages, 2 SR-IOV interface" + #Copy the image to a compute path and edit this path + image name: dataplaneVNF_2VMs-image + disk: 10 + numas: + - paired-threads: 2 # "cores", "paired-threads", "threads" + memory: 2 # GBytes + interfaces: + - name: xe0 + vpci: "0000:00:11.0" + dedicated: "no" # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag) + bandwidth: 1 Gbps + - name: xe1 + vpci: "0000:00:12.0" + dedicated: "no" + bandwidth: 1 Gbps + bridge-ifaces: + - name: eth0 + vpci: "0000:00:09.0" + bandwidth: 1 Mbps # Optional, informative only + + - name: VNF_2VMs-VM2 + description: "Dataplane VM1 with 2 threads, 2 GB hugepages, 2 SR-IOV interface" + #Copy the image to a compute path and edit this path + image name: dataplaneVNF_2VMs-image + disk: 10 + numas: + - paired-threads: 1 # "cores", "paired-threads", "threads" + memory: 2 # GBytes + interfaces: + - name: xe0 + vpci: "0000:00:11.0" + dedicated: "no" # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag) + bandwidth: 1 Gbps + - name: xe1 + vpci: "0000:00:12.0" + dedicated: "no" + bandwidth: 1 Gbps + bridge-ifaces: + - name: eth0 + vpci: "0000:00:09.0" + bandwidth: 1 Mbps # Optional, informative only + diff --git a/vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml b/vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml deleted file mode 100644 index 674f36cc..00000000 --- a/vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml +++ /dev/null @@ -1,113 +0,0 @@ -## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. -# This file is part of openmano -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: nfvlabs@tid.es -## ---- -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" - # class: parent # Optional. Used to organize VNFs - internal-connections: - - name: datanet - description: datanet - type: e-lan - implementation: underlay - ip-profile: - ip-version: IPv4 - subnet-address: 192.168.1.0/24 - gateway-address: 192.168.1.1 - dns-address: 8.8.8.8 - dhcp: - enabled: true - start-address: 192.168.1.100 - count: 100 - elements: - - VNFC: VNF_2VMs-VM1 - local_iface_name: xe0 - ip_address: 192.168.1.2 - - VNFC: VNF_2VMs-VM2 - local_iface_name: xe0 - ip_address: 192.168.1.3 - external-connections: - - name: control0 - type: mgmt - VNFC: VNF_2VMs-VM1 - local_iface_name: eth0 - description: control interface VM1 - - name: control1 - type: mgmt - VNFC: VNF_2VMs-VM2 - local_iface_name: eth0 - description: control interface VM2 - - name: in - type: data - VNFC: VNF_2VMs-VM1 - local_iface_name: xe1 - description: Dataplane interface input - - name: out - type: data - VNFC: VNF_2VMs-VM2 - local_iface_name: xe1 - description: Dataplane interface output - VNFC: - - name: VNF_2VMs-VM1 - description: "Dataplane VM1 with 4 threads, 2 GB hugepages, 2 SR-IOV interface" - #Copy the image to a compute path and edit this path - image name: dataplaneVNF_2VMs-image - disk: 10 - numas: - - paired-threads: 2 # "cores", "paired-threads", "threads" - memory: 2 # GBytes - interfaces: - - name: xe0 - vpci: "0000:00:11.0" - dedicated: "no" # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag) - bandwidth: 1 Gbps - - name: xe1 - vpci: "0000:00:12.0" - dedicated: "no" - bandwidth: 1 Gbps - bridge-ifaces: - - name: eth0 - vpci: "0000:00:09.0" - bandwidth: 1 Mbps # Optional, informative only - - - name: VNF_2VMs-VM2 - description: "Dataplane VM1 with 2 threads, 2 GB hugepages, 2 SR-IOV interface" - #Copy the image to a compute path and edit this path - image name: dataplaneVNF_2VMs-image - disk: 10 - numas: - - paired-threads: 1 # "cores", "paired-threads", "threads" - memory: 2 # GBytes - interfaces: - - name: xe0 - vpci: "0000:00:11.0" - dedicated: "no" # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag) - bandwidth: 1 Gbps - - name: xe1 - vpci: "0000:00:12.0" - dedicated: "no" - bandwidth: 1 Gbps - bridge-ifaces: - - name: eth0 - vpci: "0000:00:09.0" - bandwidth: 1 Mbps # Optional, informative only -