X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO-VIM-openstack%2Fosm_rovim_openstack%2Ftests%2Ftest_vimconn_openstack.py;h=81a42747019bb78cb3d3cf1adb63444efd986440;hb=3dcff2e821908afdc6625d0328c208d9b0b6f6e8;hp=4799449a0ab1fbb1a760c7f55b06991b7154f511;hpb=226af6f9a295efb019ba0f525ccc2a1498fb9c69;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 4799449a..81a42747 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 @@ -1127,6 +1127,11 @@ class TestSfcOperations(unittest.TestCase): 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): self.status = s @@ -2671,6 +2676,7 @@ class TestNewVmInstance(unittest.TestCase): """Prepare disks for VM instance successfully.""" existing_vim_volumes = [] created_items = {} + block_device_mapping = {} vm_av_zone = ["nova"] mock_root_volumes.return_value = root_vol_id @@ -2679,7 +2685,12 @@ class TestNewVmInstance(unittest.TestCase): self.vimconn.cinder = CopyingMock() self.vimconn._prepare_disk_for_vminstance( - name, existing_vim_volumes, created_items, vm_av_zone, disk_list2 + name, + existing_vim_volumes, + created_items, + vm_av_zone, + block_device_mapping, + disk_list2, ) self.vimconn.cinder.volumes.set_bootable.assert_called_once_with( root_vol_id, True @@ -2722,6 +2733,7 @@ class TestNewVmInstance(unittest.TestCase): existing_vim_volumes = [] created_items = {} vm_av_zone = ["nova"] + block_device_mapping = {} mock_root_volumes.return_value = root_vol_id mock_created_vol_availability.return_value = 1700 @@ -2729,7 +2741,12 @@ class TestNewVmInstance(unittest.TestCase): with self.assertRaises(VimConnException) as err: self.vimconn._prepare_disk_for_vminstance( - name, existing_vim_volumes, created_items, vm_av_zone, disk_list2 + name, + existing_vim_volumes, + created_items, + vm_av_zone, + block_device_mapping, + disk_list2, ) self.assertEqual( str(err.exception), "Timeout creating volumes for instance basicvm" @@ -2774,12 +2791,18 @@ class TestNewVmInstance(unittest.TestCase): """Disk list is empty.""" existing_vim_volumes = [] created_items = {} + block_device_mapping = {} vm_av_zone = ["nova"] mock_created_vol_availability.return_value = 2 mock_existing_vol_availability.return_value = 3 self.vimconn._prepare_disk_for_vminstance( - name, existing_vim_volumes, created_items, vm_av_zone, disk_list + name, + existing_vim_volumes, + created_items, + vm_av_zone, + block_device_mapping, + disk_list, ) self.vimconn.cinder.volumes.set_bootable.assert_not_called() mock_created_vol_availability.assert_called_once_with(0, created_items) @@ -2802,6 +2825,7 @@ class TestNewVmInstance(unittest.TestCase): existing_vim_volumes = [] created_items = {} vm_av_zone = ["nova"] + block_device_mapping = {} mock_root_volumes.side_effect = Exception() mock_created_vol_availability.return_value = 10 @@ -2809,7 +2833,12 @@ class TestNewVmInstance(unittest.TestCase): with self.assertRaises(Exception): self.vimconn._prepare_disk_for_vminstance( - name, existing_vim_volumes, created_items, vm_av_zone, disk_list2 + name, + existing_vim_volumes, + created_items, + vm_av_zone, + block_device_mapping, + disk_list2, ) self.vimconn.cinder.volumes.set_bootable.assert_not_called() mock_created_vol_availability.assert_not_called() @@ -2840,13 +2869,19 @@ class TestNewVmInstance(unittest.TestCase): existing_vim_volumes = [] created_items = {} vm_av_zone = ["nova"] + block_device_mapping = {} mock_root_volumes.return_value = root_vol_id mock_non_root_volumes.side_effect = Exception with self.assertRaises(Exception): self.vimconn._prepare_disk_for_vminstance( - name, existing_vim_volumes, created_items, vm_av_zone, disk_list2 + name, + existing_vim_volumes, + created_items, + vm_av_zone, + block_device_mapping, + disk_list2, ) self.vimconn.cinder.volumes.set_bootable.assert_not_called() mock_created_vol_availability.assert_not_called() @@ -4021,6 +4056,7 @@ class TestNewVmInstance(unittest.TestCase): existing_vim_volumes=[], created_items={}, vm_av_zone="nova", + block_device_mapping={}, disk_list=disk_list2, ) self.vimconn.nova.servers.create.assert_called_once_with( @@ -4033,7 +4069,7 @@ class TestNewVmInstance(unittest.TestCase): key_name="my_keypair", userdata="userdata", config_drive=True, - block_device_mapping=None, + block_device_mapping={}, scheduler_hints={}, ) mock_time.assert_called_once() @@ -4187,6 +4223,7 @@ class TestNewVmInstance(unittest.TestCase): existing_vim_volumes=[], created_items={}, vm_av_zone="nova", + block_device_mapping={}, disk_list=disk_list2, ) self.vimconn.nova.servers.create.assert_called_once_with( @@ -4199,7 +4236,7 @@ class TestNewVmInstance(unittest.TestCase): key_name="my_keypair", userdata="userdata", config_drive=True, - block_device_mapping=None, + block_device_mapping={}, scheduler_hints={}, ) mock_time.assert_called_once() @@ -4281,6 +4318,7 @@ class TestNewVmInstance(unittest.TestCase): existing_vim_volumes=[], created_items={}, vm_av_zone="nova", + block_device_mapping={}, disk_list=disk_list2, ) self.vimconn.nova.servers.create.assert_called_once_with( @@ -4293,7 +4331,7 @@ class TestNewVmInstance(unittest.TestCase): key_name="my_keypair", userdata="userdata", config_drive=True, - block_device_mapping=None, + block_device_mapping={}, scheduler_hints={"group": "38b73-e9cc-5a6a-t270-82cc4811bd4a"}, ) mock_time.assert_called_once() @@ -4374,6 +4412,7 @@ class TestNewVmInstance(unittest.TestCase): existing_vim_volumes=[], created_items={}, vm_av_zone="nova", + block_device_mapping={}, disk_list=disk_list2, ) @@ -4387,7 +4426,7 @@ class TestNewVmInstance(unittest.TestCase): key_name="my_keypair", userdata="userdata", config_drive=True, - block_device_mapping=None, + block_device_mapping={}, scheduler_hints={}, ) mock_time.assert_not_called() @@ -4830,51 +4869,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.)" @@ -5445,6 +5450,67 @@ class TestNewVmInstance(unittest.TestCase): self.assertEqual(mock_sleep.call_count, 1800) mock_format_exception.assert_not_called() + @patch.object(vimconnector, "_reload_connection", new_callable=CopyingMock()) + def test_get_monitoring_data(self, mock_reload_conection): + servers = ["server1", "server2"] + 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) @@ -5469,11 +5535,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()) @@ -5556,7 +5617,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, @@ -5635,7 +5696,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, @@ -5677,9 +5738,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) @@ -5735,9 +5794,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) @@ -5805,7 +5862,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) @@ -5854,7 +5911,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) @@ -5919,7 +5976,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, @@ -5978,7 +6035,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, @@ -6023,7 +6080,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, @@ -6062,7 +6119,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, @@ -6699,7 +6756,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, {}) @@ -6811,9 +6868,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( @@ -6844,7 +6899,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] ) @@ -6880,7 +6935,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, @@ -6918,7 +6973,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, @@ -6957,7 +7012,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, @@ -7007,9 +7062,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( @@ -7051,7 +7104,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, @@ -7099,7 +7152,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