April 2008 - CIM - libvirt List Archives

[PATCH] [TEST] Remove unnecessary log_param in test cases
by zli＠linux.vnet.ibm.com 21 Apr '08

21 Apr '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1208768152 -28800 # Node ID 41a6c5cd50733a67d56d6612dad02705377a8b88 # Parent 0d31dff13ae341fd6515dc844ee98c7b5300b71d [TEST] Remove unnecessary log_param in test cases Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/AllocationCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/AllocationCapabilities/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -24,13 +24,12 @@ import sys import sys from XenKvmLib import enumclass from CimTest.Globals import do_main -from CimTest.Globals import logger, log_param, CIM_ERROR_ENUMERATE, platform_sup +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, platform_sup from CimTest.ReturnCodes import PASS, FAIL @do_main(platform_sup) def main(): options = main.options - log_param() pools = {} pt = ['MemoryPool', 'ProcessorPool', 'DiskPool', 'NetworkPool'] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py --- a/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -54,7 +54,7 @@ from distutils.file_util import move_fil from distutils.file_util import move_file from XenKvmLib import assoc from VirtLib import utils -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.ReturnCodes import PASS, SKIP from XenKvmLib.common_util import try_getinstance from VirtLib.live import net_list @@ -106,7 +106,6 @@ def main(): def main(): options = main.options - log_param() status = PASS server = options.ip os.system("rm -f %s" % back_disk_file ) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -36,7 +36,6 @@ def main(): def main(): options = main.options status = PASS - Globals.log_param() try: cs = computersystem.enumerate(options.ip, options.virt) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Mon Apr 21 16:55:52 2008 +0800 @@ -27,7 +27,7 @@ from XenKvmLib import computersystem from XenKvmLib import computersystem from VirtLib import live from VirtLib import utils -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP @@ -43,7 +43,6 @@ def clean_system(host, virt): @do_main(sup_types) def main(): options = main.options - log_param() if not clean_system(options.ip, options.virt): logger.error("System has defined domains; unable to run") return SKIP diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Mon Apr 21 16:55:52 2008 +0800 @@ -42,7 +42,6 @@ def main(): def main(): options = main.options status = FAIL - Globals.log_param() cxml = vxml.get_class(options.virt)(test_dom) rc = cxml.define(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Mon Apr 21 16:55:52 2008 +0800 @@ -46,7 +46,6 @@ def main(): options = main.options status = FAIL enabState = 0 - Globals.log_param() cxml = vxml.get_class(options.virt)(test_dom) cxml.define(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Mon Apr 21 16:55:52 2008 +0800 @@ -45,7 +45,7 @@ from XenKvmLib import computersystem from XenKvmLib import computersystem from XenKvmLib import vxml from VirtLib import utils -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from XenKvmLib.common_util import call_request_state_change from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC @@ -63,7 +63,6 @@ def main(): def main(): options = main.options status = FAIL - log_param() cxml = vxml.get_class(options.virt)(test_dom, mem) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py Mon Apr 21 16:55:52 2008 +0800 @@ -46,7 +46,7 @@ from XenKvmLib import vxml from XenKvmLib import vxml from VirtLib import utils from XenKvmLib.test_doms import destroy_and_undefine_all -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from XenKvmLib.common_util import call_request_state_change from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC @@ -66,7 +66,6 @@ def main(): def main(): options = main.options status = FAIL - log_param() cxml = vxml.get_class(options.virt)(test_dom, mem) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Mon Apr 21 16:55:52 2008 +0800 @@ -44,7 +44,6 @@ def main(): def main(): options = main.options status = FAIL - Globals.log_param() cxml = vxml.get_class(options.virt)(test_dom) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Mon Apr 21 16:55:52 2008 +0800 @@ -40,7 +40,7 @@ import sys from VirtLib import utils -from CimTest.Globals import do_main, log_param, logger +from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import get_cs_instance @@ -74,7 +74,6 @@ def main(): def main(): options = main.options status = FAIL - log_param() tc_scen = [('Start', [ACTIVE_STATE, ACTIVE_STATE]), \ ('Suspend', [SUSPND_STATE, SUSPND_STATE]), \ diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/27_define_suspend_errs.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/27_define_suspend_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/27_define_suspend_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -39,7 +39,7 @@ import sys import sys import pywbem from VirtLib import utils -from CimTest.Globals import do_main, log_param, logger +from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import get_cs_instance @@ -56,7 +56,6 @@ exp_desc = 'Domain not running' @do_main(sup_types) def main(): options = main.options - log_param() try: # define the vs diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Mon Apr 21 16:55:52 2008 +0800 @@ -39,7 +39,7 @@ import sys from VirtLib import utils -from CimTest.Globals import do_main, log_param, logger +from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import get_cs_instance @@ -73,7 +73,6 @@ def main(): def main(): options = main.options status = FAIL - log_param() tc_scen = [('Start', [ACTIVE_STATE, ACTIVE_STATE]), \ ('Reboot', [ACTIVE_STATE, REBOOT_STATE])] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Mon Apr 21 16:55:52 2008 +0800 @@ -41,7 +41,7 @@ import sys from VirtLib import utils -from CimTest.Globals import do_main, log_param, logger +from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import get_cs_instance @@ -76,7 +76,6 @@ def main(): def main(): options = main.options status = FAIL - log_param() tc_scen = [('Start', [ACTIVE_STATE, ACTIVE_STATE]), \ ('Suspend', [SUSPND_STATE, SUSPND_STATE]), \ diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Mon Apr 21 16:55:52 2008 +0800 @@ -40,7 +40,7 @@ import sys from VirtLib import utils -from CimTest.Globals import do_main, log_param, logger +from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import get_cs_instance @@ -74,7 +74,6 @@ def main(): def main(): options = main.options status = FAIL - log_param() tc_scen = [('Start', [ACTIVE_STATE, ACTIVE_STATE]), \ ('Reset', [ACTIVE_STATE, RESET_STATE])] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py Mon Apr 21 16:55:52 2008 +0800 @@ -38,7 +38,7 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import * -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC @@ -69,7 +69,6 @@ def check_attributes(domain_name, ip, vi @do_main(sup_types) def main(): options = main.options - log_param() status = PASS try: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py Mon Apr 21 16:55:52 2008 +0800 @@ -62,7 +62,7 @@ from XenKvmLib.test_xml import testxml, from XenKvmLib.test_xml import testxml, disk_path from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all from XenKvmLib.assoc import Associators, AssociatorNames -from CimTest.Globals import log_param, logger, CIM_ERROR_ASSOCIATORNAMES, \ +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \ CIM_ERROR_ASSOCIATORS from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -349,7 +349,6 @@ def verify_CS_values(assoc_info, cs_valu @do_main(sup_types) def main(): - log_param() server = main.options.ip status = setup_env(server) if status != PASS: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystem/42_cs_gi_errs.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/42_cs_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/42_cs_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -79,7 +79,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import try_getinstance from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS, VIRSH_ERROR_DEFINE +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, VIRSH_ERROR_DEFINE from CimTest.Globals import do_main @@ -98,7 +98,6 @@ expr_values = { @do_main(sup_types) def main(): options = main.options - log_param() inst_ccname = classname = get_typed_class(options.virt, 'ComputerSystem') inst_name = 'ETdomain' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py --- a/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py Mon Apr 21 16:55:52 2008 +0800 @@ -24,7 +24,7 @@ import os import os import signal import time -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.common_util import create_using_definesystem @@ -40,7 +40,6 @@ test_dom = "domU" @do_main(SUPPORTED_TYPES) def main(): options = main.options - log_param() status = FAIL dict = set_default(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -83,7 +83,6 @@ def main(): # Getting the VS list and deleting the test_dom if it already exists. destroy_and_undefine_all(options.ip) - Globals.log_param() test_xml, bridge = testxml_bridge(test_dom, vcpus = test_vcpus, \ mac = test_mac, disk = test_disk, \ diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -234,7 +234,6 @@ def main(): loop = 0 server = options.ip destroy_and_undefine_all(options.ip) - Globals.log_param() test_xml, bridge = testxml_bridge(test_dom, mem = test_mem, vcpus = test_vcpus, \ mac = test_mac, disk = test_disk, server = options.ip) if bridge == None: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -202,7 +202,6 @@ def main(): global assoc_classname global vsxml status = PASS - Globals.log_param() options = main.options destroy_and_undefine_all(options.ip) virt = options.virt diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -528,7 +528,6 @@ def main(): global vsxml global server status = PASS - Globals.log_param() options = main.options destroy_and_undefine_all(options.ip) virt = options.virt diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -35,7 +35,6 @@ sup_types = ['Xen', 'XenFV', 'KVM'] @do_main(sup_types) def main(): options = main.options - Globals.log_param() try: host_sys = hostsystem.enumerate(options.ip, options.virt)[0] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib import hostsystem from XenKvmLib import hostsystem from XenKvmLib import vsms from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORNAMES +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORNAMES from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP @@ -111,7 +111,6 @@ def verify_service(inst_list, ip, virt): @do_main(sup_types) def main(): options = main.options - log_param() cap_list = {"VirtualSystemManagementCapabilities" : "ManagementCapabilities", "VirtualSystemMigrationCapabilities" : "MigrationCapabilities"} diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -27,7 +27,7 @@ from XenKvmLib import hostsystem from XenKvmLib import hostsystem from XenKvmLib.classes import get_typed_class from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -68,7 +68,6 @@ def main(): def main(): options = main.options rc = PASS - log_param() hs = get_typed_class(options.virt, "HostSystem") cs = get_typed_class(options.virt, "ComputerSystem") diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -26,7 +26,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib.classes import get_typed_class from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP sup_types = ['Xen', 'XenFV', 'KVM'] @@ -65,7 +65,6 @@ def try_assoc(ref, ref_class, exp_rc, ex @do_main(sup_types) def main(): options = main.options - log_param() rc = PASS cap_list = {get_typed_class(options.virt, "VirtualSystemManagementCapabilities") : "ManagementCapabilities", get_typed_class(options.virt, "VirtualSystemMigrationCapabilities") : "MigrationCapabilities"} diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Mon Apr 21 16:55:52 2008 +0800 @@ -52,7 +52,7 @@ from XenKvmLib.assoc import AssociatorNa from XenKvmLib.assoc import AssociatorNames from XenKvmLib.common_util import get_host_info from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, logger, CIM_ERROR_ASSOCIATORNAMES +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -164,7 +164,6 @@ def verify_cap_fields(server, service_fi @do_main(sup_types) def main(): options = main.options - log_param() server = options.ip global service_list global cap_list diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -38,7 +38,7 @@ from XenKvmLib.test_doms import destroy_ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.classes import get_typed_class from XenKvmLib import vxml -from CimTest.Globals import log_param, logger, CIM_ERROR_ASSOCIATORS, do_main +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS, do_main from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL @@ -81,7 +81,6 @@ def main(): def main(): options = main.options - log_param() status = PASS destroy_and_undefine_all(options.ip, options.virt) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -41,7 +41,7 @@ from XenKvmLib.test_xml import testxml from XenKvmLib.test_xml import testxml from VirtLib import utils from CimTest import Globals -from CimTest.Globals import log_param, logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS from CimTest.Globals import do_main from XenKvmLib import hostsystem from XenKvmLib import computersystem @@ -85,7 +85,6 @@ def main(): options = main.options status = FAIL - log_param() destroy_and_undefine_all(options.ip) virt_xml = get_class(options.virt) cxml = virt_xml(test_dom) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -58,7 +58,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL from CimTest import Globals -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, do_main sup_types = ['Xen', 'XenFV', 'KVM'] @@ -93,7 +93,6 @@ def main(): def main(): options = main.options - log_param() status = PASS prev_namespace = Globals.CIM_NS Globals.CIM_NS = 'root/interop' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -87,7 +87,7 @@ from XenKvmLib.common_util import try_as 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 log_param, logger, CIM_USER, CIM_PASS, CIM_NS, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main sup_types = ['Xen', 'XenFV', 'KVM'] @@ -133,7 +133,6 @@ def main(): def main(): options = main.options - log_param() status = PASS global conn diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -85,7 +85,6 @@ def test_assoc(host, class_name, id, vir @do_main(sup_types) def main(): options = main.options - Globals.log_param() try: key_list = ["InstanceID"] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -53,7 +53,7 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import vxml from XenKvmLib import assoc -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS, \ +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, \ CIM_ERROR_ASSOCIATORS from CimTest.Globals import do_main from XenKvmLib.common_util import try_assoc @@ -80,7 +80,6 @@ def main(): def main(): options = main.options - log_param() status = PASS virtxml = vxml.get_class(options.virt) cxml = virtxml(test_dom, mac = test_mac) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -34,7 +34,6 @@ sup_types = ['Xen', 'KVM', 'XenFV'] @do_main(sup_types) def main(): options = main.options - Globals.log_param() try: key_list = ["InstanceID"] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py --- a/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -56,7 +56,7 @@ from XenKvmLib.vxml import XenXML, KVMXM from XenKvmLib.vxml import XenXML, KVMXML, get_class from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main sup_types = ['Xen', 'KVM', 'XenFV'] @@ -70,7 +70,6 @@ expr_values = { @do_main(sup_types) def main(): options = main.options - log_param() status = PASS classname = get_typed_class(options.virt, 'EnabledLogicalElementCapabilities') diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -32,7 +32,7 @@ from VirtLib import live from VirtLib import live from VirtLib import utils from CimTest import Globals -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV'] @@ -40,7 +40,6 @@ SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV' @do_main(SUPPORTED_TYPES) def main(): options = main.options - log_param() status = PASS host = live.hostname(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Mon Apr 21 16:55:52 2008 +0800 @@ -53,7 +53,7 @@ from XenKvmLib.test_doms import destroy_ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.assoc import Associators, AssociatorNames from XenKvmLib.common_util import get_host_info -from CimTest.Globals import log_param, logger, CIM_ERROR_ASSOCIATORNAMES, \ +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \ CIM_ERROR_ASSOCIATORS from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \ @@ -218,7 +218,6 @@ def verify_RASD_values(server, sd_assoc_ @do_main(sup_types) def main(): options = main.options - log_param() server = options.ip status = PASS status, host_name, classname = get_host_info(server, options.virt) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Mon Apr 21 16:55:52 2008 +0800 @@ -45,7 +45,7 @@ from XenKvmLib.assoc import Associators from XenKvmLib.assoc import Associators from XenKvmLib.vxml import XenXML, KVMXML, get_class from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, logger, CIM_ERROR_ASSOCIATORNAMES, do_main +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.test_xml import testxml from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all @@ -273,7 +273,6 @@ def clean_up(server, status): @do_main(sup_types) def main(): options = main.options - log_param() status = PASS if options.virt == 'XenFV': diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Mon Apr 21 16:55:52 2008 +0800 @@ -49,7 +49,7 @@ import os import os from distutils.file_util import move_file from VirtLib import utils -from CimTest.Globals import log_param, logger, CIM_ERROR_ASSOCIATORNAMES, \ +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \ CIM_ERROR_ASSOCIATORS from CimTest.Globals import do_main from XenKvmLib.assoc import AssociatorNames, Associators @@ -258,7 +258,6 @@ def main(): def main(): options= main.options server = options.ip - log_param() # Get the host info status, host_name, classname = get_host_info(server) if status != PASS: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostSystem/05_hs_gi_errs.py --- a/suites/libvirt-cim/cimtest/HostSystem/05_hs_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostSystem/05_hs_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -79,7 +79,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from optparse import OptionParser from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main sup_types = ['Xen', 'KVM', 'XenFV'] @@ -94,7 +94,6 @@ expr_values = { @do_main(sup_types) def main(): options = main.options - log_param() status = PASS if options.virt == "XenFV": diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py --- a/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py Mon Apr 21 16:55:52 2008 +0800 @@ -49,7 +49,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from XenKvmLib.assoc import Associators, AssociatorNames from XenKvmLib.common_util import get_host_info -from CimTest.Globals import log_param, logger, CIM_ERROR_ASSOCIATORNAMES, \ +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \ CIM_ERROR_ASSOCIATORS from CimTest.ReturnCodes import PASS, FAIL @@ -180,7 +180,6 @@ def main(): global virt, server global assoc_name, class_name, req_cn options = main.options - log_param() server = options.ip status = PASS virt = options.virt diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedDependency/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -65,7 +65,6 @@ def main(): options = main.options status = PASS - Globals.log_param() virtxml = vxml.get_class(options.virt) cxml = virtxml(test_dom, mac = test_mac) ret = cxml.define(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -47,7 +47,7 @@ from XenKvmLib import computersystem from XenKvmLib import computersystem from XenKvmLib import assoc from XenKvmLib.classes import get_class_basename -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM'] @@ -58,7 +58,6 @@ test_mac = "00:11:22:33:44:55" @do_main(sup_types) def main(): options = main.options - log_param() status = PASS virtxml = vxml.get_class(options.virt) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedDependency/03_enabledstate.py --- a/suites/libvirt-cim/cimtest/HostedDependency/03_enabledstate.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedDependency/03_enabledstate.py Mon Apr 21 16:55:52 2008 +0800 @@ -38,7 +38,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib.common_util import get_host_info from XenKvmLib.classes import get_class_basename -from CimTest.Globals import log_param, logger, CIM_ERROR_ASSOCIATORS, \ +from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS, \ CIM_ERROR_GETINSTANCE from CimTest.Globals import do_main from XenKvmLib.devices import CIM_Instance @@ -102,7 +102,6 @@ def main(): def main(): options = main.options - log_param() status = PASS virtxml = vxml.get_class(options.virt) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -32,7 +32,7 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import assoc from XenKvmLib import vxml -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import get_host_info, try_assoc @@ -106,7 +106,6 @@ def main(): def main(): options = main.options - log_param() status = PASS server = options.ip virtxml = vxml.get_class(options.virt) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -27,7 +27,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib import hostsystem from CimTest import Globals -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -35,7 +35,6 @@ from XenKvmLib.classes import get_typed_ @do_main(platform_sup) def main(): options = main.options - log_param() status = FAIL try: host_sys = hostsystem.enumerate(options.ip, options.virt)[0] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -26,7 +26,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib import hostsystem from CimTest import Globals -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -34,7 +34,6 @@ from XenKvmLib.classes import get_typed_ @do_main(platform_sup) def main(): options = main.options - log_param() status = PASS try: host_sys = hostsystem.enumerate(options.ip, options.virt)[0] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -27,7 +27,7 @@ from XenKvmLib import hostsystem from XenKvmLib import hostsystem from XenKvmLib.common_util import try_assoc from CimTest import Globals -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -39,7 +39,6 @@ expr_values = { "rc" : pywbem.CIM_ERR_ @do_main(platform_sup) def main(): options = main.options - log_param() status = PASS try: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -26,7 +26,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib.common_util import try_assoc from CimTest import Globals -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -45,7 +45,6 @@ expr_values = { @do_main(platform_sup) def main(): options = main.options - log_param() status = PASS assoc_classname = get_typed_class(options.virt, "HostedResourcePool") diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedService/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedService/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from CimTest import Globals from CimTest.Globals import do_main -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -36,7 +36,6 @@ sup_types = ['Xen', 'XenFV', 'KVM'] @do_main(sup_types) def main(): options = main.options - log_param() try: host_sys = hostsystem.enumerate(options.ip, options.virt)[0] except Exception: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedService/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from CimTest import Globals from CimTest.Globals import do_main -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -36,7 +36,6 @@ sup_types = ['Xen', 'XenFV', 'KVM'] @do_main(sup_types) def main(): options = main.options - log_param() try: host_sys = hostsystem.enumerate(options.ip, options.virt)[0] except Exception: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -27,7 +27,7 @@ from XenKvmLib import hostsystem from XenKvmLib import hostsystem from XenKvmLib.classes import get_typed_class from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -37,7 +37,6 @@ exp_desc = "No such instance" @do_main(sup_types) def main(): options = main.options - log_param() rc = -1 status = FAIL diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -27,7 +27,7 @@ from XenKvmLib import hostsystem from XenKvmLib import hostsystem from XenKvmLib.classes import get_typed_class from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -37,7 +37,6 @@ exp_desc = "No such instance" @do_main(sup_types) def main(): options = main.options - log_param() rc = -1 status = FAIL diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py --- a/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Mon Apr 21 16:55:52 2008 +0800 @@ -29,7 +29,7 @@ from XenKvmLib import devices from XenKvmLib import devices from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV'] @@ -39,7 +39,6 @@ test_dom = "test_domain" @do_main(SUPPORTED_TYPES) def main(): options = main.options - log_param() if options.virt == 'Xen': test_dev = 'xvda' else: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py --- a/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Mon Apr 21 16:55:52 2008 +0800 @@ -32,7 +32,7 @@ from XenKvmLib.vxml import XenXML, KVMXM from XenKvmLib.vxml import XenXML, KVMXML, get_class from XenKvmLib.test_doms import define_test_domain, undefine_test_domain from XenKvmLib.test_xml import testxml -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main sup_types = ['Xen', 'KVM', 'XenFV'] @@ -47,7 +47,6 @@ def clean_system(host, virt='Xen'): @do_main(sup_types) def main(): options = main.options - log_param() if not clean_system(options.ip, options.virt): logger.error("System has defined domains; unable to run") return 2 diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py --- a/suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -131,7 +131,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger, CIM_USER, do_main +from CimTest.Globals import logger, CIM_USER, do_main from CimTest.Globals import CIM_PASS, CIM_NS, CIM_ERROR_GETINSTANCE sup_types = ['Xen', 'KVM', 'XenFV'] @@ -171,7 +171,6 @@ def try_invalid_gi(i, field1, field2): @do_main(sup_types) def main(): options = main.options - log_param() global classname classname = get_typed_class(options.virt, 'LogicalDisk') diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/Memory/01_memory.py --- a/suites/libvirt-cim/cimtest/Memory/01_memory.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py Mon Apr 21 16:55:52 2008 +0800 @@ -29,7 +29,7 @@ from XenKvmLib import devices from XenKvmLib import devices from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main sup_types = ['Xen', 'KVM', 'XenFV'] @@ -40,7 +40,6 @@ mem = 256 #MB @do_main(sup_types) def main(): options = main.options - log_param() vsxml = get_class(options.virt)(test_dom, mem) vsxml.define(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/Memory/02_defgetmem.py --- a/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py Mon Apr 21 16:55:52 2008 +0800 @@ -32,7 +32,7 @@ from XenKvmLib.test_doms import undefine from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import create_using_definesystem from XenKvmLib.devices import get_dom_mem_inst -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main sup_types = ['Xen', 'KVM', 'XenFV'] default_dom = "domu" @@ -60,7 +60,6 @@ def check_mem(memInst): @do_main(sup_types) def main(): options = main.options - log_param() status = 0 undefine_test_domain(default_dom, options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py --- a/suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -130,7 +130,7 @@ from XenKvmLib.vxml import XenXML, KVMXM from XenKvmLib.vxml import XenXML, KVMXML, get_class from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger, CIM_USER, do_main +from CimTest.Globals import logger, CIM_USER, do_main from CimTest.Globals import CIM_PASS, CIM_NS sup_types = ['Xen', 'KVM', 'XenFV'] @@ -170,7 +170,6 @@ def try_invalid_gi(i, field1, field2): @do_main(sup_types) def main(): options = main.options - log_param() devid = "%s/%s" % (test_dom, test_mem) status = PASS diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/NetworkPort/01_netport.py --- a/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Mon Apr 21 16:55:52 2008 +0800 @@ -36,7 +36,7 @@ from XenKvmLib import devices from XenKvmLib import devices from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC @@ -50,7 +50,6 @@ bug = "90844" @do_main(sup_types) def main(): options = main.options - log_param() vsxml = get_class(options.virt)(test_dom, mac=test_mac) vsxml.define(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py --- a/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py Mon Apr 21 16:55:52 2008 +0800 @@ -33,7 +33,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class from CimTest.ReturnCodes import PASS, SKIP -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main sup_types = ['Xen', 'KVM', 'XenFV'] @@ -239,7 +239,6 @@ def main(): def main(): options = main.options status = PASS - log_param() test_dom = "nettest_domain" test_mac = "00:11:22:33:44:55" diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py --- a/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py Mon Apr 21 16:55:52 2008 +0800 @@ -30,7 +30,7 @@ from XenKvmLib import const from XenKvmLib import const from XenKvmLib import devices from XenKvmLib.vxml import KVMXML -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -42,7 +42,6 @@ test_mac = "00:11:22:33:44:55" @do_main(sup_types) def main(): options = main.options - log_param() const.KVM_default_net_type = 'user' cxml = KVMXML(test_dom, mac = test_mac) ret = cxml.define(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/Processor/01_processor.py --- a/suites/libvirt-cim/cimtest/Processor/01_processor.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Processor/01_processor.py Mon Apr 21 16:55:52 2008 +0800 @@ -30,7 +30,7 @@ from XenKvmLib.test_xml import testxml from XenKvmLib.test_xml import testxml from XenKvmLib.classes import get_typed_class from XenKvmLib.vxml import XenXML, KVMXML, get_class -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -42,7 +42,6 @@ test_vcpus = 1 @do_main(SUPPORTED_TYPES) def main(): options = main.options - log_param() status = PASS vsxml = get_class(options.virt)(test_dom, vcpus=test_vcpus) vsxml.define(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/Processor/02_definesys_get_procs.py --- a/suites/libvirt-cim/cimtest/Processor/02_definesys_get_procs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Processor/02_definesys_get_procs.py Mon Apr 21 16:55:52 2008 +0800 @@ -38,7 +38,7 @@ from XenKvmLib.test_doms import undefine from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import create_using_definesystem from XenKvmLib.devices import get_dom_proc_insts -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV'] @@ -70,7 +70,6 @@ def check_processors(procs): @do_main(sup_types) def main(): options = main.options - log_param() status = PASS undefine_test_domain(default_dom, options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py --- a/suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -130,7 +130,7 @@ from XenKvmLib.vxml import get_class from XenKvmLib.vxml import get_class from XenKvmLib.test_doms import destroy_and_undefine_all from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger, CIM_USER +from CimTest.Globals import logger, CIM_USER from CimTest.Globals import CIM_PASS, CIM_NS from CimTest.Globals import do_main @@ -172,7 +172,6 @@ def try_invalid_gi(i, field1, field2): @do_main(sup_types) def main(): options = main.options - log_param() devid = "%s/%s" % (test_dom, "0") status = PASS diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/Profile/01_enum.py --- a/suites/libvirt-cim/cimtest/Profile/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Profile/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -49,7 +49,6 @@ def main(): prev_namespace = Globals.CIM_NS Globals.CIM_NS = 'root/interop' - Globals.log_param() try: key_list = ["InstanceID"] proflist = enumclass.enumerate(options.ip, cn, key_list, options.virt) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py --- a/suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py Mon Apr 21 16:55:52 2008 +0800 @@ -43,7 +43,7 @@ from XenKvmLib.vxml import get_class from XenKvmLib.vxml import get_class from XenKvmLib.test_doms import destroy_and_undefine_all from CimTest import Globals -from CimTest.Globals import log_param, logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORNAMES +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORNAMES from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -183,7 +183,6 @@ def main(): options = main.options virt = options.virt server = options.ip - log_param() status = PASS diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/Profile/03_rprofile_gi_errs.py --- a/suites/libvirt-cim/cimtest/Profile/03_rprofile_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Profile/03_rprofile_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -70,7 +70,6 @@ expr_values = { @do_main(sup_types) def main(): options = main.options - Globals.log_param() prev_namespace = Globals.CIM_NS Globals.CIM_NS = 'root/interop' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py --- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Mon Apr 21 16:55:52 2008 +0800 @@ -59,7 +59,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \ verify_diskrasd_values, verify_memrasd_values -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV'] @@ -137,7 +137,6 @@ def main(): options = main.options status = 0 rc = 1 - log_param() destroy_and_undefine_all(options.ip) if options.virt == 'Xen': test_disk = 'xvda' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/RASD/02_enum.py --- a/suites/libvirt-cim/cimtest/RASD/02_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -36,7 +36,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \ verify_diskrasd_values, verify_memrasd_values -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV'] @@ -143,7 +143,6 @@ def verify_rasd_values(rasd_values_info) @do_main(sup_types) def main(): options = main.options - log_param() destroy_and_undefine_all(options.ip) global test_disk, vsxml global virt, server diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py --- a/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -60,7 +60,7 @@ from XenKvmLib.test_doms import destroy_ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS, CIM_ERROR_GETINSTANCE +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, CIM_ERROR_GETINSTANCE from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV'] @@ -122,7 +122,6 @@ def main(): options = main.options global test_disk, vsxml global virt, server, conn - log_param() destroy_and_undefine_all(options.ip) server = options.ip virt = options.virt diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py --- a/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py Mon Apr 21 16:55:52 2008 +0800 @@ -75,7 +75,7 @@ from XenKvmLib.assoc import Associators from XenKvmLib.assoc import Associators from XenKvmLib.common_util import profile_init_list from CimTest import Globals -from CimTest.Globals import log_param, logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import FAIL, PASS @@ -160,7 +160,6 @@ def get_refprof_verify_info(proflist): @do_main(sup_types) def main(): - log_param() options = main.options global virt, server, reg_classname virt = options.virt diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py --- a/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -55,7 +55,7 @@ from XenKvmLib import enumclass from XenKvmLib import enumclass from XenKvmLib import assoc from CimTest import Globals -from CimTest.Globals import log_param, logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS from CimTest.Globals import do_main, CIM_USER, CIM_PASS from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import FAIL, PASS @@ -116,7 +116,6 @@ def verify_prof_err(field, keys): @do_main(sup_types) def main(): - log_param() options = main.options global virt, server, reg_classname, conn virt = options.virt diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib import enumclass from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -36,7 +36,6 @@ sup_types = ['Xen', 'XenFV', 'KVM'] @do_main(sup_types) def main(): options = main.options - log_param() status = PASS try: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib import devices from XenKvmLib import devices from XenKvmLib.classes import get_typed_class from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -36,7 +36,6 @@ sup_types = ['Xen', 'XenFV', 'KVM'] @do_main(sup_types) def main(): options = main.options - log_param() status = PASS key_list = ["DeviceID", "CreationClassName", "SystemName", diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -26,7 +26,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib.classes import get_typed_class from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -38,7 +38,6 @@ exp_desc = "No such instance (wrong) - r @do_main(sup_types) def main(): options = main.options - log_param() rc = -1 status = FAIL diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -26,7 +26,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib.classes import get_typed_class from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -37,7 +37,6 @@ exp_desc = "No such instance" @do_main(sup_types) def main(): options = main.options - log_param() rc = -1 status = FAIL diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py Mon Apr 21 16:55:52 2008 +0800 @@ -176,7 +176,6 @@ def verify_rapf_err(vsxml): @do_main(platform_sup) def main(): global virt, server - Globals.log_param() options = main.options server = options.ip virt = options.virt diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePool/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -31,7 +31,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from XenKvmLib import vxml from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP from VirtLib.live import net_list from XenKvmLib.vsms import RASD_TYPE_PROC, RASD_TYPE_MEM, RASD_TYPE_NET_ETHER, \ @@ -145,7 +145,6 @@ def main(): ip = main.options.ip virt = main.options.virt - log_param() status, pool_list = init_list(ip, virt) if status != PASS: logger.error("Failed to initialise the list") diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py --- a/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py Mon Apr 21 16:55:52 2008 +0800 @@ -35,7 +35,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from distutils.file_util import move_file from CimTest.ReturnCodes import PASS, SKIP -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.Globals import do_main sup_types = ['Xen', 'KVM'] @@ -120,7 +120,6 @@ def main(): ip = main.options.ip virt = main.options.virt status = PASS - log_param() global conn conn = assoc.myWBEMConnection('http://%s' % ip, (CIM_USER, CIM_PASS), diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -32,7 +32,6 @@ sup_types = ['Xen', 'XenFV', 'KVM'] @do_main(sup_types) def main(): options = main.options - Globals.log_param() key_list = ["InstanceID"] try: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -49,7 +49,7 @@ import pywbem import pywbem from XenKvmLib import assoc from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.common_util import try_getinstance @@ -64,7 +64,6 @@ expr_values = { @do_main(sup_types) def main(): options = main.options - log_param() status = PASS conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, CIM_PASS), CIM_NS) classname = get_typed_class(options.virt, 'ResourcePoolConfigurationCapabilities') diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -27,7 +27,7 @@ from XenKvmLib import rpcs from XenKvmLib import rpcs from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -35,7 +35,6 @@ def main(): def main(): options = main.options server = options.ip - log_param() classname = get_typed_class(options.virt, "ResourcePoolConfigurationService") try: host_sys = hostsystem.enumerate(server, options.virt)[0] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py Mon Apr 21 16:55:52 2008 +0800 @@ -29,7 +29,7 @@ import pywbem import pywbem from CimTest.ReturnCodes import PASS from XenKvmLib import assoc -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from XenKvmLib.common_util import get_host_info, try_getinstance from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -233,7 +233,6 @@ def main(): def main(): options = main.options status = PASS - log_param() server = options.ip conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, CIM_PASS), CIM_NS) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/03_CreateResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/03_CreateResourcePool.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/03_CreateResourcePool.py Mon Apr 21 16:55:52 2008 +0800 @@ -41,7 +41,7 @@ import sys import sys import pywbem from XenKvmLib import rpcs_service -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -54,7 +54,6 @@ cim_mname = "CreateResourcePool" @do_main(platform_sup) def main(): options = main.options - log_param() rpcs_conn = eval("rpcs_service." + get_typed_class(options.virt, \ "ResourcePoolConfigurationService"))(options.ip) try: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py Mon Apr 21 16:55:52 2008 +0800 @@ -50,7 +50,7 @@ import sys import sys import pywbem from XenKvmLib import rpcs_service -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -62,7 +62,6 @@ cim_mname = "CreateChildResourcePool" @do_main(platform_sup) def main(): options = main.options - log_param() rpcs_conn = eval("rpcs_service." + get_typed_class(options.virt, \ "ResourcePoolConfigurationService"))(options.ip) try: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/05_AddResourcesToResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/05_AddResourcesToResourcePool.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/05_AddResourcesToResourcePool.py Mon Apr 21 16:55:52 2008 +0800 @@ -48,7 +48,7 @@ import sys import sys import pywbem from XenKvmLib import rpcs_service -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS, XFAIL_RC from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -61,7 +61,6 @@ bug = 92173 @do_main(platform_sup) def main(): options = main.options - log_param() rpcs_conn = eval("rpcs_service." + get_typed_class(options.virt, \ "ResourcePoolConfigurationService"))(options.ip) try: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/06_RemoveResourcesFromResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/06_RemoveResourcesFromResourcePool.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/06_RemoveResourcesFromResourcePool.py Mon Apr 21 16:55:52 2008 +0800 @@ -48,7 +48,7 @@ import sys import sys import pywbem from XenKvmLib import rpcs_service -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -60,7 +60,6 @@ cim_mname = "RemoveResourcesFromResourc @do_main(platform_sup) def main(): options = main.options - log_param() rpcs_conn = eval("rpcs_service." + get_typed_class(options.virt, \ "ResourcePoolConfigurationService"))(options.ip) try: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py Mon Apr 21 16:55:52 2008 +0800 @@ -44,7 +44,7 @@ import sys import sys import pywbem from XenKvmLib import rpcs_service -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -56,7 +56,6 @@ cim_mname = "DeleteResourcePool" @do_main(platform_sup) def main(): options = main.options - log_param() rpcs_conn = eval("rpcs_service." + get_typed_class(options.virt, \ "ResourcePoolConfigurationService"))(options.ip) try: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -68,7 +68,6 @@ def main(): test_disk = 'xvda' else: test_disk = 'hda' - Globals.log_param() virt_xml = vxml.get_class(options.virt) cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -52,7 +52,7 @@ import sys from CimTest import Globals -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP from VirtLib import utils from XenKvmLib import assoc @@ -162,7 +162,6 @@ def main(): test_disk = 'hdb' status = PASS - log_param() virt_xml = vxml.get_class(options.virt) cxml = virt_xml(test_dom, mem = test_mem, vcpus = test_vcpus, mac = test_mac, disk = test_disk) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -151,7 +151,7 @@ from XenKvmLib.common_util import try_as from XenKvmLib.common_util import try_assoc from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.Globals import do_main sup_types = ['Xen', 'KVM', 'XenFV'] @@ -207,7 +207,6 @@ def try_invalid_assoc(classname, name_va @do_main(sup_types) def main(): options = main.options - log_param() status = PASS if options.virt == 'Xen': diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -60,7 +60,7 @@ from XenKvmLib.common_util import try_as 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, log_param, logger +from CimTest.Globals import do_main, logger from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS sup_types = ['Xen', 'KVM', 'XenFV'] @@ -96,7 +96,6 @@ def main(): def main(): options = main.options - log_param() status = PASS if options.virt == 'Xen': diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -167,7 +167,6 @@ def main(): cn = 'Xen_AllocationCapabilities' loop = 0 server = options.ip - Globals.log_param() # Taking care of already existing diskconf file # Creating diskpool.conf if it does not exist diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -32,7 +32,7 @@ from CimTest.ReturnCodes import PASS from CimTest.ReturnCodes import PASS from XenKvmLib.common_util import try_assoc from XenKvmLib import assoc -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.Globals import do_main sup_types = ['Xen'] @@ -106,7 +106,6 @@ def main(): def main(): options = main.options status = PASS - log_param() conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, CIM_PASS), CIM_NS) ret_value = err_invalid_instid_keyname(conn, field='INVALID_InstID_KeyName') diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py Mon Apr 21 16:55:52 2008 +0800 @@ -37,7 +37,7 @@ import sys import sys from VirtLib import utils from XenKvmLib import assoc -from CimTest.Globals import log_param, CIM_ERROR_ASSOCIATORS, logger, do_main +from CimTest.Globals import CIM_ERROR_ASSOCIATORS, logger, do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen'] @@ -53,7 +53,6 @@ def main(): if not options.ip: parser.print_help() return 1 - log_param() status = PASS server = options.ip an = 'Xen_SettingsDefineCapabilities' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/05_reverse_vsmcap.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/05_reverse_vsmcap.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/05_reverse_vsmcap.py Mon Apr 21 16:55:52 2008 +0800 @@ -38,7 +38,7 @@ import sys import sys from VirtLib import utils from XenKvmLib import assoc -from CimTest.Globals import log_param, CIM_ERROR_ASSOCIATORS, logger, do_main +from CimTest.Globals import CIM_ERROR_ASSOCIATORS, logger, do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen'] @@ -50,7 +50,6 @@ def print_error(fieldname, ret_value, ex @do_main(sup_types) def main(): options = main.options - log_param() status = PASS server = options.ip an = 'Xen_SettingsDefineCapabilities' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -30,7 +30,7 @@ from XenKvmLib import vxml from XenKvmLib import vxml from XenKvmLib import devices from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV'] @@ -43,7 +43,6 @@ def main(): def main(): options= main.options - log_param() if options.virt == 'Xen': test_disk = 'xvdb' else: diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py --- a/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -30,7 +30,7 @@ from XenKvmLib import computersystem from XenKvmLib import computersystem from XenKvmLib import assoc from XenKvmLib import devices -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV'] @@ -42,7 +42,6 @@ def main(): def main(): options = main.options - log_param() status = FAIL virt_xml = vxml.get_class(options.virt) cxml = virt_xml(test_dom, mac=test_mac) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py --- a/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py Mon Apr 21 16:55:52 2008 +0800 @@ -36,7 +36,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib import devices from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC @@ -62,7 +62,6 @@ def main(): else: test_disk = 'hda' - log_param() status = PASS virt_xml = vxml.get_class(options.virt) cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VSSD/01_enum.py --- a/suites/libvirt-cim/cimtest/VSSD/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VSSD/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -33,7 +33,7 @@ from XenKvmLib.test_doms import destroy_ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.vxml import XenXML, KVMXML, get_class from CimTest.Globals import do_main -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger sup_types = ['Xen', 'KVM'] @@ -42,7 +42,6 @@ test_dom = "new" @do_main(sup_types) def main(): options = main.options - log_param() status = 0 destroy_and_undefine_all(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VSSD/02_bootldr.py --- a/suites/libvirt-cim/cimtest/VSSD/02_bootldr.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VSSD/02_bootldr.py Mon Apr 21 16:55:52 2008 +0800 @@ -32,7 +32,7 @@ from VirtLib.live import bootloader 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 log_param, logger, do_main +from CimTest.Globals import logger, do_main sup_types = ['Xen'] test_dom = "dom" @@ -41,7 +41,6 @@ test_dom = "dom" @do_main(sup_types) def main(): options = main.options - log_param() status = 1 destroy_and_undefine_all(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py --- a/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -52,7 +52,7 @@ import pywbem import pywbem from VirtLib import utils from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.Globals import CIM_PASS, CIM_NS, CIM_USER from XenKvmLib import assoc from XenKvmLib.test_xml import testxml @@ -93,7 +93,6 @@ def main(): parser.print_help() return FAIL - log_param() status = PASS destroy_and_undefine_all(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Mon Apr 21 16:55:52 2008 +0800 @@ -45,7 +45,7 @@ import XenKvmLib import XenKvmLib from XenKvmLib import enumclass from CimTest.Globals import do_main, CIM_ERROR_ASSOCIATORS, CIM_ERROR_ENUMERATE -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib import assoc @@ -206,7 +206,6 @@ def verify_rasd_values(rasd_values_info) @do_main(sup_types) def main(): options = main.options - log_param() destroy_and_undefine_all(options.ip) global test_disk, vsxml global virt, server diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -33,7 +33,6 @@ sup_types=['Xen', 'KVM', 'XenFV'] @do_main(sup_types) def main(): options = main.options - Globals.log_param() try: key_list = ["InstanceID"] diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -56,7 +56,7 @@ from XenKvmLib.common_util import try_ge from XenKvmLib.common_util import try_getinstance from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS, do_main +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main sup_types=['Xen', 'KVM', 'XenFV'] @@ -71,7 +71,6 @@ expr_values = { @do_main(sup_types) def main(): options = main.options - log_param() status = PASS classname = get_typed_class(options.virt, 'VirtualSystemManagementCapabilities') diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib.test_doms import undefine from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import create_using_definesystem from CimTest.Globals import do_main -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV'] default_dom = 'test_domain' @@ -36,7 +36,6 @@ default_dom = 'test_domain' @do_main(SUPPORTED_TYPES) def main(): options = main.options - log_param() status = create_using_definesystem(default_dom, options.ip, virt=options.virt) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Mon Apr 21 16:55:52 2008 +0800 @@ -29,7 +29,7 @@ from XenKvmLib import vsms, vxml from XenKvmLib import vsms, vxml from XenKvmLib.classes import get_typed_class from CimTest.Globals import do_main -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV'] @@ -38,7 +38,6 @@ default_dom = 'test_domain' @do_main(sup_types) def main(): options = main.options - log_param() service = vsms.get_vsms_class(options.virt)(options.ip) cxml = vxml.get_class(options.virt)(default_dom) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib import vsms from XenKvmLib import vsms from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import create_using_definesystem -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -39,7 +39,6 @@ exp_desc = 'Unable to parse embedded obj @do_main(sup_types) def main(): options = main.options - log_param() dname = 'test_domain' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib import vsms from XenKvmLib import vsms from XenKvmLib.test_doms import undefine_test_domain from XenKvmLib.common_util import create_using_definesystem -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC @@ -39,7 +39,6 @@ exp_desc = 'Unable to parse embedded obj @do_main(sup_types) def main(): options = main.options - log_param() dname = 'test_domain' vssd, rasd = vsms.default_vssd_rasd_str(dom_name=dname, virt=options.virt) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,14 +28,13 @@ from XenKvmLib import vsms from XenKvmLib import vsms from XenKvmLib.classes import get_typed_class from XenKvmLib.test_doms import undefine_test_domain -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import FAIL, PASS, SKIP sup_types = ['Xen', 'KVM', 'XenFV'] def destroysystem_fail(tc, options): - log_param() service = vsms.get_vsms_class(options.virt)(options.ip) classname = get_typed_class(options.virt, 'ComputerSystem') diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib import vsms from XenKvmLib import vsms from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import FAIL, PASS @@ -40,7 +40,6 @@ npvcpu = 2 @do_main(sup_types) def main(): options = main.options - log_param() if options.virt == 'KVM': nddev = 'hdb' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py Mon Apr 21 16:55:52 2008 +0800 @@ -29,7 +29,7 @@ from XenKvmLib import vsms from XenKvmLib import vsms from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC @@ -43,7 +43,6 @@ bug = '90070' @do_main(sup_types) def main(): options = main.options - log_param() service = vsms.get_vsms_class(options.virt)(options.ip) cxml = vxml.get_class(options.virt)(default_dom) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import vsms from XenKvmLib import vxml -from CimTest.Globals import log_param, logger +from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC @@ -44,7 +44,6 @@ bug_net = '90853' @do_main(sup_types) def main(): options = main.options - log_param() service = vsms.get_vsms_class(options.virt)(options.ip) cxml = vxml.get_class(options.virt)(default_dom) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -25,7 +25,7 @@ import sys import sys from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class -from CimTest.Globals import log_param, CIM_ERROR_ENUMERATE, logger, do_main +from CimTest.Globals import CIM_ERROR_ENUMERATE, logger, do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'XenFV', 'KVM'] @@ -38,7 +38,6 @@ def main(): def main(): options = main.options - log_param() # Expected values from the enumetation cn = get_typed_class(options.virt, 'VirtualSystemMigrationCapabilities') instid = 'MigrationCapabilities' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/02_vsmc_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/02_vsmc_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/02_vsmc_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -48,7 +48,7 @@ import sys import sys import pywbem from XenKvmLib import assoc -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.common_util import try_getinstance @@ -65,7 +65,6 @@ def main(): def main(): options = main.options - log_param() status = PASS conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, CIM_PASS), CIM_NS) classname = get_typed_class(options.virt, 'VirtualSystemMigrationCapabilities') diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py Mon Apr 21 16:55:52 2008 +0800 @@ -33,7 +33,7 @@ from XenKvmLib import vsmigrations 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 log_param, logger, CIM_ERROR_ENUMERATE, do_main +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen'] @@ -61,7 +61,6 @@ def start_guest_get_ref(ip, guest_name): @do_main(sup_types) def main(): options = main.options - log_param() status = PASS rc = -1 diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Mon Apr 21 16:55:52 2008 +0800 @@ -31,7 +31,7 @@ from XenKvmLib import vsmigrations 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 log_param, logger, CIM_ERROR_ENUMERATE, do_main +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen'] @@ -104,7 +104,6 @@ def start_guest(ip, guest_name, type): @do_main(sup_types) def main(): options = main.options - log_param() status = PASS rc = -1 diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/05_migratable_host_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/05_migratable_host_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/05_migratable_host_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ from XenKvmLib.test_xml import * from XenKvmLib.test_xml import * from XenKvmLib import computersystem from XenKvmLib import vsmigrations -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL sup_types = ['Xen'] @@ -40,7 +40,6 @@ exp_desc = 'Missing key (Name) in Comput @do_main(sup_types) def main(): options = main.options - log_param() xmlfile = testxml(test_dom) status = FAIL diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -24,7 +24,7 @@ import sys import sys from optparse import OptionParser from XenKvmLib import enumclass -from CimTest.Globals import log_param, CIM_ERROR_ENUMERATE, logger +from CimTest.Globals import CIM_ERROR_ENUMERATE, logger from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -36,7 +36,6 @@ def print_error(fieldname, ret_value, ex @do_main(platform_sup) def main(): options = main.options - log_param() # Expected results from enumeration cn = get_typed_class(options.virt, "VirtualSystemMigrationSettingData") instid = 'MigrationSettingData' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/02_vsmsd_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/02_vsmsd_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/02_vsmsd_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -46,7 +46,7 @@ import sys import sys import pywbem from XenKvmLib import assoc -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +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 @@ -67,7 +67,6 @@ def main(): def main(): global options options = main.options - log_param() global conn global keys global field diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Mon Apr 21 16:55:52 2008 +0800 @@ -57,7 +57,7 @@ from XenKvmLib.test_xml import xml_get_d from XenKvmLib.test_xml import xml_get_dom_bootloader from CimTest import Globals from XenKvmLib import assoc -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main sup_types = ['Xen'] @@ -163,7 +163,6 @@ def main(): options = main.options global status - log_param() destroy_and_undefine_all(options.ip) test_xml = testxml_bl(test_dom, vcpus = test_vcpus, \ mac = test_mac, disk = test_disk, \ diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Mon Apr 21 16:55:52 2008 +0800 @@ -53,7 +53,7 @@ from CimTest import Globals from CimTest import Globals from XenKvmLib import assoc from XenKvmLib.rasd import InstId_err -from CimTest.Globals import log_param, logger, do_main +from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen'] @@ -126,7 +126,6 @@ def main(): def main(): options = main.options status = PASS - log_param() destroy_and_undefine_all(options.ip) test_xml1 = testxml(test_dom, mem = test_mem, \ diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -60,7 +60,7 @@ from XenKvmLib.common_util import try_as 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, log_param, logger +from CimTest.Globals import do_main, logger from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS sup_types = ['Xen', 'XenFV', 'KVM'] @@ -99,7 +99,6 @@ def main(): parser.print_help() return FAIL - log_param() status = PASS destroy_and_undefine_all(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -63,7 +63,7 @@ from XenKvmLib.common_util import try_as 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, log_param, logger +from CimTest.Globals import do_main, logger from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS sup_types = ['Xen', 'XenFV', 'KVM'] @@ -101,7 +101,6 @@ def main(): parser.print_help() return FAIL - log_param() status = PASS destroy_and_undefine_all(options.ip) diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -23,7 +23,7 @@ # Date: 25-03-2008 import sys from XenKvmLib import enumclass -from CimTest.Globals import log_param, CIM_ERROR_ENUMERATE, logger +from CimTest.Globals import CIM_ERROR_ENUMERATE, logger from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -36,7 +36,6 @@ def print_error(fieldname, ret_value, ex @do_main(platform_sup) def main(): options = main.options - log_param() # Expected results from enumeration cn = get_typed_class(options.virt, "VirtualSystemSnapshotService") Name = 'SnapshotService' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -28,7 +28,7 @@ import sys import sys import pywbem from XenKvmLib import assoc -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +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 @@ -223,7 +223,6 @@ def main(): def main(): global options options = main.options - log_param() global conn global field global ccn diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py Mon Apr 21 16:55:52 2008 +0800 @@ -23,7 +23,7 @@ # Date: 24-03-2008 import sys from XenKvmLib import enumclass -from CimTest.Globals import log_param, CIM_ERROR_ENUMERATE, logger +from CimTest.Globals import CIM_ERROR_ENUMERATE, logger from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class @@ -35,7 +35,6 @@ def print_error(fieldname, ret_value, ex @do_main(platform_sup) def main(): options = main.options - log_param() # Expected results from enumeration cn = get_typed_class(options.virt, "VirtualSystemSnapshotServiceCapabilities") instid = 'SnapshotCapabilities' diff -r 0d31dff13ae3 -r 41a6c5cd5073 suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py Mon Apr 21 16:55:52 2008 +0800 @@ -46,7 +46,7 @@ import sys import sys import pywbem from XenKvmLib import assoc -from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS +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 @@ -66,7 +66,6 @@ def main(): def main(): global options options = main.options - log_param() global conn global keys global field

2 1

Xen test report on Fedora 8
by Guo Lian Yun 21 Apr '08

21 Apr '08

stro: Fedora8 Kernel: kernel-2.6.23.1-42.fc8 Xen: xen-3.1.2-2.fc8 Libvirt: libvirt-0.4.2-1 CIMOM: sblim-sfcb-1.2.5-0 PyWBEM: pywbem-0.6-2 LibCMPIutil: 72 LibvirtCIM: 551 CIM Schema: cimv216Experimental Cimtest: 93 =========== CIMTEST FULL REPORT FAIL[33] ======================= AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: PASS ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 85769 ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 85769 ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: FAIL ComputerSystem - 27_define_suspend_errs.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 32_start_reboot.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 33_suspend_reboot.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 35_start_reset.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 40_RSC_start.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 41_cs_to_settingdefinestate.py: FAIL ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: PASS ElementAllocatedFromPool - 01_forward.py: FAIL Unknown pool membership for `hd_domain/xvda' ElementAllocatedFromPool - 02_reverse.py: FAIL No such instance (foo) ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: PASS ElementCapabilities - 01_forward.py: PASS ElementCapabilities - 02_reverse.py: PASS ElementCapabilities - 03_forward_errs.py: PASS ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: PASS ElementConforms - 02_reverse.py: PASS ElementConforms - 03_ectp_fwd_errs.py: PASS ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: PASS ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS EnabledLogicalElementCapabilities - 01_enum.py: PASS EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: FAIL HostSystem - 03_hs_to_settdefcap.py: FAIL HostSystem - 04_hs_to_EAPF.py: FAIL HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: PASS HostedDependency - 02_reverse.py: PASS HostedDependency - 03_enabledstate.py: PASS HostedDependency - 04_reverse_errs.py: PASS HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: PASS LogicalDisk - 03_ld_gi_errs.py: PASS Memory - 01_memory.py: PASS Memory - 02_defgetmem.py: FAIL Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: XFAIL Bug: 90844 NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: SKIP Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: FAIL Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: FAIL PRINT - Verifying the fields for :System Virtualization PRINT - Verifying the fields for :Virtual System Profile PRINT - Verifying the fields for :Generic Device Resource Virtualization Profile - 02_profile_to_elec.py: FAIL Profile - 03_rprofile_gi_errs.py: PASS RASD - 01_verify_rasd_fields.py: FAIL RASD - 02_enum.py: FAIL RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: PASS ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: PASS ResourcePool - 01_enum.py: PASS ResourcePool - 02_rp_gi_errors.py: PASS ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL Bug: 92173 InvokeMethod(AddResourcesToResourcePool): Unknown Method Bug:<92173> ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS SettingsDefine - 01_forward.py: PASS SettingsDefine - 02_reverse.py: FAIL SettingsDefine - 03_sds_fwd_errs.py: PASS SettingsDefine - 04_sds_rev_errs.py: PASS SettingsDefineCapabilities - 01_forward.py: FAIL No such instance (foo) SettingsDefineCapabilities - 03_forward_errs.py: XFAIL Bug: Test error: returned XFAIL without a valid bug string. Bug:<> SettingsDefineCapabilities - 04_forward_vsmsdata.py: FAIL SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS SystemDevice - 01_forward.py: PASS SystemDevice - 02_reverse.py: PASS SystemDevice - 03_fwderrs.py: PASS VSSD - 01_enum.py: PASS VSSD - 02_bootldr.py: PASS VSSD - 03_vssd_gi_errs.py: FAIL VSSD - 04_vssd_to_rasd.py: FAIL VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: FAIL VirtualSystemManagementService - 02_destroysystem.py: PASS VirtualSystemManagementService - 03_definesystem_ess.py: PASS VirtualSystemManagementService - 04_definesystem_ers.py: PASS VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL VirtualSystemManagementService - 06_addresource.py: PASS VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: XFAIL Bug: 90853 InvokeMethod(ModifyResourceSettings): Device `11:22:33:aa:bb:cc' not found Bug:<90853> VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: FAIL InvokeMethod(CheckVirtualSystemIsMigratableToHost): Provider not found or not loadable VirtualSystemMigrationService - 02_host_migrate_type.py: FAIL InvokeMethod(CheckVirtualSystemIsMigratableToHost): Provider not found or not loadable VirtualSystemMigrationService - 05_migratable_host_errs.py: FAIL InvokeMethod(CheckVirtualSystemIsMigratableToHost): Provider not found or not loadable VirtualSystemMigrationSettingData - 01_enum.py: FAIL Provider not found or not loadable VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: FAIL VirtualSystemSettingDataComponent - 01_forward.py: FAIL No such instance (VSSDC_dom/00:11:22:33:44:aa) No such instance (VSSDC_dom/xvda) No such instance (VSSDC_dom/mem) VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: FAIL Provider not found or not loadable VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: FAIL Best, Regards Daisy Guo Lian Yun E-mail: yunguol(a)cn.ibm.com IBM China Development Lab, Shanghai, China TEL: (86)-21-61008057

2 2

[PATCH] [TEST] .2# Retrieve revision and changeset string
by zli＠linux.vnet.ibm.com 21 Apr '08

21 Apr '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1208509216 -28800 # Node ID 1fc0ff2248ae99860b83abb5ce8952df82218798 # Parent a3b6354aa1fd6cd95a99a0abf877b4994ec0c839 [TEST] .2# Retrieve revision and changeset string Updates: - use env var instead - less cim query. now once per suite run. Test cases now need to import CIM_REV and CIM_SET to get the value. Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r a3b6354aa1fd -r 1fc0ff2248ae lib/CimTest/Globals.py --- a/lib/CimTest/Globals.py Fri Apr 18 16:12:37 2008 +0800 +++ b/lib/CimTest/Globals.py Fri Apr 18 17:00:16 2008 +0800 @@ -34,6 +34,8 @@ global platform_sup global platform_sup global CIM_IP global CIM_PORT +global CIM_REV +global CIM_SET global CIM_ERROR_ASSOCIATORNAMES global CIM_ERROR_ENUMERATE @@ -47,6 +49,8 @@ CIM_FUUID = os.getenv("CIM_FUUID") CIM_FUUID = os.getenv("CIM_FUUID") CIM_TC = os.getenv("CIM_TC") CIM_IP = os.getenv("CIM_IP") +CIM_REV = os.getenv("CIM_REV") +CIM_SET = os.getenv("CIM_SET") CIM_PORT = "5988" NM = "TEST LOG" platform_sup = ["Xen", "KVM", "XenFV"] @@ -86,6 +90,9 @@ if not CIM_TC: CIM_TC = " " if not CIM_IP: CIM_IP = "localhost" + +if not CIM_REV or not CIM_SET: + CIM_REV = CIM_SET = "Unknown" def log_param(debug=None): #FIXME debug=None is a temporary work around to avoid duplicate diff -r a3b6354aa1fd -r 1fc0ff2248ae suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Fri Apr 18 16:12:37 2008 +0800 +++ b/suites/libvirt-cim/main.py Fri Apr 18 17:00:16 2008 +0800 @@ -25,6 +25,7 @@ from optparse import OptionParser from optparse import OptionParser import os import sys +from pywbem import WBEMConnection sys.path.append('../../lib') import TestSuite import commands @@ -32,6 +33,8 @@ from VirtLib import groups from VirtLib import groups from CimTest.ReturnCodes import PASS, SKIP, XFAIL from CimTest.Globals import platform_sup +sys.path.append('./lib') +from XenKvmLib.classes import get_typed_class parser = OptionParser() parser.add_option("-i", "--ip", dest="ip", default="localhost", @@ -79,6 +82,19 @@ def remove_old_logs(ogroup): print "Cleaned log files." +def get_version(virt, ip): + conn = WBEMConnection('http://%s' % ip, + (os.getenv('CIM_USER'), os.getenv('CIM_PASS')), + os.getenv('CIM_NS')) + vsms_cn = get_typed_class(virt, 'VirtualSystemManagementService') + try: + inst = conn.EnumerateInstances(vsms_cn) + revision = inst[0]['Revision'] + changeset = inst[0]['Changeset'] + except Exception: + return 'Unknown', 'Unknown' + return revision, changeset + def main(): (options, args) = parser.parse_args() @@ -117,14 +133,18 @@ def main(): else: dbg = "" + revision, changeset = get_version(options.virt, options.ip) + print "Testing " + options.virt + " hypervisor" for test in test_list: t_path = os.path.join(TEST_SUITE, test['group']) os.environ['CIM_TC'] = test['test'] - - cmd = "cd %s && python %s -i %s -v %s %s" % \ - (t_path, test['test'], options.ip, options.virt, dbg) + cdto = 'cd %s' % t_path + env = 'CIM_REV=%s CIM_SET=%s' % (revision, changeset) + run = 'python %s -i %s -v %s %s' % (test['test'], options.ip, + options.virt, dbg) + cmd = cdto + ' && ' + env + ' ' + run status, output = commands.getstatusoutput(cmd) os_status = os.WEXITSTATUS(status)

4 5

CimTest Report on XenFV 18-04-2008
by Deepti B Kalakeri 21 Apr '08

21 Apr '08

====================================== CIM Test Report for XenFV ====================================== Distro : RHEL 5.2 Beta Kernel : 2.6.18-88.el5xen Xen version : 3.1.2-88.el5 Libvirt : libvirt-0.3.3-7.el5 CIMOM : pegasus PyWBEM : pywbem-3.14 CIM Schema : cimv216Experimental LibCMPIutil : 72 LibVirtCIM : 552 CIMTEST : 93 ====================================== PASS : 75 FAIL : 18 XFAIL : 3 SKIP : 33 ----------------- Total : 129 ====================================== List of test cases that are failing: ComputerSystem - 04_defineStartVS.py: FAIL ComputerSystem - 06_paused_active_suspend.py: FAIL ComputerSystem - 23_suspend_suspend.py: FAIL ComputerSystem - 32_start_reboot.py: FAIL ComputerSystem - 33_suspend_reboot.py: FAIL ComputerSystem - 35_start_reset.py: FAIL ComputerSystemIndication - 01_created_indication.py: FAIL ElementAllocatedFromPool - 04_forward_errs.py: FAIL HostSystem - 02_hostsystem_to_rasd.py: FAIL HostSystem - 03_hs_to_settdefcap.py: FAIL HostSystem - 06_hs_to_vsms.py: FAIL ResourcePoolConfigurationService - 03_CreateResourcePool.py: FAIL ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: FAIL ResourcePoolConfigurationService - 07_DeleteResourcePool.py: FAIL SettingsDefine - 02_reverse.py: FAIL VirtualSystemManagementService - 02_destroysystem.py: FAIL VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL Please find the complete test result along with the failures attached with the mail. Thanks and Regards, Deepti. Starting test suite: libvirt-cim Testing XenFV hypervisor AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: SKIP ERROR - System has defined domains; unable to run ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: FAIL ERROR - Error: property values are not set for VS domguest ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 85769 ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful Bug:<85769> ComputerSystem - 06_paused_active_suspend.py: FAIL ERROR - Exception: (1, u'CIM_ERR_FAILED: Domain not running') ERROR - Unable to suspend dom DomST1 using RequestedStateChange() InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain not running ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 27_define_suspend_errs.py: PASS ComputerSystem - 32_start_reboot.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 33_suspend_reboot.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 35_start_reset.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 40_RSC_start.py: PASS ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: FAIL Traceback (most recent call last): File "01_created_indication.py", line 33, in ? from XenKvmLib.indication_tester import CIMIndicationSubscription File "/data/users/deepti/cimtest/suites/libvirt-cim/lib/XenKvmLib/indication_tester.py", line 397 help="HTTP Auth username", dest="username") SyntaxError: duplicate keyword argument ElementAllocatedFromPool - 01_forward.py: SKIP ElementAllocatedFromPool - 02_reverse.py: SKIP ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: FAIL ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER: InvalidClassName.CreationClassName="Xen_LogicalDisk",DeviceID="hd_domain/hda",SystemCreationClassName="Xen_ComputerSystem",SystemName="hd_domain" ERROR - ------FAILED: Invalid classnameKeyname.------ ElementCapabilities - 01_forward.py: PASS ElementCapabilities - 02_reverse.py: PASS ElementCapabilities - 03_forward_errs.py: PASS ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: PASS ElementConforms - 02_reverse.py: PASS ElementConforms - 03_ectp_fwd_errs.py: PASS ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: SKIP ElementSettingData - 03_esd_assoc_with_rasd_errs.py: SKIP EnabledLogicalElementCapabilities - 01_enum.py: PASS EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: FAIL ERROR - InstanceID Mismatch ERROR - Returned CrossClass_GuestDom/0 instead of CrossClass_GuestDom/proc ERROR - Mistmatching association values HostSystem - 03_hs_to_settdefcap.py: FAIL ERROR - SettingsDefineCapabilities returned 0 ResourcePool objects instead of 4 ERROR - SystemExit : 1 CIM_ERR_FAILED: For provider Virt_SettingsDefineCapabilities the library name was empty. Check provider registered location. HostSystem - 04_hs_to_EAPF.py: SKIP HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: FAIL ERROR - Xen_SettingsDefineCapabilities returned 0 MigrationSettingData objects, expected only 1 ERROR - Did not get the expected MigrationSettingData record CIM_ERR_FAILED: For provider Virt_SettingsDefineCapabilities the library name was empty. Check provider registered location. HostedDependency - 01_forward.py: SKIP HostedDependency - 02_reverse.py: SKIP HostedDependency - 03_enabledstate.py: SKIP HostedDependency - 04_reverse_errs.py: SKIP HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: SKIP ERROR - System has defined domains; unable to run LogicalDisk - 03_ld_gi_errs.py: PASS Memory - 01_memory.py: PASS Memory - 02_defgetmem.py: PASS Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: PASS NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: SKIP Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: PASS Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: SKIP Profile - 02_profile_to_elec.py: SKIP Profile - 03_rprofile_gi_errs.py: SKIP RASD - 01_verify_rasd_fields.py: PASS RASD - 02_enum.py: PASS RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: PASS ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: PASS ResourcePool - 01_enum.py: SKIP ResourcePool - 02_rp_gi_errors.py: SKIP ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: FAIL ERROR - Unexpected rc code 7 and description CIM_ERR_NOT_SUPPORTED InvokeMethod(CreateResourcePool): CIM_ERR_NOT_SUPPORTED ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL ERROR - Unexpected rc code 7 and description CIM_ERR_NOT_SUPPORTED InvokeMethod(CreateChildResourcePool): CIM_ERR_NOT_SUPPORTED ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL Bug: 92173 ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Unknown Method InvokeMethod(AddResourcesToResourcePool): CIM_ERR_FAILED: Unknown Method Bug:<92173> ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: FAIL ERROR - Unexpected rc code 7 and description CIM_ERR_NOT_SUPPORTED InvokeMethod(RemoveResourcesFromResourcePool): CIM_ERR_NOT_SUPPORTED ResourcePoolConfigurationService - 07_DeleteResourcePool.py: FAIL ERROR - Unexpected rc code 7 and description CIM_ERR_NOT_SUPPORTED InvokeMethod(DeleteResourcePool): CIM_ERR_NOT_SUPPORTED SettingsDefine - 01_forward.py: PASS SettingsDefine - 02_reverse.py: FAIL ERROR - Mistmatching value for VSSDComponent association CIM_ERR_NOT_FOUND: No such instance (virtgst/proc) SettingsDefine - 03_sds_fwd_errs.py: PASS SettingsDefine - 04_sds_rev_errs.py: PASS SettingsDefineCapabilities - 01_forward.py: SKIP SettingsDefineCapabilities - 03_forward_errs.py: SKIP SettingsDefineCapabilities - 04_forward_vsmsdata.py: SKIP SettingsDefineCapabilities - 05_reverse_vsmcap.py: SKIP SystemDevice - 01_forward.py: PASS SystemDevice - 02_reverse.py: PASS SystemDevice - 03_fwderrs.py: PASS VSSD - 01_enum.py: SKIP VSSD - 02_bootldr.py: SKIP VSSD - 03_vssd_gi_errs.py: SKIP VSSD - 04_vssd_to_rasd.py: PASS VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: PASS VirtualSystemManagementService - 02_destroysystem.py: FAIL ERROR - Unknow exception happened ERROR - (1, u'CIM_ERR_FAILED: Unable to retrieve domain name.') ERROR - Destroyed multiple domains InvokeMethod(DestroySystem): CIM_ERR_FAILED: Unable to retrieve domain name. VirtualSystemManagementService - 03_definesystem_ess.py: PASS VirtualSystemManagementService - 04_definesystem_ers.py: PASS VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL ERROR - destroy_fail>>noname: Error executing DestroySystem, exception details below ERROR - (1, u'CIM_ERR_FAILED: Unable to retrieve domain name.') ERROR - destroy_fail>>nonexistent: Error executing DestroySystem, exception details below ERROR - (1, u'CIM_ERR_FAILED: Failed to find domain') InvokeMethod(DestroySystem): CIM_ERR_FAILED: Unable to retrieve domain name. InvokeMethod(DestroySystem): CIM_ERR_FAILED: Failed to find domain VirtualSystemManagementService - 06_addresource.py: SKIP VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: XFAIL Bug: 90853 ERROR - Error invoking ModifyRS ERROR - (1, u"CIM_ERR_FAILED: Unknown system `rstest_domain'") InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Unknown system `rstest_domain' Bug:<90853> VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: SKIP VirtualSystemSettingDataComponent - 02_reverse.py: SKIP VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: SKIP VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: SKIP VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS

1 1

Xen test report on Fedora 8 (20080421)
by Guo Lian Yun 21 Apr '08

21 Apr '08

stro: Fedora8 Kernel: kernel-2.6.23.1-42.fc8 Xen: xen-3.1.2-2.fc8 Libvirt: libvirt-0.4.2-1 CIMOM: sblim-sfcb-1.2.5-0 PyWBEM: pywbem-0.6-2 LibCMPIutil: 72 LibvirtCIM: 551 CIM Schema: cimv216Experimental Cimtest: 93 =========== CIMTEST FAIL[31] REPORT ====================================== ComputerSystem - 23_suspend_suspend.py: FAIL ComputerSystem - 27_define_suspend_errs.py: FAIL ComputerSystem - 32_start_reboot.py: FAIL ComputerSystem - 33_suspend_reboot.py: FAIL ComputerSystem - 35_start_reset.py: FAIL ComputerSystem - 40_RSC_start.py: FAIL ComputerSystem - 41_cs_to_settingdefinestate.py: FAIL ElementAllocatedFromPool - 01_forward.py: FAIL ElementAllocatedFromPool - 02_reverse.py: FAIL HostSystem - 03_hs_to_settdefcap.py: FAIL HostSystem - 04_hs_to_EAPF.py: FAIL Memory - 02_defgetmem.py: FAIL Processor - 02_definesys_get_procs.py: FAIL Profile - 02_profile_to_elec.py: FAIL RASD - 01_verify_rasd_fields.py: FAIL RASD - 02_enum.py: FAIL SettingsDefine - 02_reverse.py: FAIL SettingsDefineCapabilities - 01_forward.py: FAIL SettingsDefineCapabilities - 04_forward_vsmsdata.py: FAIL VSSD - 03_vssd_gi_errs.py: FAIL VirtualSystemManagementService - 01_definesystem_name.py: FAIL VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL VirtualSystemMigrationService - 01_migratable_host.py: FAIL VirtualSystemMigrationService - 02_host_migrate_type.py: FAIL VirtualSystemMigrationService - 05_migratable_host_errs.py: FAIL VirtualSystemMigrationSettingData - 01_enum.py: FAIL VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: FAIL VirtualSystemSettingDataComponent - 01_forward.py: FAIL VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL VirtualSystemSnapshotServiceCapabilities - 01_enum.py: FAIL VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: FAIL =========== CIMTEST FULL REPORT =========================================== AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: PASS ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 85769 ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 85769 ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: FAIL ComputerSystem - 27_define_suspend_errs.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 32_start_reboot.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 33_suspend_reboot.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 35_start_reset.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 40_RSC_start.py: FAIL InvokeMethod(DefineSystem): Failed to create domain ComputerSystem - 41_cs_to_settingdefinestate.py: FAIL ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: PASS ElementAllocatedFromPool - 01_forward.py: FAIL Unknown pool membership for `hd_domain/xvda' ElementAllocatedFromPool - 02_reverse.py: FAIL No such instance (foo) ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: PASS ElementCapabilities - 01_forward.py: PASS ElementCapabilities - 02_reverse.py: PASS ElementCapabilities - 03_forward_errs.py: PASS ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: PASS ElementConforms - 02_reverse.py: PASS ElementConforms - 03_ectp_fwd_errs.py: PASS ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: PASS ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS EnabledLogicalElementCapabilities - 01_enum.py: PASS EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: PASS HostSystem - 03_hs_to_settdefcap.py: FAIL HostSystem - 04_hs_to_EAPF.py: FAIL HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: PASS HostedDependency - 02_reverse.py: PASS HostedDependency - 03_enabledstate.py: PASS HostedDependency - 04_reverse_errs.py: PASS HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: PASS LogicalDisk - 03_ld_gi_errs.py: PASS Memory - 01_memory.py: PASS Memory - 02_defgetmem.py: FAIL Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: XFAIL Bug: 90844 NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: SKIP Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: FAIL Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: PASS Profile - 02_profile_to_elec.py: FAIL Profile - 03_rprofile_gi_errs.py: PASS RASD - 01_verify_rasd_fields.py: FAIL RASD - 02_enum.py: FAIL RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: PASS ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: PASS ResourcePool - 01_enum.py: PASS ResourcePool - 02_rp_gi_errors.py: PASS ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL Bug: 92173 InvokeMethod(AddResourcesToResourcePool): Unknown Method Bug:<92173> ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS SettingsDefine - 01_forward.py: PASS SettingsDefine - 02_reverse.py: FAIL SettingsDefine - 03_sds_fwd_errs.py: PASS SettingsDefine - 04_sds_rev_errs.py: PASS SettingsDefineCapabilities - 01_forward.py: FAIL No such instance (foo) SettingsDefineCapabilities - 03_forward_errs.py: XFAIL Bug: Test error: returned XFAIL without a valid bug string. Bug:<> SettingsDefineCapabilities - 04_forward_vsmsdata.py: FAIL SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS SystemDevice - 01_forward.py: PASS SystemDevice - 02_reverse.py: PASS SystemDevice - 03_fwderrs.py: PASS VSSD - 01_enum.py: PASS VSSD - 02_bootldr.py: PASS VSSD - 03_vssd_gi_errs.py: FAIL VSSD - 04_vssd_to_rasd.py: FAIL VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: FAIL VirtualSystemManagementService - 02_destroysystem.py: PASS VirtualSystemManagementService - 03_definesystem_ess.py: PASS VirtualSystemManagementService - 04_definesystem_ers.py: PASS VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL VirtualSystemManagementService - 06_addresource.py: PASS VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: XFAIL Bug: 90853 InvokeMethod(ModifyResourceSettings): Device `11:22:33:aa:bb:cc' not found Bug:<90853> VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: FAIL InvokeMethod(CheckVirtualSystemIsMigratableToHost): Provider not found or not loadable VirtualSystemMigrationService - 02_host_migrate_type.py: FAIL InvokeMethod(CheckVirtualSystemIsMigratableToHost): Provider not found or not loadable VirtualSystemMigrationService - 05_migratable_host_errs.py: FAIL InvokeMethod(CheckVirtualSystemIsMigratableToHost): Provider not found or not loadable VirtualSystemMigrationSettingData - 01_enum.py: FAIL Provider not found or not loadable VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: FAIL VirtualSystemSettingDataComponent - 01_forward.py: FAIL No such instance (VSSDC_dom/00:11:22:33:44:aa) No such instance (VSSDC_dom/xvda) No such instance (VSSDC_dom/mem) VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: FAIL Provider not found or not loadable VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: FAIL Best, Regards Daisy Guo Lian Yun E-mail: yunguol(a)cn.ibm.com IBM China Development Lab, Shanghai, China TEL: (86)-21-61008057

1 0

[PATCH 0 of 3] [TEST]add ElementAllocatedFromPool for KVM & XenFV support
by Guo Lian Yun 18 Apr '08

18 Apr '08

Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>

3 12

[PATCH] Hang a default VSSD off of the VSMC to mirror the AC RASD behavior
by Dan Smith 18 Apr '08

18 Apr '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1208378296 25200 # Node ID 00dc567c364daeeebc40888742516dc1dcd2b106 # Parent f7e2c322ac0ab1d109192a362d508ca4a2a87310 Hang a default VSSD off of the VSMC to mirror the AC RASD behavior Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r f7e2c322ac0a -r 00dc567c364d src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Wed Apr 16 11:08:13 2008 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Wed Apr 16 13:38:16 2008 -0700 @@ -55,6 +55,176 @@ const static CMPIBroker *_BROKER; #define SDC_DISK_INC 250 #define DEFAULT_MAC_PREFIX "00:16:3e" + +static bool system_has_vt(virConnectPtr conn) +{ + char *caps = NULL; + bool vt = false; + + caps = virConnectGetCapabilities(conn); + if (caps != NULL) + vt = (strstr(caps, "hvm") != NULL); + + free(caps); + + return vt; +} + +static CMPIInstance *_xen_base_vssd(virConnectPtr conn, + const char *ns, + const char *name) +{ + CMPIInstance *inst; + + inst = get_typed_instance(_BROKER, + pfx_from_conn(conn), + "VirtualSystemSettingData", + ns); + if (inst == NULL) + return NULL; + + CMSetProperty(inst, "VirtualSystemIdentifier", + (CMPIValue *)name, CMPI_chars); + + return inst; +} + +static CMPIStatus _xen_vsmc_to_vssd(virConnectPtr conn, + const char *ns, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *inst; + int isfv = 0; + + inst = _xen_base_vssd(conn, ns, "Xen_Paravirt_Guest"); + if (inst == NULL) + goto error; + + CMSetProperty(inst, "Bootloader", + (CMPIValue *)"/usr/bin/pygrub", CMPI_chars); + + CMSetProperty(inst, "isFullVirt", + (CMPIValue *)&isfv, CMPI_boolean); + + inst_list_add(list, inst); + + if (system_has_vt(conn)) { + isfv = 1; + + inst = _xen_base_vssd(conn, ns, "Xen_Fullvirt_Guest"); + if (inst == NULL) + goto error; + + CMSetProperty(inst, "BootDevice", + (CMPIValue *)"hda", CMPI_chars); + + CMSetProperty(inst, "isFullVirt", + (CMPIValue *)&isfv, CMPI_boolean); + + inst_list_add(list, inst); + } + + return s; + + error: + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to create %s_VSSD instance", + pfx_from_conn(conn)); + + return s; +} + +static CMPIStatus _kvm_vsmc_to_vssd(virConnectPtr conn, + const char *ns, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *inst; + + inst = get_typed_instance(_BROKER, + pfx_from_conn(conn), + "VirtualSystemSettingData", + ns); + if (inst == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to create %s_VSSD instance", + pfx_from_conn(conn)); + goto out; + } + + CMSetProperty(inst, "VirtualSystemIdentifier", + (CMPIValue *)"KVM_guest", CMPI_chars); + + CMSetProperty(inst, "BootDevice", + (CMPIValue *)"hda", CMPI_chars); + + inst_list_add(list, inst); + out: + return s; +} + +static CMPIStatus _lxc_vsmc_to_vssd(virConnectPtr conn, + const char *ns, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *inst; + + inst = get_typed_instance(_BROKER, + pfx_from_conn(conn), + "VirtualSystemSettingData", + ns); + if (inst == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to create %s_VSSD instance", + pfx_from_conn(conn)); + goto out; + } + + CMSetProperty(inst, "InitPath", + (CMPIValue *)"/sbin/init", CMPI_chars); + + inst_list_add(list, inst); + out: + return s; +} + +static CMPIStatus vsmc_to_vssd(const CMPIObjectPath *ref, + struct std_assoc_info *info, + struct inst_list *list) +{ + CMPIStatus s; + virConnectPtr conn = NULL; + const char *cn; + const char *ns; + + cn = CLASSNAME(ref); + ns = NAMESPACE(ref); + + conn = connect_by_classname(_BROKER, cn, &s); + if (conn == NULL) + goto out; + + if (STARTS_WITH(cn, "Xen")) + s = _xen_vsmc_to_vssd(conn, ns, list); + else if (STARTS_WITH(cn, "KVM")) + s = _kvm_vsmc_to_vssd(conn, ns, list); + else if (STARTS_WITH(cn, "LXC")) + s = _lxc_vsmc_to_vssd(conn, ns, list); + else + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Invalid reference"); + + out: + virConnectClose(conn); + + return s; +} static bool rasd_prop_copy_value(struct sdc_rasd_prop src, struct sdc_rasd_prop *dest) @@ -1008,11 +1178,39 @@ static struct std_assoc _vsmsd_to_migrat .make_ref = make_ref }; +static char *vsmc[] = { + "Xen_VirtualSystemManagementCapabilities", + "KVM_VirtualSystemManagementCapabilities", + "LXC_VirtualSystemManagementCapabilities", + NULL +}; + +static char *vssd[] = { + "Xen_VirtualSystemSettingData", + "KVM_VirtualSystemSettingData", + "LXC_VirtualSystemSettingData", + NULL +}; + +static struct std_assoc _vsmc_to_vssd = { + .source_class = (char**)&vsmc, + .source_prop = "GroupComponent", + + .target_class = (char**)&vssd, + .target_prop = "PartComponent", + + .assoc_class = (char**)&assoc_classname, + + .handler = vsmc_to_vssd, + .make_ref = make_ref +}; + static struct std_assoc *assoc_handlers[] = { &_alloc_cap_to_rasd, &_rasd_to_alloc_cap, &_migrate_cap_to_vsmsd, &_vsmsd_to_migrate_cap, + &_vsmc_to_vssd, NULL };

2 5

[PATCH] (3) Enable localhost migration
by Kaitlin Rupert 18 Apr '08

18 Apr '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1208536954 25200 # Node ID 55f2e355bcd318ec51f673beac6bc1d963c14960 # Parent 1904e4f08af21f99af698e42da236cf39407c5e2 (3) Enable localhost migration. Updates: -Use one if statement instead of two. -Fix subject Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 1904e4f08af2 -r 55f2e355bcd3 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Thu Apr 17 13:37:29 2008 -0700 +++ b/src/Virt_VSMigrationService.c Fri Apr 18 09:42:34 2008 -0700 @@ -76,6 +76,7 @@ virConnectPtr conn; char *ref_cn; char *ref_ns; + char *host; uint16_t type; char uuid[33]; }; @@ -1045,7 +1046,8 @@ goto out; } - if (domain_exists(job->conn, job->domain)) { + if ((!STREQ(job->host, "localhost")) && + (domain_exists(job->conn, job->domain))) { CU_DEBUG("Remote domain `%s' exists", job->domain); cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -1131,6 +1133,7 @@ free(job->domain); free(job->ref_cn); free(job->ref_ns); + free(job->host); free(job); return NULL; @@ -1238,6 +1241,7 @@ job->domain = strdup(domain); job->ref_cn = strdup(CLASSNAME(ref)); job->ref_ns = strdup(NAMESPACE(ref)); + job->host = strdup(host); uuid_generate(uuid); uuid_unparse(uuid, job->uuid);

1 0

[PATCH]
by Kaitlin Rupert 18 Apr '08

18 Apr '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1208536702 25200 # Node ID 75b0999bf8632d854768190b0f4735176c1874b4 # Parent 1904e4f08af21f99af698e42da236cf39407c5e2 #2 Enable localhost migration. Updates: -Use one if statement instead of two. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 1904e4f08af2 -r 75b0999bf863 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Thu Apr 17 13:37:29 2008 -0700 +++ b/src/Virt_VSMigrationService.c Fri Apr 18 09:38:22 2008 -0700 @@ -76,6 +76,7 @@ virConnectPtr conn; char *ref_cn; char *ref_ns; + char *host; uint16_t type; char uuid[33]; }; @@ -1045,7 +1046,8 @@ goto out; } - if (domain_exists(job->conn, job->domain)) { + if ((!STREQ(job->host, "localhost")) && + (domain_exists(job->conn, job->domain))) { CU_DEBUG("Remote domain `%s' exists", job->domain); cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -1131,6 +1133,7 @@ free(job->domain); free(job->ref_cn); free(job->ref_ns); + free(job->host); free(job); return NULL; @@ -1238,6 +1241,7 @@ job->domain = strdup(domain); job->ref_cn = strdup(CLASSNAME(ref)); job->ref_ns = strdup(NAMESPACE(ref)); + job->host = strdup(host); uuid_generate(uuid); uuid_unparse(uuid, job->uuid);

1 1

[PATCH] [TEST] Add the missing Address value in NetRASD init
by zli＠linux.vnet.ibm.com 18 Apr '08

18 Apr '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1208509526 -28800 # Node ID 4ee138efe1ef8332366db16b30fd777bae8b2a08 # Parent 1fc0ff2248ae99860b83abb5ce8952df82218798 [TEST] Add the missing Address value in NetRASD init Provider code already has this NetRASD Address as the mac. Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 1fc0ff2248ae -r 4ee138efe1ef suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri Apr 18 17:00:16 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri Apr 18 17:05:26 2008 +0800 @@ -138,6 +138,7 @@ def get_dasd_class(virt): class CIM_NetResourceAllocationSettingData(CIMClassMOF): def __init__(self, type, mac, name): + self.Address = mac self.NetworkType = type if type == 'ethernet' or type == 'bridge' : self.ResourceType = RASD_TYPE_NET_ETHER

4 3