- CIM - libvirt List Archives

[PATCH] [TEST] #2 Adding new tc to verify KVMRedirectionSAP
by Deepti B. Kalakeri 27 Jan '09

27 Jan '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1232714174 28800 # Node ID a2ecb7430c50fcf6df6019625ee1a8b8ae24dfd9 # Parent ef20310648bc1d22c4c6aa23bcc092a01a49e340 [TEST] #2 Adding new tc to verify KVMRedirectionSAP. Updates from patch 1 to 2: -------------------------- Added GRASD support in the call to DefineSytem(). Modified necessary places for GRASD. Tested with KVM/Xen/LXC on current sources and KVM with F9 rpm. This tc will fail with LXC, Xen with current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r ef20310648bc -r a2ecb7430c50 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Thu Jan 22 01:15:12 2009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Fri Jan 23 04:36:14 2009 -0800 @@ -46,6 +46,15 @@ # Default TimeoutPeriod param for CS.RequestedStateChange() TIME = "00000000000000.000000:000" + +#KVMRedirectionSAP protocol values +KVMRedSAP_proto = { 'raw' : 2, 'rdp' : 3, 'vnc' : 4 } + +# CIM values for KVMRedirectionSAP.EnabledState +CIM_SAP_ACTIVE_STATE = 2 +CIM_SAP_INACTIVE_STATE = 3 +CIM_SAP_AVAILABLE_STATE = 6 + # vxml.NetXML default_bridge_name = 'testbridge' diff -r ef20310648bc -r a2ecb7430c50 suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Thu Jan 22 01:15:12 2009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri Jan 23 04:36:14 2009 -0800 @@ -33,6 +33,7 @@ RASD_TYPE_NET_ETHER = 10 RASD_TYPE_NET_OTHER = 11 RASD_TYPE_DISK = 17 +RASD_TYPE_GRAPHICS = 24 VSSD_RECOVERY_NONE = 2 VSSD_RECOVERY_RESTART = 3 @@ -232,6 +233,36 @@ def get_masd_class(virt): pass + +class CIM_GraphicsResourceAllocationSettingData(CIMClassMOF): + def __init__(self, name, res_sub_type="vnc", ip="127.0.0.1", + lport='-1', keymap="en-us"): + self.InstanceID = '%s/graphics' %name + self.ResourceType = RASD_TYPE_GRAPHICS + + if res_sub_type != None: + self.ResourceSubType = res_sub_type + + if ip != None and lport != None: + self.Address = '%s:%s' % (ip, lport) + + if keymap != None: + self.KeyMap = keymap + + +class Xen_GraphicsResourceAllocationSettingData(CIM_GraphicsResourceAllocationSettingData): + pass + +class KVM_GraphicsResourceAllocationSettingData(CIM_GraphicsResourceAllocationSettingData): + pass + +class LXC_GraphicsResourceAllocationSettingData(CIM_GraphicsResourceAllocationSettingData): + pass + +@eval_cls('GraphicsResourceAllocationSettingData') +def get_gasd_class(virt): + pass + def default_vssd_rasd_str(dom_name='test_domain', disk_dev='xvda', disk_source=const.Xen_disk_path, @@ -272,9 +303,12 @@ mallocunits=malloc_units, name=dom_name) + class_gasd = get_gasd_class(virt) + g = class_gasd(name=dom_name) + # LXC only takes disk and memory device for now. if virt == 'LXC': - return vssd, [d.mof(), m.mof()] + return vssd, [d.mof(), m.mof()], g.mof() class_nasd = get_nasd_class(virt) if net_mac != const.Xen_default_mac: @@ -293,5 +327,5 @@ p = class_pasd(vcpu=proc_vcpu, name=dom_name) - return vssd, [d.mof(), n.mof(), p.mof(), m.mof()] + return vssd, [d.mof(), n.mof(), p.mof(), m.mof(), g.mof()] diff -r ef20310648bc -r a2ecb7430c50 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Thu Jan 22 01:15:12 2009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Jan 23 04:36:14 2009 -0800 @@ -413,7 +413,6 @@ '/domain/devices/interface/source/@network') return networkStr - def dumpxml(self, ip): cmd = 'virsh -c %s dumpxml %s' % (self.vuri, self.dname) s, o = utils.run_remote(ip, cmd) @@ -467,7 +466,8 @@ class VirtCIM: def __init__(self, virt, dom_name, disk_dev, disk_source, net_type, net_name, net_mac, vcpus, mem, - mem_allocunits, emu_type): + mem_allocunits, emu_type, grstype, ip, + port_num, kmap): self.virt = virt self.domain_name = dom_name self.err_rc = None @@ -488,7 +488,9 @@ self.masd = vsms.get_masd_class(virt)(megabytes=mem, mallocunits=mem_allocunits, name=dom_name) - + self.gasd = vsms.get_gasd_class(virt)(name=dom_name, + res_sub_type=grstype, ip=ip, + lport=port_num, keymap=kmap) def cim_define(self, ip, ref_conf=None): service = vsms.get_vsms_class(self.virt)(ip) @@ -506,6 +508,8 @@ pass else: res_settings.append(str(self.nasd)) + if self.gasd is not None: + res_settings.append(str(self.gasd)) if ref_conf is None: ref_conf = ' ' @@ -657,6 +661,8 @@ self.dasd = rasd elif cn.find("NetResourceAllocationSettingData") >= 0: self.nasd = rasd + elif cn.find("GraphicsResourceAllocationSettingData") >= 0: + self.gasd = rasd def verify_error_msg(self, exp_rc, exp_desc): try: @@ -688,7 +694,8 @@ disk=const.Xen_default_disk_dev, ntype=const.default_net_type, net_name=const.default_network_name, - emu_type=None): + emu_type=None, grstype="vnc", address="127.0.0.1", + port_num='-1', keymap="en-us"): if not (os.path.exists(const.Xen_kernel_path) \ and os.path.exists(const.Xen_init_path)): logger.error('ERROR: Either the kernel image ' @@ -700,7 +707,7 @@ VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path, ntype, net_name, mac, vcpus, mem, mem_allocunits, - emu_type) + emu_type, grstype, address, port_num, keymap) def _os(self, os_kernel, os_initrd): os = self.get_node('/domain/os') @@ -750,14 +757,16 @@ disk=const.KVM_default_disk_dev, ntype=const.default_net_type, net_name=const.default_network_name, - emu_type=None): + emu_type=None, grstype="vnc", address="127.0.0.1", + port_num='-1', keymap="en-us"): if not os.path.exists(disk_file_path): logger.error('Error: Disk image does not exist') sys.exit(1) VirtXML.__init__(self, 'kvm', test_dom, set_uuid(), mem, vcpus) VirtCIM.__init__(self, 'KVM', test_dom, disk, disk_file_path, ntype, net_name, mac, vcpus, mem, - mem_allocunits, emu_type) + mem_allocunits, emu_type, grstype, address, + port_num, keymap) self._os() self._devices(const.KVM_default_emulator, ntype, disk_file_path, disk, mac, net_name) @@ -802,14 +811,15 @@ disk=const.XenFV_default_disk_dev, ntype=const.default_net_type, net_name=const.default_network_name, - emu_type=None): + emu_type=None, grstype="vnc", + address="127.0.0.1", port_num='-1', keymap="en-us"): if not os.path.exists(disk_file_path): logger.error('Error: Disk image does not exist') sys.exit(1) VirtXML.__init__(self, 'xenfv', test_dom, set_uuid(), mem, vcpus) VirtCIM.__init__(self, 'XenFV', test_dom, disk, disk_file_path, ntype, net_name, mac, vcpus, mem, mem_allocunits, - emu_type) + emu_type, grstype, address, port_num, keymap) self._features() self._os(const.XenFV_default_loader) self._devices(const.XenFV_default_emulator, @@ -856,11 +866,13 @@ mac=const.LXC_default_mac, ntype=const.default_net_type, net_name=const.default_network_name, - tty=const.LXC_default_tty): + tty=const.LXC_default_tty, grstype="vnc", + address="127.0.0.1", port_num='-1', keymap="en-us"): VirtXML.__init__(self, 'lxc', test_dom, set_uuid(), mem, vcpus) VirtCIM.__init__(self, 'LXC', test_dom, const.LXC_default_mp, const.LXC_default_source, ntype, net_name, mac, vcpus, - mem, const.default_mallocunits, None) + mem, const.default_mallocunits, None, grstype, + address, port_num, keymap) self._os(const.LXC_init_path) self._devices(mac, ntype, net_name, const.LXC_default_tty) self.create_lxc_file(CIM_IP, const.LXC_init_path)

3 2

[PATCH] Add interop and cimv2 ns registrations to spec
by Kaitlin Rupert 23 Jan '09

23 Jan '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1232577959 28800 # Node ID 29c0ffe73355b4461eff24a3ba5263bea61e0e7a # Parent 818470c2d36f7f573491be79cb8b414cc638da61 Add interop and cimv2 ns registrations to spec. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 818470c2d36f -r 29c0ffe73355 libvirt-cim.spec.in --- a/libvirt-cim.spec.in Tue Jan 20 08:06:05 2009 -0800 +++ b/libvirt-cim.spec.in Wed Jan 21 14:45:59 2009 -0800 @@ -51,6 +51,12 @@ %define REGISTRATION %{_datadir}/%{name}/*.registration %define SCHEMA %{_datadir}/%{name}/*.mof +%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration +%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.mof + +%define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.registration +%define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof + %{_datadir}/%{name}/provider-register.sh -d -t pegasus \ -n @CIM_VIRT_NS@ \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true @@ -65,6 +71,15 @@ %{_datadir}/%{name}/provider-register.sh -t pegasus \ -n @CIM_VIRT_NS@ \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n @CIM_VIRT_NS@ \ + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n root/interop \ + -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n root/cimv2\ + -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true %preun %{_datadir}/%{name}/provider-register.sh -d -t pegasus \

2 2

[PATCH] Add support for EmulatedType 1 to SDC
by Kaitlin Rupert 23 Jan '09

23 Jan '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1232129948 28800 # Node ID 2409abcca2b26accdb8529a0951b42446ddcc1f0 # Parent 8c56ab06aeb9b89f419f1befe6182c92ad5edbb8 Add support for EmulatedType 1 to SDC. Also fix a bug with the if statement in set_disk_props() and a spacing bug. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 8c56ab06aeb9 -r 2409abcca2b2 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Wed Jan 14 08:41:52 2009 -0800 +++ b/src/Virt_SettingsDefineCapabilities.c Fri Jan 16 10:19:08 2009 -0800 @@ -611,13 +611,13 @@ const CMPIObjectPath *ref, const char *id, uint64_t disk_size, + uint16_t emu_type, struct inst_list *list) { const char *addr; const char *dev; CMPIInstance *inst; CMPIStatus s = {CMPI_RC_OK, NULL}; - uint16_t emu_type = 0; if (type == DOMAIN_LXC) { addr = "/tmp"; @@ -646,7 +646,7 @@ dev = "xvda"; CMSetProperty(inst, "Caption", (CMPIValue *)"PV disk", CMPI_chars); - } else if (type, DOMAIN_XENFV) { + } else if (type == DOMAIN_XENFV) { CMSetProperty(inst, "Caption", (CMPIValue *)"FV disk", CMPI_chars); } @@ -671,6 +671,7 @@ char *pfx; const char *id; uint64_t disk_size; + uint16_t emu_type = 0; CMPIStatus s = {CMPI_RC_OK, NULL}; switch(template_type) { @@ -702,16 +703,54 @@ pfx = class_prefix_name(CLASSNAME(ref)); if (STREQ(pfx, "Xen")) { - s = set_disk_props(DOMAIN_XENPV, ref, id, disk_size, list); - + int xen_type[2] = {DOMAIN_XENFV, DOMAIN_XENPV}; + int i = 0; + + for (; i < 2; i++) { + emu_type = 0; + s = set_disk_props(xen_type[i], + ref, + id, + disk_size, + emu_type, + list); + if (s.rc != CMPI_RC_OK) + goto out; + + emu_type = 1; + s = set_disk_props(xen_type[i], + ref, + id, + disk_size, + emu_type, + list); + if (s.rc != CMPI_RC_OK) + goto out; + } + } else if (STREQ(pfx, "KVM")) { + s = set_disk_props(DOMAIN_KVM, + ref, + id, + disk_size, + emu_type, + list); if (s.rc != CMPI_RC_OK) - goto out; + goto out; - s = set_disk_props(DOMAIN_XENFV, ref, id, disk_size, list); - } else if (STREQ(pfx, "KVM")) { - s = set_disk_props(DOMAIN_KVM, ref, id, disk_size, list); + emu_type = 1; + s = set_disk_props(DOMAIN_KVM, + ref, + id, + disk_size, + emu_type, + list); } else if (STREQ(pfx, "LXC")) { - s = set_disk_props(DOMAIN_LXC, ref, id, disk_size, list); + s = set_disk_props(DOMAIN_LXC, + ref, + id, + disk_size, + emu_type, + list); } else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED,

2 1

[Fwd: [Libvirt-cim] [PATCH] [TEST] Adding 01_enum_KVMredSAP.py of KVMRedirectionSAP]
by Deepti B Kalakeri 23 Jan '09

23 Jan '09

Please use these two patches for reviewing the 01_enum_KVMredSAP.py of KVMRedirectionSAP tc. Sorry for the confusion. -- Thanks and Regards, Deepti B. Kalakeri IBM Linux Technology Center deeptik(a)linux.vnet.ibm.com

1 0

[PATCH] [CU] Update README - indicate autogen.sh is run when building from a cloned tree
by Kaitlin Rupert 23 Jan '09

23 Jan '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1232652800 28800 # Node ID d4a9e07d6738f76780bcb1ada5b7c0dbc57e4e0f # Parent 0ef95d18e20c364966938676a8023c9bca167724 [CU] Update README - indicate autogen.sh is run when building from a cloned tree Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 0ef95d18e20c -r d4a9e07d6738 README --- a/README Tue Dec 02 09:09:48 2008 -0800 +++ b/README Thu Jan 22 11:33:20 2009 -0800 @@ -29,7 +29,9 @@ Procedure: - $ ./autogen.sh + -If building a tree cloned from the hg repository, run this step first: + $ ./autogen.sh + $ # You probably want the EO parser enabled $ ./configure --enable-eoparser $ make

2 1

[PATCH] Update README so instructions to restart Pegasus / sfcb are comments
by Kaitlin Rupert 23 Jan '09

23 Jan '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1232652569 28800 # Node ID e91ea7a0cecb9449ae5b415f50944ca97b4d3126 # Parent 42c9ad8b71cf38acc2e968d6fdf255b5715b6ae2 Update README so instructions to restart Pegasus / sfcb are comments And don't look like instructions that should be entered on the command line Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 42c9ad8b71cf -r e91ea7a0cecb README --- a/README Wed Jan 21 10:20:00 2009 -0800 +++ b/README Thu Jan 22 11:29:29 2009 -0800 @@ -35,7 +35,10 @@ $ ./configure $ make $ make preinstall - $ Restart Pegasus or SFCB + + # Restart Pegasus or SFCB + $ sudo make install $ sudo make postinstall - $ Restart Pegasus or SFCB + + # Restart Pegasus or SFCB

2 1

[PATCH] [TEST] #3 Add some error checking when detecting hypervisor version
by Kaitlin Rupert 23 Jan '09

23 Jan '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1232643309 28800 # Node ID 9436d51e3f6f699ccba16cb6183095f0f4dabdfc # Parent 79d847b2acf889cc83d62003e9cbf8617b1272aa [TEST] #3 Add some error checking when detecting hypervisor version Updates from 2 to 3: -Simplfy the splitline logic. Updates from 1 to 2: -In libvirt or hypervisior version cannot be determined, print error message to console. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 79d847b2acf8 -r 9436d51e3f6f suites/libvirt-cim/lib/XenKvmLib/reporting.py --- a/suites/libvirt-cim/lib/XenKvmLib/reporting.py Mon Jan 19 09:10:19 2009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/reporting.py Thu Jan 22 08:55:09 2009 -0800 @@ -45,13 +45,24 @@ cmd = "virsh version" virsh_ver = get_cmd_val(cmd, ip) if virsh_ver != "Unknown": - if len(virsh_ver.splitlines()) == 4: - if virsh_ver.splitlines()[0].find("libvir"): - libvirt_ver = virsh_ver.splitlines()[0].split()[4] + libvirt, tok1, tok2, hypervisor = virsh_ver.splitlines() + if libvirt.find("libvir"): + libvirt_ver = libvirt.split()[4] - if virsh_ver.splitlines()[3].find("hypervisor"): - hyp_ver = virsh_ver.splitlines()[3].split("hypervisor")[1] - hyp_ver = hyp_ver.split(": ")[1] + if hypervisor.find("hypervisor"): + tok = hypervisor.split("hypervisor") + #We need these checks here, because sometimes hypervisor is found, + #but the rest of the version info isn't available + if len(tok) > 1: + tok = tok[1].split(": ") + if len(tok) > 1: + hyp_ver = tok[1] + + if libvirt_ver == "Unknown": + print "\nUnable to determine libvirt version\n" + + if hyp_ver == "Unknown": + print "\nUnable to determine hypervisior version\n" return libvirt_ver, hyp_ver

2 1

[PATCH] Remove fopen() from out in KVMRedirectionSAP
by Kaitlin Rupert 22 Jan '09

22 Jan '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1232584945 28800 # Node ID 1efa2d18e09bb7851ca70ca0112d8363190e81d1 # Parent 6fa1f52dc8298b4d643fc94bb3f91715cc40dd58 Remove fopen() from out in KVMRedirectionSAP The file is already open, we just need to close it. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 6fa1f52dc829 -r 1efa2d18e09b src/Virt_KVMRedirectionSAP.c --- a/src/Virt_KVMRedirectionSAP.c Tue Jan 20 22:27:01 2009 -0800 +++ b/src/Virt_KVMRedirectionSAP.c Wed Jan 21 16:42:25 2009 -0800 @@ -213,7 +213,6 @@ } out: - tcp_info = fopen(path, "r"); fclose(tcp_info); return s; }

2 1

[PATCH] [TEST] #2 Add some error checking when detecting hypervisor version
by Kaitlin Rupert 22 Jan '09

22 Jan '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1232382714 28800 # Node ID a5a4d35749d1d9ed8604ea4879e12828c7f5b169 # Parent 57f3bc7c3105bb779b41e19b1c03a1e5f214cec1 [TEST] #2 Add some error checking when detecting hypervisor version Updates: -In libvirt or hypervisior version cannot be determined, print error message to console. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 57f3bc7c3105 -r a5a4d35749d1 suites/libvirt-cim/lib/XenKvmLib/reporting.py --- a/suites/libvirt-cim/lib/XenKvmLib/reporting.py Fri Jan 16 11:51:26 2009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/reporting.py Mon Jan 19 08:31:54 2009 -0800 @@ -50,8 +50,17 @@ libvirt_ver = virsh_ver.splitlines()[0].split()[4] if virsh_ver.splitlines()[3].find("hypervisor"): - hyp_ver = virsh_ver.splitlines()[3].split("hypervisor")[1] - hyp_ver = hyp_ver.split(": ")[1] + tok = virsh_ver.splitlines()[3].split("hypervisor") + if len(tok) > 1: + tok = tok[1].split(": ") + if len(tok) > 1: + hyp_ver = tok[1] + + if libvirt_ver == "Unknown": + print "\nUnable to determine libvirt version\n" + + if hyp_ver == "Unknown": + print "\nUnable to determine hypervisior version\n" return libvirt_ver, hyp_ver

2 3

[PATCH] [TEST] #3 Fix verify_rasds() and verify_devices() in SD 02_reverse.py
by Kaitlin Rupert 22 Jan '09

22 Jan '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1232580651 28800 # Node ID 6e23c06353a1529f295109cd79858cdea4dbf0be # Parent c48f4ad82a02ab19ff0d30d77d492060d0a30145 [TEST] #3 Fix verify_rasds() and verify_devices() in SD 02_reverse.py Since VSSDC should return RASDs that all correspond to the guest, there's no need to parse the InstanceID to see if the guest name matches the guest we've created. Also, fix the logic of the verify functions to be a little cleaner. Compare all the properties of the instances, not just the InstanceIDs/DeviceIDs. Remove parse_instance_id() from verify_devices(); guest and dev_id were not being used in the function. Updates from 2 to 3: -Fix typo in setup_env(). cmxl should be cxml -Fixed bug in cim_define() that was causing this to fail with LXC Updates from 1 to 2: -Removed unnecessary undefine() call -Moved the verification of the number of RASDs before the for loop - in the case of LXC, we remove one of the RASDs from this list so we don't verify it, but we still want to verify the appropriate number of RASDs was returned. -Print an error message if comparing all the instance properties fails. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r c48f4ad82a02 -r 6e23c06353a1 suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Tue Jan 20 18:24:05 2009 -0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Wed Jan 21 15:30:51 2009 -0800 @@ -55,7 +55,7 @@ from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.const import do_main -from XenKvmLib.assoc import AssociatorNames +from XenKvmLib.assoc import AssociatorNames, compare_all_prop from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.rasd import enum_rasds @@ -80,7 +80,7 @@ ret = cxml.cim_define(server) if not ret: logger.error("Failed to Create the dom: %s", test_dom) - return FAIL, cmxl + return FAIL, cxml status = cxml.cim_start(server) if status != PASS: @@ -101,9 +101,6 @@ return rasd_insts, status for rasd_cn, rasd_list in rasds.iteritems(): - if virt == "LXC" and rasd_cn == proc_rasd_cn: - continue - for rasd in rasd_list: guest, dev, status = parse_instance_id(rasd.InstanceID) if status != PASS: @@ -135,56 +132,44 @@ return dev_insts, PASS -def verify_rasd(virt, enum_list, rasds, guest_name): - proc_rasd_cn = get_typed_class(virt, "ProcResourceAllocationSettingData") +def verify_rasd(virt, enum_list, rasds): + if len(enum_list) != len(rasds): + logger.error("Got %d RASDs, expected %d", len(enum_list), len(rasds)) + return FAIL + + status = FAIL for rasd in enum_list: - if virt == "LXC" and rasd.classname == proc_rasd_cn: - enum_list.remove(rasd) - continue - - guest, dev, status = parse_instance_id(rasd['InstanceID']) - if status != PASS: - logger.error("Unable to parse InstanceID: %s", rasd['InstanceID']) - return status - - if guest != guest_name: - continue - exp_rasd = rasds[rasd.classname] - if rasd['InstanceID'] == exp_rasd.InstanceID: - status = PASS - else: - logger.info("Got %s instead of %s" % (rasd['InstanceID'], - exp_rasd.InstanceID)) - status = FAIL + if rasd['InstanceID'] != exp_rasd.InstanceID: + logger.error("Got %s instead of %s", rasd['InstanceID'], + exp_rasd.InstanceID) + return FAIL - if status != PASS: - logger.error("RASD with id %s not returned", exp_rasd.InstanceID) + status = compare_all_prop(rasd, exp_rasd) + if status != PASS: + logger.error("Verifying instance properties failed.") + + return status + +def verify_devices(enum_list, devs): + dev = enum_list[0] + dev_cn = dev.classname + + if len(enum_list) != 1: + logger.error("Got %d %s devices, expected 1", len(enum_list), dev_cn) return FAIL - return PASS + exp_dev = devs[dev_cn] -def verify_devices(enum_list, devs): - for dev in enum_list: - guest, dev_id, status = parse_instance_id(dev['DeviceID']) - if status != PASS: - logger.error("Unable to parse InstanceID: %s", dev['DeviceID']) - return status + if dev['DeviceID'] != exp_dev.DeviceID: + logger.error("Got %s instead of %s", dev['DeviceID'], exp_dev.DeviceID) + return FAIL - exp_dev = devs[dev.classname] - - if dev['DeviceID'] == exp_dev.DeviceID: - status = PASS - else: - logger.info("Got %s instead of %s" % (dev['DeviceID'], - exp_dev.DeviceID)) - status = FAIL - + status = compare_all_prop(dev, exp_dev) if status != PASS: - logger.error("Device with id %s not returned", exp_dev.DeviceID) - return FAIL + return status return PASS @@ -196,7 +181,6 @@ status, cxml = setup_env(options.ip, virt) if status != PASS: - cxml.undefine(options.ip) return status if virt == 'XenFV': @@ -217,21 +201,24 @@ assoc = AssociatorNames(options.ip, vssdc_cn, vssd_cn, InstanceID = instIdval) - status = verify_rasd(virt, assoc, rasds, test_dom) + status = verify_rasd(virt, assoc, rasds) if status != PASS: raise Exception("Failed to verify RASDs") - if len(assoc) != len(rasds): - raise Exception("Got %d RASDs, exp %d" % (len(assoc), len(rasds))) - sds_cn = get_typed_class(virt, 'SettingsDefineState') devs, status = init_device_list(virt, options.ip, test_dom) if status != PASS: raise Exception("Unable to build device instance list") + proc_cn = get_typed_class(virt, 'ProcResourceAllocationSettingData') for rasd in assoc: rasd_cn = rasd.classname + + # LXC guests don't have proc devices + if virt == "LXC" and rasd_cn == proc_cn: + continue + sdc_assoc = AssociatorNames(options.ip, sds_cn, rasd_cn, InstanceID = rasd['InstanceID']) diff -r c48f4ad82a02 -r 6e23c06353a1 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Tue Jan 20 18:24:05 2009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Jan 21 15:30:51 2009 -0800 @@ -501,9 +501,11 @@ res_settings.append(str(self.pasd)) if self.masd is not None: res_settings.append(str(self.masd)) - if self.nasd is not None or \ - (self.virt == 'LXC' and const.LXC_netns_support is False): - res_settings.append(str(self.nasd)) + if self.nasd is not None: + if self.virt == 'LXC' and const.LXC_netns_support is False: + pass + else: + res_settings.append(str(self.nasd)) if ref_conf is None: ref_conf = ' '

2 1