# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220461450 25200 # Node ID f2e5f71a34c1b30bc10012ec87073c26df135b1a # Parent 5e9db458b90c76223ac2c24452708a2aca945845 [TEST] Update VSMigrCap, VSMigSer, and VSMigSD to use do_main in const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 5e9db458b90c -r f2e5f71a34c1 suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/01_enum.py Wed Sep 03 10:04:08 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/01_enum.py Wed Sep 03 10:04:10 2008 -0700 @@ -25,7 +25,8 @@ import sys from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest.Globals import CIM_ERROR_ENUMERATE, logger, do_main +from CimTest.Globals import CIM_ERROR_ENUMERATE, logger +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] diff -r 5e9db458b90c -r f2e5f71a34c1 suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/02_vsmc_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/02_vsmc_gi_errs.py Wed Sep 03 10:04:08 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/02_vsmc_gi_errs.py Wed Sep 03 10:04:10 2008 -0700 @@ -49,7 +49,7 @@ import pywbem from XenKvmLib import assoc from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.common_util import try_getinstance from XenKvmLib.classes import get_typed_class diff -r 5e9db458b90c -r f2e5f71a34c1 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py Wed Sep 03 10:04:08 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py Wed Sep 03 10:04:10 2008 -0700 @@ -33,7 +33,8 @@ from XenKvmLib import vsmigrations from XenKvmLib.vsmigrations import check_possible_host_migration, migrate_guest_to_host, check_migration_job from XenKvmLib import enumclass -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, XFAIL sup_types = ['Xen', 'XenFV'] diff -r 5e9db458b90c -r f2e5f71a34c1 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Wed Sep 03 10:04:08 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Wed Sep 03 10:04:10 2008 -0700 @@ -32,7 +32,8 @@ from XenKvmLib.vsmigrations import check_possible_host_migration, \ migrate_guest_to_host, check_migration_job from XenKvmLib import enumclass -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, XFAIL sup_types = ['Xen', 'XenFV'] diff -r 5e9db458b90c -r f2e5f71a34c1 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/05_migratable_host_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/05_migratable_host_errs.py Wed Sep 03 10:04:08 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/05_migratable_host_errs.py Wed Sep 03 10:04:10 2008 -0700 @@ -27,7 +27,8 @@ from XenKvmLib import vxml from XenKvmLib import computersystem from XenKvmLib import vsmigrations -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV'] diff -r 5e9db458b90c -r f2e5f71a34c1 suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py Wed Sep 03 10:04:08 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py Wed Sep 03 10:04:10 2008 -0700 @@ -26,7 +26,7 @@ from XenKvmLib import enumclass from CimTest.Globals import CIM_ERROR_ENUMERATE, logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 5e9db458b90c -r f2e5f71a34c1 suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/02_vsmsd_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/02_vsmsd_gi_errs.py Wed Sep 03 10:04:08 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/02_vsmsd_gi_errs.py Wed Sep 03 10:04:10 2008 -0700 @@ -49,7 +49,7 @@ from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.ReturnCodes import PASS from XenKvmLib.common_util import try_getinstance -from CimTest.Globals import do_main, platform_sup +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class platform_sup = ['Xen', 'XenFV', 'KVM', 'LXC']