# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223460217 25200 # Node ID 91c75d1ff10baa5fcb705384549210648b4ad7a5 # Parent 814a0e67bb1023607349ecc9b95a4636aabcc24d [TEST] Fixing 01_forward.py of SDC. Tested with Xen, XenFV, KVM with current sources. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 814a0e67bb10 -r 91c75d1ff10b suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Wed Oct 08 02:50:21 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Wed Oct 08 03:03:37 2008 -0700 @@ -168,7 +168,16 @@ def verify_sdc_with_ac(virt, server, poo try: assoc_info = assoc.Associators(server, assoc_cname, cn, InstanceID = instid) - if len(assoc_info) != 4: + + if 'DiskPool' in instid and (virt =='Xen' or virt == 'XenFV'): + # 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 len(assoc_info) != exp_len: logger.error("%s returned %i ResourcePool objects" "instead 4", assoc_cname, len(assoc_info)) status = FAIL