x/python-ganttclient
Code Issues Proposed changes

Merge "libvirt: enable apic setting for Xen or KVM guest."

Browse Source
This commit is contained in:
Jenkins
2012-12-10 18:41:20 +00:00
committed by Gerrit Code Review
parent 6a08d41f4f 5140773133
commit c259f4d442
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nova/tests/test_libvirt.py
View File

@@ -652,6 +652,7 @@ class LibvirtConnTestCase(test.TestCase):
_fake_network_info(self.stubs, 1), _fake_network_info(self.stubs, 1),
None, None) None, None)
self.assertEquals(cfg.acpi, True) self.assertEquals(cfg.acpi, True)
self.assertEquals(cfg.apic, True)
self.assertEquals(cfg.memory, 1024 * 1024 * 2) self.assertEquals(cfg.memory, 1024 * 1024 * 2)
self.assertEquals(cfg.vcpus, 1) self.assertEquals(cfg.vcpus, 1)
self.assertEquals(cfg.os_type, vm_mode.HVM) self.assertEquals(cfg.os_type, vm_mode.HVM)

12
nova/tests/test_libvirt_config.py
View File

@@ -632,6 +632,8 @@ class LibvirtConfigGuestTest(LibvirtConfigBaseTest):
obj.os_loader = '/usr/lib/xen/boot/hvmloader' obj.os_loader = '/usr/lib/xen/boot/hvmloader'
obj.os_root = "root=xvda" obj.os_root = "root=xvda"
obj.os_cmdline = "console=xvc0" obj.os_cmdline = "console=xvc0"
obj.acpi = True
obj.apic = True
disk = config.LibvirtConfigGuestDisk() disk = config.LibvirtConfigGuestDisk()
disk.source_type = "file" disk.source_type = "file"
@@ -654,6 +656,10 @@ class LibvirtConfigGuestTest(LibvirtConfigBaseTest):
<cmdline>console=xvc0</cmdline> <cmdline>console=xvc0</cmdline>
<root>root=xvda</root> <root>root=xvda</root>
</os> </os>
<features>
<acpi/>
<apic/>
</features>
<devices> <devices>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/tmp/img"/> <source file="/tmp/img"/>
@@ -671,6 +677,8 @@ class LibvirtConfigGuestTest(LibvirtConfigBaseTest):
obj.uuid = "b38a3f43-4be2-4046-897f-b67c2f5e0147" obj.uuid = "b38a3f43-4be2-4046-897f-b67c2f5e0147"
obj.os_type = "linux" obj.os_type = "linux"
obj.os_boot_dev = "hd" obj.os_boot_dev = "hd"
obj.acpi = True
obj.apic = True
disk = config.LibvirtConfigGuestDisk() disk = config.LibvirtConfigGuestDisk()
disk.source_type = "file" disk.source_type = "file"
@@ -691,6 +699,10 @@ class LibvirtConfigGuestTest(LibvirtConfigBaseTest):
<type>linux</type> <type>linux</type>
<boot dev="hd"/> <boot dev="hd"/>
</os> </os>
<features>
<acpi/>
<apic/>
</features>
<devices> <devices>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/tmp/img"/> <source file="/tmp/img"/>