[PATCH 0 of 4] Update test cases to use do_main from const.py

# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220041472 25200 # Node ID bc9a4f35b1b48b6111f12d86925c1fbec09780a0 # Parent 946fd46b96866adaab356876f9c8bbf937f0b3d6 [TEST] Update CSI and EAFP tests to use do_main from const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py --- a/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py Fri Aug 29 13:24:32 2008 -0700 @@ -26,7 +26,7 @@ import time from pywbem.cim_obj import CIMInstanceName from CimTest.Globals import logger -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.common_util import create_using_definesystem, \ call_request_state_change diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Fri Aug 29 13:24:32 2008 -0700 @@ -51,7 +51,8 @@ from XenKvmLib.common_util import create_diskpool_conf, cleanup_restore from XenKvmLib.classes import get_typed_class from XenKvmLib.logicaldevices import field_err -from CimTest.Globals import do_main, logger +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 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Fri Aug 29 13:24:32 2008 -0700 @@ -49,7 +49,8 @@ import pywbem from XenKvmLib.assoc import Associators from XenKvmLib.vxml import get_class -from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORS +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.classes import get_typed_class diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Fri Aug 29 13:24:32 2008 -0700 @@ -35,7 +35,8 @@ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.common_util import try_assoc from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup, logger +from CimTest.Globals import logger +from XenKvmLib.const import do_main, platform_sup from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, test_dpath, \ diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Fri Aug 29 13:24:32 2008 -0700 @@ -36,7 +36,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC -from CimTest.Globals import do_main, platform_sup +from XenKvmLib.const import do_main, platform_sup from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, test_dpath, \

+1 for me. Kaitlin Rupert wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220041472 25200 # Node ID bc9a4f35b1b48b6111f12d86925c1fbec09780a0 # Parent 946fd46b96866adaab356876f9c8bbf937f0b3d6 [TEST] Update CSI and EAFP tests to use do_main from const.py
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py --- a/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py Fri Aug 29 13:24:32 2008 -0700 @@ -26,7 +26,7 @@ import time from pywbem.cim_obj import CIMInstanceName from CimTest.Globals import logger -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.common_util import create_using_definesystem, \ call_request_state_change diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Fri Aug 29 13:24:32 2008 -0700 @@ -51,7 +51,8 @@ from XenKvmLib.common_util import create_diskpool_conf, cleanup_restore from XenKvmLib.classes import get_typed_class from XenKvmLib.logicaldevices import field_err -from CimTest.Globals import do_main, logger +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 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Fri Aug 29 13:24:32 2008 -0700 @@ -49,7 +49,8 @@ import pywbem from XenKvmLib.assoc import Associators from XenKvmLib.vxml import get_class -from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORS +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.classes import get_typed_class diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Fri Aug 29 13:24:32 2008 -0700 @@ -35,7 +35,8 @@ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.common_util import try_assoc from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup, logger +from CimTest.Globals import logger +from XenKvmLib.const import do_main, platform_sup from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, test_dpath, \ diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Fri Aug 29 13:24:32 2008 -0700 @@ -36,7 +36,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC -from CimTest.Globals import do_main, platform_sup +from XenKvmLib.const import do_main, platform_sup from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, test_dpath, \
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim

# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220041548 25200 # Node ID d722b79c405442082ccd02dbf1e50f0542a3344b # Parent bc9a4f35b1b48b6111f12d86925c1fbec09780a0 [TEST] Update ElementCapabilities and ElementConforms to use do_main from const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Fri Aug 29 13:25:48 2008 -0700 @@ -26,9 +26,9 @@ from XenKvmLib import assoc from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORNAMES, \ -CIM_ERROR_ENUMERATE +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \ + CIM_ERROR_ENUMERATE +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP from XenKvmLib.enumclass import enumerate @@ -113,7 +113,7 @@ Name = system, CreationClassName = ccn) except Exception: - logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % system) + logger.error(CIM_ERROR_ASSOCIATORNAMES % system) return FAIL cn = get_typed_class(virt, "EnabledLogicalElementCapabilities") if elec[0].classname != cn: diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Fri Aug 29 13:25:48 2008 -0700 @@ -29,7 +29,7 @@ from XenKvmLib import vsms from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORNAMES -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Fri Aug 29 13:25:48 2008 -0700 @@ -26,8 +26,8 @@ from XenKvmLib import assoc from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @@ -37,8 +37,8 @@ def try_assoc(ref, ref_class, exp_rc, exp_desc, options): conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (CIM_USER, CIM_PASS), + CIM_NS) status = FAIL rc = -1 names = [] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Fri Aug 29 13:25:48 2008 -0700 @@ -25,8 +25,8 @@ from pywbem.cim_obj import CIMInstanceName from XenKvmLib import assoc from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @@ -36,8 +36,8 @@ def try_assoc(ref, ref_class, exp_rc, exp_desc, options): conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (CIM_USER, CIM_PASS), + CIM_NS) status = FAIL rc = -1 names = [] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Fri Aug 29 13:25:48 2008 -0700 @@ -53,7 +53,7 @@ from XenKvmLib.common_util import get_host_info from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri Aug 29 13:25:48 2008 -0700 @@ -38,8 +38,9 @@ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.classes import get_typed_class from XenKvmLib import vxml -from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS, do_main from CimTest import Globals +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Fri Aug 29 13:25:48 2008 -0700 @@ -42,7 +42,7 @@ from VirtLib import utils from CimTest import Globals from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib import enumclass from XenKvmLib import computersystem from XenKvmLib import assoc diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri Aug 29 13:25:48 2008 -0700 @@ -58,7 +58,8 @@ from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL from CimTest import Globals -from CimTest.Globals import logger, CIM_USER, CIM_PASS, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS +from XenKvmLib.const import do_main sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Fri Aug 29 13:25:48 2008 -0700 @@ -87,7 +87,8 @@ from XenKvmLib.common_util import try_assoc from XenKvmLib.test_doms import destroy_and_undefine_all 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', 'XenFV', 'KVM', 'LXC']

+1 for me Kaitlin Rupert wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220041548 25200 # Node ID d722b79c405442082ccd02dbf1e50f0542a3344b # Parent bc9a4f35b1b48b6111f12d86925c1fbec09780a0 [TEST] Update ElementCapabilities and ElementConforms to use do_main from const.py
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Fri Aug 29 13:25:48 2008 -0700 @@ -26,9 +26,9 @@ from XenKvmLib import assoc from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORNAMES, \ -CIM_ERROR_ENUMERATE +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \ + CIM_ERROR_ENUMERATE +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP from XenKvmLib.enumclass import enumerate
@@ -113,7 +113,7 @@ Name = system, CreationClassName = ccn) except Exception: - logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % system) + logger.error(CIM_ERROR_ASSOCIATORNAMES % system) return FAIL cn = get_typed_class(virt, "EnabledLogicalElementCapabilities") if elec[0].classname != cn: diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Fri Aug 29 13:25:48 2008 -0700 @@ -29,7 +29,7 @@ from XenKvmLib import vsms from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORNAMES -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Fri Aug 29 13:25:48 2008 -0700 @@ -26,8 +26,8 @@ from XenKvmLib import assoc from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @@ -37,8 +37,8 @@
def try_assoc(ref, ref_class, exp_rc, exp_desc, options): conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (CIM_USER, CIM_PASS), + CIM_NS) status = FAIL rc = -1 names = [] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Fri Aug 29 13:25:48 2008 -0700 @@ -25,8 +25,8 @@ from pywbem.cim_obj import CIMInstanceName from XenKvmLib import assoc from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @@ -36,8 +36,8 @@
def try_assoc(ref, ref_class, exp_rc, exp_desc, options): conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (CIM_USER, CIM_PASS), + CIM_NS) status = FAIL rc = -1 names = [] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Fri Aug 29 13:25:48 2008 -0700 @@ -53,7 +53,7 @@ from XenKvmLib.common_util import get_host_info from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri Aug 29 13:25:48 2008 -0700 @@ -38,8 +38,9 @@ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.classes import get_typed_class from XenKvmLib import vxml -from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS, do_main from CimTest import Globals +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Fri Aug 29 13:25:48 2008 -0700 @@ -42,7 +42,7 @@ from VirtLib import utils from CimTest import Globals from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib import enumclass from XenKvmLib import computersystem from XenKvmLib import assoc diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri Aug 29 13:25:48 2008 -0700 @@ -58,7 +58,8 @@ from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL from CimTest import Globals -from CimTest.Globals import logger, CIM_USER, CIM_PASS, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS +from XenKvmLib.const import do_main
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
diff -r bc9a4f35b1b4 -r d722b79c4054 suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Fri Aug 29 13:24:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Fri Aug 29 13:25:48 2008 -0700 @@ -87,7 +87,8 @@ from XenKvmLib.common_util import try_assoc from XenKvmLib.test_doms import destroy_and_undefine_all 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', 'XenFV', 'KVM', 'LXC']
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim

# HG changeset patch # User Kaitlin Rupert <karupert@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@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

+1 for me. Kaitlin Rupert wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@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@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@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim

# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220041572 25200 # Node ID 90ff66d2baee23319d29727d61fa9cf5d8f64f27 # Parent 8c056f2d614a9bf26ed8154a7a355f9c9551ab22 [TEST] Update HostSystem, HostedService, and HRP to use do_main from const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Fri Aug 29 13:26:12 2008 -0700 @@ -30,7 +30,8 @@ from XenKvmLib.classes import get_typed_class from VirtLib import live from VirtLib import utils -from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, do_main +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Fri Aug 29 13:26:12 2008 -0700 @@ -47,7 +47,7 @@ # Date : 29.01.2008 import sys -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.test_doms import destroy_and_undefine_all diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Fri Aug 29 13:26:12 2008 -0700 @@ -45,7 +45,8 @@ from XenKvmLib.assoc import Associators from XenKvmLib.vxml import XenXML, KVMXML, get_class from XenKvmLib.classes import get_typed_class -from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, do_main +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.test_xml import testxml from XenKvmLib.test_doms import destroy_and_undefine_all diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Fri Aug 29 13:26:12 2008 -0700 @@ -51,7 +51,7 @@ from VirtLib import utils from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \ CIM_ERROR_ASSOCIATORS -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.vxml import XenXML, KVMXML, get_class from XenKvmLib.assoc import AssociatorNames, Associators from XenKvmLib.common_util import get_host_info diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/05_hs_gi_errs.py --- a/suites/libvirt-cim/cimtest/HostSystem/05_hs_gi_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/05_hs_gi_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -79,7 +79,8 @@ from XenKvmLib.classes import get_typed_class from optparse import OptionParser 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 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py --- a/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py Fri Aug 29 13:26:12 2008 -0700 @@ -45,7 +45,7 @@ # Date : 28.03.2008 import sys -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.assoc import Associators, AssociatorNames from XenKvmLib.common_util import get_host_info diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Fri Aug 29 13:26:12 2008 -0700 @@ -30,7 +30,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Fri Aug 29 13:26:12 2008 -0700 @@ -29,7 +29,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -29,7 +29,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class expr_values = { "rc" : pywbem.CIM_ERR_NOT_FOUND, \ diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -29,7 +29,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedService/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedService/01_forward.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/01_forward.py Fri Aug 29 13:26:12 2008 -0700 @@ -27,7 +27,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 CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedService/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Fri Aug 29 13:26:12 2008 -0700 @@ -27,7 +27,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 CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -26,8 +26,9 @@ from XenKvmLib import assoc from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_USER, \ + CIM_PASS, CIM_NS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @@ -43,13 +44,13 @@ try: host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) + logger.error(CIM_ERROR_ENUMERATE % host_sys.name) return FAIL conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (CIM_USER, CIM_PASS), + CIM_NS) instanceref = CIMInstanceName(get_typed_class(options.virt, "HostSystem"), keybindings = {"Wrong" : "wrong", "CreationClassName" : host_sys.CreationClassName}) diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -26,8 +26,9 @@ from XenKvmLib import assoc from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_USER, \ + CIM_PASS, CIM_NS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @@ -43,7 +44,7 @@ try: host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) + logger.error(CIM_ERROR_ENUMERATE % host_sys.name) return FAIL @@ -53,8 +54,8 @@ conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (CIM_USER, CIM_PASS), + CIM_NS) for k, v in servicelist.items(): instanceref = CIMInstanceName(k, keybindings = {"Wrong" : v,

+1 for me. Kaitlin Rupert wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220041572 25200 # Node ID 90ff66d2baee23319d29727d61fa9cf5d8f64f27 # Parent 8c056f2d614a9bf26ed8154a7a355f9c9551ab22 [TEST] Update HostSystem, HostedService, and HRP to use do_main from const.py
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Fri Aug 29 13:26:12 2008 -0700 @@ -30,7 +30,8 @@ from XenKvmLib.classes import get_typed_class from VirtLib import live from VirtLib import utils -from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, do_main +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL
SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Fri Aug 29 13:26:12 2008 -0700 @@ -47,7 +47,7 @@ # Date : 29.01.2008
import sys -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.test_doms import destroy_and_undefine_all diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Fri Aug 29 13:26:12 2008 -0700 @@ -45,7 +45,8 @@ from XenKvmLib.assoc import Associators from XenKvmLib.vxml import XenXML, KVMXML, get_class from XenKvmLib.classes import get_typed_class -from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, do_main +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.test_xml import testxml from XenKvmLib.test_doms import destroy_and_undefine_all diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Fri Aug 29 13:26:12 2008 -0700 @@ -51,7 +51,7 @@ from VirtLib import utils from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \ CIM_ERROR_ASSOCIATORS -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.vxml import XenXML, KVMXML, get_class from XenKvmLib.assoc import AssociatorNames, Associators from XenKvmLib.common_util import get_host_info diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/05_hs_gi_errs.py --- a/suites/libvirt-cim/cimtest/HostSystem/05_hs_gi_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/05_hs_gi_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -79,7 +79,8 @@ from XenKvmLib.classes import get_typed_class from optparse import OptionParser 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 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py --- a/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py Fri Aug 29 13:26:12 2008 -0700 @@ -45,7 +45,7 @@ # Date : 28.03.2008
import sys -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.assoc import Associators, AssociatorNames from XenKvmLib.common_util import get_host_info diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Fri Aug 29 13:26:12 2008 -0700 @@ -30,7 +30,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf
diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Fri Aug 29 13:26:12 2008 -0700 @@ -29,7 +29,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf
diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -29,7 +29,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class
expr_values = { "rc" : pywbem.CIM_ERR_NOT_FOUND, \ diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -29,7 +29,7 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf
diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedService/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedService/01_forward.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/01_forward.py Fri Aug 29 13:26:12 2008 -0700 @@ -27,7 +27,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 CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL
diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedService/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Fri Aug 29 13:26:12 2008 -0700 @@ -27,7 +27,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 CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL
diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -26,8 +26,9 @@ from XenKvmLib import assoc from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_USER, \ + CIM_PASS, CIM_NS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @@ -43,13 +44,13 @@ try: host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) + logger.error(CIM_ERROR_ENUMERATE % host_sys.name) return FAIL
conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (CIM_USER, CIM_PASS), + CIM_NS) instanceref = CIMInstanceName(get_typed_class(options.virt, "HostSystem"), keybindings = {"Wrong" : "wrong", "CreationClassName" : host_sys.CreationClassName})
diff -r 8c056f2d614a -r 90ff66d2baee suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Fri Aug 29 13:26:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Fri Aug 29 13:26:12 2008 -0700 @@ -26,8 +26,9 @@ from XenKvmLib import assoc from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest import Globals -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_USER, \ + CIM_PASS, CIM_NS +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @@ -43,7 +44,7 @@ try: host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) + logger.error(CIM_ERROR_ENUMERATE % host_sys.name) return FAIL
@@ -53,8 +54,8 @@
conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (CIM_USER, CIM_PASS), + CIM_NS) for k, v in servicelist.items(): instanceref = CIMInstanceName(k, keybindings = {"Wrong" : v,
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
participants (2)
-
Deepti B Kalakeri
-
Kaitlin Rupert