# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1231730933 28800 # Node ID b7039ca10406849aadd502d738942bd97d775b8d # Parent 5cd63239ee18370a87d82b8d72856fa0f297b273 [TEST] Update RASD/05_disk_rasd_emu_type.py to support Xen This tc fails for Xen when emu_types = 1, I'm looking into this now. Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 5cd63239ee18 -r b7039ca10406 suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py --- a/suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py Thu Jan 08 15:02:43 2009 -0800 +++ b/suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py Sun Jan 11 19:28:53 2009 -0800 @@ -30,7 +30,7 @@ from CimTest.Globals import logger from XenKvmLib.const import get_provider_version -SUPPORTED_TYPES = ['KVM'] +SUPPORTED_TYPES = ['KVM', 'Xen'] default_dom = 'test_domain' libvirt_em_type_changeset = 737 diff -r 5cd63239ee18 -r b7039ca10406 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Thu Jan 08 15:02:43 2009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Sun Jan 11 19:28:53 2009 -0800 @@ -631,7 +631,8 @@ disk_file_path=const.Xen_disk_path, disk=const.Xen_default_disk_dev, ntype=const.default_net_type, - net_name=const.default_network_name): + net_name=const.default_network_name, + emu_type=None): if not (os.path.exists(const.Xen_kernel_path) \ and os.path.exists(const.Xen_init_path)): logger.error('ERROR: Either the kernel image ' @@ -642,7 +643,8 @@ self._devices(disk_file_path, disk, ntype, mac, net_name) VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path, - ntype, net_name, mac, vcpus, mem, mem_allocunits) + ntype, net_name, mac, vcpus, mem, mem_allocunits, + emu_type) def _os(self, os_kernel, os_initrd): os = self.get_node('/domain/os')