openstack/nova
Code Issues Proposed changes

Merge "Fix connection info refresh for reboot"

Browse Source
This commit is contained in:
Jenkins 2017-10-12 11:09:21 +00:00 committed by Gerrit Code Review
commit 0445422217
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/manager.py
View File

@ -3042,7 +3042,7 @@ class ComputeManager(manager.Manager):
bdms = objects.BlockDeviceMappingList.get_by_instance_uuid( bdms = objects.BlockDeviceMappingList.get_by_instance_uuid(
context, instance.uuid) context, instance.uuid)
block_device_info = self._get_instance_block_device_info( block_device_info = self._get_instance_block_device_info(
context, instance, bdms) context, instance, bdms=bdms)
network_info = self.network_api.get_instance_nw_info(context, instance) network_info = self.network_api.get_instance_nw_info(context, instance)
@ -4377,7 +4377,7 @@ class ComputeManager(manager.Manager):
bdms = objects.BlockDeviceMappingList.get_by_instance_uuid( bdms = objects.BlockDeviceMappingList.get_by_instance_uuid(
context, instance.uuid) context, instance.uuid)
block_device_info = self._get_instance_block_device_info( block_device_info = self._get_instance_block_device_info(
context, instance, bdms) context, instance, bdms=bdms)
compute_utils.notify_about_instance_action(context, instance, compute_utils.notify_about_instance_action(context, instance,
self.host, action=fields.NotificationAction.RESUME, self.host, action=fields.NotificationAction.RESUME,

2
nova/tests/unit/compute/test_compute.py
View File

@ -3102,7 +3102,7 @@ class ComputeTestCase(BaseTestCase,
reboot_type=reboot_type) reboot_type=reboot_type)
self.assertEqual(expected_call_info, reboot_call_info) self.assertEqual(expected_call_info, reboot_call_info)
mock_get_blk.assert_called_once_with(econtext, instance, bdms) mock_get_blk.assert_called_once_with(econtext, instance, bdms=bdms)
mock_get_nw.assert_called_once_with(econtext, instance) mock_get_nw.assert_called_once_with(econtext, instance)
mock_notify_usage.assert_has_calls(notify_call_list) mock_notify_usage.assert_has_calls(notify_call_list)
mock_notify_action.assert_has_calls(notify_action_call_list) mock_notify_action.assert_has_calls(notify_action_call_list)