# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220461443 25200 # Node ID 7cbf05c0d3dda38ad6d6120f25cc1e5568b6689f # Parent 58896395abd6636bd5a2f594ee32678080212432 [TEST] Update SettingsDefine and SDC to use do_main from const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 58896395abd6 -r 7cbf05c0d3dd suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Tue Sep 02 17:56:23 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Wed Sep 03 10:04:03 2008 -0700 @@ -33,7 +33,7 @@ from XenKvmLib import devices 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.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 58896395abd6 -r 7cbf05c0d3dd suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Tue Sep 02 17:56:23 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Wed Sep 03 10:04:03 2008 -0700 @@ -52,7 +52,8 @@ import sys from CimTest import Globals -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP from VirtLib import utils from XenKvmLib import assoc diff -r 58896395abd6 -r 7cbf05c0d3dd suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Tue Sep 02 17:56:23 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Wed Sep 03 10:04:03 2008 -0700 @@ -152,7 +152,7 @@ from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS -from CimTest.Globals import do_main +from XenKvmLib.const import do_main sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 58896395abd6 -r 7cbf05c0d3dd suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py Tue Sep 02 17:56:23 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py Wed Sep 03 10:04:03 2008 -0700 @@ -60,7 +60,8 @@ from XenKvmLib.common_util import try_assoc from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, logger +from CimTest.Globals import logger +from XenKvmLib.const import do_main from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 58896395abd6 -r 7cbf05c0d3dd suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Tue Sep 02 17:56:23 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Wed Sep 03 10:04:03 2008 -0700 @@ -59,8 +59,8 @@ from XenKvmLib import enumclass from VirtLib.live import virsh_version from CimTest.ReturnCodes import PASS, FAIL, SKIP -from CimTest.Globals import do_main, platform_sup, logger, \ -CIM_ERROR_GETINSTANCE, CIM_ERROR_ASSOCIATORS +from CimTest.Globals import logger, CIM_ERROR_GETINSTANCE, CIM_ERROR_ASSOCIATORS +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \ print_field_error diff -r 58896395abd6 -r 7cbf05c0d3dd suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py Tue Sep 02 17:56:23 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py Wed Sep 03 10:04:03 2008 -0700 @@ -32,7 +32,7 @@ from XenKvmLib.common_util import try_assoc from XenKvmLib import assoc from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS -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 58896395abd6 -r 7cbf05c0d3dd suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py Tue Sep 02 17:56:23 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py Wed Sep 03 10:04:03 2008 -0700 @@ -39,7 +39,7 @@ from XenKvmLib import assoc from CimTest.Globals import CIM_ERROR_ASSOCIATORS, 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 from XenKvmLib.common_util import print_field_error diff -r 58896395abd6 -r 7cbf05c0d3dd suites/libvirt-cim/cimtest/SettingsDefineCapabilities/05_reverse_vsmcap.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/05_reverse_vsmcap.py Tue Sep 02 17:56:23 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/05_reverse_vsmcap.py Wed Sep 03 10:04:03 2008 -0700 @@ -41,11 +41,10 @@ from XenKvmLib import assoc from CimTest.Globals import CIM_ERROR_ASSOCIATORS, logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from XenKvmLib.const import do_main, platform_sup from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import print_field_error -platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(platform_sup) def main(): options = main.options