X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=inline;f=RO-VIM-openstack%2Fosm_rovim_openstack%2Ftests%2Ftest_vimconn_openstack.py;h=44b63d200ba800930c296c0fc02db5d6e3508fa1;hb=25bc6389d4c6f5ff79b323c5f98a95dba42373e5;hp=eb8da2ff217ef542a224712e72591c507ede5e35;hpb=6986244790d12f4ce734fd5cd2599e84b29c3f84;p=osm%2FRO.git diff --git a/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py index eb8da2ff..44b63d20 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py @@ -23,23 +23,23 @@ This module contains unit tests for the OpenStack VIM connector Run this directly with python2 or python3. """ -import copy from copy import deepcopy import logging import unittest -import mock +import cinderclient.exceptions as cExceptions from mock import MagicMock, patch -from neutronclient.v2_0.client import Client +from neutronclient.common import exceptions as neExceptions from novaclient import exceptions as nvExceptions from novaclient.exceptions import ClientException, Conflict -from osm_ro_plugin import vimconn from osm_ro_plugin.vimconn import ( VimConnConnectionException, VimConnException, VimConnNotFoundException, + VimConnUnexpectedResponse, ) from osm_rovim_openstack.vimconn_openstack import vimconnector +from requests.exceptions import ConnectionError __author__ = "Igor D.C." __date__ = "$23-aug-2017 23:59:59$" @@ -72,6 +72,7 @@ ip_addr1 = "20.3.4.5" volume_id = "ac408b73-b9cc-4a6a-a270-82cc4811bd4a" volume_id2 = "o4e0e83-b9uu-4akk-a234-89cc4811bd4a" volume_id3 = "44e0e83-t9uu-4akk-a234-p9cc4811bd4a" +volume_id4 = "91bf5674-5b85-41d1-aa3b-4848e2691088" virtual_mac_id = "64e0e83-t9uu-4akk-a234-p9cc4811bd4a" created_items_all_true = { f"floating_ip:{floating_network_vim_id}": True, @@ -107,1032 +108,25 @@ flavor_data2 = { } -class TestSfcOperations(unittest.TestCase): - @mock.patch("logging.getLogger", autospec=True) - def setUp(self, mock_logger): - # Instantiate dummy VIM connector so we can test it - # It throws exception because of dummy parameters, - # We are disabling the logging of exception not to print them to console. - mock_logger = logging.getLogger() - mock_logger.disabled = True - self.vimconn = vimconnector( - "123", - "openstackvim", - "456", - "789", - "http://dummy.url", - None, - "user", - "pass", - ) - - def _test_new_sfi( - self, - create_sfc_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 = "nsh" - 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_sfc_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_sfc_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_sfc_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_sfc_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_sfc_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_sfc_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 = "nsh" - chain_id = 33 - 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_sfc_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: - dict_to_neutron["port_chain"]["chain_parameters"] = {"correlation": "mpls"} - if spi is None: - result = self.vimconn.new_sfp( - name, classifications, sfs, sfc_encap=False - ) - else: - result = self.vimconn.new_sfp( - name, classifications, sfs, sfc_encap=False, 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_sfc_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_sfc_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_sfc_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_sfc_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_sfc_flow_classifier") - def test_new_classification(self, create_sfc_flow_classifier): - self._test_new_classification( - create_sfc_flow_classifier, "legacy_flow_classifier" - ) - - @mock.patch.object(Client, "create_sfc_flow_classifier") - def test_new_classification_unsupported_type(self, create_sfc_flow_classifier): - self.assertRaises( - vimconn.VimConnNotSupportedException, - self._test_new_classification, - create_sfc_flow_classifier, - "h265", - ) - - @mock.patch.object(Client, "create_sfc_port_pair") - def test_new_sfi_with_sfc_encap(self, create_sfc_port_pair): - self._test_new_sfi(create_sfc_port_pair, True) - - @mock.patch.object(Client, "create_sfc_port_pair") - def test_new_sfi_without_sfc_encap(self, create_sfc_port_pair): - self._test_new_sfi(create_sfc_port_pair, False) - - @mock.patch.object(Client, "create_sfc_port_pair") - def test_new_sfi_default_sfc_encap(self, create_sfc_port_pair): - self._test_new_sfi(create_sfc_port_pair, None) - - @mock.patch.object(Client, "create_sfc_port_pair") - def test_new_sfi_bad_ingress_ports(self, create_sfc_port_pair): - ingress_ports = [ - "5311c75d-d718-4369-bbda-cdcc6da60fcc", - "a0273f64-82c9-11e7-b08f-6328e53f0fa7", - ] - self.assertRaises( - vimconn.VimConnNotSupportedException, - self._test_new_sfi, - create_sfc_port_pair, - True, - ingress_ports=ingress_ports, - ) - ingress_ports = [] - self.assertRaises( - vimconn.VimConnNotSupportedException, - self._test_new_sfi, - create_sfc_port_pair, - True, - ingress_ports=ingress_ports, - ) - - @mock.patch.object(Client, "create_sfc_port_pair") - def test_new_sfi_bad_egress_ports(self, create_sfc_port_pair): - egress_ports = [ - "230cdf1b-de37-4891-bc07-f9010cf1f967", - "b41228fe-82c9-11e7-9b44-17504174320b", - ] - self.assertRaises( - vimconn.VimConnNotSupportedException, - self._test_new_sfi, - create_sfc_port_pair, - True, - egress_ports=egress_ports, - ) - egress_ports = [] - self.assertRaises( - vimconn.VimConnNotSupportedException, - self._test_new_sfi, - create_sfc_port_pair, - True, - egress_ports=egress_ports, - ) - - @mock.patch.object(vimconnector, "get_sfi") - @mock.patch.object(Client, "create_sfc_port_pair_group") - def test_new_sf(self, create_sfc_port_pair_group, get_sfi): - get_sfi.return_value = {"sfc_encap": True} - self._test_new_sf(create_sfc_port_pair_group) - - @mock.patch.object(vimconnector, "get_sfi") - @mock.patch.object(Client, "create_sfc_port_pair_group") - def test_new_sf_inconsistent_sfc_encap(self, create_sfc_port_pair_group, get_sfi): - get_sfi.return_value = {"sfc_encap": "nsh"} - self.assertRaises( - vimconn.VimConnNotSupportedException, - self._test_new_sf, - create_sfc_port_pair_group, - ) - - @mock.patch.object(Client, "create_sfc_port_chain") - def test_new_sfp_with_sfc_encap(self, create_sfc_port_chain): - self._test_new_sfp(create_sfc_port_chain, True, None) - - @mock.patch.object(Client, "create_sfc_port_chain") - def test_new_sfp_without_sfc_encap(self, create_sfc_port_chain): - self._test_new_sfp(create_sfc_port_chain, None, None) - self._test_new_sfp(create_sfc_port_chain, None, 25) - - @mock.patch.object(Client, "create_sfc_port_chain") - def test_new_sfp_default_sfc_encap(self, create_sfc_port_chain): - self._test_new_sfp(create_sfc_port_chain, None, None) - - @mock.patch.object(Client, "create_sfc_port_chain") - def test_new_sfp_with_sfc_encap_spi(self, create_sfc_port_chain): - self._test_new_sfp(create_sfc_port_chain, True, 25) - - @mock.patch.object(Client, "create_sfc_port_chain") - def test_new_sfp_default_sfc_encap_spi(self, create_sfc_port_chain): - self._test_new_sfp(create_sfc_port_chain, None, 25) - - @mock.patch.object(Client, "list_sfc_flow_classifiers") - def test_get_classification_list(self, list_sfc_flow_classifiers): - # what OpenStack is assumed to return to the VIM connector - list_sfc_flow_classifiers.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_sfc_flow_classifiers.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_sfc_port_pairs") - def test_get_sfi_list_with_sfc_encap(self, list_sfc_port_pairs): - self._test_get_sfi_list(list_sfc_port_pairs, "nsh", True) - - @mock.patch.object(Client, "list_sfc_port_pairs") - def test_get_sfi_list_without_sfc_encap(self, list_sfc_port_pairs): - self._test_get_sfi_list(list_sfc_port_pairs, None, False) - - @mock.patch.object(Client, "list_sfc_port_pair_groups") - def test_get_sf_list(self, list_sfc_port_pair_groups): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_pair_groups.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_sfc_port_pair_groups.assert_called_with(**filter_dict) - # assert that the VIM connector successfully - # translated and returned the OpenStack result - self.assertEqual( - result, - [ - { - "sfis": [ - "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_sfc_port_chains, correlation, sfc_encap): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_chains.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_sfc_port_chains.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_sfc_port_chains") - def test_get_sfp_list_with_sfc_encap(self, list_sfc_port_chains): - self._test_get_sfp_list(list_sfc_port_chains, "nsh", True) - - @mock.patch.object(Client, "list_sfc_port_chains") - def test_get_sfp_list_without_sfc_encap(self, list_sfc_port_chains): - self._test_get_sfp_list(list_sfc_port_chains, None, False) - - @mock.patch.object(Client, "list_sfc_flow_classifiers") - def test_get_classification(self, list_sfc_flow_classifiers): - # what OpenStack is assumed to return to the VIM connector - list_sfc_flow_classifiers.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_sfc_flow_classifiers.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_sfc_flow_classifiers") - def test_get_classification_many_results(self, list_sfc_flow_classifiers): - # what OpenStack is assumed to return to the VIM connector - list_sfc_flow_classifiers.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_sfc_flow_classifiers.assert_called_with( - id="3196bafc-82dd-11e7-a205-9bf6c14b0721" - ) - - @mock.patch.object(Client, "list_sfc_flow_classifiers") - def test_get_classification_no_results(self, list_sfc_flow_classifiers): - # what OpenStack is assumed to return to the VIM connector - list_sfc_flow_classifiers.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_sfc_flow_classifiers.assert_called_with( - id="3196bafc-82dd-11e7-a205-9bf6c14b0721" - ) - - @mock.patch.object(Client, "list_sfc_port_pairs") - def test_get_sfi(self, list_sfc_port_pairs): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_pairs.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_sfc_port_pairs.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_sfc_port_pairs") - def test_get_sfi_many_results(self, list_sfc_port_pairs): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_pairs.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_sfc_port_pairs.assert_called_with( - id="c0436d92-82db-11e7-8f9c-5fa535f1261f" - ) - - @mock.patch.object(Client, "list_sfc_port_pairs") - def test_get_sfi_no_results(self, list_sfc_port_pairs): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_pairs.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_sfc_port_pairs.assert_called_with( - id="b22892fc-82d9-11e7-ae85-0fea6a3b3757" - ) - - @mock.patch.object(Client, "list_sfc_port_pair_groups") - def test_get_sf(self, list_sfc_port_pair_groups): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_pair_groups.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_sfc_port_pair_groups.assert_called_with( - id="b22892fc-82d9-11e7-ae85-0fea6a3b3757" - ) - # assert that VIM connector successfully returned the OpenStack result - self.assertEqual( - result, - { - "description": "", - "tenant_id": "8f3019ef06374fa880a0144ad4bc1d7b", - "project_id": "8f3019ef06374fa880a0144ad4bc1d7b", - "sfis": ["08fbdbb0-82d6-11e7-ad95-9bb52fbec2f2"], - "id": "aabba8a6-82d9-11e7-a18a-d3c7719b742d", - "name": "osm_sf1", - }, - ) - - @mock.patch.object(Client, "list_sfc_port_pair_groups") - def test_get_sf_many_results(self, list_sfc_port_pair_groups): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_pair_groups.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_sfc_port_pair_groups.assert_called_with( - id="b22892fc-82d9-11e7-ae85-0fea6a3b3757" - ) - - @mock.patch.object(Client, "list_sfc_port_pair_groups") - def test_get_sf_no_results(self, list_sfc_port_pair_groups): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_pair_groups.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_sfc_port_pair_groups.assert_called_with( - id="b22892fc-82d9-11e7-ae85-0fea6a3b3757" - ) - - @mock.patch.object(Client, "list_sfc_port_chains") - def test_get_sfp(self, list_sfc_port_chains): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_chains.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_sfc_port_chains.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_sfc_port_chains") - def test_get_sfp_many_results(self, list_sfc_port_chains): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_chains.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_sfc_port_chains.assert_called_with( - id="5d002f38-82de-11e7-a770-f303f11ce66a" - ) - - @mock.patch.object(Client, "list_sfc_port_chains") - def test_get_sfp_no_results(self, list_sfc_port_chains): - # what OpenStack is assumed to return to the VIM connector - list_sfc_port_chains.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_sfc_port_chains.assert_called_with( - id="5d002f38-82de-11e7-a770-f303f11ce66a" - ) - - @mock.patch.object(Client, "delete_sfc_flow_classifier") - def test_delete_classification(self, delete_sfc_flow_classifier): - result = self.vimconn.delete_classification( - "638f957c-82df-11e7-b7c8-132706021464" - ) - delete_sfc_flow_classifier.assert_called_with( - "638f957c-82df-11e7-b7c8-132706021464" - ) - self.assertEqual(result, "638f957c-82df-11e7-b7c8-132706021464") - - @mock.patch.object(Client, "delete_sfc_port_pair") - def test_delete_sfi(self, delete_sfc_port_pair): - result = self.vimconn.delete_sfi("638f957c-82df-11e7-b7c8-132706021464") - delete_sfc_port_pair.assert_called_with("638f957c-82df-11e7-b7c8-132706021464") - self.assertEqual(result, "638f957c-82df-11e7-b7c8-132706021464") - - @mock.patch.object(Client, "delete_sfc_port_pair_group") - def test_delete_sf(self, delete_sfc_port_pair_group): - result = self.vimconn.delete_sf("638f957c-82df-11e7-b7c8-132706021464") - delete_sfc_port_pair_group.assert_called_with( - "638f957c-82df-11e7-b7c8-132706021464" - ) - self.assertEqual(result, "638f957c-82df-11e7-b7c8-132706021464") - - @mock.patch.object(Client, "delete_sfc_port_chain") - def test_delete_sfp(self, delete_sfc_port_chain): - result = self.vimconn.delete_sfp("638f957c-82df-11e7-b7c8-132706021464") - delete_sfc_port_chain.assert_called_with("638f957c-82df-11e7-b7c8-132706021464") - self.assertEqual(result, "638f957c-82df-11e7-b7c8-132706021464") +def check_if_assert_not_called(mocks: list): + for mocking in mocks: + mocking.assert_not_called() -class Status: - def __init__(self, s): +class Volume: + def __init__(self, s, type="__DEFAULT__", name="", id=""): self.status = s + self.volume_type = type + self.name = name + self.id = id - def __str__(self): - return self.status + +class Server: + def __init__(self, name="", status="", flavor="", id=""): + self.id = id + self.name = name + self.status = status + self.flavor = flavor class CopyingMock(MagicMock): @@ -1378,7 +372,7 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn._prepare_port_dict_mac_ip_addr(net, port_dict) self.assertDictEqual(port_dict, result_dict) - def test_prepare_port_dict_mac_ip_addr_no_mac_and_ip(self): + def test_prepare_port_dict_mac_ip_addr_empty_net(self): """mac address and ip address does not exist.""" net = {} port_dict = {} @@ -1386,6 +380,67 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn._prepare_port_dict_mac_ip_addr(net, port_dict) self.assertDictEqual(port_dict, result_dict) + def test_prepare_port_dict_mac_ip_addr_dual(self): + """mac address, ipv4 and ipv6 addresses exist.""" + net = { + "mac_address": mac_address, + "ip_address": ["10.0.1.5", "2345:0425:2CA1:0000:0000:0567:5673:23b5"], + } + port_dict = {} + result_dict = { + "mac_address": mac_address, + "fixed_ips": [ + {"ip_address": "10.0.1.5"}, + {"ip_address": "2345:0425:2CA1:0000:0000:0567:5673:23b5"}, + ], + } + self.vimconn._prepare_port_dict_mac_ip_addr(net, port_dict) + self.assertDictEqual(port_dict, result_dict) + + def test_prepare_port_dict_mac_ip_addr_dual_ip_addr_is_not_list(self): + """mac address, ipv4 and ipv6 addresses exist.""" + net = { + "mac_address": mac_address, + "ip_address": "10.0.1.5", + } + port_dict = {} + result_dict = { + "mac_address": mac_address, + "fixed_ips": [ + {"ip_address": "10.0.1.5"}, + ], + } + self.vimconn._prepare_port_dict_mac_ip_addr(net, port_dict) + self.assertDictEqual(port_dict, result_dict) + + def test_prepare_port_dict_mac_ip_addr_dual_net_without_ip_addr(self): + """mac address, ipv4 and ipv6 addresses exist.""" + net = { + "mac_address": mac_address, + "ip_address": [], + } + port_dict = {} + result_dict = { + "mac_address": mac_address, + } + self.vimconn._prepare_port_dict_mac_ip_addr(net, port_dict) + self.assertDictEqual(port_dict, result_dict) + + def test_prepare_port_dict_mac_ip_addr_dual_net_without_mac_addr(self): + """mac address, ipv4 and ipv6 addresses exist.""" + net = { + "ip_address": ["10.0.1.5", "2345:0425:2CA1:0000:0000:0567:5673:23b5"], + } + port_dict = {} + result_dict = { + "fixed_ips": [ + {"ip_address": "10.0.1.5"}, + {"ip_address": "2345:0425:2CA1:0000:0000:0567:5673:23b5"}, + ], + } + self.vimconn._prepare_port_dict_mac_ip_addr(net, port_dict) + self.assertDictEqual(port_dict, result_dict) + def test_create_new_port(self): """new port has id and mac address.""" new_port = { @@ -1398,7 +453,7 @@ class TestNewVmInstance(unittest.TestCase): net, port_dict, created_items = {}, {}, {} expected_result = new_port expected_net = { - "mac_adress": mac_address, + "mac_address": mac_address, "vim_id": port_id, } expected_created_items = {f"port:{port_id}": True} @@ -2247,7 +1302,7 @@ class TestNewVmInstance(unittest.TestCase): def test_prepare_persistent_root_volumes_vim_using_volume_id(self): """Existing persistent root volume with vim_volume_id.""" - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("a") disk = {"vim_volume_id": volume_id} block_device_mapping = {} @@ -2258,7 +1313,7 @@ class TestNewVmInstance(unittest.TestCase): expected_existing_vim_volumes = [{"id": volume_id}] boot_volume_id = self.vimconn._prepare_persistent_root_volumes( name, - vm_av_zone, + storage_av_zone, disk, base_disk_index, block_device_mapping, @@ -2270,12 +1325,50 @@ class TestNewVmInstance(unittest.TestCase): self.assertEqual(existing_vim_volumes, expected_existing_vim_volumes) self.vimconn.cinder.volumes.create.assert_not_called() + @patch.object(vimconnector, "update_block_device_mapping") + def test__prepare_shared_volumes_vim_using_volume_id( + self, mock_update_block_device_mapping + ): + """Existing persistent non root volume with vim_volume_id. + class Volume: + def __init__(self, s, type="__DEFAULT__", name="", id=""): + self.status = s + self.volume_type = type + self.name = name + self.id = id + volumes = {"shared-volume": volume_id4} + + The device mappeing BEFORE is: {} + The device mappeing AFTER is: {'vdb': '8ca50cc6-a779-4513-a1f3-900b8b3987d2'} + """ + base_disk_index = ord("b") + disk = {"name": "shared-volume"} + block_device_mapping = {} + existing_vim_volumes = [] + created_items = {} + expected_block_device_mapping = {} + self.vimconn.cinder.volumes.list.return_value = [ + Volume("available", "multiattach", "shared-volume", volume_id4) + ] + self.vimconn.cinder.volumes.get.return_value.id = volume_id4 + self.vimconn.cinder.volumes.get.return_value.status = "available" + self.vimconn._prepare_shared_volumes( + name, + disk, + base_disk_index, + block_device_mapping, + existing_vim_volumes, + created_items, + ) + self.vimconn.cinder.volumes.get.assert_called_with(volume_id4) + self.assertDictEqual(block_device_mapping, expected_block_device_mapping) + @patch.object(vimconnector, "update_block_device_mapping") def test_prepare_persistent_non_root_volumes_vim_using_volume_id( self, mock_update_block_device_mapping ): """Existing persistent non root volume with vim_volume_id.""" - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("b") disk = {"vim_volume_id": volume_id} block_device_mapping = {} @@ -2286,7 +1379,7 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn._prepare_non_root_persistent_volumes( name, disk, - vm_av_zone, + storage_av_zone, block_device_mapping, base_disk_index, existing_vim_volumes, @@ -2302,7 +1395,7 @@ class TestNewVmInstance(unittest.TestCase): self, mock_update_block_device_mapping ): """Existing persistent root volume with vim_id.""" - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("a") disk = {"vim_id": volume_id} block_device_mapping = {} @@ -2313,7 +1406,7 @@ class TestNewVmInstance(unittest.TestCase): expected_existing_vim_volumes = [{"id": volume_id}] boot_volume_id = self.vimconn._prepare_persistent_root_volumes( name, - vm_av_zone, + storage_av_zone, disk, base_disk_index, block_device_mapping, @@ -2331,7 +1424,7 @@ class TestNewVmInstance(unittest.TestCase): self, mock_update_block_device_mapping ): """Existing persistent root volume with vim_id.""" - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("b") disk = {"vim_id": volume_id} block_device_mapping = {} @@ -2343,7 +1436,7 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn._prepare_non_root_persistent_volumes( name, disk, - vm_av_zone, + storage_av_zone, block_device_mapping, base_disk_index, existing_vim_volumes, @@ -2361,7 +1454,7 @@ class TestNewVmInstance(unittest.TestCase): ): """Create persistent root volume.""" self.vimconn.cinder.volumes.create.return_value.id = volume_id2 - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("a") disk = {"size": 10, "image_id": image_id} block_device_mapping = {} @@ -2370,7 +1463,7 @@ class TestNewVmInstance(unittest.TestCase): expected_boot_vol_id = volume_id2 boot_volume_id = self.vimconn._prepare_persistent_root_volumes( name, - vm_av_zone, + storage_av_zone, disk, base_disk_index, block_device_mapping, @@ -2406,7 +1499,7 @@ class TestNewVmInstance(unittest.TestCase): ): """Create persistent root volume, disk has keep parameter.""" self.vimconn.cinder.volumes.create.return_value.id = volume_id2 - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("a") disk = {"size": 10, "image_id": image_id, "keep": True} block_device_mapping = {} @@ -2416,7 +1509,7 @@ class TestNewVmInstance(unittest.TestCase): expected_existing_vim_volumes = [] boot_volume_id = self.vimconn._prepare_persistent_root_volumes( name, - vm_av_zone, + storage_av_zone, disk, base_disk_index, block_device_mapping, @@ -2454,7 +1547,7 @@ class TestNewVmInstance(unittest.TestCase): """Create persistent non-root volume.""" self.vimconn.cinder = CopyingMock() self.vimconn.cinder.volumes.create.return_value.id = volume_id2 - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("a") disk = {"size": 10} block_device_mapping = {} @@ -2464,7 +1557,7 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn._prepare_non_root_persistent_volumes( name, disk, - vm_av_zone, + storage_av_zone, block_device_mapping, base_disk_index, existing_vim_volumes, @@ -2498,7 +1591,7 @@ class TestNewVmInstance(unittest.TestCase): """Create persistent non-root volume.""" self.vimconn.cinder = CopyingMock() self.vimconn.cinder.volumes.create.return_value.id = volume_id2 - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("a") disk = {"size": 10, "keep": True} block_device_mapping = {} @@ -2508,7 +1601,7 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn._prepare_non_root_persistent_volumes( name, disk, - vm_av_zone, + storage_av_zone, block_device_mapping, base_disk_index, existing_vim_volumes, @@ -2535,13 +1628,35 @@ class TestNewVmInstance(unittest.TestCase): _call_mock_update_block_device_mapping[0].kwargs["created_items"], {} ) + @patch.object(vimconnector, "update_block_device_mapping") + def test_new_shared_volumes(self, mock_update_block_device_mapping): + """Create shared volume.""" + + class MyVolume: + name = "my-shared-volume" + id = volume_id4 + availability_zone = ["nova"] + + self.vimconn.storage_availability_zone = ["nova"] + self.vimconn.cinder.volumes.create.return_value = MyVolume() + shared_volume_data = {"size": 10, "name": "my-shared-volume"} + result = self.vimconn.new_shared_volumes(shared_volume_data) + self.vimconn.cinder.volumes.create.assert_called_once_with( + size=10, + name="my-shared-volume", + volume_type="multiattach", + availability_zone=["nova"], + ) + self.assertEqual(result[0], "my-shared-volume") + self.assertEqual(result[1], volume_id4) + @patch.object(vimconnector, "update_block_device_mapping") def test_prepare_persistent_root_volumes_create_raise_exception( self, mock_update_block_device_mapping ): """Create persistent root volume raise exception.""" self.vimconn.cinder.volumes.create.side_effect = Exception - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("a") disk = {"size": 10, "image_id": image_id} block_device_mapping = {} @@ -2551,7 +1666,7 @@ class TestNewVmInstance(unittest.TestCase): with self.assertRaises(Exception): result = self.vimconn._prepare_persistent_root_volumes( name, - vm_av_zone, + storage_av_zone, disk, base_disk_index, block_device_mapping, @@ -2578,7 +1693,7 @@ class TestNewVmInstance(unittest.TestCase): ): """Create persistent non-root volume raise exception.""" self.vimconn.cinder.volumes.create.side_effect = Exception - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] base_disk_index = ord("b") disk = {"size": 10} block_device_mapping = {} @@ -2589,7 +1704,7 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn._prepare_non_root_persistent_volumes( name, disk, - vm_av_zone, + storage_av_zone, block_device_mapping, base_disk_index, existing_vim_volumes, @@ -2647,9 +1762,9 @@ class TestNewVmInstance(unittest.TestCase): f"volume:{volume_id3}": True, } self.vimconn.cinder.volumes.get.side_effect = [ - Status("processing"), - Status("available"), - Status("available"), + Volume("processing"), + Volume("available"), + Volume("available"), ] result = self.vimconn._wait_for_created_volumes_availability( @@ -2674,9 +1789,9 @@ class TestNewVmInstance(unittest.TestCase): {"id": "44e0e83-b9uu-4akk-t234-p9cc4811bd4a"}, ] self.vimconn.cinder.volumes.get.side_effect = [ - Status("processing"), - Status("available"), - Status("available"), + Volume("processing"), + Volume("available", "multiattach"), + Volume("available"), ] result = self.vimconn._wait_for_existing_volumes_availability( @@ -2700,8 +1815,8 @@ class TestNewVmInstance(unittest.TestCase): elapsed_time = 1805 created_items = {f"volume:{volume_id2}": True} self.vimconn.cinder.volumes.get.side_effect = [ - Status("processing"), - Status("processing"), + Volume("processing"), + Volume("processing"), ] with patch("time.sleep", mock_sleep): result = self.vimconn._wait_for_created_volumes_availability( @@ -2719,8 +1834,8 @@ class TestNewVmInstance(unittest.TestCase): elapsed_time = 1805 existing_vim_volumes = [{"id": volume_id2}] self.vimconn.cinder.volumes.get.side_effect = [ - Status("processing"), - Status("processing"), + Volume("processing"), + Volume("processing"), ] result = self.vimconn._wait_for_existing_volumes_availability( @@ -2811,7 +1926,7 @@ class TestNewVmInstance(unittest.TestCase): existing_vim_volumes = [] created_items = {} block_device_mapping = {} - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] mock_root_volumes.return_value = root_vol_id mock_created_vol_availability.return_value = 10 @@ -2821,7 +1936,7 @@ class TestNewVmInstance(unittest.TestCase): name, existing_vim_volumes, created_items, - vm_av_zone, + storage_av_zone, block_device_mapping, disk_list2, ) @@ -2834,7 +1949,7 @@ class TestNewVmInstance(unittest.TestCase): self.assertEqual(mock_non_root_volumes.call_count, 1) mock_root_volumes.assert_called_once_with( name="basicvm", - vm_av_zone=["nova"], + storage_av_zone=["nova"], disk={"size": 10, "image_id": image_id}, base_disk_index=97, block_device_mapping={}, @@ -2844,7 +1959,7 @@ class TestNewVmInstance(unittest.TestCase): mock_non_root_volumes.assert_called_once_with( name="basicvm", disk={"size": 20}, - vm_av_zone=["nova"], + storage_av_zone=["nova"], base_disk_index=98, block_device_mapping={}, existing_vim_volumes=[], @@ -2865,7 +1980,7 @@ class TestNewVmInstance(unittest.TestCase): """Timeout exceeded while waiting for disks.""" existing_vim_volumes = [] created_items = {} - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] block_device_mapping = {} mock_root_volumes.return_value = root_vol_id @@ -2877,7 +1992,7 @@ class TestNewVmInstance(unittest.TestCase): name, existing_vim_volumes, created_items, - vm_av_zone, + storage_av_zone, block_device_mapping, disk_list2, ) @@ -2893,7 +2008,7 @@ class TestNewVmInstance(unittest.TestCase): self.assertEqual(mock_non_root_volumes.call_count, 1) mock_root_volumes.assert_called_once_with( name="basicvm", - vm_av_zone=["nova"], + storage_av_zone=["nova"], disk={"size": 10, "image_id": image_id}, base_disk_index=97, block_device_mapping={}, @@ -2903,7 +2018,7 @@ class TestNewVmInstance(unittest.TestCase): mock_non_root_volumes.assert_called_once_with( name="basicvm", disk={"size": 20}, - vm_av_zone=["nova"], + storage_av_zone=["nova"], base_disk_index=98, block_device_mapping={}, existing_vim_volumes=[], @@ -2925,7 +2040,7 @@ class TestNewVmInstance(unittest.TestCase): existing_vim_volumes = [] created_items = {} block_device_mapping = {} - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] mock_created_vol_availability.return_value = 2 mock_existing_vol_availability.return_value = 3 @@ -2933,7 +2048,7 @@ class TestNewVmInstance(unittest.TestCase): name, existing_vim_volumes, created_items, - vm_av_zone, + storage_av_zone, block_device_mapping, disk_list, ) @@ -2957,7 +2072,7 @@ class TestNewVmInstance(unittest.TestCase): """Persistent root volumes preparation raises error.""" existing_vim_volumes = [] created_items = {} - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] block_device_mapping = {} mock_root_volumes.side_effect = Exception() @@ -2969,7 +2084,7 @@ class TestNewVmInstance(unittest.TestCase): name, existing_vim_volumes, created_items, - vm_av_zone, + storage_av_zone, block_device_mapping, disk_list2, ) @@ -2978,7 +2093,7 @@ class TestNewVmInstance(unittest.TestCase): mock_existing_vol_availability.assert_not_called() mock_root_volumes.assert_called_once_with( name="basicvm", - vm_av_zone=["nova"], + storage_av_zone=["nova"], disk={"size": 10, "image_id": image_id}, base_disk_index=97, block_device_mapping={}, @@ -3001,7 +2116,7 @@ class TestNewVmInstance(unittest.TestCase): """Non-root volumes preparation raises error.""" existing_vim_volumes = [] created_items = {} - vm_av_zone = ["nova"] + storage_av_zone = ["nova"] block_device_mapping = {} mock_root_volumes.return_value = root_vol_id @@ -3012,7 +2127,7 @@ class TestNewVmInstance(unittest.TestCase): name, existing_vim_volumes, created_items, - vm_av_zone, + storage_av_zone, block_device_mapping, disk_list2, ) @@ -3023,7 +2138,7 @@ class TestNewVmInstance(unittest.TestCase): self.assertEqual(mock_non_root_volumes.call_count, 1) mock_root_volumes.assert_called_once_with( name="basicvm", - vm_av_zone=["nova"], + storage_av_zone=["nova"], disk={"size": 10, "image_id": image_id}, base_disk_index=97, block_device_mapping={}, @@ -3033,7 +2148,7 @@ class TestNewVmInstance(unittest.TestCase): mock_non_root_volumes.assert_called_once_with( name="basicvm", disk={"size": 20}, - vm_av_zone=["nova"], + storage_av_zone=["nova"], base_disk_index=98, block_device_mapping={}, existing_vim_volumes=[], @@ -4190,7 +3305,7 @@ class TestNewVmInstance(unittest.TestCase): name=name, existing_vim_volumes=[], created_items={}, - vm_av_zone="nova", + storage_av_zone="nova", block_device_mapping={}, disk_list=disk_list2, ) @@ -4367,7 +3482,7 @@ class TestNewVmInstance(unittest.TestCase): name=name, existing_vim_volumes=[], created_items={}, - vm_av_zone="nova", + storage_av_zone="nova", block_device_mapping={}, disk_list=disk_list2, ) @@ -4465,7 +3580,7 @@ class TestNewVmInstance(unittest.TestCase): name=name, existing_vim_volumes=[], created_items={}, - vm_av_zone="nova", + storage_av_zone="nova", block_device_mapping={}, disk_list=disk_list2, ) @@ -4564,7 +3679,7 @@ class TestNewVmInstance(unittest.TestCase): name=name, existing_vim_volumes=[], created_items={}, - vm_av_zone="nova", + storage_av_zone="nova", block_device_mapping={}, disk_list=disk_list2, ) @@ -4789,7 +3904,9 @@ class TestNewVmInstance(unittest.TestCase): }, ) - def test_delete_floating_ip_by_id_floating_ip_raises_nvexception(self): + def test_delete_floating_ip_by_id__delete_floating_ip_raises_client_exception__operation_is_successful( + self, + ): """netron delete floating ip raises nvExceptions.ClientException.""" created_items = { f"floating_ip:{floating_network_vim_id}": True, @@ -4813,7 +3930,36 @@ class TestNewVmInstance(unittest.TestCase): "Error deleting floating ip: ClientException: Unknown Error (HTTP Client exception occurred.)" ) - def test_delete_floating_ip_by_id_floating_ip_raises_vimconnexception(self): + def test_delete_floating_ip_by_id__delete_floating_ip_raises_connection_error__operation_fails( + self, + ): + """netron delete floating ip raises nvExceptions.ClientException.""" + created_items = { + f"floating_ip:{floating_network_vim_id}": True, + f"port:{port_id}": True, + } + k_id = floating_network_vim_id + k = f"floating_ip:{floating_network_vim_id}" + self.vimconn.neutron.delete_floatingip.side_effect = ConnectionError( + "Connection exception occurred." + ) + with self.assertRaises(VimConnConnectionException): + self.vimconn._delete_floating_ip_by_id(k, k_id, created_items) + self.vimconn.neutron.delete_floatingip.assert_called_once_with(k_id) + self.assertEqual( + created_items, + { + f"floating_ip:{floating_network_vim_id}": True, + f"port:{port_id}": True, + }, + ) + self.vimconn.logger.error.assert_called_once_with( + "Error deleting floating ip: ConnectionError: Connection exception occurred." + ) + + def test_delete_floating_ip_by_id_floating_ip_raises_vimconn_not_found_exception__operation_is_successful( + self, + ): """netron delete floating ip raises VimConnNotFoundException.""" created_items = { f"floating_ip:{floating_network_vim_id}": True, @@ -4908,6 +4054,15 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn.logger.error.assert_not_called() self.assertEqual(created_items, expected_created_items) + def test_delete_shared_volumes(self): + """cinder delete shared volumes""" + shared_volume_vim_id = volume_id4 + self.vimconn.cinder.volumes.get.return_value.status = "available" + self.vimconn.delete_shared_volumes(shared_volume_vim_id) + self.vimconn.cinder.volumes.get.assert_called_once_with(shared_volume_vim_id) + self.vimconn.cinder.volumes.delete.assert_called_once_with(shared_volume_vim_id) + self.vimconn.logger.error.assert_not_called() + def test_delete_volumes_by_id_with_cinder_get_volume_raise_exception(self): """cinder get volume raises exception.""" created_items = { @@ -4939,7 +4094,9 @@ class TestNewVmInstance(unittest.TestCase): ) self.assertEqual(created_items, expected_created_items) - def test_delete_volumes_by_id_with_cinder_delete_volume_raise_exception(self): + def test_delete_volumes_by_id_with_cinder__delete_volume_raise_client_exception__exception_is_not_raised( + self, + ): """cinder delete volume raises exception.""" created_items = { f"floating_ip:{floating_network_vim_id}": True, @@ -4957,8 +4114,8 @@ class TestNewVmInstance(unittest.TestCase): k = f"volume:{volume_id}" k_id = volume_id self.vimconn.cinder.volumes.get.return_value.status = "available" - self.vimconn.cinder.volumes.delete.side_effect = nvExceptions.ClientException( - "Connection aborted." + self.vimconn.cinder.volumes.delete.side_effect = cExceptions.ClientException( + 403, "Connection aborted." ) result = self.vimconn._delete_volumes_by_id_wth_cinder( k, k_id, volumes_to_hold, created_items @@ -4967,7 +4124,42 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn.cinder.volumes.get.assert_called_once_with(k_id) self.vimconn.cinder.volumes.delete.assert_called_once_with(k_id) self.vimconn.logger.error.assert_called_once_with( - "Error deleting volume: ClientException: Unknown Error (HTTP Connection aborted.)" + "Error deleting volume: ClientException: Connection aborted. (HTTP 403)" + ) + self.assertEqual(created_items, expected_created_items) + + def test_delete_volumes_by_id_with_cinder__delete_volume_raise_connection_exception__exception_is_raised( + self, + ): + """cinder delete volume raises exception.""" + created_items = { + f"floating_ip:{floating_network_vim_id}": True, + f"volume:{volume_id2}": True, + f"volume:{volume_id}": True, + f"port:{port_id}": None, + } + expected_created_items = { + f"floating_ip:{floating_network_vim_id}": True, + f"volume:{volume_id2}": True, + f"volume:{volume_id}": True, + f"port:{port_id}": None, + } + volumes_to_hold = [] + k = f"volume:{volume_id}" + k_id = volume_id + self.vimconn.cinder.volumes.get.return_value.status = "available" + self.vimconn.cinder.volumes.delete.side_effect = cExceptions.ConnectionError( + "Connection failed." + ) + with self.assertRaises(VimConnConnectionException): + result = self.vimconn._delete_volumes_by_id_wth_cinder( + k, k_id, volumes_to_hold, created_items + ) + self.assertEqual(result, None) + self.vimconn.cinder.volumes.get.assert_called_once_with(k_id) + self.vimconn.cinder.volumes.delete.assert_called_once_with(k_id) + self.vimconn.logger.error.assert_called_once_with( + "Error deleting volume: ConnectionError: Connection failed." ) self.assertEqual(created_items, expected_created_items) @@ -4991,7 +4183,7 @@ class TestNewVmInstance(unittest.TestCase): result = self.vimconn._delete_volumes_by_id_wth_cinder( k, k_id, volumes_to_hold, created_items ) - self.assertEqual(result, None) + self.assertEqual(result, False) self.vimconn.cinder.volumes.get.assert_not_called() self.vimconn.cinder.volumes.delete.assert_not_called() self.vimconn.logger.error.assert_not_called() @@ -5027,51 +4219,17 @@ class TestNewVmInstance(unittest.TestCase): def test_delete_ports_by_id_by_neutron(self): """neutron delete ports.""" k_id = port_id - self.vimconn.neutron.list_ports.return_value = { - "ports": [{"id": port_id}, {"id": port2_id}] - } - self.vimconn._delete_ports_by_id_wth_neutron(k_id) - self.vimconn.neutron.list_ports.assert_called_once() self.vimconn.neutron.delete_port.assert_called_once_with(k_id) self.vimconn.logger.error.assert_not_called() - def test_delete_ports_by_id_by_neutron_id_not_in_port_list(self): - """port id not in the port list.""" - k_id = volume_id - self.vimconn.neutron.list_ports.return_value = { - "ports": [{"id": port_id}, {"id": port2_id}] - } - - self.vimconn._delete_ports_by_id_wth_neutron(k_id) - self.vimconn.neutron.list_ports.assert_called_once() - self.vimconn.neutron.delete_port.assert_not_called() - self.vimconn.logger.error.assert_not_called() - - def test_delete_ports_by_id_by_neutron_list_port_raise_exception(self): - """neutron list port raises exception.""" - k_id = port_id - self.vimconn.neutron.list_ports.side_effect = nvExceptions.ClientException( - "Connection aborted." - ) - self.vimconn._delete_ports_by_id_wth_neutron(k_id) - self.vimconn.neutron.list_ports.assert_called_once() - self.vimconn.neutron.delete_port.assert_not_called() - self.vimconn.logger.error.assert_called_once_with( - "Error deleting port: ClientException: Unknown Error (HTTP Connection aborted.)" - ) - def test_delete_ports_by_id_by_neutron_delete_port_raise_exception(self): """neutron delete port raises exception.""" k_id = port_id - self.vimconn.neutron.list_ports.return_value = { - "ports": [{"id": port_id}, {"id": port2_id}] - } self.vimconn.neutron.delete_port.side_effect = nvExceptions.ClientException( "Connection aborted." ) self.vimconn._delete_ports_by_id_wth_neutron(k_id) - self.vimconn.neutron.list_ports.assert_called_once() self.vimconn.neutron.delete_port.assert_called_once_with(k_id) self.vimconn.logger.error.assert_called_once_with( "Error deleting port: ClientException: Unknown Error (HTTP Connection aborted.)" @@ -5215,7 +4373,7 @@ class TestNewVmInstance(unittest.TestCase): @patch.object(vimconnector, "_get_item_name_id") @patch.object(vimconnector, "_delete_volumes_by_id_wth_cinder") @patch.object(vimconnector, "_delete_floating_ip_by_id") - def test_delete_created_items_delete_vol_raises( + def test_delete_created_items__delete_vol_raises_connection_error__operation_fails( self, mock_delete_floating_ip_by_id, mock_delete_volumes_by_id_wth_cinder, @@ -5231,15 +4389,16 @@ class TestNewVmInstance(unittest.TestCase): ("floating_ip", f"{floating_network_vim_id}"), ("volume", f"{volume_id}"), ] - mock_delete_volumes_by_id_wth_cinder.side_effect = ConnectionError( - "Connection failed." + mock_delete_volumes_by_id_wth_cinder.side_effect = ( + neExceptions.ConnectionFailed("Connection failed.") ) volumes_to_hold = [] keep_waiting = False - result = self.vimconn._delete_created_items( - created_items, volumes_to_hold, keep_waiting - ) - self.assertEqual(result, False) + with self.assertRaises(VimConnConnectionException): + result = self.vimconn._delete_created_items( + created_items, volumes_to_hold, keep_waiting + ) + self.assertEqual(result, None) self.assertEqual(mock_get_item_name_id.call_count, 2) mock_delete_volumes_by_id_wth_cinder.assert_called_once_with( f"volume:{volume_id}", f"{volume_id}", [], created_items @@ -5256,7 +4415,7 @@ class TestNewVmInstance(unittest.TestCase): @patch.object(vimconnector, "_get_item_name_id") @patch.object(vimconnector, "_delete_volumes_by_id_wth_cinder") @patch.object(vimconnector, "_delete_floating_ip_by_id") - def test_delete_created_items_delete_fip_raises( + def test_delete_created_items__delete_fip_raises_connection_error__operation_fails( self, mock_delete_floating_ip_by_id, mock_delete_volumes_by_id_wth_cinder, @@ -5278,14 +4437,13 @@ class TestNewVmInstance(unittest.TestCase): ) volumes_to_hold = [] keep_waiting = True - result = self.vimconn._delete_created_items( - created_items, volumes_to_hold, keep_waiting - ) - self.assertEqual(result, True) - self.assertEqual(mock_get_item_name_id.call_count, 2) - mock_delete_volumes_by_id_wth_cinder.assert_called_once_with( - f"volume:{volume_id}", f"{volume_id}", [], created_items - ) + with self.assertRaises(VimConnConnectionException): + result = self.vimconn._delete_created_items( + created_items, volumes_to_hold, keep_waiting + ) + self.assertEqual(result, None) + self.assertEqual(mock_get_item_name_id.call_count, 1) + mock_delete_volumes_by_id_wth_cinder.assert_not_called() mock_delete_floating_ip_by_id.assert_called_once_with( f"floating_ip:{floating_network_vim_id}", f"{floating_network_vim_id}", @@ -5298,7 +4456,7 @@ class TestNewVmInstance(unittest.TestCase): @patch.object(vimconnector, "_get_item_name_id") @patch.object(vimconnector, "_delete_volumes_by_id_wth_cinder") @patch.object(vimconnector, "_delete_floating_ip_by_id") - def test_delete_created_items_get_item_name_raises( + def test_delete_created_items_get_item_name_raises_type_error__operation_fails( self, mock_delete_floating_ip_by_id, mock_delete_volumes_by_id_wth_cinder, @@ -5316,19 +4474,16 @@ class TestNewVmInstance(unittest.TestCase): ] volumes_to_hold = [] keep_waiting = False - result = self.vimconn._delete_created_items( - created_items, volumes_to_hold, keep_waiting - ) - self.assertEqual(result, False) - self.assertEqual(mock_get_item_name_id.call_count, 2) + with self.assertRaises(VimConnException): + result = self.vimconn._delete_created_items( + created_items, volumes_to_hold, keep_waiting + ) + self.assertEqual(result, None) + self.assertEqual(mock_get_item_name_id.call_count, 1) mock_delete_volumes_by_id_wth_cinder.assert_not_called() mock_delete_floating_ip_by_id.assert_not_called() _call_logger = self.vimconn.logger.error.call_args_list self.assertEqual(_call_logger[0][0], ("Error deleting 3: Invalid Type",)) - self.assertEqual( - _call_logger[1][0], - (f"Error deleting volume{volume_id}: Invalid attribute",), - ) @patch.object(vimconnector, "_get_item_name_id") @patch.object(vimconnector, "_delete_volumes_by_id_wth_cinder") @@ -5498,16 +4653,14 @@ class TestNewVmInstance(unittest.TestCase): @patch("time.sleep") @patch.object(vimconnector, "_extract_items_wth_keep_flag_from_created_items") - @patch.object(vimconnector, "_format_exception") @patch.object(vimconnector, "_reload_connection") @patch.object(vimconnector, "_delete_vm_ports_attached_to_network") @patch.object(vimconnector, "_delete_created_items") - def test_delete_vminstance_extract_items_wth_keep_raises( + def test_delete_vminstance__extract_items_wth_keep_raises_attributeerror__raise_vimconnexception( self, mock_delete_created_items, mock_delete_vm_ports_attached_to_network, mock_reload_connection, - mock_format_exception, mock_extract_items_wth_keep_flag_from_created_items, mock_sleep, ): @@ -5523,7 +4676,7 @@ class TestNewVmInstance(unittest.TestCase): mock_extract_items_wth_keep_flag_from_created_items.side_effect = AttributeError volumes_to_hold = [] mock_delete_created_items.return_value = False - with self.assertRaises(AttributeError): + with self.assertRaises(VimConnException): self.vimconn.delete_vminstance( vm_id, initial_created_items, volumes_to_hold ) @@ -5532,7 +4685,6 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn.nova.servers.delete.assert_not_called() mock_delete_created_items.assert_not_called() mock_sleep.assert_not_called() - mock_format_exception.assert_not_called() mock_extract_items_wth_keep_flag_from_created_items.assert_called_once_with( initial_created_items ) @@ -5543,7 +4695,7 @@ class TestNewVmInstance(unittest.TestCase): @patch.object(vimconnector, "_reload_connection") @patch.object(vimconnector, "_delete_vm_ports_attached_to_network") @patch.object(vimconnector, "_delete_created_items") - def test_delete_vminstance_delete_created_items_raises( + def test_delete_vminstance__delete_created_items_returns_true__delete_created_items_called_several_times( self, mock_delete_created_items, mock_delete_vm_ports_attached_to_network, @@ -5558,15 +4710,12 @@ class TestNewVmInstance(unittest.TestCase): mock_extract_items_wth_keep_flag_from_created_items.return_value = created_items mock_sleep = MagicMock() volumes_to_hold = [] - err = ConnectionError("ClientException occurred.") - mock_delete_created_items.side_effect = err - with self.assertRaises(ConnectionError) as err: - self.vimconn.delete_vminstance(vm_id, created_items, volumes_to_hold) - self.assertEqual(str(err), "ClientException occurred.") + mock_delete_created_items.side_effect = [True, False] + self.vimconn.delete_vminstance(vm_id, created_items, volumes_to_hold) mock_reload_connection.assert_called_once() mock_delete_vm_ports_attached_to_network.assert_called_once_with(created_items) self.vimconn.nova.servers.delete.assert_called_once_with(vm_id) - mock_delete_created_items.assert_called_once() + self.assertEqual(mock_delete_created_items.call_count, 2) mock_sleep.assert_not_called() mock_extract_items_wth_keep_flag_from_created_items.assert_called_once_with( created_items @@ -5574,16 +4723,14 @@ class TestNewVmInstance(unittest.TestCase): @patch("time.sleep") @patch.object(vimconnector, "_extract_items_wth_keep_flag_from_created_items") - @patch.object(vimconnector, "_format_exception") @patch.object(vimconnector, "_reload_connection") @patch.object(vimconnector, "_delete_vm_ports_attached_to_network") @patch.object(vimconnector, "_delete_created_items") - def test_delete_vminstance_delete_vm_ports_raises( + def test_delete_vminstance__delete_vm_ports_raises_connection_error__raise_vimconnconnectionexception( self, mock_delete_created_items, mock_delete_vm_ports_attached_to_network, mock_reload_connection, - mock_format_exception, mock_extract_items_wth_keep_flag_from_created_items, mock_sleep, ): @@ -5594,10 +4741,9 @@ class TestNewVmInstance(unittest.TestCase): volumes_to_hold = [f"{volume_id}", f"{volume_id2}"] err = ConnectionError("ClientException occurred.") mock_delete_vm_ports_attached_to_network.side_effect = err - mock_delete_created_items.side_effect = err - with self.assertRaises(ConnectionError) as err: + mock_delete_created_items.return_value = False + with self.assertRaises(VimConnConnectionException): self.vimconn.delete_vminstance(vm_id, created_items, volumes_to_hold) - self.assertEqual(str(err), "ClientException occurred.") mock_reload_connection.assert_called_once() mock_delete_vm_ports_attached_to_network.assert_called_once_with(created_items) self.vimconn.nova.servers.delete.assert_not_called() @@ -5609,16 +4755,14 @@ class TestNewVmInstance(unittest.TestCase): @patch("time.sleep") @patch.object(vimconnector, "_extract_items_wth_keep_flag_from_created_items") - @patch.object(vimconnector, "_format_exception") @patch.object(vimconnector, "_reload_connection") @patch.object(vimconnector, "_delete_vm_ports_attached_to_network") @patch.object(vimconnector, "_delete_created_items") - def test_delete_vminstance_nova_server_delete_raises( + def test_delete_vminstance__nova_server_delete_raises_clientexception__raise_vimconn_unexpected_response( self, mock_delete_created_items, mock_delete_vm_ports_attached_to_network, mock_reload_connection, - mock_format_exception, mock_extract_items_wth_keep_flag_from_created_items, mock_sleep, ): @@ -5627,12 +4771,11 @@ class TestNewVmInstance(unittest.TestCase): created_items = deepcopy(created_items_all_true) mock_extract_items_wth_keep_flag_from_created_items.return_value = created_items volumes_to_hold = [f"{volume_id}", f"{volume_id2}"] - err = VimConnConnectionException("ClientException occurred.") + err = nvExceptions.ClientException("ClientException occurred.") self.vimconn.nova.servers.delete.side_effect = err mock_delete_created_items.side_effect = err - with self.assertRaises(VimConnConnectionException) as err: + with self.assertRaises(VimConnUnexpectedResponse): self.vimconn.delete_vminstance(vm_id, created_items, volumes_to_hold) - self.assertEqual(str(err), "ClientException occurred.") mock_reload_connection.assert_called_once() mock_delete_vm_ports_attached_to_network.assert_called_once_with(created_items) self.vimconn.nova.servers.delete.assert_called_once_with(vm_id) @@ -5644,16 +4787,14 @@ class TestNewVmInstance(unittest.TestCase): @patch("time.sleep") @patch.object(vimconnector, "_extract_items_wth_keep_flag_from_created_items") - @patch.object(vimconnector, "_format_exception") @patch.object(vimconnector, "_reload_connection") @patch.object(vimconnector, "_delete_vm_ports_attached_to_network") @patch.object(vimconnector, "_delete_created_items") - def test_delete_vminstance_reload_connection_raises( + def test_delete_vminstance__reload_connection_raises_connection_error__raises_vimconnconnection_exception( self, mock_delete_created_items, mock_delete_vm_ports_attached_to_network, mock_reload_connection, - mock_format_exception, mock_extract_items_wth_keep_flag_from_created_items, mock_sleep, ): @@ -5666,9 +4807,8 @@ class TestNewVmInstance(unittest.TestCase): err = ConnectionError("ClientException occurred.") mock_delete_created_items.return_value = False mock_reload_connection.side_effect = err - with self.assertRaises(ConnectionError) as err: + with self.assertRaises(VimConnConnectionException): self.vimconn.delete_vminstance(vm_id, created_items, volumes_to_hold) - self.assertEqual(str(err), "ClientException occurred.") mock_reload_connection.assert_called_once() mock_delete_vm_ports_attached_to_network.assert_not_called() self.vimconn.nova.servers.delete.assert_not_called() @@ -5801,7 +4941,6 @@ class TestNewVmInstance(unittest.TestCase): self.assertDictEqual(result, created_items) def test_update_block_device_mapping_empty_volume(self): - """""" volume = "" block_device_mapping = {} base_disk_index = 100 @@ -5816,7 +4955,6 @@ class TestNewVmInstance(unittest.TestCase): self.assertEqual(created_items, {}) def test_update_block_device_mapping_invalid_volume(self): - """""" volume = "Volume-A" block_device_mapping = {} base_disk_index = 100 @@ -5833,7 +4971,6 @@ class TestNewVmInstance(unittest.TestCase): self.assertEqual(created_items, {}) def test_update_block_device_mapping(self): - """""" volume = MagicMock(autospec=True) volume.id = volume_id block_device_mapping = {} @@ -5851,7 +4988,6 @@ class TestNewVmInstance(unittest.TestCase): ) def test_update_block_device_mapping_with_keep_flag(self): - """""" volume = MagicMock(autospec=True) volume.id = volume_id block_device_mapping = {} @@ -5916,6 +5052,78 @@ class TestNewVmInstance(unittest.TestCase): with self.assertRaises(AttributeError): self.vimconn._extract_items_wth_keep_flag_from_created_items(created_items) + @patch.object(vimconnector, "_reload_connection", new_callable=CopyingMock()) + def test_get_monitoring_data(self, mock_reload_conection): + flavors = [ + {"original_name": "flavor1", "id": "367fc1eb-bd22-40f8-a519-ed2fb4e5976b"}, + {"original_name": "flavor2", "id": "5dcf9732-d17d-40b3-910d-37fc4c5aacc0"}, + ] + servers = [ + Server( + "server1", "ACTIVE", flavors[0], "312200db-42e3-4772-9518-d5db85468392" + ), + Server( + "server2", "ACTIVE", flavors[1], "39a166cf-e4e6-479c-b88c-9ad558cf2cbf" + ), + ] + ports = {"ports": ["port1", "port2"]} + self.vimconn.nova.servers.list.return_value = servers + self.vimconn.neutron.list_ports.return_value = ports + result = self.vimconn.get_monitoring_data() + self.assertTupleEqual(result, (servers, ports)) + mock_reload_conection.assert_called_once() + self.vimconn.nova.servers.list.assert_called_once_with(detailed=True) + self.vimconn.neutron.list_ports.assert_called_once() + + @patch.object(vimconnector, "_reload_connection", new_callable=CopyingMock()) + def test_get_monitoring_data_reload_connection_raises(self, mock_reload_conection): + mock_reload_conection.side_effect = VimConnNotFoundException( + "Connection object not found." + ) + with self.assertRaises(VimConnException) as err: + result = self.vimconn.get_monitoring_data() + self.assertTupleEqual(result, None) + self.assertEqual( + str(err.exception.args[0]), + "Exception in monitoring while getting VMs and ports status: Connection object not found.", + ) + mock_reload_conection.assert_called_once() + check_if_assert_not_called( + [self.vimconn.nova.servers.list, self.vimconn.neutron.list_ports] + ) + + @patch.object(vimconnector, "_reload_connection", new_callable=CopyingMock()) + def test_get_monitoring_data_server_list_raises(self, mock_reload_conection): + self.vimconn.nova.servers.list.side_effect = VimConnConnectionException( + "Can not connect to Cloud API." + ) + with self.assertRaises(VimConnException) as err: + result = self.vimconn.get_monitoring_data() + self.assertTupleEqual(result, None) + self.assertEqual( + str(err.exception.args[0]), + "Exception in monitoring while getting VMs and ports status: Can not connect to Cloud API.", + ) + mock_reload_conection.assert_called_once() + self.vimconn.nova.servers.list.assert_called_once_with(detailed=True) + self.vimconn.neutron.list_ports.assert_not_called() + + @patch.object(vimconnector, "_reload_connection", new_callable=CopyingMock()) + def test_get_monitoring_data_list_ports_raises(self, mock_reload_conection): + self.vimconn.neutron.list_ports.side_effect = VimConnConnectionException( + "Can not connect to Cloud API." + ) + with self.assertRaises(VimConnException) as err: + result = self.vimconn.get_monitoring_data() + self.assertTupleEqual(result, None) + self.assertEqual( + str(err.exception.args[0]), + "Exception in monitoring while getting VMs and ports status: Can not connect to Cloud API.", + ) + mock_reload_conection.assert_called_once() + self.vimconn.nova.servers.list.assert_called_once_with(detailed=True) + self.vimconn.neutron.list_ports.assert_called_once() + class TestNewFlavor(unittest.TestCase): @patch("logging.getLogger", autospec=True) @@ -5940,11 +5148,6 @@ class TestNewFlavor(unittest.TestCase): self.new_flavor.id = "075d2482-5edb-43e3-91b3-234e65b6268a" self.vimconn.nova.flavors.create.return_value = self.new_flavor - @staticmethod - def check_if_assert_not_called(mocks: list): - for mocking in mocks: - mocking.assert_not_called() - @patch.object(vimconnector, "process_vio_numa_nodes", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_memory", new_callable=CopyingMock()) @patch.object(vimconnector, "process_numa_vcpu", new_callable=CopyingMock()) @@ -6027,7 +5230,7 @@ class TestNewFlavor(unittest.TestCase): ), ) self.assertDictEqual(extra_specs, expected_extra_specs) - self.check_if_assert_not_called( + check_if_assert_not_called( [ mock_process_numa_threads, mock_process_numa_cores, @@ -6106,7 +5309,7 @@ class TestNewFlavor(unittest.TestCase): ), ) self.assertDictEqual(extra_specs, expected_extra_specs) - self.check_if_assert_not_called( + check_if_assert_not_called( [ mock_process_numa_threads, mock_process_numa_cores, @@ -6148,9 +5351,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_paired_threads.side_effect = [6, 6] self.vimconn._process_numa_parameters_of_flavor(numas, extra_specs) - self.check_if_assert_not_called( - [mock_process_numa_threads, mock_process_numa_cores] - ) + check_if_assert_not_called([mock_process_numa_threads, mock_process_numa_cores]) self.assertEqual(mock_process_numa_memory.call_count, 2) self.assertEqual(mock_process_numa_vcpu.call_count, 2) self.assertEqual(mock_process_numa_paired_threads.call_count, 2) @@ -6206,9 +5407,7 @@ class TestNewFlavor(unittest.TestCase): self.vimconn.vim_type = "VIO" mock_process_numa_paired_threads.side_effect = [4, 4] self.vimconn._process_numa_parameters_of_flavor(numas, extra_specs) - self.check_if_assert_not_called( - [mock_process_numa_threads, mock_process_numa_cores] - ) + check_if_assert_not_called([mock_process_numa_threads, mock_process_numa_cores]) self.assertEqual(mock_process_numa_paired_threads.call_count, 2) self.assertEqual(mock_process_numa_memory.call_count, 2) self.assertEqual(mock_process_numa_vcpu.call_count, 2) @@ -6276,7 +5475,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_cores.side_effect = [1, 2] self.vimconn._process_numa_parameters_of_flavor(numas, extra_specs) - self.check_if_assert_not_called( + check_if_assert_not_called( [mock_process_numa_threads, mock_process_numa_paired_threads] ) self.assertEqual(mock_process_numa_cores.call_count, 2) @@ -6325,7 +5524,7 @@ class TestNewFlavor(unittest.TestCase): self.vimconn.vim_type = "VIO" mock_process_numa_cores.side_effect = [1, 2] self.vimconn._process_numa_parameters_of_flavor(numas, extra_specs) - self.check_if_assert_not_called( + check_if_assert_not_called( [mock_process_numa_threads, mock_process_numa_paired_threads] ) self.assertEqual(mock_process_numa_memory.call_count, 2) @@ -6390,7 +5589,7 @@ class TestNewFlavor(unittest.TestCase): self.vimconn.vim_type = "VIO" mock_process_numa_threads.return_value = 3 self.vimconn._process_numa_parameters_of_flavor(numas, extra_specs) - self.check_if_assert_not_called( + check_if_assert_not_called( [ mock_process_numa_memory, mock_process_numa_vcpu, @@ -6449,7 +5648,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_threads.return_value = 3 self.vimconn._process_numa_parameters_of_flavor(numas, extra_specs) - self.check_if_assert_not_called( + check_if_assert_not_called( [ mock_process_numa_memory, mock_process_numa_vcpu, @@ -6494,7 +5693,7 @@ class TestNewFlavor(unittest.TestCase): expected_extra_specs = {"hw:numa_nodes": "0"} self.vimconn.vim_type = "VIO" self.vimconn._process_numa_parameters_of_flavor(numas, extra_specs) - self.check_if_assert_not_called( + check_if_assert_not_called( [ mock_process_numa_memory, mock_process_numa_vcpu, @@ -6533,7 +5732,7 @@ class TestNewFlavor(unittest.TestCase): mock_process_numa_threads.return_value = None self.vimconn._process_numa_parameters_of_flavor(numas, extra_specs) - self.check_if_assert_not_called( + check_if_assert_not_called( [ mock_process_numa_memory, mock_process_numa_vcpu, @@ -7170,7 +6369,7 @@ class TestNewFlavor(unittest.TestCase): extended = {} extra_specs = {} self.vimconn._process_extended_config_of_flavor(extended, extra_specs) - self.check_if_assert_not_called( + check_if_assert_not_called( [mock_process_resource_quota, mock_process_numa_parameters_of_flavor] ) self.assertEqual(extra_specs, {}) @@ -7282,9 +6481,7 @@ class TestNewFlavor(unittest.TestCase): self.vimconn.nova.flavors.create.assert_called_once_with( name=name1, ram=3, vcpus=vcpus, disk=50, ephemeral=0, swap=0, is_public=True ) - self.check_if_assert_not_called( - [self.new_flavor.set_keys, mock_format_exception] - ) + check_if_assert_not_called([self.new_flavor.set_keys, mock_format_exception]) @patch.object(vimconnector, "_get_flavor_details", new_callable=CopyingMock()) @patch.object( @@ -7315,7 +6512,7 @@ class TestNewFlavor(unittest.TestCase): self.vimconn.nova.flavors.create.assert_called_once_with( name=name1, ram=3, vcpus=8, disk=50, ephemeral=0, swap=0, is_public=True ) - self.check_if_assert_not_called( + check_if_assert_not_called( [mock_change_flavor_name, mock_format_exception, self.new_flavor.set_keys] ) @@ -7351,7 +6548,7 @@ class TestNewFlavor(unittest.TestCase): self.vimconn.nova.flavors.create.assert_called_once_with( name=name1, ram=3, vcpus=8, disk=50, ephemeral=0, swap=0, is_public=True ) - self.check_if_assert_not_called( + check_if_assert_not_called( [ self.new_flavor.set_keys, mock_extended_config_of_flavor, @@ -7389,7 +6586,7 @@ class TestNewFlavor(unittest.TestCase): self.assertEqual( str(call_mock_format_exception[0][0]), str(ClientException(error_msg)) ) - self.check_if_assert_not_called( + check_if_assert_not_called( [ mock_change_flavor_name, mock_get_flavor_details, @@ -7428,7 +6625,7 @@ class TestNewFlavor(unittest.TestCase): self.assertEqual( str(call_mock_format_exception[0][0]), str(KeyError(error_msg)) ) - self.check_if_assert_not_called( + check_if_assert_not_called( [ mock_reload_connection, mock_change_flavor_name, @@ -7478,9 +6675,7 @@ class TestNewFlavor(unittest.TestCase): swap=0, is_public=True, ) - self.check_if_assert_not_called( - [self.new_flavor.set_keys, mock_format_exception] - ) + check_if_assert_not_called([self.new_flavor.set_keys, mock_format_exception]) @patch.object(vimconnector, "_get_flavor_details", new_callable=CopyingMock()) @patch.object( @@ -7522,7 +6717,7 @@ class TestNewFlavor(unittest.TestCase): swap=0, is_public=True, ) - self.check_if_assert_not_called( + check_if_assert_not_called( [ self.new_flavor.set_keys, mock_extended_config_of_flavor, @@ -7570,7 +6765,7 @@ class TestNewFlavor(unittest.TestCase): self.assertEqual(mock_get_flavor_details.call_count, 3) self.assertEqual(self.vimconn.nova.flavors.create.call_count, 3) self.assertEqual(mock_reload_connection.call_count, 3) - self.check_if_assert_not_called( + check_if_assert_not_called( [mock_change_flavor_name, mock_extended_config_of_flavor] ) _call_mock_format_exception = mock_format_exception.call_args @@ -7763,7 +6958,6 @@ class TestNewFlavor(unittest.TestCase): numa_nodes = 0 extra_specs = {"hw:numa_nodes": "0"} expected_extra_spec = { - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', "vmware:latency_sensitivity_level": "high", "hw:numa_nodes": "0", } @@ -7795,7 +6989,6 @@ class TestNewFlavor(unittest.TestCase): expected_extra_spec = { "vmware:latency_sensitivity_level": "high", "hw:numa_nodes": "None", - "vmware:extra_config": '{"numa.nodeAffinity":"0"}', } self.vimconn.process_vio_numa_nodes(numa_nodes, extra_specs) self.assertDictEqual(extra_specs, expected_extra_spec)