[Libvirt-cim] [PATCH] [TEST] #5 Update RAFP.01 for LXC support, also pass for Xen, KVM and XenFV
Guo Lian Yun
yunguol at cn.ibm.com
Tue Jun 24 05:25:37 UTC 2008
Please ignore this patch.
Best,
Regards
Daisy (运国莲)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203
Guo Lian Yun/China/IBM at IBMCN
Sent by: libvirt-cim-bounces at redhat.com
2008-06-24 13:07
Please respond to
List for discussion and development of libvirt CIM
<libvirt-cim at redhat.com>
To
libvirt-cim at redhat.com
cc
Subject
[Libvirt-cim] [PATCH] [TEST] #5 Update RAFP.01 for LXC support, also pass
for Xen, KVM and XenFV
# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1214284001 -28800
# Node ID 3e9eef552d30fa26009f1e823e8eaf586a4eb793
# Parent c12f7b4a86e606c4fb8c1f32bc3a98bf59b75550
[TEST] #5 Update RAFP.01 for LXC support, also pass for Xen, KVM and XenFV
Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
diff -r c12f7b4a86e6 -r 3e9eef552d30
suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
Thu Jun 19 22:49:43 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
Tue Jun 24 13:06:41 2008 +0800
@@ -26,68 +26,125 @@
from VirtLib import utils
from XenKvmLib import assoc
from XenKvmLib import enumclass
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
from XenKvmLib.classes import get_typed_class
from CimTest import Globals
from CimTest.Globals import logger, do_main
from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf,
\
+create_netpool_conf
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
+test_dom = "RAFP_dom"
+test_vcpus = 1
+test_mem = 128
+test_mac = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+ destroy_and_undefine_all(server)
+ vsxml = None
+ if virt == "Xen":
+ test_disk = "xvda"
+ elif virt == "XenFV" or virt=="KVM":
+ test_disk = "hda"
+ else:
+ test_disk = None
+
+ virtxml = get_class(virt)
+ if virt == 'LXC':
+ vsxml = virtxml(test_dom)
+ else:
+ vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+ mac = test_mac, disk = test_disk)
+ try:
+ ret = vsxml.define(server)
+ if not ret:
+ logger.error("Failed to Define the domain: %s", test_dom)
+ return FAIL, vsxml, test_disk
+
+ except Exception, details:
+ logger.error("Exception : %s", details)
+ return FAIL, vsxml, test_disk
+
+ return PASS, vsxml, test_disk
+
+def get_instance(server, pool, list, virt='Xen'):
+ try:
+ inst = enumclass.getInstance(server,
+ pool,
+ list,
+ virt)
+ except Exception:
+ logger.error(Globals.CIM_ERROR_GETINSTANCE % pool)
+ return FAIL, inst
+
+ return PASS, inst
+
+def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
+ try:
+ data = assoc.AssociatorNames(server,
+ assoc_cn,
+ cn,
+ virt,
+ InstanceID=list)
+ except Exception:
+ logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
+ return FAIL
+
+ if data[0]['InstanceID'] not in rasd:
+ logger.info ('ID %s' % data[0]['InstanceID'])
+ logger.error("InstanceID Mismatch")
+ logger.error("Returned %s error" % data[0]['InstanceID'])
+ return FAIL
+
+ return PASS
+
@do_main(sup_types)
def main():
options = main.options
status = PASS
+
+ status, vsxml, test_disk = setup_env(options.ip, options.virt)
+ if status != PASS:
+ return status
+
+ status, diskid = create_diskpool_conf(options.ip, options.virt)
+ if status != PASS:
+ cleanup_restore(options.ip, options.virt)
+ vsxml.undefine(options.ip)
+ return status
- try:
- key_list = { 'InstanceID' : "MemoryPool/0" }
- mempool = enumclass.getInstance(options.ip,
- "MemoryPool",
- key_list,
- options.virt)
- except Exception:
- logger.error(Globals.CIM_ERROR_GETINSTANCE % "MemoryPool")
- return FAIL
+ status, test_network = create_netpool_conf(options.ip, options.virt)
+ if status != PASS:
+ cleanup_restore(options.ip, options.virt)
+ vsxml.undefine(options.ip)
+ return status
+
+ if options.virt == 'LXC':
+ pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
+ rasd = [ "%s/mem" % test_dom ]
+ else:
+ pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"},
+ "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
+ "DiskPool" : {'InstanceID' : diskid},
+ "NetworkPool" : {'InstanceID' : "NetworkPool/%s" %
test_network }}
+ rasd = [ "%s/mem" % test_dom,
+ "%s/proc" % test_dom,
+ "%s/%s" %(test_dom, test_disk),
+ "%s/%s" % (test_dom, test_mac) ]
- try:
- key_list = { 'InstanceID' : "ProcessorPool/0" }
- procpool = enumclass.getInstance(options.ip,
- "ProcessorPool",
- key_list,
- options.virt)
- except Exception:
- logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")
- return FAIL
-
- try:
- 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 != get_typed_class(options.virt,
"MemResourceAllocationSettingData"):
- logger.error("ERROR: Association result error")
- status = FAIL
-
- try:
- 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 != get_typed_class(options.virt,
"ProcResourceAllocationSettingData"):
- logger.error("ERROR: Association result error")
- status = FAIL
+ for k, v in pool.iteritems():
+ status, inst = get_instance(options.ip, k, v, options.virt)
+ status = verify_rasd(options.ip, "ResourceAllocationFromPool",
+ k, options.virt, inst.InstanceID,
+ rasd)
+
+ cleanup_restore(options.ip, options.virt)
+ vsxml.undefine(options.ip)
return status
-
-
+
if __name__ == "__main__":
sys.exit(main())
_______________________________________________
Libvirt-cim mailing list
Libvirt-cim at redhat.com
https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080624/7a25a4d7/attachment.htm>
More information about the Libvirt-cim
mailing list