[Libvirt-cim] [PATCH] [TEST] #2 Fix RPCS 08 to work with older version of libvirt-cim

[Kaitlin Rupert]

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1247591737 25200
# Node ID 05d74ccb64b9ca5b313d8ccb5a89138f1dfc1aea
# Parent  ad683039dafd91ced940b28c28689bdc1e3e829c
[TEST] #2 Fix RPCS 08 to work with older version of libvirt-cim...

For versions that don't support dir, netfs pool creation, or DiskPoolRASD
templates.

Instead of checking for SKIP return value, just return status.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r ad683039dafd -r 05d74ccb64b9 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py	Tue Jul 14 10:17:19 2009 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py	Tue Jul 14 10:15:37 2009 -0700
@@ -61,9 +61,11 @@
 libvirt_disk_pool_support=837
 libvirt_netfs_pool_support=869
     
-def get_pool_attr(server, pool_type, dp_types):
+def get_pool_attr(server, pool_type, dp_types, rev):
     pool_attr = { "Path" : "/tmp" }
-    if pool_type == dp_types['DISK_POOL_NETFS']:
+
+    if rev >= libvirt_netfs_pool_support and \
+       pool_type == dp_types['DISK_POOL_NETFS']:
         status , src_mnt_dir, dir_mnt_dir = nfs_netfs_setup(server)
         if status != PASS:
             logger.error("Failed to get pool_attr for NETFS diskpool type")
@@ -107,7 +109,8 @@
         try:
             logger.info("Verifying '%s'.....", key)
             test_pool = key
-            status, pool_attr = get_pool_attr(server, value, dp_types)
+            status, pool_attr = get_pool_attr(server, value, dp_types, 
+                                              curr_cim_rev)
             if status != PASS:
                 return FAIL
 
@@ -144,7 +147,7 @@
             logger.error("Exception details: %s", details)
             if key == 'DISK_POOL_NETFS':
                 netfs_cleanup(server, pool_attr)
-            return FAIL
+            return status
  
     return status