# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1234256865 28800 # Node ID 0fd388b7d9571ab8c0b96c2190a8b0b91c8a85e1 # Parent 263e285881acde9b99849cd133399298219c9d65 [TEST] #3 Fix SettingsDefineCapabilities/01_forward.py with appropriate RASD objects for different platforms Updates form 2 to 3: Simplify the if statement Updates form 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@cn.ibm.com> diff -r 263e285881ac -r 0fd388b7d957 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Fri Feb 06 01:54:39 2009 -0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Tue Feb 10 01:07:45 2009 -0800 @@ -67,6 +67,7 @@ platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC'] libvirt_rasd_template_changes = 707 +libvirt_rasd_new_changes = 805 memid = "MemoryPool/0" procid = "ProcessorPool/0" @@ -171,12 +172,22 @@ InstanceID = instid) curr_cim_rev, changeset = get_provider_version(virt, server) - if 'DiskPool' in instid and (virt =='Xen' or virt == 'XenFV') and \ - curr_cim_rev >= libvirt_rasd_template_changes: + if 'DiskPool' in instid: + if (virt =='Xen' or virt == 'XenFV') and \ + curr_cim_rev >= libvirt_rasd_template_changes and \ + curr_cim_rev < libvirt_rasd_new_changes: # 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 + exp_len = 8 + elif (virt == 'Xen' or virt == 'XenFV') and \ + curr_cim_rev >= libvirt_rasd_new_changes: + exp_len = 16 + elif virt == 'KVM' and \ + curr_cim_rev >= libvirt_rasd_new_changes: + exp_len = 8 + else: + exp_len = 4 else: exp_len = 4