[Libvirt-cim] [PATCH] [TEST] Fix RPCS tests to work with older provider versions

[Deepti B Kalakeri]

+1

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1254509610 25200
> # Node ID 9e5c87bfe7c61fe8e713790398ce5f5a8039809c
> # Parent  9dcdf8704e8907185daa46df76507f768a69ad69
> [TEST] Fix RPCS tests to work with older provider versions.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r 9dcdf8704e89 -r 9e5c87bfe7c6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py
> --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py	Fri Oct 02 10:53:38 2009 -0700
> +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py	Fri Oct 02 11:53:30 2009 -0700
> @@ -145,10 +145,12 @@
>              status = PASS
>
>          except Exception, details:
> +            if status == PASS:
> +                status = FAIL
> +
>              logger.error("Exception details: %s", details)
>              if key == 'DISK_POOL_NETFS':
>                  netfs_cleanup(server, pool_attr)
> -            return FAIL
>   
>      return status
>
> diff -r 9dcdf8704e89 -r 9e5c87bfe7c6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py
> --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py	Fri Oct 02 10:53:38 2009 -0700
> +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py	Fri Oct 02 11:53:30 2009 -0700
> @@ -173,7 +173,7 @@
>
>      libvirt_ver = virsh_version(server, virt)
>      cim_rev, changeset = get_provider_version(virt, server)
> -    if libvirt_ver < "0.4.1" and cim_rev < libvirt_rasd_storagepool_changes:
> +    if libvirt_ver < "0.4.1" or cim_rev < libvirt_rasd_storagepool_changes:
>          logger.info("Storage Volume creation support is available with Libvirt" 
>                      "version >= 0.4.1 and Libvirt-CIM rev '%s'", 
>                      libvirt_rasd_storagepool_changes)
> diff -r 9dcdf8704e89 -r 9e5c87bfe7c6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/11_create_dir_storagevolume_errs.py
> --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/11_create_dir_storagevolume_errs.py	Fri Oct 02 10:53:38 2009 -0700
> +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/11_create_dir_storagevolume_errs.py	Fri Oct 02 11:53:30 2009 -0700
> @@ -125,7 +125,7 @@
>
>      libvirt_ver = virsh_version(server, virt)
>      cim_rev, changeset = get_provider_version(virt, server)
> -    if libvirt_ver < "0.4.1" and cim_rev < libvirt_rasd_storagepool_changes:
> +    if libvirt_ver < "0.4.1" or cim_rev < libvirt_rasd_storagepool_changes:
>          logger.info("Storage Volume creation support is available with Libvirt" 
>                      "version >= 0.4.1 and Libvirt-CIM rev '%s'", 
>                      libvirt_rasd_storagepool_changes)
> diff -r 9dcdf8704e89 -r 9e5c87bfe7c6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/13_delete_storagevolume.py
> --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/13_delete_storagevolume.py	Fri Oct 02 10:53:38 2009 -0700
> +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/13_delete_storagevolume.py	Fri Oct 02 11:53:30 2009 -0700
> @@ -50,7 +50,7 @@
>
>      libvirt_ver = virsh_version(server, virt)
>      cim_rev, changeset = get_provider_version(virt, server)
> -    if libvirt_ver < "0.4.1" and cim_rev < libvirt_rasd_spool_del_changes:
> +    if libvirt_ver < "0.4.1" or cim_rev < libvirt_rasd_spool_del_changes:
>          logger.info("Storage Volume deletion support is available with Libvirt"
>                      "version >= 0.4.1 and Libvirt-CIM rev '%s'", 
>                      libvirt_rasd_spool_del_changes)
> diff -r 9dcdf8704e89 -r 9e5c87bfe7c6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/14_delete_storagevolume_errs.py
> --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/14_delete_storagevolume_errs.py	Fri Oct 02 10:53:38 2009 -0700
> +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/14_delete_storagevolume_errs.py	Fri Oct 02 11:53:30 2009 -0700
> @@ -119,7 +119,7 @@
>
>      libvirt_ver = virsh_version(server, virt)
>      cim_rev, changeset = get_provider_version(virt, server)
> -    if libvirt_ver < "0.4.1" and cim_rev < libvirt_rasd_spool_del_changes:
> +    if libvirt_ver < "0.4.1" or cim_rev < libvirt_rasd_spool_del_changes:
>          logger.info("Storage Volume deletion support is available with Libvirt"
>                      "version >= 0.4.1 and Libvirt-CIM rev '%s'", 
>                      libvirt_rasd_spool_del_changes)
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   

-- 
Thanks and Regards,
Deepti B. Kalakeri
IBM Linux Technology Center
deeptik at linux.vnet.ibm.com