# HG changeset patch
# User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com>
# Date 1250083990 25200
# Node ID 2c8ae164c260b0d8c8df07c4e01010daa58a5de1
# Parent 1388a57c7e40a0e51c095bab1fa93ce320433bdd
[TEST] Fixing get_vssd_mof() to pass uuid param.
This patch fixes VSSD/02_bootldr.py VSSD/05_set_uuid.py
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r 1388a57c7e40 -r 2c8ae164c260 suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Wed Aug 12 05:44:59 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Wed Aug 12 06:33:10 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=bldr)
+ vssd = vssd_cn(dom_name, virt, uuid=uuid, bldr=bldr)
return vssd.mof()
# classes to define RASD parameters
diff -r 1388a57c7e40 -r 2c8ae164c260 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Aug 12 05:44:59 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Aug 12 06:33:10 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):