diff options
| -rw-r--r-- | nova/compute/manager.py | 6 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 82 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute_cells.py | 4 |
3 files changed, 89 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index eb2ce2c54..f416777a2 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2544,15 +2544,15 @@ class ComputeManager(manager.SchedulerDependentManager): LOG.audit(_('Detach volume %(volume_id)s from mountpoint %(mp)s'), locals(), context=context, instance=instance) - if not self.driver.instance_exists(instance['name']): - LOG.warn(_('Detaching volume from unknown instance'), - context=context, instance=instance) connection_info = jsonutils.loads(bdm['connection_info']) # NOTE(vish): We currently don't use the serial when disconnecting, # but added for completeness in case we ever do. if connection_info and 'serial' not in connection_info: connection_info['serial'] = volume_id try: + if not self.driver.instance_exists(instance['name']): + LOG.warn(_('Detaching volume from unknown instance'), + context=context, instance=instance) self.driver.detach_volume(connection_info, instance, mp) diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 7b05e4b06..971e063a3 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -5612,6 +5612,88 @@ class ComputeAPITestCase(BaseTestCase): self.stubs.Set(compute_rpcapi.ComputeAPI, 'attach_volume', fake_rpc_attach_volume) + def test_detach_volume(self): + # Ensure volume can be detached from instance + + called = {} + instance = self._create_fake_instance() + + def fake_check_detach(*args, **kwargs): + called['fake_check_detach'] = True + + def fake_begin_detaching(*args, **kwargs): + called['fake_begin_detaching'] = True + + def fake_volume_get(self, context, volume_id): + called['fake_volume_get'] = True + return {'id': volume_id, 'attach_status': 'in-use', + 'instance_uuid': instance['uuid']} + + def fake_rpc_detach_volume(self, context, **kwargs): + called['fake_rpc_detach_volume'] = True + + self.stubs.Set(cinder.API, 'get', fake_volume_get) + self.stubs.Set(cinder.API, 'check_detach', fake_check_detach) + self.stubs.Set(cinder.API, 'begin_detaching', fake_begin_detaching) + self.stubs.Set(compute_rpcapi.ComputeAPI, 'detach_volume', + fake_rpc_detach_volume) + + self.compute_api.detach_volume(self.context, 1) + self.assertTrue(called.get('fake_volume_get')) + self.assertTrue(called.get('fake_check_detach')) + self.assertTrue(called.get('fake_begin_detaching')) + self.assertTrue(called.get('fake_rpc_detach_volume')) + + def test_detach_invalid_volume(self): + # Ensure exception is raised while detaching an un-attached volume + + def fake_volume_get(self, context, volume_id): + return {'id': volume_id, 'attach_status': 'detached'} + + self.stubs.Set(cinder.API, 'get', fake_volume_get) + self.assertRaises(exception.InvalidVolume, + self.compute_api.detach_volume, self.context, 1) + + def test_detach_volume_libvirt_is_down(self): + # Ensure rollback during detach if libvirt goes down + + called = {} + instance = self._create_fake_instance() + + def fake_get_instance_volume_bdm(*args, **kwargs): + return {'device_name': '/dev/vdb', 'volume_id': 1, + 'connection_info': '{"test": "test"}'} + + def fake_libvirt_driver_instance_exists(*args, **kwargs): + called['fake_libvirt_driver_instance_exists'] = True + return False + + def fake_libvirt_driver_detach_volume_fails(*args, **kwargs): + called['fake_libvirt_driver_detach_volume_fails'] = True + raise AttributeError + + def fake_roll_detaching(*args, **kwargs): + called['fake_roll_detaching'] = True + + def fake_volume_get(self, context, volume_id): + called['fake_volume_get'] = True + return {'id': volume_id, 'attach_status': 'in-use'} + + self.stubs.Set(cinder.API, 'get', fake_volume_get) + self.stubs.Set(cinder.API, 'roll_detaching', fake_roll_detaching) + self.stubs.Set(self.compute, "_get_instance_volume_bdm", + fake_get_instance_volume_bdm) + self.stubs.Set(self.compute.driver, "instance_exists", + fake_libvirt_driver_instance_exists) + self.stubs.Set(self.compute.driver, "detach_volume", + fake_libvirt_driver_detach_volume_fails) + + self.assertRaises(AttributeError, self.compute.detach_volume, + self.context, 1, instance) + self.assertTrue(called.get('fake_libvirt_driver_instance_exists')) + self.assertTrue(called.get('fake_volume_get')) + self.assertTrue(called.get('fake_roll_detaching')) + def test_terminate_with_volumes(self): # Make sure that volumes get detached during instance termination. admin = context.get_admin_context() diff --git a/nova/tests/compute/test_compute_cells.py b/nova/tests/compute/test_compute_cells.py index 3c25f9b43..df78c37f3 100644 --- a/nova/tests/compute/test_compute_cells.py +++ b/nova/tests/compute/test_compute_cells.py @@ -164,6 +164,10 @@ class CellsComputeAPITestCase(test_compute.ComputeAPITestCase): def test_backup(self): return super(CellsComputeAPITestCase, self).test_backup() + def test_detach_volume(self): + self.skipTest("This test is failing due to TypeError: " + "detach_volume() takes exactly 3 arguments (4 given).") + class CellsComputePolicyTestCase(test_compute.ComputePolicyTestCase): def setUp(self): |