- CIM - libvirt List Archives

[PATCH] [TEST] Updating VSMC 01_enum.py to verify the SynchronousMethodsSupported values
by Deepti B. Kalakeri 04 Sep '08

04 Sep '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1220346904 -19800 # Node ID f956aa699a3e3ea6df8f2d6e423ed9cf032d61c5 # Parent 946fd46b96866adaab356876f9c8bbf937f0b3d6 [TEST] Updating VSMC 01_enum.py to verify the SynchronousMethodsSupported values. Changes ------- 1) Also modified the tc to use do_main from const.py instead of Globals.py. 2) Used print_field_error() to print the error messages. 3) Removed Globals.py. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 946fd46b9686 -r f956aa699a3e suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py Tue Sep 02 14:45:04 2008 +0530 @@ -23,35 +23,58 @@ # import sys +from sets import Set from XenKvmLib import enumclass -from CimTest import Globals -from CimTest.Globals import do_main +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE +from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class +from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.common_util import print_field_error sup_types=['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(sup_types) def main(): options = main.options + server = options.ip + virt = options.virt + cn = get_typed_class(virt, 'VirtualSystemManagementCapabilities') + + # Methods which are considered as synchronous + # where 1 = ADD_RESOURCES , 2 = DEFINE_SYSTEM , 3 = DESTROY_SYSTEM, + # 4 = DESTROY_SYS_CONFIG, 5 = MOD_RESOURCE_SETTINGS, + # 6 = MOD_SYS_SETTINGS, 7 = RM_RESOURCES + sync_method_val = Set([ 1L, 2L, 3L, 5L, 6L, 7L ]) try: key_list = ["InstanceID"] - vsmc = enumclass.enumerate(options.ip, + vsmc = enumclass.enumerate(server, "VirtualSystemManagementCapabilities", key_list, - options.virt) + virt) except Exception: - Globals.logger.error(Globals.CIM_ERROR_ENUMERATE, - get_typed_class(options.virt, 'VirtualSystemManagementCapabilities')) - return 1 - - if len(vsmc) != 1: - Globals.logger.error("VirtualSystemManagementCapabilities return %i instance, excepted only 1" % len(vsmc)) - return 1 - if vsmc[0].InstanceID != "ManagementCapabilities": - Globals.logger.error( "error result of enum VirtualSystemManagementCapabilities") - return 1 + logger.error(CIM_ERROR_ENUMERATE, cn) + return FAIL + try: + if len(vsmc) != 1: + logger.error("'%s' returned '%d' instance, excepted only 1", cn, len(vsmc)) + return FAIL + + if vsmc[0].InstanceID != "ManagementCapabilities": + print_field_error('InstanceID', vsmc[0].InstanceID, 'ManagementCapabilities') + return FAIL + vsmc_sync_val = Set(vsmc[0].SynchronousMethodsSupported) + if len(vsmc_sync_val - sync_method_val) != 0: + print_field_error('SynchronousMethodsSupported', vsmc_sync_val, + sync_method_val) + return FAIL + + except Exception, details: + logger.error("Exception: details %s", details) + return FAIL + + return PASS if __name__ == "__main__": sys.exit(main())

3 4

[PATCH] [TEST] Remove computersystem.py
by yunguol＠cn.ibm.com 04 Sep '08

04 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1220495704 25200 # Node ID 9687be43954b20f55e9e2562948cdc1fd7f9b6b3 # Parent 3c04faaa67e001ecaf578a13da75f88235257576 [TEST] Remove computersystem.py Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3c04faaa67e0 -r 9687be43954b suites/libvirt-cim/lib/XenKvmLib/computersystem.py --- a/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Tue Sep 02 23:10:52 2008 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -# -# Copyright 2008 IBM Corp. -# -# Authors: -# Dan Smith <danms(a)us.ibm.com> -# Kaitlin Rupert <karupert(a)us.ibm.com> -# Zhengang Li <lizg(a)cn.ibm.com> -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -import pywbem -from pywbem.cim_obj import CIMInstanceName -from CimTest import CimExt -from CimTest import Globals -from XenKvmLib.devices import CIM_Instance -from XenKvmLib.classes import get_typed_class, virt_types - -class CIM_System(CIM_Instance): - def __init__(self, server, name): - conn = pywbem.WBEMConnection('http://%s' % server, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) - - try: - classname = self.__class__.__name__ - ref = CIMInstanceName(classname, keybindings={ - "Name":name, - "CreationClassName":classname}) - inst = conn.GetInstance(ref) - except pywbem.CIMError, arg: - raise arg - - self.conn = conn - self.inst = inst - self.ref = ref - - CIM_Instance.__init__(self, inst) - - def __invoke(self, method, params): - try: - return self.conn.InvokeMethod(method, - self.ref, - **params) - except pywbem.CIMError, arg: - print 'InvokeMethod(%s): %s' % (method, arg[1]) - raise - - def __getattr__(self, attr): - if self.inst.has_key(attr): - return self.inst[attr] - else: - return CimExt._Method(self.__invoke, attr) - -class Xen_ComputerSystem(CIM_System): - pass - -class KVM_ComputerSystem(CIM_System): - pass - -class LXC_ComputerSystem(CIM_System): - pass - -def get_cs_class(virt): - if virt in virt_types: - return eval(get_typed_class(virt, 'ComputerSystem')) - -def enumerate(server, virt='Xen'): - conn = pywbem.WBEMConnection('http://%s' % server, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) - classname = get_typed_class(virt, 'ComputerSystem') - - try: - instances = conn.EnumerateInstances(classname) - except pywbem.CIMError, arg: - raise Exception(arg[1]) - return [] - - list = [] - - for instance in instances: - list.append(get_cs_class(virt)(server, instance["Name"])) - - return list - -def system_of(server, iname): - t = eval(iname["CreationClassName"]) - - return t(server, iname["Name"])

1 0

[PATCH 0 of 4] [TEST] Another set of do_main updates.
by Kaitlin Rupert 04 Sep '08

04 Sep '08

2 5

[PATCH] [CU] Fix handling of invalid class in mof parser
by Dan Smith 03 Sep '08

03 Sep '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1220457988 25200 # Node ID 9545053d336e7406c7743bb019fe871031a9c847 # Parent 45e061426afe4553f78d23dcf3d1b542e1794742 [CU] Fix handling of invalid class in mof parser Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 45e061426afe -r 9545053d336e eo_util_parser.y --- a/eo_util_parser.y Fri Aug 29 09:34:07 2008 -0700 +++ b/eo_util_parser.y Wed Sep 03 09:06:28 2008 -0700 @@ -23,6 +23,7 @@ #define RC_OK 0 #define RC_EOF EOF +#define RC_INVALID_CLASS -1000 /* DEFINE ANY GLOBAL VARS HERE */ static const CMPIBroker * _BROKER; @@ -76,6 +77,8 @@ *_INSTANCE = CMNewInstance(_BROKER, op, NULL); + if (*_INSTANCE == NULL) + return RC_INVALID_CLASS; free($3); } properties '}' ';'

2 1

Xen on Pegasus Test Run Summary for Sep 03 2008
by Guo Lian Yun 03 Sep '08

03 Sep '08

================================================= Xen on Pegasus Test Run Summary for Sep 03 2008 ================================================= Distro: Red Hat Enterprise Linux Server release 5.2 (Tikanga) Kernel: 2.6.18-92.el5xen libvirt: 0.3.3 Hypervisor: Xen 3.1.0 CIMOM: Pegasus 2.7.0 Libvirt-cim revision: 676 Libvirt-cim changeset: 2db1158cea31 ================================================= FAIL : 11 XFAIL : 0 SKIP : 2 PASS : 122 ----------------- Total : 135 ================================================= FAIL Test Summary: LogicalDisk - 02_nodevs.py: FAIL LogicalDisk - 03_ld_gi_errs.py: FAIL Memory - 01_memory.py: FAIL NetworkPort - 01_netport.py: FAIL RASD - 02_enum.py: FAIL ResourceAllocationFromPool - 01_forward.py: FAIL ResourceAllocationFromPool - 05_RAPF_err.py: FAIL VSSD - 02_bootldr.py: FAIL VSSD - 04_vssd_to_rasd.py: FAIL VirtualSystemManagementService - 06_addresource.py: FAIL VirtualSystemManagementService - 08_modifyresource.py: FAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP NetworkPort - 03_user_netport.py: SKIP ================================================= Full report: -------------------------------------------------------------------- AllocationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- AllocationCapabilities - 02_alloccap_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 01_enum.py: PASS -------------------------------------------------------------------- ComputerSystem - 02_nosystems.py: SKIP -------------------------------------------------------------------- ComputerSystem - 03_defineVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 04_defineStartVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 05_activate_defined_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 06_paused_active_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 22_define_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 23_suspend_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 27_define_suspend_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 32_start_reboot.py: PASS -------------------------------------------------------------------- ComputerSystem - 33_suspend_reboot.py: PASS -------------------------------------------------------------------- ComputerSystem - 35_start_reset.py: PASS -------------------------------------------------------------------- ComputerSystem - 40_RSC_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 41_cs_to_settingdefinestate.py: PASS -------------------------------------------------------------------- ComputerSystem - 42_cs_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystemIndication - 01_created_indication.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- HostSystem - 04_hs_to_EAPF.py: PASS -------------------------------------------------------------------- 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: FAIL ERROR - LogicalDisk returned 1 instead of empty list -------------------------------------------------------------------- LogicalDisk - 03_ld_gi_errs.py: FAIL ERROR - Failed to get instance by the class of Xen_LogicalDisk ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (hd_domain/xvda)') -------------------------------------------------------------------- Memory - 01_memory.py: FAIL ERROR - Capacity should be 262144 MB instead of 131072 MB -------------------------------------------------------------------- Memory - 02_defgetmem.py: PASS -------------------------------------------------------------------- Memory - 03_mem_gi_errs.py: PASS -------------------------------------------------------------------- NetworkPort - 01_netport.py: FAIL ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)') -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- Profile - 02_profile_to_elec.py: PASS -------------------------------------------------------------------- Profile - 03_rprofile_gi_errs.py: PASS -------------------------------------------------------------------- RASD - 01_verify_rasd_fields.py: PASS -------------------------------------------------------------------- RASD - 02_enum.py: FAIL ERROR - Xen_DiskResourceAllocationSettingData with VSSDC_dom was not returned -------------------------------------------------------------------- RASD - 03_rasd_errs.py: PASS -------------------------------------------------------------------- RASD - 04_disk_rasd_size.py: PASS -------------------------------------------------------------------- ReferencedProfile - 01_verify_refprof.py: PASS -------------------------------------------------------------------- ReferencedProfile - 02_refprofile_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 01_forward.py: FAIL ERROR - RASD instance with InstanceID RAFP_dom/mem not found -------------------------------------------------------------------- ResourceAllocationFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 03_forward_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 05_RAPF_err.py: FAIL ERROR - Xen_NetResourceAllocationSettingData with RAPF_domain was not returned ERROR - ------FAILED: to verify the RAFP.------ -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS -------------------------------------------------------------------- SettingsDefine - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefine - 02_reverse.py: PASS -------------------------------------------------------------------- SettingsDefine - 03_sds_fwd_errs.py: PASS -------------------------------------------------------------------- SettingsDefine - 04_sds_rev_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS -------------------------------------------------------------------- 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: FAIL ERROR - NameError : global name 'BaseException' is not defined Traceback (most recent call last): File "/data/users/daisy/cimtest/lib/CimTest/Globals.py", line 133, in do_try rc = f() File "02_bootldr.py", line 72, in main except BaseException, detail : NameError: global name 'BaseException' is not defined ERROR - None CIM_ERR_NOT_FOUND: No such instance (dom) -------------------------------------------------------------------- VSSD - 03_vssd_gi_errs.py: PASS -------------------------------------------------------------------- VSSD - 04_vssd_to_rasd.py: FAIL ERROR - Xen_VirtualSystemSettingData with VSSDC_dom was not returned ERROR - Xen_VirtualSystemSettingData returned 0 VSSD objects, expected only 1 -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 01_definesystem_name.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 02_destroysystem.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 03_definesystem_ess.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 04_definesystem_ers.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 05_destroysystem_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 06_addresource.py: FAIL ERROR - Error invoking AddRS: add_net_res ERROR - (1, u'CIM_ERR_FAILED: Failed to create domain') InvokeMethod(AddResourceSettings): CIM_ERR_FAILED: Failed to create domain -------------------------------------------------------------------- VirtualSystemManagementService - 07_addresource_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 08_modifyresource.py: FAIL ERROR - Got None, exp /tmp/default-xen-dimage.2ND. ERROR - Error invoking ModifyRS: mod_disk_res ERROR - Error changing rs for disk path -------------------------------------------------------------------- VirtualSystemManagementService - 09_procrasd_persist.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 10_hv_version.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 11_define_memrasdunits.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 12_referenced_config.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 01_migratable_host.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 02_host_migrate_type.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 05_migratable_host_errs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 01_forward.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 02_reverse.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS -------------------------------------------------------------------- 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 0

[PATCH] [TEST] Remove untouched computersystem.py inclusion in VSMigrationS and EC
by yunguol＠cn.ibm.com 03 Sep '08

03 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1220422252 25200 # Node ID 75c6f74bde599d0c73b0fb4019e9b5fb18f3838c # Parent 90ff66d2baee23319d29727d61fa9cf5d8f64f27 [TEST] Remove untouched computersystem.py inclusion in VSMigrationS and EC Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 90ff66d2baee -r 75c6f74bde59 suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Tue Sep 02 23:10:52 2008 -0700 @@ -44,7 +44,6 @@ from CimTest.Globals import logger, CIM_ from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS from XenKvmLib.const import do_main from XenKvmLib import enumclass -from XenKvmLib import computersystem from XenKvmLib import assoc from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.test_doms import destroy_and_undefine_all diff -r 90ff66d2baee -r 75c6f74bde59 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py Tue Sep 02 23:10:52 2008 -0700 @@ -29,7 +29,6 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import vxml from XenKvmLib.common_util import poll_for_state_change -from XenKvmLib import computersystem from XenKvmLib import vsmigrations from XenKvmLib.vsmigrations import check_possible_host_migration, migrate_guest_to_host, check_migration_job from XenKvmLib import enumclass diff -r 90ff66d2baee -r 75c6f74bde59 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Tue Sep 02 23:10:52 2008 -0700 @@ -27,7 +27,6 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import vxml from XenKvmLib.common_util import poll_for_state_change -from XenKvmLib import computersystem from XenKvmLib import vsmigrations from XenKvmLib.vsmigrations import check_possible_host_migration, \ migrate_guest_to_host, check_migration_job diff -r 90ff66d2baee -r 75c6f74bde59 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/05_migratable_host_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/05_migratable_host_errs.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/05_migratable_host_errs.py Tue Sep 02 23:10:52 2008 -0700 @@ -25,7 +25,6 @@ from pywbem.cim_obj import CIMInstanceNa from pywbem.cim_obj import CIMInstanceName from VirtLib import utils from XenKvmLib import vxml -from XenKvmLib import computersystem from XenKvmLib import vsmigrations from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL

1 0

[PATCH] [TEST] Update commom_util.py to reflect computersystem.py changes
by yunguol＠cn.ibm.com 03 Sep '08

03 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1220421366 25200 # Node ID 9339b6be10b1e1eb3a90ae1b62e5c37ebf53c48d # Parent 90ff66d2baee23319d29727d61fa9cf5d8f64f27 [TEST] Update commom_util.py to reflect computersystem.py changes Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 90ff66d2baee -r 9339b6be10b1 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue Sep 02 22:56:06 2008 -0700 @@ -28,7 +28,6 @@ from XenKvmLib.test_xml import * from XenKvmLib.test_xml import * from XenKvmLib.test_doms import * from XenKvmLib import vsms -from XenKvmLib import computersystem from XenKvmLib import enumclass from pywbem.cim_obj import CIMInstanceName from XenKvmLib.devices import CIM_Instance @@ -54,7 +53,11 @@ def get_cs_instance(domain_name, ip, vir def get_cs_instance(domain_name, ip, virt='Xen'): cs = None try: - cs = computersystem.get_cs_class(virt)(ip, domain_name) + keys = { + 'Name' : domain_name, + 'CreationClassName' : get_typed_class(virt, 'ComputerSystem') + } + cs = enumclass.getInstance(ip, 'ComputerSystem', keys, virt) if cs.Name != domain_name: logger.error("VS %s is not found" % domain_name) @@ -169,12 +172,16 @@ def try_request_state_change(domain_name def poll_for_state_change(server, virt, dom, exp_state, timeout=30): dom_cs = None - cs = computersystem.get_cs_class(virt) + + keys = { + 'Name' : dom, + 'CreationClassName' : get_typed_class(virt, 'ComputerSystem') + } + dom_cs = enumclass.getInstance(server, 'ComputerSystem', keys, virt) try: for i in range(1, (timeout + 1)): sleep(1) - dom_cs = cs(server, name=dom) if dom_cs is None or dom_cs.Name != dom: logger.error("CS instance not returned for %s." % dom) return FAIL, dom_cs

1 0

[PATCH 0 of 4] More updates to switch do_main to the do_main in const.py
by Kaitlin Rupert 03 Sep '08

03 Sep '08

2 5

[PATCH] [TEST] #3 Use enumclass.py to cover computersystem.py behavior and update CS testes
by yunguol＠cn.ibm.com 03 Sep '08

03 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1220420079 25200 # Node ID 9e48d953adc1414dd4d0b3e60813cbd4fd4a9669 # Parent 90ff66d2baee23319d29727d61fa9cf5d8f64f27 [TEST] #3 Use enumclass.py to cover computersystem.py behavior and update CS testes Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 90ff66d2baee -r 9e48d953adc1 suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Tue Sep 02 22:34:39 2008 -0700 @@ -24,7 +24,7 @@ import sys from XenKvmLib.const import do_main -from XenKvmLib import computersystem +from XenKvmLib import enumclass from VirtLib import live from VirtLib import utils from CimTest import Globals @@ -37,8 +37,9 @@ def main(): options = main.options status = PASS + keys = ['Name', 'CreationClassName'] try: - cs = computersystem.enumerate(options.ip, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) live_cs = live.domain_list(options.ip, options.virt) for system in cs: name = system.name diff -r 90ff66d2baee -r 9e48d953adc1 suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Tue Sep 02 22:34:39 2008 -0700 @@ -24,7 +24,7 @@ import sys import pywbem -from XenKvmLib import computersystem +from XenKvmLib import enumclass from VirtLib import live from VirtLib import utils from CimTest.Globals import logger, CIM_ERROR_ENUMERATE @@ -50,8 +50,9 @@ def main(): cn = "%s_ComputerSystem" % options.virt + keys = ['Name', 'CreationClassName'] try: - cs = computersystem.enumerate(options.ip, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) except Exception, details: logger.error(CIM_ERROR_ENUMERATE, cn) diff -r 90ff66d2baee -r 9e48d953adc1 suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Tue Sep 02 22:34:39 2008 -0700 @@ -27,7 +27,7 @@ # 26-Sep-2007 import sys -from XenKvmLib import computersystem +from XenKvmLib import enumclass from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class from VirtLib import utils @@ -49,8 +49,9 @@ def main(): Globals.logger.error(VIRSH_ERROR_DEFINE % test_dom) return status + keys = ['Name', 'CreationClassName'] try: - cs = computersystem.enumerate(options.ip, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) if len(cs) == 0: raise Exception('No cs instance returned') for dom in cs: diff -r 90ff66d2baee -r 9e48d953adc1 suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Tue Sep 02 22:34:39 2008 -0700 @@ -32,8 +32,8 @@ import sys import sys from time import sleep from XenKvmLib import vxml -from XenKvmLib import computersystem -from CimTest import Globals +from XenKvmLib import enumclass +from CimTest import Globals, CimExt from XenKvmLib.classes import get_typed_class from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -62,8 +62,11 @@ def main(): # otherwise. for i in range(1, (timeout + 1)): sleep(1) - cs = computersystem.get_cs_class(options.virt)(options.ip, - test_dom) + keys = { + 'Name' : test_dom, + 'CreationClassName' : get_typed_class(options.virt, 'ComputerSystem') + } + cs = enumclass.getInstance(options.ip, 'ComputerSystem', keys, options.virt) if cs.Name != test_dom: Globals.logger.error("VS %s is not defined" % test_dom) break diff -r 90ff66d2baee -r 9e48d953adc1 suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Tue Sep 02 22:34:39 2008 -0700 @@ -42,11 +42,12 @@ # Date : 17-10-2007 import sys -from XenKvmLib import computersystem +from XenKvmLib import enumclass from XenKvmLib import vxml from VirtLib import utils from CimTest.Globals import logger from XenKvmLib.const import do_main +from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import call_request_state_change from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC @@ -73,7 +74,12 @@ def main(): logger.error("ERROR: VS %s was not defined" % test_dom) return status - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) + keys = { + 'Name' : test_dom, + 'CreationClassName' : get_typed_class(options.virt, 'ComputerSystem') + } + cs = enumclass.getInstance(options.ip, 'ComputerSystem', keys, options.virt) + if cs.Name == test_dom: from_State = cs.EnabledState else: @@ -95,7 +101,7 @@ def main(): #Get the value of the EnabledState property and RequestedState property. try: - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) + cs= enumclass.getInstance(options.ip, 'ComputerSystem', keys, options.virt) if cs.Name == test_dom: to_RequestedState = cs.RequestedState enabledState = cs.EnabledState diff -r 90ff66d2baee -r 9e48d953adc1 suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py Tue Sep 02 22:34:39 2008 -0700 @@ -41,7 +41,6 @@ # Date :18-10-2007 import sys -from XenKvmLib import computersystem from XenKvmLib import vxml from VirtLib import utils from XenKvmLib.test_doms import destroy_and_undefine_all diff -r 90ff66d2baee -r 9e48d953adc1 suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Tue Sep 02 22:34:39 2008 -0700 @@ -29,7 +29,6 @@ # Date: 14-12-2007 import sys -from XenKvmLib import computersystem from VirtLib import utils from XenKvmLib import vxml from XenKvmLib.test_doms import destroy_and_undefine_domain diff -r 90ff66d2baee -r 9e48d953adc1 suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py Tue Sep 02 22:34:39 2008 -0700 @@ -58,7 +58,6 @@ import sys from VirtLib import utils -from XenKvmLib import computersystem from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.test_doms import destroy_and_undefine_all diff -r 90ff66d2baee -r 9e48d953adc1 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri Aug 29 13:26:12 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Tue Sep 02 22:34:39 2008 -0700 @@ -27,7 +27,7 @@ from pywbem.cim_obj import CIMInstanceNa from pywbem.cim_obj import CIMInstanceName from XenKvmLib.devices import CIM_Instance from XenKvmLib.classes import get_typed_class -from CimTest import Globals +from CimTest import Globals, CimExt class CIM_MyClass(CIM_Instance): def __init__(self, server, keys): @@ -42,8 +42,30 @@ class CIM_MyClass(CIM_Instance): inst = conn.GetInstance(ref) except pywbem.CIMError, arg: raise arg + + self.conn = conn + self.inst = inst + self.ref = ref CIM_Instance.__init__(self, inst) + + def __invoke(self, method, params): + try: + return self.conn.InvokeMethod(method, + self.ref, + **params) + except pywbem.CIMError, arg: + print 'InvokeMethod(%s): %s' % (method, arg[1]) + raise + + def __getattr__(self, attr): + if self.inst.has_key(attr): + return self.inst[attr] + else: + return CimExt._Method(self.__invoke, attr) + +class CIM_ComputerSystem(CIM_MyClass): + pass class CIM_System(CIM_MyClass): pass @@ -91,6 +113,15 @@ class CIM_ProcResourceAllocationSettingD pass class CIM_DiskResourceAllocationSettingData(CIM_MyClass): + pass + +class Xen_ComputerSystem(CIM_ComputerSystem): + pass + +class KVM_ComputerSystem(CIM_ComputerSystem): + pass + +class LXC_ComputerSystem(CIM_ComputerSystem): pass class Xen_HostSystem(CIM_System):

1 0

[PATCH] [TEST] Update CS to call enumclass.py instead of computersystem.py
by yunguol＠cn.ibm.com 03 Sep '08

03 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1220236263 25200 # Node ID db9789b5145f4cb219d4fcdfaa242e346d8b9c4d # Parent 946fd46b96866adaab356876f9c8bbf937f0b3d6 [TEST] Update CS to call enumclass.py instead of computersystem.py Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 946fd46b9686 -r db9789b5145f suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Sun Aug 31 19:31:03 2008 -0700 @@ -24,7 +24,7 @@ import sys from XenKvmLib.const import do_main -from XenKvmLib import computersystem +from XenKvmLib import enumclass from VirtLib import live from VirtLib import utils from CimTest import Globals @@ -37,8 +37,9 @@ options = main.options status = PASS + keys = ['Name', 'CreationClassName'] try: - cs = computersystem.enumerate(options.ip, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) live_cs = live.domain_list(options.ip, options.virt) for system in cs: name = system.name diff -r 946fd46b9686 -r db9789b5145f suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Sun Aug 31 19:31:03 2008 -0700 @@ -24,7 +24,7 @@ import sys import pywbem -from XenKvmLib import computersystem +from XenKvmLib import enumclass from VirtLib import live from VirtLib import utils from CimTest.Globals import logger, CIM_ERROR_ENUMERATE @@ -49,9 +49,9 @@ return SKIP cn = "%s_ComputerSystem" % options.virt - + keys = ['Name', 'CreationClassName'] try: - cs = computersystem.enumerate(options.ip, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) except Exception, details: logger.error(CIM_ERROR_ENUMERATE, cn) diff -r 946fd46b9686 -r db9789b5145f suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Sun Aug 31 19:31:03 2008 -0700 @@ -27,7 +27,7 @@ # 26-Sep-2007 import sys -from XenKvmLib import computersystem +from XenKvmLib import enumclass from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class from VirtLib import utils @@ -48,9 +48,9 @@ if not rc: Globals.logger.error(VIRSH_ERROR_DEFINE % test_dom) return status - + keys = ['Name', 'CreationClassName'] try: - cs = computersystem.enumerate(options.ip, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) if len(cs) == 0: raise Exception('No cs instance returned') for dom in cs: diff -r 946fd46b9686 -r db9789b5145f suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Sun Aug 31 19:31:03 2008 -0700 @@ -32,7 +32,7 @@ import sys from time import sleep from XenKvmLib import vxml -from XenKvmLib import computersystem +from XenKvmLib import enumclass from CimTest import Globals from XenKvmLib.classes import get_typed_class from XenKvmLib.const import do_main @@ -62,8 +62,8 @@ # otherwise. for i in range(1, (timeout + 1)): sleep(1) - cs = computersystem.get_cs_class(options.virt)(options.ip, - test_dom) + cs = get_typed_class(options.virt, 'ComputerSystem')\ + (options.ip, test_dom if cs.Name != test_dom: Globals.logger.error("VS %s is not defined" % test_dom) break diff -r 946fd46b9686 -r db9789b5145f suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Sun Aug 31 19:31:03 2008 -0700 @@ -42,8 +42,8 @@ # Date : 17-10-2007 import sys -from XenKvmLib import computersystem from XenKvmLib import vxml +from XenKvmLib.classes import get_typed_class from VirtLib import utils from CimTest.Globals import logger from XenKvmLib.const import do_main @@ -73,7 +73,8 @@ logger.error("ERROR: VS %s was not defined" % test_dom) return status - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) + cs = get_typed_class(options.virt, 'ComputerSystem')\ + (options.ip, test_dom) if cs.Name == test_dom: from_State = cs.EnabledState else: @@ -95,7 +96,8 @@ #Get the value of the EnabledState property and RequestedState property. try: - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) + cs = get_typed_class(options.virt, 'ComputerSystem')\ + (options.ip, test_dom) if cs.Name == test_dom: to_RequestedState = cs.RequestedState enabledState = cs.EnabledState diff -r 946fd46b9686 -r db9789b5145f suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Sun Aug 31 19:31:03 2008 -0700 @@ -29,7 +29,6 @@ # Date: 14-12-2007 import sys -from XenKvmLib import computersystem from VirtLib import utils from XenKvmLib import vxml from XenKvmLib.test_doms import destroy_and_undefine_domain diff -r 946fd46b9686 -r db9789b5145f suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py Sun Aug 31 19:31:03 2008 -0700 @@ -58,7 +58,6 @@ import sys from VirtLib import utils -from XenKvmLib import computersystem from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.test_doms import destroy_and_undefine_all

4 3