diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-18 23:16:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-18 23:16:10 +0000 |
| commit | 38d8b7ca7e8292d3c237c8d4aee2bde4842d964a (patch) | |
| tree | bac003964a34a6f23bd0bbbad83d7925dd62f65c | |
| parent | 142323a73e379ab657af4dab6fe8b36c6710f1db (diff) | |
| parent | 9da547ebbcd7a2f4e8304aa7d070d3dd27821c6b (diff) | |
| download | nova-38d8b7ca7e8292d3c237c8d4aee2bde4842d964a.tar.gz | |
Merge "Change "libvirt.xml" back to the original after doing unrescue" into stable/liberty
| -rw-r--r-- | nova/tests/unit/virt/libvirt/test_driver.py | 7 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index e0fce34f2a..0870ade930 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -13787,10 +13787,12 @@ class LibvirtDriverTestCase(test.NoDBTestCase): mock_get_domain.return_value = fake_dom mock_load_file.return_value = "fake_unrescue_xml" unrescue_xml_path = os.path.join('/path', 'unrescue.xml') + xml_path = os.path.join('/path', 'libvirt.xml') rescue_file = os.path.join('/path', 'rescue.file') drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) with contextlib.nested( + mock.patch.object(libvirt_utils, 'write_to_file'), mock.patch.object(drvr, '_destroy'), mock.patch.object(drvr, '_create_domain'), mock.patch.object(libvirt_utils, 'file_delete'), @@ -13798,9 +13800,10 @@ class LibvirtDriverTestCase(test.NoDBTestCase): return_value=['lvm.rescue']), mock.patch.object(lvm, 'remove_volumes'), mock.patch.object(glob, 'iglob', return_value=[rescue_file]) - ) as (mock_destroy, mock_create, mock_del, mock_lvm_disks, - mock_remove_volumes, mock_glob): + ) as (mock_write, mock_destroy, mock_create, mock_del, + mock_lvm_disks, mock_remove_volumes, mock_glob): drvr.unrescue(instance, None) + mock_write.assert_called_once_with(xml_path, "fake_unrescue_xml") mock_destroy.assert_called_once_with(instance) mock_create.assert_called_once_with("fake_unrescue_xml", fake_dom) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 7f8a440c3c..6c20e9d95a 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -2488,7 +2488,9 @@ class LibvirtDriver(driver.ComputeDriver): """ instance_dir = libvirt_utils.get_instance_path(instance) unrescue_xml_path = os.path.join(instance_dir, 'unrescue.xml') + xml_path = os.path.join(instance_dir, 'libvirt.xml') xml = libvirt_utils.load_file(unrescue_xml_path) + libvirt_utils.write_to_file(xml_path, xml) guest = self._host.get_guest(instance) # TODO(sahid): We are converting all calls from a |