# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220461448 25200 # Node ID 5e9db458b90c76223ac2c24452708a2aca945845 # Parent d4f9f0c09fa74998b7d0ef53526ebebaac0b10f7 [TEST] Update VSMS to use do_main in const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py Wed Sep 03 10:04:08 2008 -0700 @@ -27,7 +27,7 @@ from VirtLib import utils from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import create_using_definesystem -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.Globals import logger SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Wed Sep 03 10:04:08 2008 -0700 @@ -28,7 +28,7 @@ from VirtLib.live import domain_list, active_domain_list from XenKvmLib import vsms, vxml from XenKvmLib.classes import get_typed_class -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py Wed Sep 03 10:04:08 2008 -0700 @@ -29,7 +29,7 @@ from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import create_using_definesystem 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 = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py Wed Sep 03 10:04:08 2008 -0700 @@ -29,7 +29,7 @@ from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import create_using_definesystem 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 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Wed Sep 03 10:04:08 2008 -0700 @@ -29,7 +29,7 @@ from XenKvmLib.classes import get_typed_class from XenKvmLib.test_doms import undefine_test_domain from CimTest.Globals import logger -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import FAIL, PASS, SKIP sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py Wed Sep 03 10:04:08 2008 -0700 @@ -30,7 +30,7 @@ from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import FAIL, PASS from XenKvmLib import vsms_util from XenKvmLib.const import default_network_name diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py Wed Sep 03 10:04:08 2008 -0700 @@ -30,7 +30,7 @@ from XenKvmLib import vxml from XenKvmLib.classes import get_typed_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 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py Wed Sep 03 10:04:08 2008 -0700 @@ -30,7 +30,7 @@ from XenKvmLib import vsms from XenKvmLib import vxml 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 import vsms_util from XenKvmLib.const import default_network_name diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py Wed Sep 03 10:04:08 2008 -0700 @@ -27,7 +27,7 @@ from XenKvmLib import vsms from VirtLib import utils from CimTest.Globals import logger -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import FAIL, PASS from XenKvmLib.test_doms import destroy_and_undefine_domain diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/10_hv_version.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/10_hv_version.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/10_hv_version.py Wed Sep 03 10:04:08 2008 -0700 @@ -24,7 +24,7 @@ import pywbem from VirtLib import live from XenKvmLib import vsms -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS, XFAIL_RC diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py Wed Sep 03 10:04:08 2008 -0700 @@ -29,7 +29,7 @@ from XenKvmLib import rasd from XenKvmLib.classes import get_typed_class from XenKvmLib import enumclass -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_referenced_config.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_referenced_config.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_referenced_config.py Wed Sep 03 10:04:08 2008 -0700 @@ -27,7 +27,8 @@ poll_for_state_change, get_cs_instance from XenKvmLib import vsms from VirtLib import utils -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger +from XenKvmLib.const import do_main from CimTest.ReturnCodes import FAIL, PASS from XenKvmLib.test_doms import destroy_and_undefine_domain from XenKvmLib.classes import get_typed_class diff -r d4f9f0c09fa7 -r 5e9db458b90c suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py Wed Sep 03 10:04:05 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py Wed Sep 03 10:04:08 2008 -0700 @@ -26,7 +26,8 @@ poll_for_state_change, get_cs_instance from XenKvmLib import vsms from VirtLib import utils -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger +from XenKvmLib.const import do_main from CimTest.ReturnCodes import FAIL, PASS from XenKvmLib.test_doms import destroy_and_undefine_domain from XenKvmLib.classes import get_typed_class