openstack
/
nova
Code Issues Proposed changes

Merge "libvirt: fix serial ports lost after hard-reboot"

This commit is contained in:
Jenkins 2016-05-31 20:28:18 +00:00 committed by Gerrit Code Review
parent 2df4324216 fcdec6cd13
commit c9a3d86803
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -10270,6 +10270,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
mock_hard_reboot.assert_called_once_with(self.context,
instance, [], None)
@mock.patch('nova.virt.libvirt.LibvirtDriver._undefine_domain')
@mock.patch('nova.virt.libvirt.LibvirtDriver.get_info')
@mock.patch('nova.virt.libvirt.LibvirtDriver._create_domain_and_network')
@mock.patch('nova.virt.libvirt.LibvirtDriver._create_images_and_backing')
@ -10280,7 +10281,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
def test_hard_reboot(self, mock_destroy, mock_get_disk_info,
mock_get_instance_disk_info, mock_get_guest_xml,
mock_create_images_and_backing,
mock_create_domain_and_network, mock_get_info):
mock_create_domain_and_network, mock_get_info,
mock_undefine):
self.context.auth_token = True # any non-None value will suffice
instance = objects.Instance(**self.test_instance)
instance_path = libvirt_utils.get_instance_path(instance)
@ -10312,6 +10314,9 @@ class LibvirtConnTestCase(test.NoDBTestCase):
drvr._hard_reboot(self.context, instance, network_info,
block_device_info)
mock_destroy.assert_called_once_with(instance)
mock_undefine.assert_called_once_with(instance)
# make sure that _create_images_and_backing is passed the disk_info
# returned from _get_instance_disk_info and not the one that is in
# scope from blockinfo.get_disk_info

4
nova/virt/libvirt/driver.py
View File

@ -2264,6 +2264,10 @@ class LibvirtDriver(driver.ComputeDriver):
"""
self._destroy(instance)
# Domain XML will be redefined so we can safely undefine it
# from libvirt. This ensure that such process as create serial
# console for guest will run smoothly.
self._undefine_domain(instance)
# Convert the system metadata to image metadata
instance_dir = libvirt_utils.get_instance_path(instance)