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
See the review for Fix HostSystem/03_hs_to_settdefcap.py.
--
Kaitlin Rupert
IBM Linux Technology Center
kaitlin(a)linux.vnet.ibm.com