[Libvirt-cim] [PATCH] [TEST] Add branch of devices number to HostSystem/04_hs_to_EAPF.py

[yunguol at cn.ibm.com]

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1228187146 28800
# Node ID f18f23b1ad6a2757be01fc438ddbf0eb9d544c2c
# Parent  5fb94ae83ed121d3b0ce54bde7e30175c2df6f70
[TEST] Add branch of devices number to HostSystem/04_hs_to_EAPF.py

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 5fb94ae83ed1 -r f18f23b1ad6a suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py
--- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py	Wed Nov 26 19:06:58 2008 -0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py	Mon Dec 01 19:05:46 2008 -0800
@@ -59,6 +59,7 @@
 from CimTest.ReturnCodes import PASS, FAIL, SKIP
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.logicaldevices import verify_device_values
+from XenKvmLib.const import get_provider_version
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -66,6 +67,7 @@
 test_mac   = "00:11:22:33:44:aa"
 test_mem   = 128 
 test_vcpus = 1 
+libvirt_input_graphics_changeset = 757
 
 def print_err(err, detail, cn):
     logger.error(err % cn)
@@ -266,11 +268,14 @@
         return status
 
     in_pllist = pool_init_list(virt, pool, net_name, default_pool_name)
+    curr_cim_rev, changeset = get_provider_version(virt, server)
     # One pool for each Device type, hence len should be 4
     if virt == 'LXC':
         exp_len = 1
+    elif curr_cim_rev >= libvirt_input_graphics_changeset:
+       exp_len = 6
     else:
-        exp_len = 6
+       exp_len = 4
     status = check_len(an, in_pllist, qcn, exp_len)
     if status != PASS:
         vsxml.undefine(server)