openstack/nova
Code Issues Proposed changes

Merge "Transform instance.shutdown notifications"

Browse Source
This commit is contained in:
Jenkins
2016-11-03 16:09:49 +00:00
committed by Gerrit Code Review
parent 0825f6fc0b 42b6716a33
commit 20591e1ed6
6 changed files with 173 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
nova/tests/unit/compute/test_compute_mgr.py
View File

@@ -1151,6 +1151,33 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
mock_instance_save.assert_called_once_with()
self.assertIsNone(instance.task_state)
@mock.patch('nova.context.RequestContext.elevated')
@mock.patch('nova.compute.utils.get_nw_info_for_instance')
@mock.patch(
'nova.compute.manager.ComputeManager._get_instance_block_device_info')
@mock.patch('nova.virt.driver.ComputeDriver.destroy')
@mock.patch('nova.virt.fake.FakeDriver.get_volume_connector')
@mock.patch('nova.compute.utils.notify_about_instance_action')
@mock.patch(
'nova.compute.manager.ComputeManager._notify_about_instance_usage')
def test_shutdown_instance_versioned_notifications(self,
mock_notify_unversioned, mock_notify, mock_connector,
mock_destroy, mock_blk_device_info, mock_nw_info, mock_elevated):
mock_elevated.return_value = self.context
instance = fake_instance.fake_instance_obj(
self.context,
uuid=uuids.instance,
vm_state=vm_states.ERROR,
task_state=task_states.DELETING)
bdms = [mock.Mock(id=1, is_volume=True)]
self.compute._shutdown_instance(self.context, instance, bdms,
notify=True, try_deallocate_networks=False)
mock_notify.assert_has_calls([
mock.call(self.context, instance, 'fake-mini',
action='shutdown', phase='start'),
mock.call(self.context, instance, 'fake-mini',
action='shutdown', phase='end')])
@mock.patch('nova.context.RequestContext.elevated')
@mock.patch('nova.compute.utils.get_nw_info_for_instance')
@mock.patch(