diff options
author | Lee Yarwood <lyarwood@redhat.com> | 2021-08-23 14:44:11 +0100 |
---|---|---|
committer | Lee Yarwood <lyarwood@redhat.com> | 2021-09-01 12:50:23 +0100 |
commit | 122a32ed8295ce1168505ed1b6d0f08422c506c4 (patch) | |
tree | 8f71b68445eba7dfec25463862d9c45123d9875e /nova/tests/unit/virt/libvirt/volume/test_net.py | |
parent | 9bd62eae6eb98136be7014eb6ca7e54cb41fc7ca (diff) | |
download | nova-122a32ed8295ce1168505ed1b6d0f08422c506c4.tar.gz |
workarounds: Remove rbd_volume_local_attach
This was previously deprecated for removal during the Wallaby release.
Change-Id: I158324bfdf4238fb55ae92c30d104835fbb73dff
Diffstat (limited to 'nova/tests/unit/virt/libvirt/volume/test_net.py')
-rw-r--r-- | nova/tests/unit/virt/libvirt/volume/test_net.py | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/nova/tests/unit/virt/libvirt/volume/test_net.py b/nova/tests/unit/virt/libvirt/volume/test_net.py index b92c1f0cb9..a694351629 100644 --- a/nova/tests/unit/virt/libvirt/volume/test_net.py +++ b/nova/tests/unit/virt/libvirt/volume/test_net.py @@ -214,49 +214,3 @@ class LibvirtNetVolumeDriverTestCase( requested_size) self.assertEqual(requested_size, new_size) - - def test_libvirt_rbd_driver_block_connect(self): - self.flags(rbd_volume_local_attach=True, group='workarounds') - connection_info = self.rbd_connection(self.vol) - libvirt_driver = net.LibvirtNetVolumeDriver(self.fake_host) - libvirt_driver.connector.connect_volume = mock.MagicMock( - return_value = {'path': mock.sentinel.rbd_dev}) - libvirt_driver.connect_volume(connection_info, mock.sentinel.instance) - - # Assert that the connector is called correctly and device_path updated - libvirt_driver.connector.connect_volume.assert_called_once_with( - connection_info['data']) - - def test_libvirt_rbd_driver_block_disconnect(self): - self.flags(rbd_volume_local_attach=True, group='workarounds') - connection_info = self.rbd_connection(self.vol) - libvirt_driver = net.LibvirtNetVolumeDriver(self.fake_host) - libvirt_driver.connector.disconnect_volume = mock.MagicMock() - libvirt_driver.disconnect_volume(connection_info, - mock.sentinel.instance) - - # Assert that the connector is called correctly - libvirt_driver.connector.disconnect_volume.assert_called_once_with( - connection_info['data'], None) - - def test_libvirt_rbd_driver_block_config(self): - self.flags(rbd_volume_local_attach=True, group='workarounds') - connection_info = self.rbd_connection(self.vol) - connection_info['data']['device_path'] = '/dev/rbd0' - libvirt_driver = net.LibvirtNetVolumeDriver(self.fake_host) - conf = libvirt_driver.get_config(connection_info, self.disk_info) - - # Assert that the returned config is for a RBD block device - self.assertEqual('block', conf.source_type) - self.assertEqual('/dev/rbd0', conf.source_path) - self.assertEqual('native', conf.driver_io) - - def test_libvirt_rbd_driver_block_extend(self): - self.flags(rbd_volume_local_attach=True, group='workarounds') - connection_info = self.rbd_connection(self.vol) - libvirt_driver = net.LibvirtNetVolumeDriver(self.fake_host) - - # Assert NotImplementedError is raised for extend_volume - self.assertRaises(NotImplementedError, libvirt_driver.extend_volume, - connection_info, mock.sentinel.instance, - mock.sentinel.requested_size) |