# HG changeset patch

# User Deepti B. Kalakeri<deeptik@linux.vnet.ibm.com>

# Date 1272267529 25200

# Node ID 3d5bb69edc67ab8097a61cff09927fdf4c5d3f4b

# Parent  456106b86cf4572684877cc923f3af991b4b65bb

[TEST] Fixing RPCS/10*py to work for libvirt_cim changes < 1032 revision





The test has been verified with KVM and libvirt-cim rpm for rev<1032

Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com>



diff -r 456106b86cf4 -r 3d5bb69edc67 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py

--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py		 Mon Mar 15 09:16:15 2010 -0400

+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py		 Mon Apr 26 00:38:49 2010 -0700

@@ -45,6 +45,7 @@

 

 pool_attr = { 'Path' : _image_dir }

 vol_name = "cimtest-vol.img"

+libvirt_stovol_instance_id=1032

 

 def get_template_rasd_from_sdc(virt, server, dp_inst_id):

     rasd = None

@@ -231,7 +232,8 @@

             if res[0] != PASS:

                 raise Exception("Failed to create the Vol %s" % vol_name)

 

-            if res[1]['Resource']['InstanceID'] != exp_vol_path:

+            if res[1]['Resource']['InstanceID'] != exp_vol_path and \

+               cim_rev >= libvirt_stovol_instance_id:

                 raise Exception("Incorrect InstanceID")

             else:

                 status = PASS

@@ -252,6 +254,8 @@

         

         except Exception, details:

             logger.error("Exception details: %s", details)

+            cleanup_pool_vol(server, virt, pool_name, 

+                             clean_pool, exp_vol_path)

             status = FAIL

 

     return status



_______________________________________________

Libvirt-cim mailing list

Libvirt-cim@redhat.com


https://www.redhat.com/mailman/listinfo/libvirt-cim


