- CIM - libvirt List Archives

[PATCH] Put the <features> block into the XenFV XML we generate
by Dan Smith 11 Jun '08

11 Jun '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1213124529 25200 # Node ID ad4804559dd83bd2afd10fa0768b087f6a9914a9 # Parent 7b10cae6440e138e9db809f8360c1ef7cb5f6d20 Put the <features> block into the XenFV XML we generate I think that this is a sane set of defaults for most situations. Later it might be good to provide settings for these in the VSSD, but this should do for now. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 7b10cae6440e -r ad4804559dd8 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Thu Jun 05 12:29:31 2008 -0700 +++ b/libxkutil/xmlgen.c Tue Jun 10 12:02:09 2008 -0700 @@ -502,7 +502,12 @@ " %s\n" " %s\n" " %s\n" - "</os>\n", + "</os>\n" + "<features>\n" + " <pae/>\n" + " <acpi/>\n" + " <apic/>\n" + "</features>\n", type, loader, boot);

2 1

[PATCH] [TEST] Fixing the tc 40_RSC_start.py of ComputerSystem
by Deepti B. Kalakeri 10 Jun '08

10 Jun '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1213102213 25200 # Node ID 342e77cf74f7685878555d30678b5ad07a3893f5 # Parent ca8841f47805d5d2a23069220563713412d6a7bd [TEST] Fixing the tc 40_RSC_start.py of ComputerSystem. The tc was passing with false positive. The parameters passed to check_attributes() were incorrect and fixed it. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r ca8841f47805 -r 342e77cf74f7 suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py Fri Jun 06 02:05:34 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py Tue Jun 10 05:50:13 2008 -0700 @@ -85,7 +85,7 @@ def main(): raise Exception("Unable start dom %s using RequestedStateChange()", default_dom) - rc = check_attributes(domain_name, ip, options.virt) + rc = check_attributes(default_dom, options.ip, options.virt) if rc != 0: raise Exception("Attributes for %s not set as expected.", default_dom)

2 1

[PATCH] [TEST] Update VSSD.03 for LXC support
by yunguol＠cn.ibm.com 07 Jun '08

07 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212845506 -28800 # Node ID f3763e64079cf352abd10186b893c670c3b52bfd # Parent fee941e683a399cb96994f863026ec3837841934 [TEST] Update VSSD.03 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r fee941e683a3 -r f3763e64079c suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py --- a/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py Thu Jun 05 09:51:04 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py Sat Jun 07 21:31:46 2008 +0800 @@ -58,6 +58,7 @@ from XenKvmLib.common_util import try_getinstance from XenKvmLib.test_doms import destroy_and_undefine_all +platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "VSSD_domain" expr_values = {

1 0

[PATCH] [TEST] Update ElementSettingData.03 for LXC support
by yunguol＠cn.ibm.com 07 Jun '08

07 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212845129 -28800 # Node ID 779ea9944c79488d4586aae3e0174d82801aa5af # Parent fee941e683a399cb96994f863026ec3837841934 [TEST] Update ElementSettingData.03 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r fee941e683a3 -r 779ea9944c79 suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py Thu Jun 05 09:51:04 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py Sat Jun 07 21:25:29 2008 +0800 @@ -60,7 +60,7 @@ from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM'] +sup_types = ['Xen', 'KVM', 'LXC'] test_dom = "hd_domain1" test_mac = "00:11:22:33:44:55" @@ -82,7 +82,10 @@ status = PASS virtxml = vxml.get_class(options.virt) - cxml = virtxml(test_dom, mac = test_mac) + if options.virt == 'LXC': + cxml = virtxml(test_dom) + else: + cxml = virtxml(test_dom, mac = test_mac) ret = cxml.create(options.ip) if not ret: logger.error("Failed to Create the dom: %s" % test_dom)

1 0

[PATCH] [TEST] Update VSSD.04 for LXC support
by yunguol＠cn.ibm.com 07 Jun '08

07 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212844304 -28800 # Node ID a59fe03154cb7dcafd34cdd4f26e2b653a027f41 # Parent fee941e683a399cb96994f863026ec3837841934 [TEST] Update VSSD.04 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r fee941e683a3 -r a59fe03154cb suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Thu Jun 05 09:51:04 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Sat Jun 07 21:11:44 2008 +0800 @@ -55,7 +55,7 @@ verify_diskrasd_values, verify_memrasd_values from XenKvmLib.const import CIM_REV -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "VSSDC_dom" test_vcpus = 1 @@ -64,13 +64,21 @@ proc_rev = 531 mem_rev = 529 -def setup_env(): +def setup_env(virt): vsxml_info = None virt_xml = get_class(virt) - vsxml_info = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus, - mac = test_mac, disk = test_disk) + if virt == 'LXC': + vsxml_info = virt_xml(test_dom) + else: + vsxml_info = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus, + mac = test_mac, disk = test_disk) + try: + bridge = vsxml_info.set_vbridge(server) + except Exception, details: + logger.error("Exception : %s", details) + return FAIL, vsxml_info + try: - bridge = vsxml_info.set_vbridge(server) ret = vsxml_info.define(server) if not ret: logger.error("Failed to Define the domain: %s", test_dom) @@ -177,7 +185,10 @@ assoc_cname = get_typed_class(virt, 'VirtualSystemSettingDataComponent') try: vssdc_assoc_info = assoc.Associators(server, assoc_cname, qcn, virt, InstanceID = instIdval) - if len(vssdc_assoc_info) < 4: + if len(vssdc_assoc_info) == 1 and \ + vssdc_assoc_info[0].classname == 'LXC_MemResourceAllocationSettingData': + logger.info("%s returned expect objects" % assoc_cname) + elif len(vssdc_assoc_info) < 4: logger.error("%s returned %i %s objects, expected 4" % (assoc_cname, len(vssdc_assoc_info), qcn)) status = FAIL @@ -223,7 +234,7 @@ else: test_disk = "hda" - status, vsxml = setup_env() + status, vsxml = setup_env(virt) if status != PASS: return status

1 0

[PATCH] [TEST] Update RASD.02 for LXC support
by yunguol＠cn.ibm.com 07 Jun '08

07 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212842935 -28800 # Node ID 4972af55a4c0086235375b02b97114803752baaa # Parent fee941e683a399cb96994f863026ec3837841934 [TEST] Update RASD.02 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r fee941e683a3 -r 4972af55a4c0 suites/libvirt-cim/cimtest/RASD/02_enum.py --- a/suites/libvirt-cim/cimtest/RASD/02_enum.py Thu Jun 05 09:51:04 2008 +0800 +++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py Sat Jun 07 20:48:55 2008 +0800 @@ -38,7 +38,7 @@ from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "VSSDC_dom" test_vcpus = 1 @@ -154,10 +154,20 @@ else: test_disk = "hda" virtxml = get_class(virt) - vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus, + if virt == 'LXC': + vsxml = virtxml(test_dom) + class_list = [get_typed_class(virt, rasd.masd_cn)] + else: + vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus, mac = test_mac, disk = test_disk) + vsxml.set_vbridge(server) + class_list = [ get_typed_class(virt, rasd.dasd_cn), + get_typed_class(virt, rasd.masd_cn), + get_typed_class(virt, rasd.pasd_cn), + get_typed_class(virt, rasd.nasd_cn) + ] + try: - vsxml.set_vbridge(server) ret = vsxml.define(server) if not ret: logger.error("Failed to Define the domain: %s", test_dom) @@ -165,11 +175,7 @@ except Exception, details: logger.error("Exception : %s", details) return FAIL - class_list = [ get_typed_class(virt, rasd.dasd_cn), - get_typed_class(virt, rasd.masd_cn), - get_typed_class(virt, rasd.pasd_cn), - get_typed_class(virt, rasd.nasd_cn) - ] + status = PASS procrasd, netrasd, diskrasd, memrasd = init_list(virt) diff -r fee941e683a3 -r 4972af55a4c0 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Thu Jun 05 09:51:04 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Sat Jun 07 20:48:55 2008 +0800 @@ -233,6 +233,9 @@ class KVM_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData): pass +class LXC_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData): + pass + class Xen_NetResourceAllocationSettingData(CIM_NetResourceAllocationSettingData): pass

1 0

[PATCH] [TEST] #3 Adding set_interface_details() fn to the vxml.py
by Deepti B. Kalakeri 06 Jun '08

06 Jun '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1212743134 25200 # Node ID 3a9f19764e3aef9b73e9998e91613a21d2df0384 # Parent fee941e683a399cb96994f863026ec3837841934 [TEST] #3 Adding set_interface_details() fn to the vxml.py. This function is used add network details to Xen/XenFV/KVM guest. Changes: >From patch 2 to 3: ------------------ 1) Retained the LXC changes from const.py which was accidentally removed in previous patch. >From patch 1 to 2: ----------------- 1) Removed the extra param used in the set_interface_details() fn. 2) Made the xxx_default_net_type defined in const.py for Xen/XenFV/KVM as network. 3) Removed the individual xxx_default_net_type for Xen/XenFV/KVM. 4) Defined common variable default_net_type in const.py the individual. 5) Changed the vxml.py to use the common variable default_net_type of const.py. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r fee941e683a3 -r 3a9f19764e3a suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Thu Jun 05 09:51:04 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Fri Jun 06 02:05:34 2008 -0700 @@ -40,6 +40,7 @@ if not CIM_REV or not CIM_SET: # vxml.NetXML default_bridge_name = 'testbridge' default_network_name = 'default-net' +default_net_type = 'network' #vxml.PoolXML default_pool_name = 'testpool' @@ -59,7 +60,6 @@ Xen_secondary_disk_path = os.path.join(_ Xen_secondary_disk_path = os.path.join(_image_dir, 'default-xen-dimage.2ND') Xen_default_disk_dev = 'xvda' Xen_default_mac = '11:22:33:aa:bb:cc' -Xen_default_net_type = 'ethernet' # vxml.KVMXML if fv_cap(CIM_IP): @@ -70,7 +70,6 @@ KVM_secondary_disk_path = os.path.join(_ KVM_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND') KVM_default_disk_dev = 'hda' KVM_default_mac = '11:22:33:aa:bb:cc' -KVM_default_net_type = 'network' # vxml.XenFVXML s, o = platform.architecture() @@ -84,7 +83,6 @@ XenFV_secondary_disk_path = os.path.join XenFV_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND') XenFV_default_disk_dev = 'hda' XenFV_default_mac = '00:16:3e:5d:c7:9e' -XenFV_default_net_type = 'bridge' #vxml.LXCXML LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init') diff -r fee941e683a3 -r 3a9f19764e3a suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Thu Jun 05 09:51:04 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Jun 06 02:05:34 2008 -0700 @@ -300,6 +300,10 @@ class VirtXML(Virsh, XMLClass): self.set_attributes('/domain/devices/interface/source', bridge=bridgename) + def set_nettype(self, nettype): + self.set_attributes('/domain/devices/interface/type', + type=nettype) + def set_diskimg(self, diskimg): self.set_attributes('/domain/devices/disk/source', file=diskimg) @@ -437,6 +441,38 @@ class VirtXML(Virsh, XMLClass): return vbr + def set_interface_details(self, devices, net_mac, net_type, virt_type): + interface = self.add_sub_node(devices, 'interface', type=net_type) + self.add_sub_node(interface, 'mac', address=net_mac) + if net_type == 'bridge': + self._set_vbridge(CIM_IP, virt_type) + elif net_type == 'network': + self.set_vnetwork(interface, virt_type) + elif net_type == 'ethernet': + pass + elif net_type == 'user': + pass + else: + logger.error("%s is not a valid network type", net_type) + sys.exit(1) + + def set_vnetwork(self, interface, virt_type): + network_list = live.net_list(CIM_IP, virt_type) + if len(network_list) > 0: + nname = network_list[0] + else: + logger.info('No virutal network found') + logger.info('Trying to create one ......') + netxml = NetXML(CIM_IP, virt_type) + ret = netxml.create_vnet() + if not ret: + logger.error('Failed to create the virtual network "%s"', + netxml.net_name) + sys.exit(SKIP) + nname = netxml.xml_get_netpool_name() + self.add_sub_node(interface, 'source', network=nname) + + class VirtCIM: def __init__(self, virt, dom_name, disk_dev, disk_source, @@ -497,7 +533,7 @@ class XenXML(VirtXML, VirtCIM): vcpus=const.default_vcpus, mac=const.Xen_default_mac, disk_file_path=const.Xen_disk_path, - disk=const.Xen_default_disk_dev): + disk=const.Xen_default_disk_dev): if not (os.path.exists(const.Xen_kernel_path) \ and os.path.exists(const.Xen_init_path)): logger.error('ERROR: Either the kernel image ' @@ -505,10 +541,10 @@ class XenXML(VirtXML, VirtCIM): sys.exit(1) VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus) self._os(const.Xen_kernel_path, const.Xen_init_path) - self._devices(disk_file_path, disk, const.Xen_default_net_type, mac) + self._devices(disk_file_path, disk, const.default_net_type, mac) VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path, - const.Xen_default_net_type, mac, vcpus, mem) + const.default_net_type, mac, vcpus, mem) def _os(self, os_kernel, os_initrd): os = self.get_node('/domain/os') @@ -524,9 +560,7 @@ class XenXML(VirtXML, VirtCIM): self.add_sub_node(disk, 'driver', name='file') self.add_sub_node(disk, 'source', file=disk_img) self.add_sub_node(disk, 'target', dev=disk_dev) - - interface = self.add_sub_node(devices, 'interface', type=net_type) - self.add_sub_node(interface, 'mac', address=net_mac) + self.set_interface_details(devices, net_mac, net_type, virt_type='Xen') def set_bootloader(self, ip, gtype=0): bldr = live.bootloader(ip, gtype) @@ -558,7 +592,7 @@ class KVMXML(VirtXML): sys.exit(1) VirtXML.__init__(self, 'kvm', test_dom, set_uuid(), mem, vcpus) self._os() - self._devices(const.KVM_default_emulator, const.KVM_default_net_type, + self._devices(const.KVM_default_emulator, const.default_net_type, disk_file_path, disk, mac) def _os(self): @@ -572,33 +606,8 @@ class KVMXML(VirtXML): self.add_sub_node(disk, 'source', file=disk_img) self.add_sub_node(disk, 'target', dev=disk_dev) - interface = self.add_sub_node(devices, 'interface', type=net_type) - self.add_sub_node(interface, 'mac', address=net_mac) + self.set_interface_details(devices, net_mac, net_type, virt_type='KVM') - if net_type == 'bridge': - self.set_vbridge(CIM_IP) - elif net_type == 'network': - self.set_vnetwork(interface) - else: - logger.error("%s is not a valid network type", net_type) - sys.exit(1) - - def set_vnetwork(self, interface): - network_list = live.net_list(CIM_IP, virt='KVM') - if len(network_list) > 0: - nname = network_list[0] - else: - logger.info('No virutal network found') - logger.info('Trying to create one ......') - netxml = NetXML(CIM_IP, virt='KVM') - ret = netxml.create_vnet() - if not ret: - logger.error('Failed to create the virtual network "%s"', - netxml.net_name) - sys.exit(SKIP) - nname = netxml.xml_get_netpool_name() - self.add_sub_node(interface, 'source', network=nname) - def set_emulator(self, emu): return self._set_emulator(emu) @@ -625,7 +634,7 @@ class XenFVXML(VirtXML): VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus) self._os(const.XenFV_default_loader) self._devices(const.XenFV_default_emulator, - const.XenFV_default_net_type, mac, disk_file_path, disk) + const.default_net_type, mac, disk_file_path, disk) def _os(self, os_loader): os = self.get_node('/domain/os') @@ -637,14 +646,10 @@ class XenFVXML(VirtXML): devices = self.get_node('/domain/devices') self.add_sub_node(devices, 'emulator', emu) - - interface = self.add_sub_node(devices, 'interface', type=net_type) - self.add_sub_node(interface, 'mac', address=net_mac) - self.set_bridge(CIM_IP) - disk = self.add_sub_node(devices, 'disk', type='file') self.add_sub_node(disk, 'source', file=disk_img) self.add_sub_node(disk, 'target', dev=disk_dev) + self.set_interface_details(devices, net_mac, net_type, virt_type='XenFV') def set_emulator(self, emu): return self._set_emulator(emu)

1 0

[PATCH] [TEST] #2 Adding set_interface_details() fn to the vxml.py
by Deepti B. Kalakeri 06 Jun '08

06 Jun '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1212669379 25200 # Node ID 8252a996154a47991c165ef8286f55aa1cc55654 # Parent 959719c32cc9d5a60fe3d6474e3fcc09f2e44875 [TEST] #2 Adding set_interface_details() fn to the vxml.py. This function give choice to add different network types to Xen/XenFV/KVM guest. Changes: >From patch 1 to 2: ----------------- 1) Removed the extra param used in the set_interface_details() fn. 2) Made the xxx_default_net_type defined in const.py for Xen/XenFV/KVM as network. 3) Removed the individual xxx_default_net_type for Xen/XenFV/KVM. 4) Defined common variable default_net_type in const.py the individual. 5) Changed the vxml.py to use the common variable default_net_type of const.py. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 959719c32cc9 -r 8252a996154a suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Wed Jun 04 17:30:22 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Thu Jun 05 05:36:19 2008 -0700 @@ -44,6 +44,7 @@ default_domname = 'domU1' default_domname = 'domU1' default_memory = 128 default_vcpus = 1 +default_net_type = 'network' _image_dir = '/tmp' @@ -55,7 +56,6 @@ Xen_secondary_disk_path = os.path.join(_ Xen_secondary_disk_path = os.path.join(_image_dir, 'default-xen-dimage.2ND') Xen_default_disk_dev = 'xvda' Xen_default_mac = '11:22:33:aa:bb:cc' -Xen_default_net_type = 'ethernet' # vxml.KVMXML if fv_cap(CIM_IP): @@ -66,7 +66,6 @@ KVM_secondary_disk_path = os.path.join(_ KVM_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND') KVM_default_disk_dev = 'hda' KVM_default_mac = '11:22:33:aa:bb:cc' -KVM_default_net_type = 'network' # vxml.XenFVXML s, o = platform.architecture() @@ -80,10 +79,7 @@ XenFV_secondary_disk_path = os.path.join XenFV_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND') XenFV_default_disk_dev = 'hda' XenFV_default_mac = '00:16:3e:5d:c7:9e' -XenFV_default_net_type = 'bridge' #vxml.LXCXML LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init') LXC_default_tty = '/dev/ptmx' -LXC_default_mp = '/tmp' -LXC_default_source = '/tmp/lxc_files' diff -r 959719c32cc9 -r 8252a996154a suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Jun 04 17:30:22 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Thu Jun 05 05:36:19 2008 -0700 @@ -300,6 +300,10 @@ class VirtXML(Virsh, XMLClass): self.set_attributes('/domain/devices/interface/source', bridge=bridgename) + def set_nettype(self, nettype): + self.set_attributes('/domain/devices/interface/type', + type=nettype) + def set_diskimg(self, diskimg): self.set_attributes('/domain/devices/disk/source', file=diskimg) @@ -437,6 +441,38 @@ class VirtXML(Virsh, XMLClass): return vbr + def set_interface_details(self, devices, net_mac, net_type, virt_type): + interface = self.add_sub_node(devices, 'interface', type=net_type) + self.add_sub_node(interface, 'mac', address=net_mac) + if net_type == 'bridge': + self._set_vbridge(CIM_IP, virt_type) + elif net_type == 'network': + self.set_vnetwork(interface, virt_type) + elif net_type == 'ethernet': + pass + elif net_type == 'user': + pass + else: + logger.error("%s is not a valid network type", net_type) + sys.exit(1) + + def set_vnetwork(self, interface, virt_type): + network_list = live.net_list(CIM_IP, virt_type) + if len(network_list) > 0: + nname = network_list[0] + else: + logger.info('No virutal network found') + logger.info('Trying to create one ......') + netxml = NetXML(CIM_IP, virt_type) + ret = netxml.create_vnet() + if not ret: + logger.error('Failed to create the virtual network "%s"', + netxml.net_name) + sys.exit(SKIP) + nname = netxml.xml_get_netpool_name() + self.add_sub_node(interface, 'source', network=nname) + + class VirtCIM: def __init__(self, virt, dom_name, disk_dev, disk_source, @@ -497,7 +533,7 @@ class XenXML(VirtXML, VirtCIM): vcpus=const.default_vcpus, mac=const.Xen_default_mac, disk_file_path=const.Xen_disk_path, - disk=const.Xen_default_disk_dev): + disk=const.Xen_default_disk_dev): if not (os.path.exists(const.Xen_kernel_path) \ and os.path.exists(const.Xen_init_path)): logger.error('ERROR: Either the kernel image ' @@ -505,10 +541,10 @@ class XenXML(VirtXML, VirtCIM): sys.exit(1) VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus) self._os(const.Xen_kernel_path, const.Xen_init_path) - self._devices(disk_file_path, disk, const.Xen_default_net_type, mac) + self._devices(disk_file_path, disk, const.default_net_type, mac) VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path, - const.Xen_default_net_type, mac, vcpus, mem) + const.default_net_type, mac, vcpus, mem) def _os(self, os_kernel, os_initrd): os = self.get_node('/domain/os') @@ -524,9 +560,7 @@ class XenXML(VirtXML, VirtCIM): self.add_sub_node(disk, 'driver', name='file') self.add_sub_node(disk, 'source', file=disk_img) self.add_sub_node(disk, 'target', dev=disk_dev) - - interface = self.add_sub_node(devices, 'interface', type=net_type) - self.add_sub_node(interface, 'mac', address=net_mac) + self.set_interface_details(devices, net_mac, net_type, virt_type='Xen') def set_bootloader(self, ip, gtype=0): bldr = live.bootloader(ip, gtype) @@ -558,7 +592,7 @@ class KVMXML(VirtXML): sys.exit(1) VirtXML.__init__(self, 'kvm', test_dom, set_uuid(), mem, vcpus) self._os() - self._devices(const.KVM_default_emulator, const.KVM_default_net_type, + self._devices(const.KVM_default_emulator, const.default_net_type, disk_file_path, disk, mac) def _os(self): @@ -572,33 +606,8 @@ class KVMXML(VirtXML): self.add_sub_node(disk, 'source', file=disk_img) self.add_sub_node(disk, 'target', dev=disk_dev) - interface = self.add_sub_node(devices, 'interface', type=net_type) - self.add_sub_node(interface, 'mac', address=net_mac) + self.set_interface_details(devices, net_mac, net_type, virt_type='KVM') - if net_type == 'bridge': - self.set_vbridge(CIM_IP) - elif net_type == 'network': - self.set_vnetwork(interface) - else: - logger.error("%s is not a valid network type", net_type) - sys.exit(1) - - def set_vnetwork(self, interface): - network_list = live.net_list(CIM_IP, virt='KVM') - if len(network_list) > 0: - nname = network_list[0] - else: - logger.info('No virutal network found') - logger.info('Trying to create one ......') - netxml = NetXML(CIM_IP, virt='KVM') - ret = netxml.create_vnet() - if not ret: - logger.error('Failed to create the virtual network "%s"', - netxml.net_name) - sys.exit(SKIP) - nname = netxml.xml_get_netpool_name() - self.add_sub_node(interface, 'source', network=nname) - def set_emulator(self, emu): return self._set_emulator(emu) @@ -625,7 +634,7 @@ class XenFVXML(VirtXML): VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus) self._os(const.XenFV_default_loader) self._devices(const.XenFV_default_emulator, - const.XenFV_default_net_type, mac, disk_file_path, disk) + const.default_net_type, mac, disk_file_path, disk) def _os(self, os_loader): os = self.get_node('/domain/os') @@ -637,14 +646,10 @@ class XenFVXML(VirtXML): devices = self.get_node('/domain/devices') self.add_sub_node(devices, 'emulator', emu) - - interface = self.add_sub_node(devices, 'interface', type=net_type) - self.add_sub_node(interface, 'mac', address=net_mac) - self.set_bridge(CIM_IP) - disk = self.add_sub_node(devices, 'disk', type='file') self.add_sub_node(disk, 'source', file=disk_img) self.add_sub_node(disk, 'target', dev=disk_dev) + self.set_interface_details(devices, net_mac, net_type, virt_type='XenFV') def set_emulator(self, emu): return self._set_emulator(emu)

2 1

on the LXC_SettingsDefineCapabilities association
by Guo Lian Yun 05 Jun '08

05 Jun '08

Kaitlin, Containers currently only really support memory and disk pools. I'm not sure if the unsupported error make sense below. [root@nine cimtest]# wbemcli ain -ac LXC_SettingsDefineCapabilities http://root:password@localhost/root/virt:LXC_AllocationCapabilities.Instanc…"NetworkPool/default" * * wbemcli: Cim: (7) CIM_ERR_NOT_SUPPORTED: Unsupported hypervisor: ';LXC'; * Actually, I get all types of instance list by ein querying. [root@nine cimtest]# wbemcli ein http://root:password@localhost/root/virt:LXC_AllocationCapabilities localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="ProcessorPool/0" localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="MemoryPool/0" localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="NetworkPool/default" localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="DiskPool/testpool" Best, Regards Daisy (运国莲) VSM Team, China Systems & Technology Labs (CSTL) E-mail: yunguol(a)cn.ibm.com TEL: (86)-21-60922144 Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

2 1

SIGSEGV error of LXC_VirtualSystemSettingData with invalid InstanceID value
by Guo Lian Yun 05 Jun '08

05 Jun '08

Hi, If the InstanceID setting below, the provider Virt_VSSD will report SIGSEGV error: wbemcli gi http://root:password@localhost/root/virt:LXC_VirtualSystemSettingData.Insta…"invalid" * * wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider Virt_VSSD(30284) exiting due to a SIGSEGV signal * If the InstanceID set as "invalid:invalid", we can get expect result. wbemcli gi http://root:password@localhost/root/virt:KVM_VirtualSystemSettingData.Insta…"invalid:invalid" * * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (invalid) * Best, Regards Daisy (运国莲) VSM Team, China Systems & Technology Labs (CSTL) E-mail: yunguol(a)cn.ibm.com TEL: (86)-21-60922144 Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

3 3