From 0daaed5a23a6f41085c126b2ef69bfb82777f94a Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 26 Mar 2012 06:35:27 +0100 Subject: [PATCH] Add another libvirt get_guest_config() test case This would have caught bug #964843 Change-Id: Id871a81ee4d5d639fd0e976b71bcd860623f6e4c --- nova/tests/test_libvirt.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index f623b349..1a41d1b2 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -449,6 +449,7 @@ class LibvirtConnTestCase(test.TestCase): self.assertEquals(cfg.vcpus, 1) self.assertEquals(cfg.os_type, "hvm") self.assertEquals(cfg.os_boot_dev, "hd") + self.assertEquals(cfg.os_root, None) self.assertEquals(len(cfg.devices), 7) self.assertEquals(type(cfg.devices[0]), config.LibvirtConfigGuestDisk) @@ -465,6 +466,10 @@ class LibvirtConnTestCase(test.TestCase): self.assertEquals(type(cfg.devices[6]), config.LibvirtConfigGuestGraphics) + def test_get_guest_config_with_two_nics(self): + conn = connection.LibvirtConnection(True) + instance_ref = db.instance_create(self.context, self.test_instance) + cfg = conn.get_guest_config(instance_ref, _fake_network_info(self.stubs, 2), None, False) @@ -473,6 +478,8 @@ class LibvirtConnTestCase(test.TestCase): self.assertEquals(cfg.vcpus, 1) self.assertEquals(cfg.os_type, "hvm") self.assertEquals(cfg.os_boot_dev, "hd") + self.assertEquals(cfg.os_root, None) + self.assertEquals(len(cfg.devices), 8) self.assertEquals(type(cfg.devices[0]), config.LibvirtConfigGuestDisk) self.assertEquals(type(cfg.devices[1]), @@ -490,6 +497,27 @@ class LibvirtConnTestCase(test.TestCase): self.assertEquals(type(cfg.devices[7]), config.LibvirtConfigGuestGraphics) + def test_get_guest_config_with_root_device_name(self): + self.flags(libvirt_type='uml') + conn = connection.LibvirtConnection(True) + instance_ref = db.instance_create(self.context, self.test_instance) + + cfg = conn.get_guest_config(instance_ref, [], None, False, + {'root_device_name': 'dev/vdb'}) + self.assertEquals(cfg.acpi, False) + self.assertEquals(cfg.memory, 1024 * 1024 * 2) + self.assertEquals(cfg.vcpus, 1) + self.assertEquals(cfg.os_type, "uml") + self.assertEquals(cfg.os_boot_dev, None) + self.assertEquals(cfg.os_root, 'dev/vdb') + self.assertEquals(len(cfg.devices), 3) + self.assertEquals(type(cfg.devices[0]), + config.LibvirtConfigGuestDisk) + self.assertEquals(type(cfg.devices[1]), + config.LibvirtConfigGuestDisk) + self.assertEquals(type(cfg.devices[2]), + config.LibvirtConfigGuestConsole) + def test_xml_and_uri_no_ramdisk_no_kernel(self): instance_data = dict(self.test_instance) self._check_xml_and_uri(instance_data,