# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com&gt; # Date 1240000721 25200 # Node ID 6d9a4f2dd357dd62d05d0415a6af7b16f3fffd93 # Parent ced161a8198115797a6036f3f22e02d234439a76 [TEST] Fix HS 03 to work with Xen on upstream libvirt Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com&gt; diff -r ced161a81981 -r 6d9a4f2dd357 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Wed Apr 15 20:19:31 2009 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Fri Apr 17 13:38:41 2009 -0700 @@ -29,13 +29,15 @@ # Steps: # 1. Create a guest. # 2. Enumerate the HostSystem . -# 3. Using the HostedResourcePool association, get the HostSystem instances on the system -# 4. Using the ElementCapabilities association get the ProcessorPool, MemPool, DiskPool & -# NetPool instances on the system. -# 5. Using the SettingsDefineCapabilities association on the AllocationCapabilities, get -# the (Default, Minimum, Maximum and Increment) instances for ProcRASD. -# 6. Similarly for the MemRASD, DiskRASD & NetRASD get the SettingDefineCap assocn and \ -# get the instances for (Def, Min, Max and Inc). +# 3. Using the HostedResourcePool association, get the HostSystem instances +# on the system +# 4. Using the ElementCapabilities association get the ProcessorPool, +# MemPool, DiskPool & NetPool instances on the system. +# 5. Using the SettingsDefineCapabilities association on the +# AllocationCapabilities, get the (Default, Minimum, Maximum and Increment) +# instances for ProcRASD. +# 6. Similarly for the MemRASD, DiskRASD & NetRASD get the SettingDefineCap +# assocn and get the instances for (Def, Min, Max and Inc). # # Feb 13 2008 @@ -228,6 +230,10 @@ exp_len = 8 if curr_cim_rev >= libvirt_rasd_new_changes: exp_len = 16 + if curr_cim_rev >= libvirt_rasd_dpool_changes: + volumes = enum_volumes(virt, server) + exp_len = volumes * 8 + if virt == 'KVM': if curr_cim_rev >= libvirt_rasd_new_changes and \ curr_cim_rev < libvirt_rasd_dpool_changes: