[Libvirt-cim] [PATCH 3 of 4] [TEST] Update ESD, ELEC, and HD to use do_main from const.py

[Deepti B Kalakeri]

+1 for me.

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1220041564 25200
> # Node ID 8c056f2d614a9bf26ed8154a7a355f9c9551ab22
> # Parent  d722b79c405442082ccd02dbf1e50f0542a3344b
> [TEST] Update ESD, ELEC, and HD to use do_main from const.py
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r d722b79c4054 -r 8c056f2d614a suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py
> --- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py	Fri Aug 29 13:25:48 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py	Fri Aug 29 13:26:04 2008 -0700
> @@ -52,10 +52,10 @@
>  from XenKvmLib.enumclass import getInstance 
>  from XenKvmLib.assoc import Associators, compare_all_prop
>  from XenKvmLib.classes import get_typed_class
> -from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORS
> +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS
>  from CimTest.ReturnCodes import PASS, FAIL
>  from XenKvmLib.vxml import get_class
> -from XenKvmLib import const 
> +from XenKvmLib.const import do_main 
>
>  sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
>
> diff -r d722b79c4054 -r 8c056f2d614a suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py
> --- a/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py	Fri Aug 29 13:25:48 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py	Fri Aug 29 13:26:04 2008 -0700
> @@ -55,7 +55,7 @@
>  from XenKvmLib import assoc
>  from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, \
>  CIM_ERROR_ASSOCIATORS
> -from CimTest.Globals import do_main
> +from XenKvmLib.const import do_main
>  from XenKvmLib.common_util import try_assoc
>  from XenKvmLib.classes import get_typed_class
>  from CimTest.ReturnCodes import PASS, FAIL
> diff -r d722b79c4054 -r 8c056f2d614a suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/01_enum.py
> --- a/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/01_enum.py	Fri Aug 29 13:25:48 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/01_enum.py	Fri Aug 29 13:26:04 2008 -0700
> @@ -25,7 +25,7 @@
>  from XenKvmLib import enumclass
>  from XenKvmLib.classes import get_typed_class
>  from CimTest import Globals
> -from CimTest.Globals import do_main
> +from XenKvmLib.const import do_main
>  from VirtLib import live
>  from VirtLib import utils
>
> diff -r d722b79c4054 -r 8c056f2d614a suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py
> --- a/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py	Fri Aug 29 13:25:48 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py	Fri Aug 29 13:26:04 2008 -0700
> @@ -56,7 +56,8 @@
>  from XenKvmLib.vxml import XenXML, KVMXML, get_class
>  from XenKvmLib.classes import get_typed_class
>  from CimTest.ReturnCodes import PASS, FAIL
> -from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main
> +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
> +from XenKvmLib.const import do_main
>
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
>
> diff -r d722b79c4054 -r 8c056f2d614a suites/libvirt-cim/cimtest/HostedDependency/01_forward.py
> --- a/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py	Fri Aug 29 13:25:48 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py	Fri Aug 29 13:26:04 2008 -0700
> @@ -52,7 +52,7 @@
>  from XenKvmLib import enumclass
>  from XenKvmLib.classes import get_class_basename
>  from CimTest import Globals
> -from CimTest.Globals import do_main
> +from XenKvmLib.const import do_main
>  from CimTest.ReturnCodes import PASS, FAIL
>
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> diff -r d722b79c4054 -r 8c056f2d614a suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py
> --- a/suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py	Fri Aug 29 13:25:48 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py	Fri Aug 29 13:26:04 2008 -0700
> @@ -47,7 +47,8 @@
>  from XenKvmLib import computersystem 
>  from XenKvmLib import assoc
>  from XenKvmLib.classes import get_class_basename
> -from CimTest.Globals import logger, do_main
> +from CimTest.Globals import logger
> +from XenKvmLib.const import do_main
>  from CimTest.ReturnCodes import PASS, FAIL
>
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> diff -r d722b79c4054 -r 8c056f2d614a suites/libvirt-cim/cimtest/HostedDependency/03_enabledstate.py
> --- a/suites/libvirt-cim/cimtest/HostedDependency/03_enabledstate.py	Fri Aug 29 13:25:48 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/HostedDependency/03_enabledstate.py	Fri Aug 29 13:26:04 2008 -0700
> @@ -40,7 +40,7 @@
>  from XenKvmLib.classes import get_class_basename
>  from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS, \
>  CIM_ERROR_GETINSTANCE
> -from CimTest.Globals import do_main
> +from XenKvmLib.const import do_main
>  from XenKvmLib.devices import CIM_Instance
>  from CimTest.ReturnCodes import PASS, FAIL
>
> diff -r d722b79c4054 -r 8c056f2d614a suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py
> --- a/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py	Fri Aug 29 13:25:48 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py	Fri Aug 29 13:26:04 2008 -0700
> @@ -33,7 +33,7 @@
>  from XenKvmLib import assoc
>  from XenKvmLib import vxml
>  from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
> -from CimTest.Globals import do_main
> +from XenKvmLib.const import do_main
>  from XenKvmLib.classes import get_typed_class
>  from XenKvmLib.common_util import get_host_info, try_assoc
>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>