x/python-ganttclient
Code Issues Proposed changes

Add another libvirt get_guest_config() test case

Browse Source 
This would have caught bug #964843

Change-Id: Id871a81ee4d5d639fd0e976b71bcd860623f6e4c
This commit is contained in:
Mark McLoughlin
2012-03-26 06:35:27 +01:00
parent 7b537a81b1
commit 0daaed5a23
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nova/tests/test_libvirt.py
View File

@@ -449,6 +449,7 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEquals(cfg.vcpus, 1) self.assertEquals(cfg.vcpus, 1)
self.assertEquals(cfg.os_type, "hvm") self.assertEquals(cfg.os_type, "hvm")
self.assertEquals(cfg.os_boot_dev, "hd") self.assertEquals(cfg.os_boot_dev, "hd")
self.assertEquals(cfg.os_root, None)
self.assertEquals(len(cfg.devices), 7) self.assertEquals(len(cfg.devices), 7)
self.assertEquals(type(cfg.devices[0]), self.assertEquals(type(cfg.devices[0]),
config.LibvirtConfigGuestDisk) config.LibvirtConfigGuestDisk)
@@ -465,6 +466,10 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEquals(type(cfg.devices[6]), self.assertEquals(type(cfg.devices[6]),
config.LibvirtConfigGuestGraphics) 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, cfg = conn.get_guest_config(instance_ref,
_fake_network_info(self.stubs, 2), _fake_network_info(self.stubs, 2),
None, False) None, False)
@@ -473,6 +478,8 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEquals(cfg.vcpus, 1) self.assertEquals(cfg.vcpus, 1)
self.assertEquals(cfg.os_type, "hvm") self.assertEquals(cfg.os_type, "hvm")
self.assertEquals(cfg.os_boot_dev, "hd") 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]), self.assertEquals(type(cfg.devices[0]),
config.LibvirtConfigGuestDisk) config.LibvirtConfigGuestDisk)
self.assertEquals(type(cfg.devices[1]), self.assertEquals(type(cfg.devices[1]),
@@ -490,6 +497,27 @@ class LibvirtConnTestCase(test.TestCase):
self.assertEquals(type(cfg.devices[7]), self.assertEquals(type(cfg.devices[7]),
config.LibvirtConfigGuestGraphics) 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): def test_xml_and_uri_no_ramdisk_no_kernel(self):
instance_data = dict(self.test_instance) instance_data = dict(self.test_instance)
self._check_xml_and_uri(instance_data, self._check_xml_and_uri(instance_data,