From: Pablo Montes Moreno Date: Thu, 6 Apr 2017 09:54:34 +0000 (+0200) Subject: Fixed minor bug when editing sdn-controller. Modified test_RO.py according to openman... X-Git-Tag: v2.0.0~23^2~1 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b12711fda02f2bac40a2cc1adfb5a27675bbad61;p=osm%2FRO.git Fixed minor bug when editing sdn-controller. Modified test_RO.py according to openmano behaviour. Added additional tests for SDN Change-Id: Iacb895c0f95e24e0e1b1c1b33a8072f8edd40534 Signed-off-by: Pablo Montes Moreno --- diff --git a/openmano b/openmano index 0e4287e7..45db3403 100755 --- a/openmano +++ b/openmano @@ -1161,7 +1161,7 @@ def sdn_controller_edit(args): if args.ip != None: controller_dict['ip'] = args.ip if args.port != None: - controller_dict['port'] = args.port + controller_dict['port'] = int(args.port) if args.dpid != None: controller_dict['dpid'] = args.dpid if args.type != None: diff --git a/test/RO_tests/pmp_passthrough/scenario_pmp_passthrough.yaml b/test/RO_tests/pmp_passthrough/scenario_pmp_passthrough.yaml new file mode 100644 index 00000000..369907c8 --- /dev/null +++ b/test/RO_tests/pmp_passthrough/scenario_pmp_passthrough.yaml @@ -0,0 +1,50 @@ +## +# 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: 2 +scenario: + name: p2p_passthrough + description: Network scenario consisting of 4 machines with a passthrough interconnected between them + vnfs: + passthrough1: # vnf/net name in the scenario + vnf_name: passthrough # VNF name as introduced in OPENMANO DB + passthrough2: # vnf/net name in the scenario + vnf_name: passthrough # VNF name as introduced in OPENMANO DB + passthrough3: # vnf/net name in the scenario + vnf_name: passthrough # VNF name as introduced in OPENMANO DB + passthrough4: # vnf/net name in the scenario + vnf_name: passthrough # VNF name as introduced in OPENMANO DB + + networks: + mgmt: # provide a name for this net or connection + external: true + interfaces: + - passthrough1: eth0 # Node and its interface + - passthrough2: eth0 # Node and its interface + - passthrough3: eth0 # Node and its interface + - passthrough4: eth0 # Node and its interface + dataplane: # provide a name for this net or connection + interfaces: + - passthrough1: xe0 # Node and its interface + - passthrough2: xe0 # Node and its interface + - passthrough3: xe0 # Node and its interface + - passthrough4: xe0 # Node and its interface + diff --git a/test/RO_tests/pmp_passthrough/vnfd_1passthrough.yaml b/test/RO_tests/pmp_passthrough/vnfd_1passthrough.yaml new file mode 100644 index 00000000..94784d5d --- /dev/null +++ b/test/RO_tests/pmp_passthrough/vnfd_1passthrough.yaml @@ -0,0 +1,53 @@ +## +# 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 +## +--- +vnf: + name: passthrough + description: Machine with EPA and a SR-IOV interface + external-connections: + - name: eth0 + type: bridge + VNFC: passthrough-VM + local_iface_name: eth0 + description: management interface + - name: xe0 + type: data + VNFC: passthrough-VM + local_iface_name: xe0 + description: Dataplane interface + VNFC: + - name: passthrough-VM + description: Machine with EPA and a SR-IOV interface + image name: centos + disk: 20 + numas: + - threads: 1 # "cores", "paired-threads", "threads" + memory: 1 # GBytes + interfaces: + - name: xe0 + vpci: "0000:00:11.0" + dedicated: "yes" # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag) + bandwidth: 1 Gbps + + bridge-ifaces: + - name: eth0 + vpci: "0000:00:0a.0" + diff --git a/test/RO_tests/pmp_sriov/scenario_pmp_sriov.yaml b/test/RO_tests/pmp_sriov/scenario_pmp_sriov.yaml new file mode 100644 index 00000000..05dc91bc --- /dev/null +++ b/test/RO_tests/pmp_sriov/scenario_pmp_sriov.yaml @@ -0,0 +1,50 @@ +## +# 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: 2 +scenario: + name: p2p_sriov + description: Network scenario consisting of four machines with a sr-iov interconnected between them + vnfs: + sriov1: # vnf/net name in the scenario + vnf_name: sriov # VNF name as introduced in OPENMANO DB + sriov2: # vnf/net name in the scenario + vnf_name: sriov # VNF name as introduced in OPENMANO DB + sriov3: # vnf/net name in the scenario + vnf_name: sriov # VNF name as introduced in OPENMANO DB + sriov4: # vnf/net name in the scenario + vnf_name: sriov # VNF name as introduced in OPENMANO DB + + networks: + mgmt: # provide a name for this net or connection + external: true + interfaces: + - sriov1: eth0 # Node and its interface + - sriov2: eth0 # Node and its interface + - sriov3: eth0 # Node and its interface + - sriov4: eth0 # Node and its interface + dataplane: # provide a name for this net or connection + interfaces: + - sriov1: xe0 # Node and its interface + - sriov2: xe0 # Node and its interface + - sriov3: xe0 # Node and its interface + - sriov4: xe0 # Node and its interface + diff --git a/test/RO_tests/pmp_sriov/vnfd_1sriov.yaml b/test/RO_tests/pmp_sriov/vnfd_1sriov.yaml new file mode 100644 index 00000000..e424b027 --- /dev/null +++ b/test/RO_tests/pmp_sriov/vnfd_1sriov.yaml @@ -0,0 +1,53 @@ +## +# 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 +## +--- +vnf: + name: sriov + description: Machine with EPA and a SR-IOV interface + external-connections: + - name: eth0 + type: bridge + VNFC: sriov-VM + local_iface_name: eth0 + description: management interface + - name: xe0 + type: data + VNFC: sriov-VM + local_iface_name: xe0 + description: Dataplane interface + VNFC: + - name: sriov-VM + description: Machine with EPA and a SR-IOV interface + image name: centos + disk: 20 + numas: + - threads: 1 # "cores", "paired-threads", "threads" + memory: 1 # 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 + + bridge-ifaces: + - name: eth0 + vpci: "0000:00:0a.0" + diff --git a/test/test_RO.py b/test/test_RO.py index dd69c2a7..f5194ac4 100755 --- a/test/test_RO.py +++ b/test/test_RO.py @@ -56,7 +56,7 @@ def check_instance_scenario_active(uuid): for net in instance['nets']: status = net['status'] - if status != 'BUILD': + if status != 'ACTIVE': return (False, status) for vnf in instance['vnfs']: