[Libvirt-cim] [PATCH] [TEST] #3 Fix HostedResourcePool/03_forward_errs.py to work with sblim cmpi base provider

[Deepti B Kalakeri]

+1 for me.

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1223629268 25200
> # Node ID f34ca6c26d7a0ffc457b256a8ba839d35bf141e8
> # Parent  285bc0174fb36512228e1cfcaba2186a0aa112c5
> [TEST] #3 Fix HostedResourcePool/03_forward_errs.py to work with sblim cmpi base provider
>
> Line up the colons and remove slash
>
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
>
> diff -r 285bc0174fb3 -r f34ca6c26d7a suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py
> --- a/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py	Wed Oct 08 03:03:37 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py	Fri Oct 10 02:01:08 2008 -0700
> @@ -25,48 +25,57 @@ import pywbem
>  import pywbem
>  from XenKvmLib import assoc
>  from XenKvmLib import enumclass
> +from XenKvmLib.common_util import get_host_info
>  from XenKvmLib.common_util import try_assoc
>  from CimTest import Globals
>  from CimTest.Globals import logger
> -from CimTest.ReturnCodes import PASS, FAIL
> +from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
>  from XenKvmLib.const import do_main
>  from XenKvmLib.classes import get_typed_class
>
> -expr_values = { "rc"   : pywbem.CIM_ERR_NOT_FOUND, \
> -                "desc" : "No such instance"
> -              } 
> +bug = "00007"
> +expr_values = {
> +        "invalid_ccname" : {"rc" : pywbem.CIM_ERR_NOT_FOUND, 
> +                  "desc" : "No such instance (CreationClassName)"},
> +        "invalid_name"   : {"rc" : pywbem.CIM_ERR_NOT_FOUND, 
> +                  "desc" : "No such instance (Name)"}
> +             }
>
>  sup_types=['Xen', 'KVM', 'XenFV', 'LXC']
>  @do_main(sup_types)
>  def main():
>      options = main.options
> -    status = PASS
>      keys = ['Name', 'CreationClassName']
> -    try: 
> -        host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0]
> -    except Exception:
> -        host_cn = get_typed_class(options.virt, "HostSystem")
> -        logger.error(Globals.CIM_ERROR_ENUMERATE % host_cn)
> +    status, host_sys, host_cn = get_host_info(options.ip, options.virt)
> +    if status != PASS:
> +        logger.error("Error in calling get_host_info function")
>          return FAIL
>
>      conn = assoc.myWBEMConnection('http://%s' % options.ip,                                        
>                                    (Globals.CIM_USER, Globals.CIM_PASS),
>                                                         Globals.CIM_NS)
> -    classname = host_sys.CreationClassName 
> +    classname = host_cn
>      assoc_classname = get_typed_class(options.virt, "HostedResourcePool")
> +    keys = {"Name" : host_sys, "CreationClassName" : "wrong"}
> +    ret =  try_assoc(conn, classname, assoc_classname, keys, 
> +                     "Name", expr_values['invalid_ccname'], bug_no="")
> +    if ret != PASS:
> +        if host_cn == 'Linux_ComputerSystem':
> +            return XFAIL_RC(bug)
> +        else:
> +            logger.error("------ FAILED: Invalid CreationClassName Key Value.------")
> +            return FAIL
>
> -    keys = {"Name" : "wrong", "CreationClassName" : host_sys.CreationClassName}
> -    ret =  try_assoc(conn, classname, assoc_classname, keys, "Name", expr_values, bug_no="")
> +    keys = {"Name" : "wrong", "CreationClassName" : host_cn}
> +    ret = try_assoc(conn, classname, assoc_classname, keys, 
> +                  "CreationClassName", expr_values['invalid_name'], bug_no="")
>      if ret != PASS:
> -        logger.error("------ FAILED: Invalid Name Key Name.------")
> -        status = ret
> +        if host_cn == 'Linux_ComputerSystem':
> +            return XFAIL_RC(bug)
> +        else:
> +            logger.error("------ FAILED: Invalid Name Key Value.------")
> +            return FAIL
>
> -    keys = {"Wrong" : host_sys.Name, "CreationClassName" : host_sys.CreationClassName}
> -    ret = try_assoc(conn, classname, assoc_classname, keys, "Name", expr_values, bug_no="")
> -    if ret != PASS:
> -        logger.error("------ FAILED: Invalid Name Key Value.------")
> -        status = ret
> -
> -    return status
> +    return PASS
>  if __name__ == "__main__":
>      sys.exit(main())
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>