# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220403376 25200 # Node ID 11dadfddf7c9a508405bc4eea09a01106b4db981 # Parent 90ff66d2baee23319d29727d61fa9cf5d8f64f27 [TEST] Update LD, Mem, and NP to use do_main from const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py --- a/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Tue Sep 02 17:56:16 2008 -0700 @@ -30,7 +30,7 @@ from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class from CimTest.Globals import logger -from CimTest.Globals import do_main +from XenKvmLib.const import do_main SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV'] diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py --- a/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Tue Sep 02 17:56:16 2008 -0700 @@ -27,7 +27,8 @@ import pywbem from VirtLib import live from XenKvmLib import devices -from CimTest.Globals import logger, do_main, CIM_ERROR_ENUMERATE +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py --- a/suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py Tue Sep 02 17:56:16 2008 -0700 @@ -131,8 +131,9 @@ from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import logger, CIM_USER, do_main -from CimTest.Globals import CIM_PASS, CIM_NS, CIM_ERROR_GETINSTANCE +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, \ + CIM_ERROR_GETINSTANCE +from XenKvmLib.const import do_main sup_types = ['Xen', 'KVM', 'XenFV'] diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/Memory/01_memory.py --- a/suites/libvirt-cim/cimtest/Memory/01_memory.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py Tue Sep 02 17:56:16 2008 -0700 @@ -30,7 +30,7 @@ from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class from CimTest.Globals import logger -from CimTest.Globals import do_main +from XenKvmLib.const import do_main sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/Memory/02_defgetmem.py --- a/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py Tue Sep 02 17:56:16 2008 -0700 @@ -32,7 +32,8 @@ from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import create_using_definesystem from XenKvmLib.devices import get_dom_mem_inst -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger +from XenKvmLib.const import do_main sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] default_dom = "domu" diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py --- a/suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py Tue Sep 02 17:56:16 2008 -0700 @@ -130,8 +130,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, do_main -from CimTest.Globals import CIM_PASS, CIM_NS +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 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/NetworkPort/01_netport.py --- a/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Tue Sep 02 17:56:16 2008 -0700 @@ -37,7 +37,7 @@ from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class from CimTest.Globals import logger -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.const import get_provider_version diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py --- a/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py Tue Sep 02 17:56:16 2008 -0700 @@ -33,7 +33,8 @@ from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, LXCXML, get_class from CimTest.ReturnCodes import PASS, SKIP -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 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py --- a/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py Tue Sep 02 17:56:16 2008 -0700 @@ -31,7 +31,7 @@ from XenKvmLib import devices from XenKvmLib.vxml import KVMXML from CimTest.Globals import logger -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['KVM']