[Libvirt-cim] [PATCH] [TEST] #2 Fix SettingsDefineCapabilities/01_forward.py with appropriate RASD objects for different platforms

[yunguol at cn.ibm.com]

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1233909739 28800
# Node ID 8e2da1911b925709fa5ce13d651236fbf73560d2
# Parent  3fc2b8a203339c6a59b5f0e2a159e3e0a802ea6d
[TEST] #2 Fix SettingsDefineCapabilities/01_forward.py with appropriate RASD objects for different platforms

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 at cn.ibm.com>

diff -r 3fc2b8a20333 -r 8e2da1911b92 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Thu Feb 05 01:19:43 2009 -0800
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Fri Feb 06 00:42:19 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"
@@ -172,10 +173,17 @@
 
             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:
+                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
+            elif 'DiskPool' in instid and (virt =='Xen' or virt == 'XenFV') and \
+                curr_cim_rev >= libvirt_rasd_new_changes:
+                exp_len = 16
+            elif 'DiskPool' in instid and virt == 'KVM' and \
+                curr_cim_rev >= libvirt_rasd_new_changes:
                 exp_len = 8
             else:
                 exp_len = 4