[PATCH 0 of 4] [TEST] Another set of do_main updates.

newer
[PATCH] [TEST] Remove...

older
[PATCH] [CU] Fix handling of...

Kaitlin Rupert

3 Sep 2008 3 Sep '08

7:04 p.m.

Show replies by date

Kaitlin Rupert

3 Sep 3 Sep

7:04 p.m.

New subject: [PATCH 1 of 4] [TEST] Update SettingsDefine and SDC to use do_main from const.py

# 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

Kaitlin Rupert

7:04 p.m.

New subject: [PATCH 2 of 4] [TEST] Update SysDev, VSMC, and VSSD to use do_main from const.py

# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220461445 25200 # Node ID d4f9f0c09fa74998b7d0ef53526ebebaac0b10f7 # Parent 7cbf05c0d3dda38ad6d6120f25cc1e5568b6689f [TEST] Update SysDev, VSMC, and VSSD to use do_main from const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Wed Sep 03 10:04:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Wed Sep 03 10:04:05 2008 -0700 @@ -30,7 +30,8 @@ from XenKvmLib import vxml from XenKvmLib import devices from XenKvmLib.classes import get_typed_class -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 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py --- a/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py Wed Sep 03 10:04:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py Wed Sep 03 10:04:05 2008 -0700 @@ -30,7 +30,8 @@ from XenKvmLib import computersystem from XenKvmLib import assoc from XenKvmLib import devices -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 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py --- a/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py Wed Sep 03 10:04:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py Wed Sep 03 10:04:05 2008 -0700 @@ -36,7 +36,8 @@ from XenKvmLib import assoc from XenKvmLib import devices from XenKvmLib.classes import get_typed_class -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger +from XenKvmLib.const import do_main from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VSSD/01_enum.py --- a/suites/libvirt-cim/cimtest/VSSD/01_enum.py Wed Sep 03 10:04:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/01_enum.py Wed Sep 03 10:04:05 2008 -0700 @@ -31,7 +31,8 @@ from XenKvmLib import enumclass from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.vxml import get_class -from CimTest.Globals import do_main, platform_sup, logger +from CimTest.Globals import logger +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VSSD/02_bootldr.py --- a/suites/libvirt-cim/cimtest/VSSD/02_bootldr.py Wed Sep 03 10:04:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/02_bootldr.py Wed Sep 03 10:04:05 2008 -0700 @@ -32,7 +32,8 @@ from VirtLib.live import bootloader from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all from XenKvmLib.test_xml import testxml_bl -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger +from XenKvmLib.const import do_main sup_types = ['Xen'] test_dom = "dom" diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py --- a/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py Wed Sep 03 10:04:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py Wed Sep 03 10:04:05 2008 -0700 @@ -51,8 +51,8 @@ import sys import pywbem from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import logger, do_main, platform_sup -from CimTest.Globals import CIM_PASS, CIM_NS, CIM_USER +from XenKvmLib.const import do_main +from CimTest.Globals import CIM_PASS, CIM_NS, CIM_USER, logger from XenKvmLib import assoc from XenKvmLib.vxml import get_class from XenKvmLib.common_util import try_getinstance diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Wed Sep 03 10:04:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Wed Sep 03 10:04:05 2008 -0700 @@ -44,8 +44,8 @@ import sys import XenKvmLib from XenKvmLib import enumclass -from CimTest.Globals import do_main, CIM_ERROR_ASSOCIATORS, CIM_ERROR_ENUMERATE -from CimTest.Globals import logger +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS, CIM_ERROR_ENUMERATE +from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib import assoc diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py Wed Sep 03 10:04:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py Wed Sep 03 10:04:05 2008 -0700 @@ -25,7 +25,7 @@ import sys from XenKvmLib import enumclass from CimTest import Globals -from CimTest.Globals import do_main +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class sup_types=['Xen', 'KVM', 'XenFV', 'LXC'] diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py Wed Sep 03 10:04:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py Wed Sep 03 10:04:05 2008 -0700 @@ -56,7 +56,8 @@ from XenKvmLib.common_util import try_getinstance 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']

Kaitlin Rupert

7:04 p.m.

New subject: [PATCH 3 of 4] [TEST] Update VSMS to use do_main in const.py

# 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

Kaitlin Rupert

7:04 p.m.

New subject: [PATCH 4 of 4] [TEST] Update VSMigrCap, VSMigSer, and VSMigSD to use do_main in const.py

# 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']

Guo Lian Yun

4 Sep 4 Sep

4:32 a.m.

+1 from me. libvirt-cim-bounces@redhat.com wrote on 2008-09-04 01:04:38:

...

_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim

6218

Age (days ago)

6219

Last active (days ago)

List overview

Download

5 comments

2 participants

participants (2)

Guo Lian Yun
Kaitlin Rupert