# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux..vnet.ibm.com> # Date 1250183951 25200 # Node ID 125d6eb391eeab673f087f7df2ade5e993f0cbe8 # Parent 090c55ea601c4ef759475bf1d0b64eae9c8f33b8 [TEST] Fixing get_vssd_mof() to pass uuid param. Rebased to the latest cimtest This patch fixes VSSD/02_bootldr.py VSSD/05_set_uuid.py Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 090c55ea601c -r 125d6eb391ee suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Wed Aug 12 04:28:07 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Thu Aug 13 10:19:11 2009 -0700 @@ -128,9 +128,9 @@ class LXC_VirtualSystemSettingData(CIM_VirtualSystemSettingData): pass -def get_vssd_mof(virt, dom_name, bldr=None): +def get_vssd_mof(virt, dom_name, uuid=None, bldr=None): vssd_cn = eval(get_typed_class(virt, "VirtualSystemSettingData")) - vssd = vssd_cn(dom_name, virt, bldr) + vssd = vssd_cn(dom_name, virt, uuid=uuid, bldr=bldr) return vssd.mof() # classes to define RASD parameters diff -r 090c55ea601c -r 125d6eb391ee suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Aug 12 04:28:07 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Thu Aug 13 10:19:11 2009 -0700 @@ -563,7 +563,7 @@ self.domain_name = dom_name self.err_rc = None self.err_desc = None - self.vssd = vsms.get_vssd_mof(virt, dom_name, uuid) + self.vssd = vsms.get_vssd_mof(virt, dom_name, uuid=uuid) self.nasd = vsms.get_nasd_class(virt)(type=net_type, mac=net_mac, name=dom_name, @@ -836,7 +836,7 @@ def set_bootloader(self, ip, gtype=0): bldr = bootloader(ip, gtype) self.add_sub_node('/domain', 'bootloader', bldr) - self.vssd = vsms.get_vssd_mof(self.virt, self.domain_name, bldr) + self.vssd = vsms.get_vssd_mof(self.virt, self.domain_name, bldr=bldr) return bldr def set_bridge(self, ip):