From 6307160aabbb4f4f8fcfaaf48197e3fa6c8a05d2 Mon Sep 17 00:00:00 2001 From: Kravchenko Pavel Date: Tue, 25 Dec 2012 17:50:37 +0200 Subject: [PATCH] Check for image_meta in libvirt.driver.spawn This adds check that image_meta exists in libvirt driver spawn method. In case it doesn't the image shouldn't be created. part of libvirt driver support for blueprint rebuild-for-ha DocImpact Change-Id: I097c7cbfde96bcb21b4f06af4e5bac00440849c2 Co-authored-by: Oshrit Feder --- nova/tests/test_libvirt.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 02578e88..362b5320 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -2451,6 +2451,38 @@ class LibvirtConnTestCase(test.TestCase): shutil.rmtree(os.path.join(CONF.instances_path, CONF.base_dir_name)) + def test_spawn_without_image_meta(self): + self.create_image_called = False + + def fake_none(*args, **kwargs): + return + + def fake_create_image(*args, **kwargs): + self.create_image_called = True + + def fake_get_info(instance): + return {'state': power_state.RUNNING} + + instance_ref = self.test_instance + instance_ref['image_ref'] = 1 + instance = db.instance_create(self.context, instance_ref) + + conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) + self.stubs.Set(conn, 'to_xml', fake_none) + self.stubs.Set(conn, '_create_image', fake_create_image) + self.stubs.Set(conn, '_create_domain_and_network', fake_none) + self.stubs.Set(conn, 'get_info', fake_get_info) + + conn.spawn(self.context, instance, None, [], None) + self.assertFalse(self.create_image_called) + + conn.spawn(self.context, + instance, + {'id': instance['image_ref']}, + [], + None) + self.assertTrue(self.create_image_called) + def test_get_console_output_file(self): fake_libvirt_utils.files['console.log'] = '01234567890'