From: kasar Date: Thu, 24 Aug 2017 12:58:18 +0000 (-0700) Subject: unit test for vmware connector using mock X-Git-Tag: v3.0.3~21 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F2088%2F7;p=osm%2FRO.git unit test for vmware connector using mock Change-Id: I06017e689eaf259ea2756ee8de29a5ad9b170c8f Signed-off-by: kasar --- diff --git a/osm_ro/test/__init__.py b/osm_ro/test/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/osm_ro/test/test_vimconn_openstack.py b/osm_ro/test/test_vimconn_openstack.py deleted file mode 100644 index aa6cf3c0..00000000 --- a/osm_ro/test/test_vimconn_openstack.py +++ /dev/null @@ -1,862 +0,0 @@ -# -*- coding: utf-8 -*- - -## -# Copyright 2017 Intel Corporation. -# -# 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 -## - -""" -This module contains unit tests for the OpenStack VIM connector -Run this directly with python2 or python3. -""" - -import copy -import unittest - -import mock -from neutronclient.v2_0.client import Client - -from osm_ro import vimconn -from osm_ro.vimconn_openstack import vimconnector - - -__author__ = "Igor D.C." -__date__ = "$23-aug-2017 23:59:59$" - - -class TestSfcOperations(unittest.TestCase): - def setUp(self): - # instantiate dummy VIM connector so we can test it - self.vimconn = vimconnector( - '123', 'openstackvim', '456', '789', 'http://dummy.url', None, - 'user', 'pass') - - def _test_new_sfi(self, create_port_pair, sfc_encap, - ingress_ports=['5311c75d-d718-4369-bbda-cdcc6da60fcc'], - egress_ports=['230cdf1b-de37-4891-bc07-f9010cf1f967']): - # input to VIM connector - name = 'osm_sfi' - # + ingress_ports - # + egress_ports - # TODO(igordc): must be changed to NSH in Queens (MPLS is a workaround) - correlation = 'mpls' - if sfc_encap is not None: - if not sfc_encap: - correlation = None - - # what OpenStack is assumed to respond (patch OpenStack's return value) - dict_from_neutron = {'port_pair': { - 'id': '3d7ddc13-923c-4332-971e-708ed82902ce', - 'name': name, - 'description': '', - 'tenant_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', - 'project_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', - 'ingress': ingress_ports[0] if len(ingress_ports) else None, - 'egress': egress_ports[0] if len(egress_ports) else None, - 'service_function_parameters': {'correlation': correlation} - }} - create_port_pair.return_value = dict_from_neutron - - # what the VIM connector is expected to - # send to OpenStack based on the input - dict_to_neutron = {'port_pair': { - 'name': name, - 'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'egress': '230cdf1b-de37-4891-bc07-f9010cf1f967', - 'service_function_parameters': {'correlation': correlation} - }} - - # call the VIM connector - if sfc_encap is None: - result = self.vimconn.new_sfi(name, ingress_ports, egress_ports) - else: - result = self.vimconn.new_sfi(name, ingress_ports, egress_ports, - sfc_encap) - - # assert that the VIM connector made the expected call to OpenStack - create_port_pair.assert_called_with(dict_to_neutron) - # assert that the VIM connector had the expected result / return value - self.assertEqual(result, dict_from_neutron['port_pair']['id']) - - def _test_new_sf(self, create_port_pair_group): - # input to VIM connector - name = 'osm_sf' - instances = ['bbd01220-cf72-41f2-9e70-0669c2e5c4cd', - '12ba215e-3987-4892-bd3a-d0fd91eecf98', - 'e25a7c79-14c8-469a-9ae1-f601c9371ffd'] - - # what OpenStack is assumed to respond (patch OpenStack's return value) - dict_from_neutron = {'port_pair_group': { - 'id': '3d7ddc13-923c-4332-971e-708ed82902ce', - 'name': name, - 'description': '', - 'tenant_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', - 'project_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', - 'port_pairs': instances, - 'group_id': 1, - 'port_pair_group_parameters': { - "lb_fields": [], - "ppg_n_tuple_mapping": { - "ingress_n_tuple": {}, - "egress_n_tuple": {} - }} - }} - create_port_pair_group.return_value = dict_from_neutron - - # what the VIM connector is expected to - # send to OpenStack based on the input - dict_to_neutron = {'port_pair_group': { - 'name': name, - 'port_pairs': ['bbd01220-cf72-41f2-9e70-0669c2e5c4cd', - '12ba215e-3987-4892-bd3a-d0fd91eecf98', - 'e25a7c79-14c8-469a-9ae1-f601c9371ffd'] - }} - - # call the VIM connector - result = self.vimconn.new_sf(name, instances) - - # assert that the VIM connector made the expected call to OpenStack - create_port_pair_group.assert_called_with(dict_to_neutron) - # assert that the VIM connector had the expected result / return value - self.assertEqual(result, dict_from_neutron['port_pair_group']['id']) - - def _test_new_sfp(self, create_port_chain, sfc_encap, spi): - # input to VIM connector - name = 'osm_sfp' - classifications = ['2bd2a2e5-c5fd-4eac-a297-d5e255c35c19', - '00f23389-bdfa-43c2-8b16-5815f2582fa8'] - sfs = ['2314daec-c262-414a-86e3-69bb6fa5bc16', - 'd8bfdb5d-195e-4f34-81aa-6135705317df'] - - # TODO(igordc): must be changed to NSH in Queens (MPLS is a workaround) - correlation = 'mpls' - chain_id = 33 - if sfc_encap is not None: - if not sfc_encap: - correlation = None - if spi: - chain_id = spi - - # what OpenStack is assumed to respond (patch OpenStack's return value) - dict_from_neutron = {'port_chain': { - 'id': '5bc05721-079b-4b6e-a235-47cac331cbb6', - 'name': name, - 'description': '', - 'tenant_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', - 'project_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', - 'chain_id': chain_id, - 'flow_classifiers': classifications, - 'port_pair_groups': sfs, - 'chain_parameters': {'correlation': correlation} - }} - create_port_chain.return_value = dict_from_neutron - - # what the VIM connector is expected to - # send to OpenStack based on the input - dict_to_neutron = {'port_chain': { - 'name': name, - 'flow_classifiers': ['2bd2a2e5-c5fd-4eac-a297-d5e255c35c19', - '00f23389-bdfa-43c2-8b16-5815f2582fa8'], - 'port_pair_groups': ['2314daec-c262-414a-86e3-69bb6fa5bc16', - 'd8bfdb5d-195e-4f34-81aa-6135705317df'], - 'chain_parameters': {'correlation': correlation} - }} - if spi: - dict_to_neutron['port_chain']['chain_id'] = spi - - # call the VIM connector - if sfc_encap is None: - if spi is None: - result = self.vimconn.new_sfp(name, classifications, sfs) - else: - result = self.vimconn.new_sfp(name, classifications, sfs, - spi=spi) - else: - if spi is None: - result = self.vimconn.new_sfp(name, classifications, sfs, - sfc_encap) - else: - result = self.vimconn.new_sfp(name, classifications, sfs, - sfc_encap, spi) - - # assert that the VIM connector made the expected call to OpenStack - create_port_chain.assert_called_with(dict_to_neutron) - # assert that the VIM connector had the expected result / return value - self.assertEqual(result, dict_from_neutron['port_chain']['id']) - - def _test_new_classification(self, create_flow_classifier, ctype): - # input to VIM connector - name = 'osm_classification' - definition = {'ethertype': 'IPv4', - 'logical_source_port': - 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', - 'protocol': 'tcp', - 'source_ip_prefix': '192.168.2.0/24', - 'source_port_range_max': 99, - 'source_port_range_min': 50} - - # what OpenStack is assumed to respond (patch OpenStack's return value) - dict_from_neutron = {'flow_classifier': copy.copy(definition)} - dict_from_neutron['flow_classifier'][ - 'id'] = '7735ec2c-fddf-4130-9712-32ed2ab6a372' - dict_from_neutron['flow_classifier']['name'] = name - dict_from_neutron['flow_classifier']['description'] = '' - dict_from_neutron['flow_classifier'][ - 'tenant_id'] = '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c' - dict_from_neutron['flow_classifier'][ - 'project_id'] = '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c' - create_flow_classifier.return_value = dict_from_neutron - - # what the VIM connector is expected to - # send to OpenStack based on the input - dict_to_neutron = {'flow_classifier': copy.copy(definition)} - dict_to_neutron['flow_classifier']['name'] = 'osm_classification' - - # call the VIM connector - result = self.vimconn.new_classification(name, ctype, definition) - - # assert that the VIM connector made the expected call to OpenStack - create_flow_classifier.assert_called_with(dict_to_neutron) - # assert that the VIM connector had the expected result / return value - self.assertEqual(result, dict_from_neutron['flow_classifier']['id']) - - @mock.patch.object(Client, 'create_flow_classifier') - def test_new_classification(self, create_flow_classifier): - self._test_new_classification(create_flow_classifier, - 'legacy_flow_classifier') - - @mock.patch.object(Client, 'create_flow_classifier') - def test_new_classification_unsupported_type(self, create_flow_classifier): - self.assertRaises(vimconn.vimconnNotSupportedException, - self._test_new_classification, - create_flow_classifier, 'h265') - - @mock.patch.object(Client, 'create_port_pair') - def test_new_sfi_with_sfc_encap(self, create_port_pair): - self._test_new_sfi(create_port_pair, True) - - @mock.patch.object(Client, 'create_port_pair') - def test_new_sfi_without_sfc_encap(self, create_port_pair): - self._test_new_sfi(create_port_pair, False) - - @mock.patch.object(Client, 'create_port_pair') - def test_new_sfi_default_sfc_encap(self, create_port_pair): - self._test_new_sfi(create_port_pair, None) - - @mock.patch.object(Client, 'create_port_pair') - def test_new_sfi_bad_ingress_ports(self, create_port_pair): - ingress_ports = ['5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'a0273f64-82c9-11e7-b08f-6328e53f0fa7'] - self.assertRaises(vimconn.vimconnNotSupportedException, - self._test_new_sfi, - create_port_pair, True, ingress_ports=ingress_ports) - ingress_ports = [] - self.assertRaises(vimconn.vimconnNotSupportedException, - self._test_new_sfi, - create_port_pair, True, ingress_ports=ingress_ports) - - @mock.patch.object(Client, 'create_port_pair') - def test_new_sfi_bad_egress_ports(self, create_port_pair): - egress_ports = ['230cdf1b-de37-4891-bc07-f9010cf1f967', - 'b41228fe-82c9-11e7-9b44-17504174320b'] - self.assertRaises(vimconn.vimconnNotSupportedException, - self._test_new_sfi, - create_port_pair, True, egress_ports=egress_ports) - egress_ports = [] - self.assertRaises(vimconn.vimconnNotSupportedException, - self._test_new_sfi, - create_port_pair, True, egress_ports=egress_ports) - - @mock.patch.object(vimconnector, 'get_sfi') - @mock.patch.object(Client, 'create_port_pair_group') - def test_new_sf(self, create_port_pair_group, get_sfi): - get_sfi.return_value = {'sfc_encap': 'mpls'} - self._test_new_sf(create_port_pair_group) - - @mock.patch.object(vimconnector, 'get_sfi') - @mock.patch.object(Client, 'create_port_pair_group') - def test_new_sf_inconsistent_sfc_encap(self, create_port_pair_group, - get_sfi): - get_sfi.return_value = {'sfc_encap': 'nsh'} - self.assertRaises(vimconn.vimconnNotSupportedException, - self._test_new_sf, create_port_pair_group) - - @mock.patch.object(Client, 'create_port_chain') - def test_new_sfp_with_sfc_encap(self, create_port_chain): - self._test_new_sfp(create_port_chain, True, None) - - @mock.patch.object(Client, 'create_port_chain') - def test_new_sfp_without_sfc_encap(self, create_port_chain): - self.assertRaises(vimconn.vimconnNotSupportedException, - self._test_new_sfp, - create_port_chain, False, None) - self.assertRaises(vimconn.vimconnNotSupportedException, - self._test_new_sfp, - create_port_chain, False, 25) - - @mock.patch.object(Client, 'create_port_chain') - def test_new_sfp_default_sfc_encap(self, create_port_chain): - self._test_new_sfp(create_port_chain, None, None) - - @mock.patch.object(Client, 'create_port_chain') - def test_new_sfp_with_sfc_encap_spi(self, create_port_chain): - self._test_new_sfp(create_port_chain, True, 25) - - @mock.patch.object(Client, 'create_port_chain') - def test_new_sfp_default_sfc_encap_spi(self, create_port_chain): - self._test_new_sfp(create_port_chain, None, 25) - - @mock.patch.object(Client, 'list_flow_classifier') - def test_get_classification_list(self, list_flow_classifier): - # what OpenStack is assumed to return to the VIM connector - list_flow_classifier.return_value = {'flow_classifiers': [ - {'source_port_range_min': 2000, - 'destination_ip_prefix': '192.168.3.0/24', - 'protocol': 'udp', - 'description': '', - 'ethertype': 'IPv4', - 'l7_parameters': {}, - 'source_port_range_max': 2000, - 'destination_port_range_min': 3000, - 'source_ip_prefix': '192.168.2.0/24', - 'logical_destination_port': None, - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'destination_port_range_max': None, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', - 'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', - 'name': 'fc1'}]} - - # call the VIM connector - filter_dict = {'protocol': 'tcp', 'ethertype': 'IPv4'} - result = self.vimconn.get_classification_list(filter_dict.copy()) - - # assert that VIM connector called OpenStack with the expected filter - list_flow_classifier.assert_called_with(**filter_dict) - # assert that the VIM connector successfully - # translated and returned the OpenStack result - self.assertEqual(result, [ - {'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', - 'name': 'fc1', - 'description': '', - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'ctype': 'legacy_flow_classifier', - 'definition': { - 'source_port_range_min': 2000, - 'destination_ip_prefix': '192.168.3.0/24', - 'protocol': 'udp', - 'ethertype': 'IPv4', - 'l7_parameters': {}, - 'source_port_range_max': 2000, - 'destination_port_range_min': 3000, - 'source_ip_prefix': '192.168.2.0/24', - 'logical_destination_port': None, - 'destination_port_range_max': None, - 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b'} - }]) - - def _test_get_sfi_list(self, list_port_pair, correlation, sfc_encap): - # what OpenStack is assumed to return to the VIM connector - list_port_pair.return_value = {'port_pairs': [ - {'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'egress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'service_function_parameters': {'correlation': correlation}, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', - 'name': 'osm_sfi'}]} - - # call the VIM connector - filter_dict = {'name': 'osm_sfi', 'description': ''} - result = self.vimconn.get_sfi_list(filter_dict.copy()) - - # assert that VIM connector called OpenStack with the expected filter - list_port_pair.assert_called_with(**filter_dict) - # assert that the VIM connector successfully - # translated and returned the OpenStack result - self.assertEqual(result, [ - {'ingress_ports': ['5311c75d-d718-4369-bbda-cdcc6da60fcc'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'egress_ports': ['5311c75d-d718-4369-bbda-cdcc6da60fcc'], - 'sfc_encap': sfc_encap, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', - 'name': 'osm_sfi'}]) - - @mock.patch.object(Client, 'list_port_pair') - def test_get_sfi_list_with_sfc_encap(self, list_port_pair): - self._test_get_sfi_list(list_port_pair, 'nsh', True) - - @mock.patch.object(Client, 'list_port_pair') - def test_get_sfi_list_without_sfc_encap(self, list_port_pair): - self._test_get_sfi_list(list_port_pair, None, False) - - @mock.patch.object(Client, 'list_port_pair_group') - def test_get_sf_list(self, list_port_pair_group): - # what OpenStack is assumed to return to the VIM connector - list_port_pair_group.return_value = {'port_pair_groups': [ - {'port_pairs': ['08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2', - '0d63799c-82d6-11e7-8deb-a746bb3ae9f5'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'port_pair_group_parameters': {}, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'f4a0bde8-82d5-11e7-90e1-a72b762fa27f', - 'name': 'osm_sf'}]} - - # call the VIM connector - filter_dict = {'name': 'osm_sf', 'description': ''} - result = self.vimconn.get_sf_list(filter_dict.copy()) - - # assert that VIM connector called OpenStack with the expected filter - list_port_pair_group.assert_called_with(**filter_dict) - # assert that the VIM connector successfully - # translated and returned the OpenStack result - self.assertEqual(result, [ - {'instances': ['08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2', - '0d63799c-82d6-11e7-8deb-a746bb3ae9f5'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'f4a0bde8-82d5-11e7-90e1-a72b762fa27f', - 'name': 'osm_sf'}]) - - def _test_get_sfp_list(self, list_port_chain, correlation, sfc_encap): - # what OpenStack is assumed to return to the VIM connector - list_port_chain.return_value = {'port_chains': [ - {'port_pair_groups': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25', - '7dc9013e-82d6-11e7-a5a6-a3a8d78a5518'], - 'flow_classifiers': ['1333c2f4-82d7-11e7-a5df-9327f33d104e', - '1387ab44-82d7-11e7-9bb0-476337183905'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'chain_parameters': {'correlation': correlation}, - 'chain_id': 40, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', - 'name': 'osm_sfp'}]} - - # call the VIM connector - filter_dict = {'name': 'osm_sfp', 'description': ''} - result = self.vimconn.get_sfp_list(filter_dict.copy()) - - # assert that VIM connector called OpenStack with the expected filter - list_port_chain.assert_called_with(**filter_dict) - # assert that the VIM connector successfully - # translated and returned the OpenStack result - self.assertEqual(result, [ - {'service_functions': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25', - '7dc9013e-82d6-11e7-a5a6-a3a8d78a5518'], - 'classifications': ['1333c2f4-82d7-11e7-a5df-9327f33d104e', - '1387ab44-82d7-11e7-9bb0-476337183905'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'sfc_encap': sfc_encap, - 'spi': 40, - 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', - 'name': 'osm_sfp'}]) - - @mock.patch.object(Client, 'list_port_chain') - def test_get_sfp_list_with_sfc_encap(self, list_port_chain): - self._test_get_sfp_list(list_port_chain, 'nsh', True) - - @mock.patch.object(Client, 'list_port_chain') - def test_get_sfp_list_without_sfc_encap(self, list_port_chain): - self._test_get_sfp_list(list_port_chain, None, False) - - @mock.patch.object(Client, 'list_flow_classifier') - def test_get_classification(self, list_flow_classifier): - # what OpenStack is assumed to return to the VIM connector - list_flow_classifier.return_value = {'flow_classifiers': [ - {'source_port_range_min': 2000, - 'destination_ip_prefix': '192.168.3.0/24', - 'protocol': 'udp', - 'description': '', - 'ethertype': 'IPv4', - 'l7_parameters': {}, - 'source_port_range_max': 2000, - 'destination_port_range_min': 3000, - 'source_ip_prefix': '192.168.2.0/24', - 'logical_destination_port': None, - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'destination_port_range_max': None, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', - 'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', - 'name': 'fc1'} - ]} - - # call the VIM connector - result = self.vimconn.get_classification( - '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d') - - # assert that VIM connector called OpenStack with the expected filter - list_flow_classifier.assert_called_with( - id='22198366-d4e8-4d6b-b4d2-637d5d6cbb7d') - # assert that VIM connector successfully returned the OpenStack result - self.assertEqual(result, - {'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', - 'name': 'fc1', - 'description': '', - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'ctype': 'legacy_flow_classifier', - 'definition': { - 'source_port_range_min': 2000, - 'destination_ip_prefix': '192.168.3.0/24', - 'protocol': 'udp', - 'ethertype': 'IPv4', - 'l7_parameters': {}, - 'source_port_range_max': 2000, - 'destination_port_range_min': 3000, - 'source_ip_prefix': '192.168.2.0/24', - 'logical_destination_port': None, - 'destination_port_range_max': None, - 'logical_source_port': - 'aaab0ab0-1452-4636-bb3b-11dca833fa2b'} - }) - - @mock.patch.object(Client, 'list_flow_classifier') - def test_get_classification_many_results(self, list_flow_classifier): - # what OpenStack is assumed to return to the VIM connector - list_flow_classifier.return_value = {'flow_classifiers': [ - {'source_port_range_min': 2000, - 'destination_ip_prefix': '192.168.3.0/24', - 'protocol': 'udp', - 'description': '', - 'ethertype': 'IPv4', - 'l7_parameters': {}, - 'source_port_range_max': 2000, - 'destination_port_range_min': 3000, - 'source_ip_prefix': '192.168.2.0/24', - 'logical_destination_port': None, - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'destination_port_range_max': None, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', - 'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', - 'name': 'fc1'}, - {'source_port_range_min': 1000, - 'destination_ip_prefix': '192.168.3.0/24', - 'protocol': 'udp', - 'description': '', - 'ethertype': 'IPv4', - 'l7_parameters': {}, - 'source_port_range_max': 1000, - 'destination_port_range_min': 3000, - 'source_ip_prefix': '192.168.2.0/24', - 'logical_destination_port': None, - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'destination_port_range_max': None, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', - 'id': '3196bafc-82dd-11e7-a205-9bf6c14b0721', - 'name': 'fc2'} - ]} - - # call the VIM connector - self.assertRaises(vimconn.vimconnConflictException, - self.vimconn.get_classification, - '3196bafc-82dd-11e7-a205-9bf6c14b0721') - - # assert the VIM connector called OpenStack with the expected filter - list_flow_classifier.assert_called_with( - id='3196bafc-82dd-11e7-a205-9bf6c14b0721') - - @mock.patch.object(Client, 'list_flow_classifier') - def test_get_classification_no_results(self, list_flow_classifier): - # what OpenStack is assumed to return to the VIM connector - list_flow_classifier.return_value = {'flow_classifiers': []} - - # call the VIM connector - self.assertRaises(vimconn.vimconnNotFoundException, - self.vimconn.get_classification, - '3196bafc-82dd-11e7-a205-9bf6c14b0721') - - # assert the VIM connector called OpenStack with the expected filter - list_flow_classifier.assert_called_with( - id='3196bafc-82dd-11e7-a205-9bf6c14b0721') - - @mock.patch.object(Client, 'list_port_pair') - def test_get_sfi(self, list_port_pair): - # what OpenStack is assumed to return to the VIM connector - list_port_pair.return_value = {'port_pairs': [ - {'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'egress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'service_function_parameters': {'correlation': 'nsh'}, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', - 'name': 'osm_sfi1'}, - ]} - - # call the VIM connector - result = self.vimconn.get_sfi('c121ebdd-7f2d-4213-b933-3325298a6966') - - # assert the VIM connector called OpenStack with the expected filter - list_port_pair.assert_called_with( - id='c121ebdd-7f2d-4213-b933-3325298a6966') - # assert the VIM connector successfully returned the OpenStack result - self.assertEqual(result, - {'ingress_ports': [ - '5311c75d-d718-4369-bbda-cdcc6da60fcc'], - 'egress_ports': [ - '5311c75d-d718-4369-bbda-cdcc6da60fcc'], - 'sfc_encap': True, - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', - 'name': 'osm_sfi1'}) - - @mock.patch.object(Client, 'list_port_pair') - def test_get_sfi_many_results(self, list_port_pair): - # what OpenStack is assumed to return to the VIM connector - list_port_pair.return_value = {'port_pairs': [ - {'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'egress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'service_function_parameters': {'correlation': 'nsh'}, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', - 'name': 'osm_sfi1'}, - {'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'egress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', - 'service_function_parameters': {'correlation': 'nsh'}, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'c0436d92-82db-11e7-8f9c-5fa535f1261f', - 'name': 'osm_sfi2'} - ]} - - # call the VIM connector - self.assertRaises(vimconn.vimconnConflictException, - self.vimconn.get_sfi, - 'c0436d92-82db-11e7-8f9c-5fa535f1261f') - - # assert that VIM connector called OpenStack with the expected filter - list_port_pair.assert_called_with( - id='c0436d92-82db-11e7-8f9c-5fa535f1261f') - - @mock.patch.object(Client, 'list_port_pair') - def test_get_sfi_no_results(self, list_port_pair): - # what OpenStack is assumed to return to the VIM connector - list_port_pair.return_value = {'port_pairs': []} - - # call the VIM connector - self.assertRaises(vimconn.vimconnNotFoundException, - self.vimconn.get_sfi, - 'b22892fc-82d9-11e7-ae85-0fea6a3b3757') - - # assert that VIM connector called OpenStack with the expected filter - list_port_pair.assert_called_with( - id='b22892fc-82d9-11e7-ae85-0fea6a3b3757') - - @mock.patch.object(Client, 'list_port_pair_group') - def test_get_sf(self, list_port_pair_group): - # what OpenStack is assumed to return to the VIM connector - list_port_pair_group.return_value = {'port_pair_groups': [ - {'port_pairs': ['08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'port_pair_group_parameters': {}, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'aabba8a6-82d9-11e7-a18a-d3c7719b742d', - 'name': 'osm_sf1'} - ]} - - # call the VIM connector - result = self.vimconn.get_sf('b22892fc-82d9-11e7-ae85-0fea6a3b3757') - - # assert that VIM connector called OpenStack with the expected filter - list_port_pair_group.assert_called_with( - id='b22892fc-82d9-11e7-ae85-0fea6a3b3757') - # assert that VIM connector successfully returned the OpenStack result - self.assertEqual(result, - {'instances': [ - '08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'aabba8a6-82d9-11e7-a18a-d3c7719b742d', - 'name': 'osm_sf1'}) - - @mock.patch.object(Client, 'list_port_pair_group') - def test_get_sf_many_results(self, list_port_pair_group): - # what OpenStack is assumed to return to the VIM connector - list_port_pair_group.return_value = {'port_pair_groups': [ - {'port_pairs': ['08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'port_pair_group_parameters': {}, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'aabba8a6-82d9-11e7-a18a-d3c7719b742d', - 'name': 'osm_sf1'}, - {'port_pairs': ['0d63799c-82d6-11e7-8deb-a746bb3ae9f5'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'port_pair_group_parameters': {}, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': 'b22892fc-82d9-11e7-ae85-0fea6a3b3757', - 'name': 'osm_sf2'} - ]} - - # call the VIM connector - self.assertRaises(vimconn.vimconnConflictException, - self.vimconn.get_sf, - 'b22892fc-82d9-11e7-ae85-0fea6a3b3757') - - # assert that VIM connector called OpenStack with the expected filter - list_port_pair_group.assert_called_with( - id='b22892fc-82d9-11e7-ae85-0fea6a3b3757') - - @mock.patch.object(Client, 'list_port_pair_group') - def test_get_sf_no_results(self, list_port_pair_group): - # what OpenStack is assumed to return to the VIM connector - list_port_pair_group.return_value = {'port_pair_groups': []} - - # call the VIM connector - self.assertRaises(vimconn.vimconnNotFoundException, - self.vimconn.get_sf, - 'b22892fc-82d9-11e7-ae85-0fea6a3b3757') - - # assert that VIM connector called OpenStack with the expected filter - list_port_pair_group.assert_called_with( - id='b22892fc-82d9-11e7-ae85-0fea6a3b3757') - - @mock.patch.object(Client, 'list_port_chain') - def test_get_sfp(self, list_port_chain): - # what OpenStack is assumed to return to the VIM connector - list_port_chain.return_value = {'port_chains': [ - {'port_pair_groups': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25'], - 'flow_classifiers': ['1333c2f4-82d7-11e7-a5df-9327f33d104e'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'chain_parameters': {'correlation': 'nsh'}, - 'chain_id': 40, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', - 'name': 'osm_sfp1'}]} - - # call the VIM connector - result = self.vimconn.get_sfp('821bc9be-82d7-11e7-8ce3-23a08a27ab47') - - # assert that VIM connector called OpenStack with the expected filter - list_port_chain.assert_called_with( - id='821bc9be-82d7-11e7-8ce3-23a08a27ab47') - # assert that VIM connector successfully returned the OpenStack result - self.assertEqual(result, - {'service_functions': [ - '7d8e3bf8-82d6-11e7-a032-8ff028839d25'], - 'classifications': [ - '1333c2f4-82d7-11e7-a5df-9327f33d104e'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'sfc_encap': True, - 'spi': 40, - 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', - 'name': 'osm_sfp1'}) - - @mock.patch.object(Client, 'list_port_chain') - def test_get_sfp_many_results(self, list_port_chain): - # what OpenStack is assumed to return to the VIM connector - list_port_chain.return_value = {'port_chains': [ - {'port_pair_groups': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25'], - 'flow_classifiers': ['1333c2f4-82d7-11e7-a5df-9327f33d104e'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'chain_parameters': {'correlation': 'nsh'}, - 'chain_id': 40, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', - 'name': 'osm_sfp1'}, - {'port_pair_groups': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25'], - 'flow_classifiers': ['1333c2f4-82d7-11e7-a5df-9327f33d104e'], - 'description': '', - 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'chain_parameters': {'correlation': 'nsh'}, - 'chain_id': 50, - 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', - 'id': '5d002f38-82de-11e7-a770-f303f11ce66a', - 'name': 'osm_sfp2'} - ]} - - # call the VIM connector - self.assertRaises(vimconn.vimconnConflictException, - self.vimconn.get_sfp, - '5d002f38-82de-11e7-a770-f303f11ce66a') - - # assert that VIM connector called OpenStack with the expected filter - list_port_chain.assert_called_with( - id='5d002f38-82de-11e7-a770-f303f11ce66a') - - @mock.patch.object(Client, 'list_port_chain') - def test_get_sfp_no_results(self, list_port_chain): - # what OpenStack is assumed to return to the VIM connector - list_port_chain.return_value = {'port_chains': []} - - # call the VIM connector - self.assertRaises(vimconn.vimconnNotFoundException, - self.vimconn.get_sfp, - '5d002f38-82de-11e7-a770-f303f11ce66a') - - # assert that VIM connector called OpenStack with the expected filter - list_port_chain.assert_called_with( - id='5d002f38-82de-11e7-a770-f303f11ce66a') - - @mock.patch.object(Client, 'delete_flow_classifier') - def test_delete_classification(self, delete_flow_classifier): - result = self.vimconn.delete_classification( - '638f957c-82df-11e7-b7c8-132706021464') - delete_flow_classifier.assert_called_with( - '638f957c-82df-11e7-b7c8-132706021464') - self.assertEqual(result, '638f957c-82df-11e7-b7c8-132706021464') - - @mock.patch.object(Client, 'delete_port_pair') - def test_delete_sfi(self, delete_port_pair): - result = self.vimconn.delete_sfi( - '638f957c-82df-11e7-b7c8-132706021464') - delete_port_pair.assert_called_with( - '638f957c-82df-11e7-b7c8-132706021464') - self.assertEqual(result, '638f957c-82df-11e7-b7c8-132706021464') - - @mock.patch.object(Client, 'delete_port_pair_group') - def test_delete_sf(self, delete_port_pair_group): - result = self.vimconn.delete_sf('638f957c-82df-11e7-b7c8-132706021464') - delete_port_pair_group.assert_called_with( - '638f957c-82df-11e7-b7c8-132706021464') - self.assertEqual(result, '638f957c-82df-11e7-b7c8-132706021464') - - @mock.patch.object(Client, 'delete_port_chain') - def test_delete_sfp(self, delete_port_chain): - result = self.vimconn.delete_sfp( - '638f957c-82df-11e7-b7c8-132706021464') - delete_port_chain.assert_called_with( - '638f957c-82df-11e7-b7c8-132706021464') - self.assertEqual(result, '638f957c-82df-11e7-b7c8-132706021464') - - -if __name__ == '__main__': - unittest.main() diff --git a/osm_ro/tests/__init__.py b/osm_ro/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/osm_ro/tests/test_vimconn_openstack.py b/osm_ro/tests/test_vimconn_openstack.py new file mode 100644 index 00000000..aa6cf3c0 --- /dev/null +++ b/osm_ro/tests/test_vimconn_openstack.py @@ -0,0 +1,862 @@ +# -*- coding: utf-8 -*- + +## +# Copyright 2017 Intel Corporation. +# +# 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 +## + +""" +This module contains unit tests for the OpenStack VIM connector +Run this directly with python2 or python3. +""" + +import copy +import unittest + +import mock +from neutronclient.v2_0.client import Client + +from osm_ro import vimconn +from osm_ro.vimconn_openstack import vimconnector + + +__author__ = "Igor D.C." +__date__ = "$23-aug-2017 23:59:59$" + + +class TestSfcOperations(unittest.TestCase): + def setUp(self): + # instantiate dummy VIM connector so we can test it + self.vimconn = vimconnector( + '123', 'openstackvim', '456', '789', 'http://dummy.url', None, + 'user', 'pass') + + def _test_new_sfi(self, create_port_pair, sfc_encap, + ingress_ports=['5311c75d-d718-4369-bbda-cdcc6da60fcc'], + egress_ports=['230cdf1b-de37-4891-bc07-f9010cf1f967']): + # input to VIM connector + name = 'osm_sfi' + # + ingress_ports + # + egress_ports + # TODO(igordc): must be changed to NSH in Queens (MPLS is a workaround) + correlation = 'mpls' + if sfc_encap is not None: + if not sfc_encap: + correlation = None + + # what OpenStack is assumed to respond (patch OpenStack's return value) + dict_from_neutron = {'port_pair': { + 'id': '3d7ddc13-923c-4332-971e-708ed82902ce', + 'name': name, + 'description': '', + 'tenant_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', + 'project_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', + 'ingress': ingress_ports[0] if len(ingress_ports) else None, + 'egress': egress_ports[0] if len(egress_ports) else None, + 'service_function_parameters': {'correlation': correlation} + }} + create_port_pair.return_value = dict_from_neutron + + # what the VIM connector is expected to + # send to OpenStack based on the input + dict_to_neutron = {'port_pair': { + 'name': name, + 'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'egress': '230cdf1b-de37-4891-bc07-f9010cf1f967', + 'service_function_parameters': {'correlation': correlation} + }} + + # call the VIM connector + if sfc_encap is None: + result = self.vimconn.new_sfi(name, ingress_ports, egress_ports) + else: + result = self.vimconn.new_sfi(name, ingress_ports, egress_ports, + sfc_encap) + + # assert that the VIM connector made the expected call to OpenStack + create_port_pair.assert_called_with(dict_to_neutron) + # assert that the VIM connector had the expected result / return value + self.assertEqual(result, dict_from_neutron['port_pair']['id']) + + def _test_new_sf(self, create_port_pair_group): + # input to VIM connector + name = 'osm_sf' + instances = ['bbd01220-cf72-41f2-9e70-0669c2e5c4cd', + '12ba215e-3987-4892-bd3a-d0fd91eecf98', + 'e25a7c79-14c8-469a-9ae1-f601c9371ffd'] + + # what OpenStack is assumed to respond (patch OpenStack's return value) + dict_from_neutron = {'port_pair_group': { + 'id': '3d7ddc13-923c-4332-971e-708ed82902ce', + 'name': name, + 'description': '', + 'tenant_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', + 'project_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', + 'port_pairs': instances, + 'group_id': 1, + 'port_pair_group_parameters': { + "lb_fields": [], + "ppg_n_tuple_mapping": { + "ingress_n_tuple": {}, + "egress_n_tuple": {} + }} + }} + create_port_pair_group.return_value = dict_from_neutron + + # what the VIM connector is expected to + # send to OpenStack based on the input + dict_to_neutron = {'port_pair_group': { + 'name': name, + 'port_pairs': ['bbd01220-cf72-41f2-9e70-0669c2e5c4cd', + '12ba215e-3987-4892-bd3a-d0fd91eecf98', + 'e25a7c79-14c8-469a-9ae1-f601c9371ffd'] + }} + + # call the VIM connector + result = self.vimconn.new_sf(name, instances) + + # assert that the VIM connector made the expected call to OpenStack + create_port_pair_group.assert_called_with(dict_to_neutron) + # assert that the VIM connector had the expected result / return value + self.assertEqual(result, dict_from_neutron['port_pair_group']['id']) + + def _test_new_sfp(self, create_port_chain, sfc_encap, spi): + # input to VIM connector + name = 'osm_sfp' + classifications = ['2bd2a2e5-c5fd-4eac-a297-d5e255c35c19', + '00f23389-bdfa-43c2-8b16-5815f2582fa8'] + sfs = ['2314daec-c262-414a-86e3-69bb6fa5bc16', + 'd8bfdb5d-195e-4f34-81aa-6135705317df'] + + # TODO(igordc): must be changed to NSH in Queens (MPLS is a workaround) + correlation = 'mpls' + chain_id = 33 + if sfc_encap is not None: + if not sfc_encap: + correlation = None + if spi: + chain_id = spi + + # what OpenStack is assumed to respond (patch OpenStack's return value) + dict_from_neutron = {'port_chain': { + 'id': '5bc05721-079b-4b6e-a235-47cac331cbb6', + 'name': name, + 'description': '', + 'tenant_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', + 'project_id': '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c', + 'chain_id': chain_id, + 'flow_classifiers': classifications, + 'port_pair_groups': sfs, + 'chain_parameters': {'correlation': correlation} + }} + create_port_chain.return_value = dict_from_neutron + + # what the VIM connector is expected to + # send to OpenStack based on the input + dict_to_neutron = {'port_chain': { + 'name': name, + 'flow_classifiers': ['2bd2a2e5-c5fd-4eac-a297-d5e255c35c19', + '00f23389-bdfa-43c2-8b16-5815f2582fa8'], + 'port_pair_groups': ['2314daec-c262-414a-86e3-69bb6fa5bc16', + 'd8bfdb5d-195e-4f34-81aa-6135705317df'], + 'chain_parameters': {'correlation': correlation} + }} + if spi: + dict_to_neutron['port_chain']['chain_id'] = spi + + # call the VIM connector + if sfc_encap is None: + if spi is None: + result = self.vimconn.new_sfp(name, classifications, sfs) + else: + result = self.vimconn.new_sfp(name, classifications, sfs, + spi=spi) + else: + if spi is None: + result = self.vimconn.new_sfp(name, classifications, sfs, + sfc_encap) + else: + result = self.vimconn.new_sfp(name, classifications, sfs, + sfc_encap, spi) + + # assert that the VIM connector made the expected call to OpenStack + create_port_chain.assert_called_with(dict_to_neutron) + # assert that the VIM connector had the expected result / return value + self.assertEqual(result, dict_from_neutron['port_chain']['id']) + + def _test_new_classification(self, create_flow_classifier, ctype): + # input to VIM connector + name = 'osm_classification' + definition = {'ethertype': 'IPv4', + 'logical_source_port': + 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', + 'protocol': 'tcp', + 'source_ip_prefix': '192.168.2.0/24', + 'source_port_range_max': 99, + 'source_port_range_min': 50} + + # what OpenStack is assumed to respond (patch OpenStack's return value) + dict_from_neutron = {'flow_classifier': copy.copy(definition)} + dict_from_neutron['flow_classifier'][ + 'id'] = '7735ec2c-fddf-4130-9712-32ed2ab6a372' + dict_from_neutron['flow_classifier']['name'] = name + dict_from_neutron['flow_classifier']['description'] = '' + dict_from_neutron['flow_classifier'][ + 'tenant_id'] = '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c' + dict_from_neutron['flow_classifier'][ + 'project_id'] = '130b1e97-b0f1-40a8-8804-b6ad9b8c3e0c' + create_flow_classifier.return_value = dict_from_neutron + + # what the VIM connector is expected to + # send to OpenStack based on the input + dict_to_neutron = {'flow_classifier': copy.copy(definition)} + dict_to_neutron['flow_classifier']['name'] = 'osm_classification' + + # call the VIM connector + result = self.vimconn.new_classification(name, ctype, definition) + + # assert that the VIM connector made the expected call to OpenStack + create_flow_classifier.assert_called_with(dict_to_neutron) + # assert that the VIM connector had the expected result / return value + self.assertEqual(result, dict_from_neutron['flow_classifier']['id']) + + @mock.patch.object(Client, 'create_flow_classifier') + def test_new_classification(self, create_flow_classifier): + self._test_new_classification(create_flow_classifier, + 'legacy_flow_classifier') + + @mock.patch.object(Client, 'create_flow_classifier') + def test_new_classification_unsupported_type(self, create_flow_classifier): + self.assertRaises(vimconn.vimconnNotSupportedException, + self._test_new_classification, + create_flow_classifier, 'h265') + + @mock.patch.object(Client, 'create_port_pair') + def test_new_sfi_with_sfc_encap(self, create_port_pair): + self._test_new_sfi(create_port_pair, True) + + @mock.patch.object(Client, 'create_port_pair') + def test_new_sfi_without_sfc_encap(self, create_port_pair): + self._test_new_sfi(create_port_pair, False) + + @mock.patch.object(Client, 'create_port_pair') + def test_new_sfi_default_sfc_encap(self, create_port_pair): + self._test_new_sfi(create_port_pair, None) + + @mock.patch.object(Client, 'create_port_pair') + def test_new_sfi_bad_ingress_ports(self, create_port_pair): + ingress_ports = ['5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'a0273f64-82c9-11e7-b08f-6328e53f0fa7'] + self.assertRaises(vimconn.vimconnNotSupportedException, + self._test_new_sfi, + create_port_pair, True, ingress_ports=ingress_ports) + ingress_ports = [] + self.assertRaises(vimconn.vimconnNotSupportedException, + self._test_new_sfi, + create_port_pair, True, ingress_ports=ingress_ports) + + @mock.patch.object(Client, 'create_port_pair') + def test_new_sfi_bad_egress_ports(self, create_port_pair): + egress_ports = ['230cdf1b-de37-4891-bc07-f9010cf1f967', + 'b41228fe-82c9-11e7-9b44-17504174320b'] + self.assertRaises(vimconn.vimconnNotSupportedException, + self._test_new_sfi, + create_port_pair, True, egress_ports=egress_ports) + egress_ports = [] + self.assertRaises(vimconn.vimconnNotSupportedException, + self._test_new_sfi, + create_port_pair, True, egress_ports=egress_ports) + + @mock.patch.object(vimconnector, 'get_sfi') + @mock.patch.object(Client, 'create_port_pair_group') + def test_new_sf(self, create_port_pair_group, get_sfi): + get_sfi.return_value = {'sfc_encap': 'mpls'} + self._test_new_sf(create_port_pair_group) + + @mock.patch.object(vimconnector, 'get_sfi') + @mock.patch.object(Client, 'create_port_pair_group') + def test_new_sf_inconsistent_sfc_encap(self, create_port_pair_group, + get_sfi): + get_sfi.return_value = {'sfc_encap': 'nsh'} + self.assertRaises(vimconn.vimconnNotSupportedException, + self._test_new_sf, create_port_pair_group) + + @mock.patch.object(Client, 'create_port_chain') + def test_new_sfp_with_sfc_encap(self, create_port_chain): + self._test_new_sfp(create_port_chain, True, None) + + @mock.patch.object(Client, 'create_port_chain') + def test_new_sfp_without_sfc_encap(self, create_port_chain): + self.assertRaises(vimconn.vimconnNotSupportedException, + self._test_new_sfp, + create_port_chain, False, None) + self.assertRaises(vimconn.vimconnNotSupportedException, + self._test_new_sfp, + create_port_chain, False, 25) + + @mock.patch.object(Client, 'create_port_chain') + def test_new_sfp_default_sfc_encap(self, create_port_chain): + self._test_new_sfp(create_port_chain, None, None) + + @mock.patch.object(Client, 'create_port_chain') + def test_new_sfp_with_sfc_encap_spi(self, create_port_chain): + self._test_new_sfp(create_port_chain, True, 25) + + @mock.patch.object(Client, 'create_port_chain') + def test_new_sfp_default_sfc_encap_spi(self, create_port_chain): + self._test_new_sfp(create_port_chain, None, 25) + + @mock.patch.object(Client, 'list_flow_classifier') + def test_get_classification_list(self, list_flow_classifier): + # what OpenStack is assumed to return to the VIM connector + list_flow_classifier.return_value = {'flow_classifiers': [ + {'source_port_range_min': 2000, + 'destination_ip_prefix': '192.168.3.0/24', + 'protocol': 'udp', + 'description': '', + 'ethertype': 'IPv4', + 'l7_parameters': {}, + 'source_port_range_max': 2000, + 'destination_port_range_min': 3000, + 'source_ip_prefix': '192.168.2.0/24', + 'logical_destination_port': None, + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'destination_port_range_max': None, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', + 'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', + 'name': 'fc1'}]} + + # call the VIM connector + filter_dict = {'protocol': 'tcp', 'ethertype': 'IPv4'} + result = self.vimconn.get_classification_list(filter_dict.copy()) + + # assert that VIM connector called OpenStack with the expected filter + list_flow_classifier.assert_called_with(**filter_dict) + # assert that the VIM connector successfully + # translated and returned the OpenStack result + self.assertEqual(result, [ + {'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', + 'name': 'fc1', + 'description': '', + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'ctype': 'legacy_flow_classifier', + 'definition': { + 'source_port_range_min': 2000, + 'destination_ip_prefix': '192.168.3.0/24', + 'protocol': 'udp', + 'ethertype': 'IPv4', + 'l7_parameters': {}, + 'source_port_range_max': 2000, + 'destination_port_range_min': 3000, + 'source_ip_prefix': '192.168.2.0/24', + 'logical_destination_port': None, + 'destination_port_range_max': None, + 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b'} + }]) + + def _test_get_sfi_list(self, list_port_pair, correlation, sfc_encap): + # what OpenStack is assumed to return to the VIM connector + list_port_pair.return_value = {'port_pairs': [ + {'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'egress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'service_function_parameters': {'correlation': correlation}, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', + 'name': 'osm_sfi'}]} + + # call the VIM connector + filter_dict = {'name': 'osm_sfi', 'description': ''} + result = self.vimconn.get_sfi_list(filter_dict.copy()) + + # assert that VIM connector called OpenStack with the expected filter + list_port_pair.assert_called_with(**filter_dict) + # assert that the VIM connector successfully + # translated and returned the OpenStack result + self.assertEqual(result, [ + {'ingress_ports': ['5311c75d-d718-4369-bbda-cdcc6da60fcc'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'egress_ports': ['5311c75d-d718-4369-bbda-cdcc6da60fcc'], + 'sfc_encap': sfc_encap, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', + 'name': 'osm_sfi'}]) + + @mock.patch.object(Client, 'list_port_pair') + def test_get_sfi_list_with_sfc_encap(self, list_port_pair): + self._test_get_sfi_list(list_port_pair, 'nsh', True) + + @mock.patch.object(Client, 'list_port_pair') + def test_get_sfi_list_without_sfc_encap(self, list_port_pair): + self._test_get_sfi_list(list_port_pair, None, False) + + @mock.patch.object(Client, 'list_port_pair_group') + def test_get_sf_list(self, list_port_pair_group): + # what OpenStack is assumed to return to the VIM connector + list_port_pair_group.return_value = {'port_pair_groups': [ + {'port_pairs': ['08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2', + '0d63799c-82d6-11e7-8deb-a746bb3ae9f5'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'port_pair_group_parameters': {}, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'f4a0bde8-82d5-11e7-90e1-a72b762fa27f', + 'name': 'osm_sf'}]} + + # call the VIM connector + filter_dict = {'name': 'osm_sf', 'description': ''} + result = self.vimconn.get_sf_list(filter_dict.copy()) + + # assert that VIM connector called OpenStack with the expected filter + list_port_pair_group.assert_called_with(**filter_dict) + # assert that the VIM connector successfully + # translated and returned the OpenStack result + self.assertEqual(result, [ + {'instances': ['08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2', + '0d63799c-82d6-11e7-8deb-a746bb3ae9f5'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'f4a0bde8-82d5-11e7-90e1-a72b762fa27f', + 'name': 'osm_sf'}]) + + def _test_get_sfp_list(self, list_port_chain, correlation, sfc_encap): + # what OpenStack is assumed to return to the VIM connector + list_port_chain.return_value = {'port_chains': [ + {'port_pair_groups': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25', + '7dc9013e-82d6-11e7-a5a6-a3a8d78a5518'], + 'flow_classifiers': ['1333c2f4-82d7-11e7-a5df-9327f33d104e', + '1387ab44-82d7-11e7-9bb0-476337183905'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'chain_parameters': {'correlation': correlation}, + 'chain_id': 40, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', + 'name': 'osm_sfp'}]} + + # call the VIM connector + filter_dict = {'name': 'osm_sfp', 'description': ''} + result = self.vimconn.get_sfp_list(filter_dict.copy()) + + # assert that VIM connector called OpenStack with the expected filter + list_port_chain.assert_called_with(**filter_dict) + # assert that the VIM connector successfully + # translated and returned the OpenStack result + self.assertEqual(result, [ + {'service_functions': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25', + '7dc9013e-82d6-11e7-a5a6-a3a8d78a5518'], + 'classifications': ['1333c2f4-82d7-11e7-a5df-9327f33d104e', + '1387ab44-82d7-11e7-9bb0-476337183905'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'sfc_encap': sfc_encap, + 'spi': 40, + 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', + 'name': 'osm_sfp'}]) + + @mock.patch.object(Client, 'list_port_chain') + def test_get_sfp_list_with_sfc_encap(self, list_port_chain): + self._test_get_sfp_list(list_port_chain, 'nsh', True) + + @mock.patch.object(Client, 'list_port_chain') + def test_get_sfp_list_without_sfc_encap(self, list_port_chain): + self._test_get_sfp_list(list_port_chain, None, False) + + @mock.patch.object(Client, 'list_flow_classifier') + def test_get_classification(self, list_flow_classifier): + # what OpenStack is assumed to return to the VIM connector + list_flow_classifier.return_value = {'flow_classifiers': [ + {'source_port_range_min': 2000, + 'destination_ip_prefix': '192.168.3.0/24', + 'protocol': 'udp', + 'description': '', + 'ethertype': 'IPv4', + 'l7_parameters': {}, + 'source_port_range_max': 2000, + 'destination_port_range_min': 3000, + 'source_ip_prefix': '192.168.2.0/24', + 'logical_destination_port': None, + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'destination_port_range_max': None, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', + 'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', + 'name': 'fc1'} + ]} + + # call the VIM connector + result = self.vimconn.get_classification( + '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d') + + # assert that VIM connector called OpenStack with the expected filter + list_flow_classifier.assert_called_with( + id='22198366-d4e8-4d6b-b4d2-637d5d6cbb7d') + # assert that VIM connector successfully returned the OpenStack result + self.assertEqual(result, + {'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', + 'name': 'fc1', + 'description': '', + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'ctype': 'legacy_flow_classifier', + 'definition': { + 'source_port_range_min': 2000, + 'destination_ip_prefix': '192.168.3.0/24', + 'protocol': 'udp', + 'ethertype': 'IPv4', + 'l7_parameters': {}, + 'source_port_range_max': 2000, + 'destination_port_range_min': 3000, + 'source_ip_prefix': '192.168.2.0/24', + 'logical_destination_port': None, + 'destination_port_range_max': None, + 'logical_source_port': + 'aaab0ab0-1452-4636-bb3b-11dca833fa2b'} + }) + + @mock.patch.object(Client, 'list_flow_classifier') + def test_get_classification_many_results(self, list_flow_classifier): + # what OpenStack is assumed to return to the VIM connector + list_flow_classifier.return_value = {'flow_classifiers': [ + {'source_port_range_min': 2000, + 'destination_ip_prefix': '192.168.3.0/24', + 'protocol': 'udp', + 'description': '', + 'ethertype': 'IPv4', + 'l7_parameters': {}, + 'source_port_range_max': 2000, + 'destination_port_range_min': 3000, + 'source_ip_prefix': '192.168.2.0/24', + 'logical_destination_port': None, + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'destination_port_range_max': None, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', + 'id': '22198366-d4e8-4d6b-b4d2-637d5d6cbb7d', + 'name': 'fc1'}, + {'source_port_range_min': 1000, + 'destination_ip_prefix': '192.168.3.0/24', + 'protocol': 'udp', + 'description': '', + 'ethertype': 'IPv4', + 'l7_parameters': {}, + 'source_port_range_max': 1000, + 'destination_port_range_min': 3000, + 'source_ip_prefix': '192.168.2.0/24', + 'logical_destination_port': None, + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'destination_port_range_max': None, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'logical_source_port': 'aaab0ab0-1452-4636-bb3b-11dca833fa2b', + 'id': '3196bafc-82dd-11e7-a205-9bf6c14b0721', + 'name': 'fc2'} + ]} + + # call the VIM connector + self.assertRaises(vimconn.vimconnConflictException, + self.vimconn.get_classification, + '3196bafc-82dd-11e7-a205-9bf6c14b0721') + + # assert the VIM connector called OpenStack with the expected filter + list_flow_classifier.assert_called_with( + id='3196bafc-82dd-11e7-a205-9bf6c14b0721') + + @mock.patch.object(Client, 'list_flow_classifier') + def test_get_classification_no_results(self, list_flow_classifier): + # what OpenStack is assumed to return to the VIM connector + list_flow_classifier.return_value = {'flow_classifiers': []} + + # call the VIM connector + self.assertRaises(vimconn.vimconnNotFoundException, + self.vimconn.get_classification, + '3196bafc-82dd-11e7-a205-9bf6c14b0721') + + # assert the VIM connector called OpenStack with the expected filter + list_flow_classifier.assert_called_with( + id='3196bafc-82dd-11e7-a205-9bf6c14b0721') + + @mock.patch.object(Client, 'list_port_pair') + def test_get_sfi(self, list_port_pair): + # what OpenStack is assumed to return to the VIM connector + list_port_pair.return_value = {'port_pairs': [ + {'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'egress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'service_function_parameters': {'correlation': 'nsh'}, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', + 'name': 'osm_sfi1'}, + ]} + + # call the VIM connector + result = self.vimconn.get_sfi('c121ebdd-7f2d-4213-b933-3325298a6966') + + # assert the VIM connector called OpenStack with the expected filter + list_port_pair.assert_called_with( + id='c121ebdd-7f2d-4213-b933-3325298a6966') + # assert the VIM connector successfully returned the OpenStack result + self.assertEqual(result, + {'ingress_ports': [ + '5311c75d-d718-4369-bbda-cdcc6da60fcc'], + 'egress_ports': [ + '5311c75d-d718-4369-bbda-cdcc6da60fcc'], + 'sfc_encap': True, + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', + 'name': 'osm_sfi1'}) + + @mock.patch.object(Client, 'list_port_pair') + def test_get_sfi_many_results(self, list_port_pair): + # what OpenStack is assumed to return to the VIM connector + list_port_pair.return_value = {'port_pairs': [ + {'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'egress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'service_function_parameters': {'correlation': 'nsh'}, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'c121ebdd-7f2d-4213-b933-3325298a6966', + 'name': 'osm_sfi1'}, + {'ingress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'egress': '5311c75d-d718-4369-bbda-cdcc6da60fcc', + 'service_function_parameters': {'correlation': 'nsh'}, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'c0436d92-82db-11e7-8f9c-5fa535f1261f', + 'name': 'osm_sfi2'} + ]} + + # call the VIM connector + self.assertRaises(vimconn.vimconnConflictException, + self.vimconn.get_sfi, + 'c0436d92-82db-11e7-8f9c-5fa535f1261f') + + # assert that VIM connector called OpenStack with the expected filter + list_port_pair.assert_called_with( + id='c0436d92-82db-11e7-8f9c-5fa535f1261f') + + @mock.patch.object(Client, 'list_port_pair') + def test_get_sfi_no_results(self, list_port_pair): + # what OpenStack is assumed to return to the VIM connector + list_port_pair.return_value = {'port_pairs': []} + + # call the VIM connector + self.assertRaises(vimconn.vimconnNotFoundException, + self.vimconn.get_sfi, + 'b22892fc-82d9-11e7-ae85-0fea6a3b3757') + + # assert that VIM connector called OpenStack with the expected filter + list_port_pair.assert_called_with( + id='b22892fc-82d9-11e7-ae85-0fea6a3b3757') + + @mock.patch.object(Client, 'list_port_pair_group') + def test_get_sf(self, list_port_pair_group): + # what OpenStack is assumed to return to the VIM connector + list_port_pair_group.return_value = {'port_pair_groups': [ + {'port_pairs': ['08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'port_pair_group_parameters': {}, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'aabba8a6-82d9-11e7-a18a-d3c7719b742d', + 'name': 'osm_sf1'} + ]} + + # call the VIM connector + result = self.vimconn.get_sf('b22892fc-82d9-11e7-ae85-0fea6a3b3757') + + # assert that VIM connector called OpenStack with the expected filter + list_port_pair_group.assert_called_with( + id='b22892fc-82d9-11e7-ae85-0fea6a3b3757') + # assert that VIM connector successfully returned the OpenStack result + self.assertEqual(result, + {'instances': [ + '08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'aabba8a6-82d9-11e7-a18a-d3c7719b742d', + 'name': 'osm_sf1'}) + + @mock.patch.object(Client, 'list_port_pair_group') + def test_get_sf_many_results(self, list_port_pair_group): + # what OpenStack is assumed to return to the VIM connector + list_port_pair_group.return_value = {'port_pair_groups': [ + {'port_pairs': ['08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'port_pair_group_parameters': {}, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'aabba8a6-82d9-11e7-a18a-d3c7719b742d', + 'name': 'osm_sf1'}, + {'port_pairs': ['0d63799c-82d6-11e7-8deb-a746bb3ae9f5'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'port_pair_group_parameters': {}, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': 'b22892fc-82d9-11e7-ae85-0fea6a3b3757', + 'name': 'osm_sf2'} + ]} + + # call the VIM connector + self.assertRaises(vimconn.vimconnConflictException, + self.vimconn.get_sf, + 'b22892fc-82d9-11e7-ae85-0fea6a3b3757') + + # assert that VIM connector called OpenStack with the expected filter + list_port_pair_group.assert_called_with( + id='b22892fc-82d9-11e7-ae85-0fea6a3b3757') + + @mock.patch.object(Client, 'list_port_pair_group') + def test_get_sf_no_results(self, list_port_pair_group): + # what OpenStack is assumed to return to the VIM connector + list_port_pair_group.return_value = {'port_pair_groups': []} + + # call the VIM connector + self.assertRaises(vimconn.vimconnNotFoundException, + self.vimconn.get_sf, + 'b22892fc-82d9-11e7-ae85-0fea6a3b3757') + + # assert that VIM connector called OpenStack with the expected filter + list_port_pair_group.assert_called_with( + id='b22892fc-82d9-11e7-ae85-0fea6a3b3757') + + @mock.patch.object(Client, 'list_port_chain') + def test_get_sfp(self, list_port_chain): + # what OpenStack is assumed to return to the VIM connector + list_port_chain.return_value = {'port_chains': [ + {'port_pair_groups': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25'], + 'flow_classifiers': ['1333c2f4-82d7-11e7-a5df-9327f33d104e'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'chain_parameters': {'correlation': 'nsh'}, + 'chain_id': 40, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', + 'name': 'osm_sfp1'}]} + + # call the VIM connector + result = self.vimconn.get_sfp('821bc9be-82d7-11e7-8ce3-23a08a27ab47') + + # assert that VIM connector called OpenStack with the expected filter + list_port_chain.assert_called_with( + id='821bc9be-82d7-11e7-8ce3-23a08a27ab47') + # assert that VIM connector successfully returned the OpenStack result + self.assertEqual(result, + {'service_functions': [ + '7d8e3bf8-82d6-11e7-a032-8ff028839d25'], + 'classifications': [ + '1333c2f4-82d7-11e7-a5df-9327f33d104e'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'sfc_encap': True, + 'spi': 40, + 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', + 'name': 'osm_sfp1'}) + + @mock.patch.object(Client, 'list_port_chain') + def test_get_sfp_many_results(self, list_port_chain): + # what OpenStack is assumed to return to the VIM connector + list_port_chain.return_value = {'port_chains': [ + {'port_pair_groups': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25'], + 'flow_classifiers': ['1333c2f4-82d7-11e7-a5df-9327f33d104e'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'chain_parameters': {'correlation': 'nsh'}, + 'chain_id': 40, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': '821bc9be-82d7-11e7-8ce3-23a08a27ab47', + 'name': 'osm_sfp1'}, + {'port_pair_groups': ['7d8e3bf8-82d6-11e7-a032-8ff028839d25'], + 'flow_classifiers': ['1333c2f4-82d7-11e7-a5df-9327f33d104e'], + 'description': '', + 'tenant_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'chain_parameters': {'correlation': 'nsh'}, + 'chain_id': 50, + 'project_id': '8f3019ef06374fa880a0144ad4bc1d7b', + 'id': '5d002f38-82de-11e7-a770-f303f11ce66a', + 'name': 'osm_sfp2'} + ]} + + # call the VIM connector + self.assertRaises(vimconn.vimconnConflictException, + self.vimconn.get_sfp, + '5d002f38-82de-11e7-a770-f303f11ce66a') + + # assert that VIM connector called OpenStack with the expected filter + list_port_chain.assert_called_with( + id='5d002f38-82de-11e7-a770-f303f11ce66a') + + @mock.patch.object(Client, 'list_port_chain') + def test_get_sfp_no_results(self, list_port_chain): + # what OpenStack is assumed to return to the VIM connector + list_port_chain.return_value = {'port_chains': []} + + # call the VIM connector + self.assertRaises(vimconn.vimconnNotFoundException, + self.vimconn.get_sfp, + '5d002f38-82de-11e7-a770-f303f11ce66a') + + # assert that VIM connector called OpenStack with the expected filter + list_port_chain.assert_called_with( + id='5d002f38-82de-11e7-a770-f303f11ce66a') + + @mock.patch.object(Client, 'delete_flow_classifier') + def test_delete_classification(self, delete_flow_classifier): + result = self.vimconn.delete_classification( + '638f957c-82df-11e7-b7c8-132706021464') + delete_flow_classifier.assert_called_with( + '638f957c-82df-11e7-b7c8-132706021464') + self.assertEqual(result, '638f957c-82df-11e7-b7c8-132706021464') + + @mock.patch.object(Client, 'delete_port_pair') + def test_delete_sfi(self, delete_port_pair): + result = self.vimconn.delete_sfi( + '638f957c-82df-11e7-b7c8-132706021464') + delete_port_pair.assert_called_with( + '638f957c-82df-11e7-b7c8-132706021464') + self.assertEqual(result, '638f957c-82df-11e7-b7c8-132706021464') + + @mock.patch.object(Client, 'delete_port_pair_group') + def test_delete_sf(self, delete_port_pair_group): + result = self.vimconn.delete_sf('638f957c-82df-11e7-b7c8-132706021464') + delete_port_pair_group.assert_called_with( + '638f957c-82df-11e7-b7c8-132706021464') + self.assertEqual(result, '638f957c-82df-11e7-b7c8-132706021464') + + @mock.patch.object(Client, 'delete_port_chain') + def test_delete_sfp(self, delete_port_chain): + result = self.vimconn.delete_sfp( + '638f957c-82df-11e7-b7c8-132706021464') + delete_port_chain.assert_called_with( + '638f957c-82df-11e7-b7c8-132706021464') + self.assertEqual(result, '638f957c-82df-11e7-b7c8-132706021464') + + +if __name__ == '__main__': + unittest.main() diff --git a/osm_ro/tests/test_vimconn_vmware.py b/osm_ro/tests/test_vimconn_vmware.py new file mode 100755 index 00000000..a4ebb5c2 --- /dev/null +++ b/osm_ro/tests/test_vimconn_vmware.py @@ -0,0 +1,397 @@ +# -*- coding: utf-8 -*- + +## +# Copyright 2016-2017 VMware Inc. +# This file is part of ETSI OSM +# 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: osslegalrouting@vmware.com +## + + +from osm_ro.vimconn_vmware import vimconnector +from osm_ro.vimconn import vimconnUnexpectedResponse,vimconnNotFoundException +from pyvcloud.vcloudair import VCA,VCS +from pyvcloud.vapp import VAPP +from pyvcloud import Http +from pyvcloud.schema.vcd.v1_5.schemas.vcloud import vdcType,networkType,catalogType, \ + vAppType,taskType +import unittest +import mock +import test_vimconn_vmware_xml_response as xml_resp + +class TestVimconn_VMware(unittest.TestCase): + def setUp(self): + config = { "admin_password": "admin", + "admin_username":"user", + "nsx_user": "nsx", + "nsx_password": "nsx", + "nsx_manager":"https://test-nsx" } + + self.vca = VCA(host='test', + username='user', + service_type='standalone', + version='5.9', + verify=False, + log=False) + + self.session = VCS('https://test/api/session', + 'test', + 'test', + None, + 'https://test/api/org/a93c', + 'https://test/api/org/a93c', + version='5.9') + + self.vim = vimconnector(uuid='12354', + name='test', + tenant_id='abc1234', + tenant_name='test', + url='https://test', + config=config) + + + @mock.patch.object(vimconnector,'get_vdc_details') + @mock.patch.object(vimconnector,'connect') + @mock.patch.object(VCA,'get_networks') + def test_get_network_not_found(self,get_networks, connect, get_vdc_details): + vdc_xml_resp = xml_resp.vdc_xml_response + # created vdc object + vdc = vdcType.parseString(vdc_xml_resp,True) + # assumed return value from VIM connector + get_vdc_details.return_value = vdc + self.vim.vca = self.vim.connect() + network_xml_resp = xml_resp.network_xml_response + networks = networkType.parseString(network_xml_resp, True) + (self.vim.vca).get_networks.return_value = [networks] + # call to VIM connector method with invalid id + self.assertRaises(vimconnNotFoundException,self.vim.get_network,'mgmt-net') + + @mock.patch.object(vimconnector,'get_vdc_details') + @mock.patch.object(vimconnector,'connect') + @mock.patch.object(VCA,'get_networks') + def test_get_network(self,get_networks, connect, get_vdc_details): + net_id = '5c04dc6d-6096-47c6-b72b-68f19013d491' + vdc_xml_resp = xml_resp.vdc_xml_response + # created vdc object + vdc = vdcType.parseString(vdc_xml_resp,True) + # created network object + network_xml_resp = xml_resp.network_xml_response + networks = networkType.parseString(network_xml_resp, True) + # assumed return value from VIM connector + get_vdc_details.return_value = vdc + self.vim.vca = self.vim.connect() + # assumed return value from VIM connector + (self.vim.vca).get_networks.return_value = [networks] + # call to VIM connector method with network_id + result = self.vim.get_network(net_id) + # assert verified expected and return result from VIM connector + self.assertEqual(net_id, result['id']) + + @mock.patch.object(vimconnector,'get_vdc_details') + @mock.patch.object(vimconnector,'connect') + @mock.patch.object(VCA,'get_networks') + def test_get_network_list_not_found(self,get_networks, connect, get_vdc_details): + vdc_xml_resp = xml_resp.vdc_xml_response + # created vdc object + vdc = vdcType.parseString(vdc_xml_resp,True) + # assumed return value from VIM connector + get_vdc_details.return_value = vdc + self.vim.vca = self.vim.connect() + + network_xml_resp = xml_resp.network_xml_response + networks = networkType.parseString(network_xml_resp, True) + (self.vim.vca).get_networks.return_value = [networks] + # call to VIM connector method with network_id + result = self.vim.get_network_list({'id':'45hdfg-345nb-345'}) + + # assert verified expected and return result from VIM connector + self.assertEqual(list(), result) + + @mock.patch.object(vimconnector,'get_vdc_details') + @mock.patch.object(vimconnector,'connect') + @mock.patch.object(VCA,'get_networks') + def test_get_network_list(self,get_networks, connect, get_vdc_details): + vdc_xml_resp = xml_resp.vdc_xml_response + net_id = '5c04dc6d-6096-47c6-b72b-68f19013d491' + vdc = vdcType.parseString(vdc_xml_resp,True) + # created network object + network_xml_resp = xml_resp.network_xml_response + networks = networkType.parseString(network_xml_resp, True) + # assumed return value from VIM connector + get_vdc_details.return_value = vdc + self.vim.vca = self.vim.connect() + # assumed return value from VIM connector + (self.vim.vca).get_networks.return_value = [networks] + + # call to VIM connector method with network_id + result = self.vim.get_network_list({'id': net_id}) + # assert verified expected and return result from VIM connector + for item in result: + self.assertEqual(item.get('id'), net_id) + self.assertEqual(item.get('status'), 'ACTIVE') + self.assertEqual(item.get('shared'), False) + + @mock.patch.object(vimconnector,'create_network_rest') + def test_new_network(self, create_network_rest): + create_net_xml_resp = xml_resp.create_network_xml_response + net_name = 'Test_network' + net_type = 'bridge' + # assumed return value from VIM connector + create_network_rest.return_value = create_net_xml_resp + # call to VIM connector method with network_id + result = self.vim.new_network(net_name, net_type) + # assert verified expected and return result from VIM connector + self.assertEqual(result, 'df1956fa-da04-419e-a6a2-427b6f83788f') + + @mock.patch.object(vimconnector, 'create_network_rest') + def test_new_network_not_created(self, create_network_rest): + # assumed return value from VIM connector + create_network_rest.return_value = """ + """ + + # assert verified expected and return result from VIM connector + self.assertRaises(vimconnUnexpectedResponse,self.vim.new_network, + 'test_net', + 'bridge') + + @mock.patch.object(vimconnector, 'connect') + @mock.patch.object(vimconnector, 'get_network_action') + @mock.patch.object(vimconnector, 'connect_as_admin') + @mock.patch.object(vimconnector, 'delete_network_action') + def test_delete_network(self, delete_network_action, connect_as_admin, get_network_action, connect): + delete_net_xml_resp = xml_resp.delete_network_xml_response + # assumed return value from VIM connector + connect.return_value = self.vca + self.vim.vca = self.vim.connect() + get_network_action.return_value = delete_net_xml_resp + connect_as_admin.return_value = self.vca + delete_network_action.return_value = True + # call to VIM connector method with network_id + result = self.vim.delete_network('0a55e5d1-43a2-4688-bc92-cb304046bf87') + # assert verified expected and return result from VIM connector + self.assertEqual(result, '0a55e5d1-43a2-4688-bc92-cb304046bf87') + + @mock.patch.object(vimconnector, 'get_vcd_network') + def test_delete_network_not_found(self, get_vcd_network): + # assumed return value from VIM connector + get_vcd_network.return_value = False + # assert verified expected and return result from VIM connector + self.assertRaises(vimconnNotFoundException,self.vim.delete_network, + '2a23e5d1-42a2-0648-bc92-cb508046bf87') + + def test_get_flavor(self): + flavor_data = {'a646eb8a-95bd-4e81-8321-5413ee72b62e': {'disk': 10, + 'vcpus': 1, + 'ram': 1024}} + vimconnector.flavorlist = flavor_data + result = self.vim.get_flavor('a646eb8a-95bd-4e81-8321-5413ee72b62e') + # assert verified expected and return result from VIM connector + self.assertEqual(result, flavor_data['a646eb8a-95bd-4e81-8321-5413ee72b62e']) + + def test_get_flavor_not_found(self): + vimconnector.flavorlist = {} + # assert verified expected and return result from VIM connector + self.assertRaises(vimconnNotFoundException,self.vim.get_flavor, + 'a646eb8a-95bd-4e81-8321-5413ee72b62e') + + def test_new_flavor(self): + flavor_data = {'disk': 10, 'vcpus': 1, 'ram': 1024} + result = self.vim.new_flavor(flavor_data) + # assert verified expected and return result from VIM connector + self.assertIsNotNone(result) + + def test_delete_flavor(self): + flavor_data = {'2cb3dffb-5c51-4355-8406-28553ead28ac': {'disk': 10, + 'vcpus': 1, + 'ram': 1024}} + vimconnector.flavorlist = flavor_data + # return value from VIM connector + result = self.vim.delete_flavor('2cb3dffb-5c51-4355-8406-28553ead28ac') + # assert verified expected and return result from VIM connector + self.assertEqual(result, '2cb3dffb-5c51-4355-8406-28553ead28ac') + + @mock.patch.object(vimconnector,'connect_as_admin') + @mock.patch.object(vimconnector,'connect') + @mock.patch.object(Http,'get') + @mock.patch.object(VCS,'get_vcloud_headers') + def test_delete_image_not_found(self, get_vcloud_headers, get, connect, connect_as_admin): + # assumed return value from VIM connector + connect.return_value = self.vca + self.vim.vca = self.vim.connect() + # assumed return value from VIM connector + connect_as_admin.return_value = self.vca + self.vca.host = connect_as_admin.return_value.host + self.vca.vcloud_session = self.session + get_vcloud_headers.return_value = {'Accept':'application/*+xml;version=5.9', + 'x-vcloud-authorization': '638bfee6cb5f435abc3480f480817254'} + get_vcloud_headers.return_value = self.vca.vcloud_session.get_vcloud_headers() + # assert verified expected and return result from VIM connector + self.assertRaises(vimconnNotFoundException, self.vim.delete_image, 'invali3453') + + @mock.patch.object(vimconnector,'connect') + @mock.patch.object(VCA,'get_catalogs') + def test_get_image_list(self, get_catalogs, connect): + catalog1 = xml_resp.catalog1_xml_response + catalog2 = xml_resp.catalog2_xml_response + + catalogs = [catalogType.parseString(cat, True) for cat in catalog1, catalog2] + connect.return_value = self.vca + self.vim.vca = self.vim.connect() + # assumed return value from VIM connector + self.vim.vca.get_catalogs.return_value = catalogs + result = self.vim.get_image_list({'id': '32ccb082-4a65-41f6-bcd6-38942e8a3829'}) + # assert verified expected and return result from VIM connector + for item in result: + self.assertEqual(item['id'], '32ccb082-4a65-41f6-bcd6-38942e8a3829') + + @mock.patch.object(vimconnector,'get_vapp_details_rest') + @mock.patch.object(vimconnector,'get_vdc_details') + def test_get_vminstance(self, get_vdc_details, get_vapp_details_rest): + vapp_info = {'status': '4', + 'acquireMksTicket': {'href': 'https://localhost/api/vApp/vm-47d12505-5968-4e16-95a7-18743edb0c8b/screen/action/acquireMksTicket', + 'type': 'application/vnd.vmware.vcloud.mksTicket+xml', 'rel': 'screen:acquireMksTicket'}, + 'vm_virtual_hardware': {'disk_edit_href': 'https://localhost/api/vApp/vm-47d12505-5968-4e16-95a7-18743edb0c8b/virtualHardwareSection/disks', 'disk_size': '40960'}, + 'name': 'Test1_vm-69a18104-8413-4cb8-bad7-b5afaec6f9fa', + 'created': '2017-09-21T01:15:31.627-07:00', + 'IsEnabled': 'true', + 'EndAddress': '12.16.24.199', + 'interfaces': [{'MACAddress': '00:50:56:01:12:a2', + 'NetworkConnectionIndex': '0', + 'network': 'testing_T6nODiW4-68f68d93-0350-4d86-b40b-6e74dedf994d', + 'IpAddressAllocationMode': 'DHCP', + 'IsConnected': 'true', + 'IpAddress': '12.16.24.200'}], + 'ovfDescriptorUploaded': 'true', + 'nestedHypervisorEnabled': 'false', + 'Gateway': '12.16.24.1', + 'acquireTicket': {'href': 'https://localhost/api/vApp/vm-47d12505-5968-4e16-95a7-18743edb0c8b/screen/action/acquireTicket', + 'rel': 'screen:acquireTicket'}, + 'vmuuid': '47d12505-5968-4e16-95a7-18743edb0c8b', + 'Netmask': '255.255.255.0', + 'StartAddress': '12.16.24.100', + 'primarynetwork': '0', + 'networkname': 'External-Network-1074', + 'IsInherited': 'false', + 'deployed': 'true'} + # created vdc object + vdc_xml_resp = xml_resp.vdc_xml_response + vdc = vdcType.parseString(vdc_xml_resp,True) + # assumed return value from VIM connector + get_vdc_details.return_value = vdc + get_vapp_details_rest.return_value = vapp_info + + result = self.vim.get_vminstance('47d12505-5968-4e16-95a7-18743edb0c8b') + # assert verified expected and return result from VIM connector + self.assertEqual(result['status'], 'ACTIVE') + self.assertEqual(result['hostId'], '47d12505-5968-4e16-95a7-18743edb0c8b') + + @mock.patch.object(VCA,'get_vapp') + @mock.patch.object(vimconnector,'connect') + @mock.patch.object(vimconnector,'get_namebyvappid') + @mock.patch.object(vimconnector,'get_vdc_details') + def test_delete_vminstance(self, get_vdc_details, get_namebyvappid, connect, vapp): + vm_id = '4f6a9b49-e92d-4935-87a1-0e4dc9c3a069' + vm_name = 'Test1_vm-69a18104-8413-4cb8-bad7-b5afaec6f9fa' + # created vdc object + vdc_xml_resp = xml_resp.vdc_xml_response + vdc = vdcType.parseString(vdc_xml_resp,True) + # assumed return value from VIM connector + connect.return_value = self.vca + self.vim.vca = self.vim.connect() + get_namebyvappid.return_name = vm_name + vapp.return_value = None + # call to VIM connector method + result = self.vim.delete_vminstance(vm_id) + # assert verified expected and return result from VIM connector + self.assertEqual(result, vm_id) + + @mock.patch.object(vimconnector,'get_network_id_by_name') + @mock.patch.object(vimconnector,'get_vm_pci_details') + @mock.patch.object(VCA,'get_vapp') + @mock.patch.object(vimconnector,'connect') + @mock.patch.object(vimconnector,'get_namebyvappid') + @mock.patch.object(vimconnector,'get_vdc_details') + def test_refresh_vms_status(self, get_vdc_details, get_namebyvappid, connect, + get_vapp, get_vm_pci_details, + get_network_id_by_name): + headers = {'Accept':'application/*+xml;version=5.9', + 'x-vcloud-authorization': '638bfee6cb5f435abc3480f480817254'} + vm_id = '05e6047b-6938-4275-8940-22d1ea7245b8' + + vapp_resp = xml_resp.vapp_xml_response + # created vdc object + vdc_xml_resp = xml_resp.vdc_xml_response + vdc = vdcType.parseString(vdc_xml_resp,True) + # assumed return value from VIM connector + get_vdc_details.return_value = vdc + connect.return_value = self.vca + + self.vim.vca = self.vim.connect() + get_namebyvappid.return_value = 'Test1_vm-69a18104-8413-4cb8-bad7-b5afaec6f9fa' + get_vm_pci_details.return_value = {'host_name': 'test-esx-1.corp.local', 'host_ip': '12.19.24.31'} + get_vapp.return_value = VAPP(vAppType.parseString(vapp_resp, True), headers, False) + get_network_id_by_name.return_value = '47d12505-5968-4e16-95a7-18743edb0c8b' + # call to VIM connector method + result = self.vim.refresh_vms_status([vm_id]) + for attr in result[vm_id]: + if attr == 'status': + # assert verified expected and return result from VIM connector + self.assertEqual(result[vm_id][attr], 'ACTIVE') + + @mock.patch.object(vimconnector,'get_vcd_network') + def test_refresh_nets_status(self, get_vcd_network): + net_id = 'c2d0f28f-d38b-4588-aecc-88af3d4af58b' + network_dict = {'status': '1','isShared': 'false','IpScope': '', + 'EndAddress':'12.19.21.15', + 'name': 'testing_gwyRXlvWYL1-9ebb6d7b-5c74-472f-be77-963ed050d44d', + 'Dns1': '12.19.21.10', 'IpRanges': '', + 'Gateway': '12.19.21.23', 'Netmask': '255.255.255.0', + 'RetainNetInfoAcrossDeployments': 'false', + 'IpScopes': '', 'IsEnabled': 'true', 'DnsSuffix': 'corp.local', + 'StartAddress': '12.19.21.11', 'IpRange': '', + 'Configuration': '', 'FenceMode': 'bridged', + 'IsInherited': 'true', 'uuid': 'c2d0f28f-d38b-4588-aecc-88af3d4af58b'} + # assumed return value from VIM connector + get_vcd_network.return_value = network_dict + result = self.vim.refresh_nets_status([net_id]) + # assert verified expected and return result from VIM connector + for attr in result[net_id]: + if attr == 'status': + self.assertEqual(result[net_id][attr], 'ACTIVE') + + @mock.patch.object(VCA,'block_until_completed') + @mock.patch.object(VCA,'get_vapp') + @mock.patch.object(vimconnector,'connect') + @mock.patch.object(vimconnector,'get_namebyvappid') + @mock.patch.object(vimconnector,'get_vdc_details') + def test_action_vminstance(self, get_vdc_details, get_namebyvappid, connect, get_vapp, block): + task_resp = xml_resp.task_xml + vm_id = '05e6047b-6938-4275-8940-22d1ea7245b8' + # created vdc object + vdc_xml_resp = xml_resp.vdc_xml_response + vdc = vdcType.parseString(vdc_xml_resp,True) + # assumed return value from VIM connector + get_vdc_details.return_value = vdc + get_namebyvappid.return_value = 'Test1_vm-69a18104-8413-4cb8-bad7-b5afaec6f9fa' + connect.return_value = self.vca + self.vim.vca = self.vim.connect() + get_vapp.return_value.undeploy.return_value = taskType.parseString(task_resp, True) + block.return_value = True + # call to VIM connector method + result = self.vim.action_vminstance(vm_id,{'shutdown': None}) + # assert verified expected and return result from VIM connector + self.assertEqual(result, None) diff --git a/osm_ro/tests/test_vimconn_vmware_xml_response.py b/osm_ro/tests/test_vimconn_vmware_xml_response.py new file mode 100644 index 00000000..41793241 --- /dev/null +++ b/osm_ro/tests/test_vimconn_vmware_xml_response.py @@ -0,0 +1,296 @@ +# -*- coding: utf-8 -*- + +## +# Copyright 2016-2017 VMware Inc. +# This file is part of ETSI OSM +# 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: osslegalrouting@vmware.com +## + +vdc_xml_response = """ + + + + + + + + + + + + + + + + + + + Org3-VDC-PVDC1 + AllocationVApp + + + MHz + 0 + 0 + 0 + 2000 + 0 + + + MB + 0 + 0 + 0 + 2048 + 71 + + + + + + + + + + + + + + + + + + + + + vmx-04 + vmx-07 + vmx-08 + vmx-09 + vmx-10 + vmx-11 + + + 0 + 1000 + 0 + 0 + true + + + + + 1000 + """ + +network_xml_response = """ + + + + + Openmano created + + + + true + 12.169.24.23 + 255.255.255.0 + 12.169.24.102 + corp.local + true + + + 12.169.24.115 + 12.169.241.150 + + + + + bridged + false + + false + """ + +delete_network_xml_response = """ + + + + + Openmano created + + + + true + 12.169.24.23 + 255.255.255.0 + 12.169.24.102 + corp.local + true + + + 12.169.241.115 + 12.169.241.150 + + + bridged + false + + false + """ + +create_network_xml_response = """ + + + + + + + + Openmano created + + + + + +
+ + + + + false + 12.16.113.1 + 255.255.255.0 + 12.16.113.2 + true + + 12.168.113.3 + 12.168.113.52 + + + + bridged + false + false + """ + +catalog1_xml_response = """ + + + + + + + + + + + Ubuntu-vm +false2017-03-17T03:17:11.293-07:005 +""" + +catalog2_xml_response = """ + + + + + + + + + + + cirros +false2017-03-08T02:06:07.003-08:005 +""" + +vapp_xml_response = """ + + + + + + + + + + + + + + + + + + + + +Lease settings section + 07776000 +VApp startup section + + The list of logical networks +External-Network-1074 + +The configuration parameters for logical networks + +External-Network-1074false192.168.254.1255.255.255.0 +true192.168.254.100192.168.254.199 +isolatedfalsetrue + +true +192.169.241.253255.255.255.0192.169.241.102corp.localtrue +192.169.241.115192.169.241.150 +bridgedfalse +trueSnapshot information section2017-09-21T01:15:31.627-07:00 + +false + + + + + + + + + + + + + + + + + + + + + + + + + +Ubuntu-vm Virtual hardware requirementsVirtual Hardware Family0 Test1_vm-69a18104-8413-4cb8-bad7-b5afaec6f9favmx-11 00:50:56:01:12:a20 true testing_T6nODiW4-68f68d93-0350-4d86-b40b-6e74dedf994d Vmxnet3 ethernet adapter on "testing_T6nODiW4-68f68d93-0350-4d86-b40b-6e74dedf994d" Network adapter 0 1 VMXNET3 10 0 SCSI Controller SCSI Controller 0 2 lsilogic 6 0 Hard disk Hard disk 1 2000 2 17 42949672960 byte 0 SATA Controller SATA Controller 0 3 vmware.sata.ahci 20 0 false CD/DVD Drive CD/DVD Drive 1 16000 3 15 0 false Floppy Drive Floppy Drive 1 8000 14 hertz * 10^6 Number of Virtual CPUs 1 virtual CPU(s) 4 0 3 1 0 1 byte * 2^20 Memory Size 1024 MB of memory 5 0 4 1024 0 + + + + +Specifies the operating system installedUbuntu Linux (64-bit)Specifies the available VM network connections0 0 12.19.21.20 true 00:50:56:01:12:a2 DHCPSpecifies Guest OS Customization Settingstruefalse47d12505-5968-4e16-95a7-18743edb0c8bfalsefalsefalsetruefalse0falseUbuntu-vm-001Specifies Runtime infoSnapshot information section2017-09-21T01:15:53.863-07:00Ubuntu-vm VMware ESXi 6.0.0 VMware, Inc. en falsefalse""" + +task_xml = """ +
""" diff --git a/osm_ro/vimconn_vmware.py b/osm_ro/vimconn_vmware.py index d1c39779..09f6827c 100644 --- a/osm_ro/vimconn_vmware.py +++ b/osm_ro/vimconn_vmware.py @@ -671,6 +671,9 @@ class vimconnector(vimconn.vimconnector): networks = self.vca.get_networks(vdc.get_name()) filter_dict = {} + if not networks: + vimconn.vimconnNotFoundException("Network {} not found".format(net_id)) + for network in networks: vdc_network_id = network.get_id().split(":") if len(vdc_network_id) == 4 and vdc_network_id[3] == net_id: @@ -686,9 +689,16 @@ class vimconnector(vimconn.vimconnector): filter_dict["type"] = "bridge" self.logger.debug("Returning {}".format(filter_dict)) return filter_dict - except: + else: + raise vimconn.vimconnNotFoundException("Network {} not found".format(net_id)) + + except Exception as e: self.logger.debug("Error in get_network") self.logger.debug(traceback.format_exc()) + if isinstance(e, vimconn.vimconnException): + raise + else: + raise vimconn.vimconnNotFoundException("Failed : Network not found {} ".format(e)) return filter_dict