[PATCH 0 of 5] [TEST] update bundles of RAFP tc and devices lib for XenFV and KVM support
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1206950073 25200 # Node ID 41d06111a09a3f7542fab1cedfdba5bf0e87f6c8 # Parent 612ccb311e273b091659fe14f0471567abe61d08 [TEST] devices lib changes for XenFV and KVM support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 612ccb311e27 -r 41d06111a09a suites/libvirt-cim/lib/XenKvmLib/devices.py --- a/suites/libvirt-cim/lib/XenKvmLib/devices.py Fri Mar 28 00:03:41 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py Mon Mar 31 00:54:33 2008 -0700 @@ -93,13 +93,13 @@ class KVM_Processor(CIM_Processor): class KVM_Processor(CIM_Processor): pass -def enumerate(server, devtype, keys): +def enumerate(server, devtype, keys, virt='Xen'): conn = pywbem.WBEMConnection('http://%s' % server, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS) list = [] - + devtype = eval(get_typed_class(virt, devtype)) try: names = conn.EnumerateInstanceNames(devtype.__name__) except pywbem.CIMError, arg:
Guo Lian Yun wrote:
@@ -93,13 +93,13 @@ class KVM_Processor(CIM_Processor): class KVM_Processor(CIM_Processor): pass
-def enumerate(server, devtype, keys): +def enumerate(server, devtype, keys, virt='Xen'): conn = pywbem.WBEMConnection('http://%s' % server, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS)
list = [] - + devtype = eval(get_typed_class(virt, devtype)) I updated this function in another patch. We need to have an agreement on what devtype contains. It was a class object inside devices. I turned it to a string representation of the class. And here it's likely to be the basename of the class name string (excluding the 'Xen_'/'KVM_' prefix).
try: names = conn.EnumerateInstanceNames(devtype.__name__) except pywbem.CIMError, arg:
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
-- - Zhengang
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1206950184 25200 # Node ID e1cd8daac37d7ac78879912e4c635f1e9b17ed0f # Parent 41d06111a09a3f7542fab1cedfdba5bf0e87f6c8 [TEST] update RAFP.01 for XenFV and KVM support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 41d06111a09a -r e1cd8daac37d suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Mon Mar 31 00:54:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Mon Mar 31 00:56:24 2008 -0700 @@ -25,12 +25,13 @@ import sys import sys from VirtLib import utils from XenKvmLib import assoc -from XenKvmLib import enumclass +from XenKvmLib import enumclass +from XenKvmLib.classes import get_typed_class from CimTest import Globals from CimTest.Globals import log_param, logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen'] +sup_types = ['Xen', 'XenFV', 'KVM'] @do_main(sup_types) def main(): @@ -41,44 +42,48 @@ def main(): try: key_list = { 'InstanceID' : "MemoryPool/0" } mempool = enumclass.getInstance(options.ip, - enumclass.Xen_MemoryPool, - key_list) + "MemoryPool", + key_list, + options.virt) except Exception: - logger.error(Globals.CIM_ERROR_GETINSTANCE % enumclass.Xen_MemoryPool) + logger.error(Globals.CIM_ERROR_GETINSTANCE % "MemoryPool") return FAIL try: key_list = { 'InstanceID' : "ProcessorPool/0" } procpool = enumclass.getInstance(options.ip, - enumclass.Xen_ProcessorPool, - key_list) + "ProcessorPool", + key_list, + options.virt) except Exception: - logger.error(Globals.CIM_ERROR_GETINSTANCE % enumclass.Xen_ProcessorPool) + logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool") return FAIL try: - memdata = assoc.AssociatorNames(options.ip, "Xen_ResourceAllocationFromPool", - "Xen_MemoryPool", + memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool", + "MemoryPool", + options.virt, InstanceID = mempool.InstanceID) except Exception: logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mempool.InstanceID) status = FAIL for i in range(len(memdata)): - if memdata[i].classname != "Xen_MemResourceAllocationSettingData": + if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"): logger.error("ERROR: Association result error") status = FAIL try: - procdata = assoc.AssociatorNames(options.ip, "Xen_ResourceAllocationFromPool", - "Xen_ProcessorPool", + procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool", + "ProcessorPool", + options.virt, InstanceID = procpool.InstanceID) except Exception: logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % procpool.InstanceID) status = FAIL for j in range(len(procdata)): - if procdata[j].classname != "Xen_ProcResourceAllocationSettingData": + if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"): logger.error("ERROR: Association result error") status = FAIL
Guo Lian Yun wrote:
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1206950184 25200 # Node ID e1cd8daac37d7ac78879912e4c635f1e9b17ed0f # Parent 41d06111a09a3f7542fab1cedfdba5bf0e87f6c8 [TEST] update RAFP.01 for XenFV and KVM support
Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> +1 from me :)
-- - Zhengang
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1206950184 25200 # Node ID e1cd8daac37d7ac78879912e4c635f1e9b17ed0f # Parent 41d06111a09a3f7542fab1cedfdba5bf0e87f6c8 [TEST] update RAFP.01 for XenFV and KVM support
Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> ZL> +1 from me :)
I've applied this patch from the series, so when you resubmit the others, be sure to leave it out. -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms@us.ibm.com
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1206950255 25200 # Node ID 1542ed9f28baf4b5025b4fffc0391131c76c2c5e # Parent e1cd8daac37d7ac78879912e4c635f1e9b17ed0f [TEST] update RAFP.02 for XenFV and KVM support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r e1cd8daac37d -r 1542ed9f28ba suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Mon Mar 31 00:56:24 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Mon Mar 31 00:57:35 2008 -0700 @@ -26,12 +26,13 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import assoc from XenKvmLib import devices +from XenKvmLib.classes import get_typed_class from XenKvmLib.devices import Xen_Memory, Xen_Processor from CimTest import Globals from CimTest.Globals import log_param, logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['xen'] +sup_types = ['Xen', 'XenFV', 'KVM'] @do_main(sup_types) def main(): @@ -42,21 +43,22 @@ def main(): key_list = ["DeviceID", "CreationClassName", "SystemName", "SystemCreationClassName"] try: - mem = devices.enumerate(options.ip, Xen_Memory, key_list) + mem = devices.enumerate(options.ip, "Memory", key_list, options.virt) except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % devices.Xen_Memory) + logger.error(Globals.CIM_ERROR_ENUMERATE % "Memory") return FAIL try: - proc = devices.enumerate(options.ip, Xen_Processor, key_list) + proc = devices.enumerate(options.ip, "Processor", key_list, options.virt) except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % devices.Xen_Processor) + logger.error(Globals.CIM_ERROR_ENUMERATE % "Processor") return FAIL for i in range(len(mem)): try: - mempool = assoc.AssociatorNames(options.ip, "Xen_ResourceAllocationFromPool", - "Xen_MemResourceAllocationSettingData", + mempool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool", + "MemResourceAllocationSettingData", + options.virt, InstanceID = mem[i].DeviceID) except Exception: logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mem[i].DeviceID) @@ -72,8 +74,9 @@ def main(): for j in range(len(proc)): try: - procpool = assoc.AssociatorNames(options.ip, "Xen_ResourceAllocationFromPool", - "Xen_ProcResourceAllocationSettingData", + procpool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool", + "ProcResourceAllocationSettingData", + options.virt, InstanceID = proc[j].DeviceID) except Exception: logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % proc[j].DeviceID)
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1206950325 25200 # Node ID f774e7aa50928c3a11cc4cac4d66496edd1de0c8 # Parent 1542ed9f28baf4b5025b4fffc0391131c76c2c5e [TEST] update RAFP.03 for XenFV and KVM support diff -r 1542ed9f28ba -r f774e7aa5092 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Mon Mar 31 00:57:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Mon Mar 31 00:58:45 2008 -0700 @@ -24,11 +24,12 @@ import pywbem import pywbem from pywbem.cim_obj import CIMInstanceName from XenKvmLib import assoc +from XenKvmLib.classes import get_typed_class from CimTest import Globals from CimTest.Globals import log_param, logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen'] +sup_types = ['Xen', 'XenFV', 'KVM'] exp_rc = 6 #CIM_ERR_NOT_FOUND exp_desc = "No such instance (wrong) - resource pool type mismatch" @@ -42,7 +43,8 @@ def main(): status = FAIL - poollist = {"Xen_MemoryPool" : "wrong", "Xen_ProcessorPool" : "wrong"} + poollist = {get_typed_class(options.virt, "MemoryPool") : "wrong", + get_typed_class(options.virt, "ProcessorPool") : "wrong"} conn = assoc.myWBEMConnection('http://%s' % options.ip, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS) @@ -52,7 +54,8 @@ def main(): names = [] try: - names = conn.AssociatorNames(instanceref, AssocClass = "Xen_ResourceAllocationFromPool") + names = conn.AssociatorNames(instanceref, + AssocClass = get_typed_class(options.virt, "ResourceAllocationFromPool")) rc = 0 except pywbem.CIMError, (rc, desc): if rc == exp_rc and desc.find(exp_desc) >= 0:
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1206950440 25200 # Node ID a0bfc37ad626afe465fc629138b4a1c2f22af1ba # Parent f774e7aa50928c3a11cc4cac4d66496edd1de0c8 [TEST] update RAFP.04 for XenFV and KVM support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r f774e7aa5092 -r a0bfc37ad626 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Mon Mar 31 00:58:45 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Mon Mar 31 01:00:40 2008 -0700 @@ -24,11 +24,12 @@ import pywbem import pywbem from pywbem.cim_obj import CIMInstanceName from XenKvmLib import assoc +from XenKvmLib.classes import get_typed_class from CimTest import Globals from CimTest.Globals import log_param, logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen'] +sup_types = ['Xen', 'XenFV', 'KVM'] exp_rc = 6 #CIM_ERR_NOT_FOUND exp_desc = "No such instance" @@ -41,7 +42,8 @@ def main(): status = FAIL - dataset = {"Xen_MemResourceAllocationSettingData" : "wrong", "Xen_ProcResourceAllocationSettingData" : "wrong"} + dataset = {get_typed_class(options.virt, "MemResourceAllocationSettingData") : "wrong", + get_typed_class(options.virt, "ProcResourceAllocationSettingData") : "wrong"} conn = assoc.myWBEMConnection('http://%s' % options.ip, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS) @@ -51,7 +53,8 @@ def main(): names = [] try: - names = conn.AssociatorNames(instanceref, AssocClass = "Xen_ResourceAllocationFromPool") + names = conn.AssociatorNames(instanceref, + AssocClass = get_typed_class(options.virt, "ResourceAllocationFromPool")) rc = 0 except pywbem.CIMError, (rc, desc): if rc == exp_rc and desc.find(exp_desc) >= 0:
participants (3)
-
Dan Smith -
Guo Lian Yun -
Zhengang Li