[PATCH 0 of 2] [TEST] Remove do_main from lib/CimTest/Globals.py
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220559236 25200 # Node ID f1e880a8c064d7eaf332fb195d1af38f66a1fb90 # Parent d409f1d12edda62db577628693124c268a7d7da4 [TEST] VSSDC, SnapshotService, and SnapshotCap to use do_main from const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Wed Sep 03 22:54:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Thu Sep 04 13:13:56 2008 -0700 @@ -58,7 +58,8 @@ from XenKvmLib import assoc from XenKvmLib import vxml 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 FAIL, PASS sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Wed Sep 03 22:54:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Thu Sep 04 13:13:56 2008 -0700 @@ -53,7 +53,8 @@ from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class from XenKvmLib.rasd import InstId_err -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', 'XenFV', 'KVM', 'LXC'] diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py Wed Sep 03 22:54:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py Thu Sep 04 13:13:56 2008 -0700 @@ -60,7 +60,8 @@ from XenKvmLib.common_util import try_assoc from XenKvmLib.test_doms import destroy_and_undefine_all 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', 'XenFV', 'KVM', 'LXC'] diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py Wed Sep 03 22:54:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py Thu Sep 04 13:13:56 2008 -0700 @@ -63,7 +63,8 @@ from XenKvmLib.common_util import try_assoc from XenKvmLib.test_doms import destroy_and_undefine_all 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', 'XenFV', 'KVM', 'LXC'] diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Wed Sep 03 22:54:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Thu Sep 04 13:13:56 2008 -0700 @@ -25,7 +25,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 +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import get_host_info diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Wed Sep 03 22:54:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Thu Sep 04 13:13:56 2008 -0700 @@ -31,7 +31,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 +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import get_host_info diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py Wed Sep 03 22:54:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py Thu Sep 04 13:13:56 2008 -0700 @@ -25,7 +25,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 +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py Wed Sep 03 22:54:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py Thu Sep 04 13:13:56 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 +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1220559238 25200 # Node ID 279d889fa02ca6c37d808042b76e727e14158126 # Parent f1e880a8c064d7eaf332fb195d1af38f66a1fb90 [TEST] Remove do_main from Globals.py This is now in const.py in the libvirt-cim suite. Also remove platform_sup and VIRSH_DEFINE - these are also in const.py Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r f1e880a8c064 -r 279d889fa02c lib/CimTest/Globals.py --- a/lib/CimTest/Globals.py Thu Sep 04 13:13:56 2008 -0700 +++ b/lib/CimTest/Globals.py Thu Sep 04 13:13:58 2008 -0700 @@ -24,7 +24,6 @@ # import os import logging -from optparse import OptionParser import traceback global CIM_USER @@ -32,14 +31,12 @@ global CIM_NS global CIM_LEVEL global CIM_FUUID -global platform_sup global CIM_IP global CIM_PORT global CIM_ERROR_ASSOCIATORNAMES global CIM_ERROR_ENUMERATE global CIM_ERROR_GETINSTANCE -global VIRSH_ERROR_DEFINE CIM_USER = os.getenv("CIM_USER") CIM_PASS = os.getenv("CIM_PASS") @@ -50,7 +47,6 @@ CIM_IP = os.getenv("CIM_IP") CIM_PORT = "5988" NM = "TEST LOG" -platform_sup = ["Xen", "KVM", "XenFV"] logging.basicConfig(filename='/dev/null') logger = logging.getLogger(NM) logging.PRINT = logging.DEBUG + 50 @@ -61,16 +57,6 @@ CIM_ERROR_GETINSTANCE = "Failed to get instance by the class of %s" CIM_ERROR_ASSOCIATORS = "Failed to get associators information for %s" CIM_ERROR_ASSOCIATORNAMES = "Failed to get associatornames according to %s" -VIRSH_ERROR_DEFINE = "Failed to define a domain with the name %s from virsh" - -parser = OptionParser() -parser.add_option("-i", "--ip", dest="ip", default="localhost", - help="IP address of machine to test, default: localhost") -parser.add_option("-v", "--virt", dest="virt", type="choice", - choices=['Xen', 'KVM', 'XenFV', 'LXC'], default="Xen", - help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV' & 'LXC', default: Xen") -parser.add_option("-d", "--debug-output", action="store_true", dest="debug", - help="Duplicate the output to stderr") if not CIM_NS: CIM_NS = "root/cimv2" @@ -115,28 +101,3 @@ logger.info("Known Bug:%s" % bug_num) print "Bug:<%s>" % bug_num -def do_main(types=['Xen'], p=parser): - def do_type(f): - import sys - from ReturnCodes import SKIP, FAIL - (options, args) = p.parse_args() - if options.virt not in types: - return lambda:SKIP - else: - def do_try(): - try: - log_param() - from VirtLib.utils import setup_ssh_key - from XenKvmLib.test_doms import destroy_and_undefine_all - setup_ssh_key() - destroy_and_undefine_all(options.ip, options.virt) - rc = f() - except Exception, e: - logger.error('%s : %s' % (e.__class__.__name__, e)) - logger.error("%s" % traceback.print_exc()) - rc = FAIL - return rc - setattr(do_try, 'options', options) - return do_try - return do_type -
+1 from me. libvirt-cim-bounces@redhat.com wrote on 2008-09-05 08:13:31:
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
participants (2)
-
Guo Lian Yun -
Kaitlin Rupert