[Libvirt-cim] [PATCH] [TEST]#4 Fix HostSystem/03_hs_to_settdefcap.py with appropriate number of RASD objects for different platforms
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1234337820 28800
# Node ID cb915025514d373e89681334db4a4caa3a9f3473
# Parent 1bb347c22e6ed03032f359c8c28e59e94b7316c2
[TEST]#4 Fix HostSystem/03_hs_to_settdefcap.py with appropriate number of RASD objects for
different platforms
Updates forms 3 to 4:
1) align the if statements
2) set exp_len = 4 before the if statements
Updates form 2 to 3:
Simplify the if statements
Updates from 1 to 2:
Add two branches of returned RASD objects number:
1) The valule to be 8 for Xen when rev >= 707 and rev < 805
2) The value to be 16 for Xen when rev >= 805
3) The value to be 8 for KVM when rev >= 805
Tested for KVM/Xen/LXC with current sources, KVM with F9 rpm.
Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com>
diff -r 1bb347c22e6e -r cb915025514d
suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py
--- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Mon Feb 09 21:47:35
2009 -0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Tue Feb 10 23:37:00
2009 -0800
@@ -56,6 +56,7 @@
test_dom = "domgst_test"
test_vcpus = 1
libvirt_rasd_template_changes = 707
+libvirt_rasd_new_changes = 805
def setup_env(server, virt="Xen"):
status = PASS
@@ -214,14 +215,20 @@
InstanceID = ap['InstanceID'])
curr_cim_rev, changeset = get_provider_version(virt, server)
- if 'DiskPool' in ap['InstanceID'] and virt =='Xen'
and \
- curr_cim_rev >= libvirt_rasd_template_changes:
+ exp_len = 4
+ if 'DiskPool' in ap['InstanceID']:
# For Diskpool, we have info 1 for each of Min, Max,
# default, Increment and 1 for each of PV and FV
# hence 4 * 2 = 8 records
- exp_len = 8
- else:
- exp_len = 4
+ if virt == 'Xen':
+ if curr_cim_rev >= libvirt_rasd_template_changes and \
+ curr_cim_rev < libvirt_read_new_changes:
+ exp_len = 8
+ if curr_cim_rev >= libvirt_read_new_changes:
+ exp_len = 16
+ if virt == 'KVM':
+ if curr_cim_rev >= libvirt_rasd_new_changes:
+ exp_len = 8
if len(assoc_info) != exp_len:
logger.error("'%s' returned %i RASD objects instead of
%i",