[Libvirt-cim] [PATCH] [TEST] #2 Update ResourcePool.01 & 02 for XenFV support

[yunguol at cn.ibm.com]

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1217390631 25200
# Node ID f4ee15598db4fe3042b8cd0485ae17803c778795
# Parent  2efc46fd30f33e06c20ca8c771abed65725a3fdb
[TEST] #2 Update ResourcePool.01 & 02 for XenFV support

I cooked up a patche for fix ResourcePool.01 on the way, so I rebased this patch.

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

diff -r 2efc46fd30f3 -r f4ee15598db4 suites/libvirt-cim/cimtest/ResourcePool/01_enum.py
--- a/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py	Wed Jul 23 17:42:47 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py	Tue Jul 29 21:03:51 2008 -0700
@@ -39,7 +39,7 @@ from XenKvmLib.common_util import cleanu
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 
-sup_types = ['Xen', 'KVM', 'LXC']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 diskid = "%s/%s" % ("DiskPool", test_dpath)
 dp_cn = 'DiskPool'
@@ -105,7 +105,10 @@ def verify_fields(pool_list, poolname, c
 @do_main(sup_types)
 def main():
     ip = main.options.ip
-    virt = main.options.virt
+    if main.options.virt == "XenFV":
+        virt = "Xen"
+    else:
+        virt = main.options.virt
     status, pool_list = init_list(ip, virt)
     if status != PASS: 
         logger.error("Failed to initialise the list")
diff -r 2efc46fd30f3 -r f4ee15598db4 suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py
--- a/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py	Wed Jul 23 17:42:47 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py	Tue Jul 29 21:03:51 2008 -0700
@@ -40,7 +40,7 @@ from XenKvmLib.common_util import cleanu
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 
-sup_types = ['Xen', 'KVM', 'LXC']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 expr_values = {
         "invalid_keyname"  : { 'rc'   : pywbem.CIM_ERR_FAILED,
@@ -88,7 +88,10 @@ def err_invalid_instid_keyvalue(conn, cl
 @do_main(sup_types)
 def main():
     ip = main.options.ip
-    virt = main.options.virt
+    if main.options.virt == "XenFV":
+        virt = "Xen"
+    else:
+        virt = main.options.virt
     conn = assoc.myWBEMConnection('http://%s' % ip, (CIM_USER, CIM_PASS),
                                   CIM_NS)