[Libvirt-cim] [PATCH] [TEST] Fix HostSystem/04_hs_to_EAPF.py
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1227509815 28800
# Node ID bc56cef9e199bb077f14d324abb3e0f3373b3fe9
# Parent c349be6661452da17725d63a69aee17f5da9a80d
[TEST] Fix HostSystem/04_hs_to_EAPF.py
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r c349be666145 -r bc56cef9e199
suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py
--- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Wed Nov 19 22:42:13 2008
-0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Sun Nov 23 22:56:55 2008
-0800
@@ -86,10 +86,14 @@
npool = get_typed_class(virt, 'NetworkPool')
dpool = get_typed_class(virt, 'DiskPool')
ppool = get_typed_class(virt, 'ProcessorPool')
+ gpool = get_typed_class(virt, 'GraphicsPool')
+ ipool = get_typed_class(virt, 'InputPool')
exp_pllist[dpool] = 'DiskPool/%s' % dp_InstID
exp_pllist[npool] = '%s/%s' %('NetworkPool', net_name)
exp_pllist[ppool] = 'ProcessorPool/0'
exp_pllist[mpool] = 'MemoryPool/0'
+ exp_pllist[gpool] = 'GraphicsPool/0'
+ exp_pllist[ipool] = 'InputPool/0'
for p_inst in pool_assoc:
CName = p_inst.classname
@@ -109,6 +113,8 @@
proc_inst = get_typed_class(virt, "Processor")
net_inst = get_typed_class(virt, "NetworkPort")
mem_inst = get_typed_class(virt, "Memory")
+ display_inst = get_typed_class(virt, "DisplayController")
+ point_inst = get_typed_class(virt, "PointingDevice")
disk = {
'SystemName' : test_dom,
@@ -133,13 +139,27 @@
'DeviceID' : "%s/%s" % (test_dom,
"mem"),
'NumberOfBlocks' : test_mem * 1024
}
+ display = {
+ 'SystemName' : test_dom,
+ 'CreationClassName' : display_inst,
+ 'DeviceID' : "%s/%s" % (test_dom,
"graphics"),
+ }
+
+ point = {
+ 'SystemName' : test_dom,
+ 'CreationClassName' : point_inst,
+ 'DeviceID' : "%s/%s" % (test_dom,
"mouse:ps2")
+ }
+
if virt == "LXC":
eaf_values = { mem_inst : mem}
else:
eaf_values = { proc_inst : proc,
disk_inst : disk,
net_inst : net,
- mem_inst : mem
+ mem_inst : mem,
+ display_inst: display,
+ point_inst : point
}
return eaf_values
@@ -250,7 +270,7 @@
if virt == 'LXC':
exp_len = 1
else:
- exp_len = 4
+ exp_len = 6
status = check_len(an, in_pllist, qcn, exp_len)
if status != PASS:
vsxml.undefine(server)
diff -r c349be666145 -r bc56cef9e199 suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py
--- a/suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py Wed Nov 19 22:42:13 2008 -0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py Sun Nov 23 22:56:55 2008 -0800
@@ -56,7 +56,8 @@
def verify_device_values(assoc_info, list_values, virt='Xen'):
- dev_cnames = ['LogicalDisk', 'Memory', 'NetworkPort',
'Processor']
+ dev_cnames = ['LogicalDisk', 'Memory', 'NetworkPort',
'Processor', \
+ 'DisplayController', 'PointingDevice']
for i in range(len(dev_cnames)):
dev_cnames[i] = get_typed_class(virt, dev_cnames[i])