- CIM - libvirt List Archives

[PATCH] (#2) Remove value 4 from VSSD ValueMap
by Kaitlin Rupert 23 Sep '08

23 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222201308 25200 # Node ID 193c94848d62dfeb5eb00566d0331995c4a42931 # Parent 30bffd9a299131895f695f0061dc57141dc09a97 (#2) Remove value 4 from VSSD ValueMap. libvirt treats "Turn Off" and "Shutdown" in the same manner. Updates: -Remove unintended debug Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 30bffd9a2991 -r 193c94848d62 schema/VSSD.mof --- a/schema/VSSD.mof Tue Sep 23 13:22:54 2008 -0700 +++ b/schema/VSSD.mof Tue Sep 23 13:21:48 2008 -0700 @@ -29,6 +29,10 @@ "One of hd,fd,cdrom.")] string BootDevice; + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; + }; [Description ( @@ -41,6 +45,10 @@ [Description ("The device to boot from. One of hd,fd,cdrom.")] string BootDevice; + + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; }; @@ -55,4 +63,8 @@ [Description ("Path to the init process for the container")] string InitPath; + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; + };

1 0

[PATCH] Remove value 4 from VSSD ValueMap
by Kaitlin Rupert 23 Sep '08

23 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222113882 25200 # Node ID 8d683acf0587201617d65d8da41818a00165b398 # Parent 1dcb9b94763bc92ad33e0ff2d2483e771253102c Remove value 4 from VSSD ValueMap. libvirt treats "Turn Off" and "Shutdown" in the same manner. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 1dcb9b94763b -r 8d683acf0587 schema/VSSD.mof --- a/schema/VSSD.mof Fri Sep 19 11:30:54 2008 -0700 +++ b/schema/VSSD.mof Mon Sep 22 13:04:42 2008 -0700 @@ -29,6 +29,10 @@ "One of hd,fd,cdrom.")] string BootDevice; + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; + }; [Description ( @@ -41,6 +45,10 @@ [Description ("The device to boot from. One of hd,fd,cdrom.")] string BootDevice; + + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; }; @@ -55,4 +63,8 @@ [Description ("Path to the init process for the container")] string InitPath; + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; + }; diff -r 1dcb9b94763b -r 8d683acf0587 src/Virt_KVMRedirectionSAP.c --- a/src/Virt_KVMRedirectionSAP.c Fri Sep 19 11:30:54 2008 -0700 +++ b/src/Virt_KVMRedirectionSAP.c Mon Sep 22 13:04:42 2008 -0700 @@ -194,17 +194,25 @@ CU_DEBUG("calling get_console_sap"); inst = get_console_sap(_BROKER, ref, conn, dominfo, &s); +CU_DEBUG("after get_console"); virDomainFree(list[i]); cleanup_dominfo(&dominfo); - if (inst == NULL) + if (inst == NULL) { +CU_DEBUG("instance is null, continuing"); continue; + } - if (names_only) +CU_DEBUG("returning inst"); + if (names_only) { +CU_DEBUG("names_only"); cu_return_instance_name(results, inst); - else + } + else { +CU_DEBUG("no names"); CMReturnInstance(results, inst); + } } out:

2 2

XenFV on Pegasus Test Run Summary for Sep 23 2008
by Deepti B Kalakeri 23 Sep '08

23 Sep '08

================================================= XenFV on Pegasus Test Run Summary for Sep 23 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: 688 Libvirt-cim changeset: bc734ecd67ae ================================================= FAIL : 3 XFAIL : 1 SKIP : 4 PASS : 127 ----------------- Total : 135 ================================================= FAIL Test Summary: LogicalDisk - 03_ld_gi_errs.py: FAIL Processor - 03_proc_gi_errs.py: FAIL SettingsDefine - 03_sds_fwd_errs.py: FAIL ================================================= XFAIL Test Summary: ResourceAllocationFromPool - 05_RAPF_err.py: XFAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP LogicalDisk - 02_nodevs.py: SKIP NetworkPort - 03_user_netport.py: SKIP VSSD - 02_bootldr.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: SKIP ERROR - System has defined domains; unable to run -------------------------------------------------------------------- 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 (no domain for hd_domain/hda)') -------------------------------------------------------------------- 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: FAIL Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyvalue------ -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 03_forward_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 05_RAPF_err.py: XFAIL ERROR - 'Xen_ResourceAllocationFromPool' association failed to generate an exception and 'InstanceID' passed. ERROR - ------FAILED: to verify the RAFP.------ Bug:<> -------------------------------------------------------------------- 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: FAIL Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ -------------------------------------------------------------------- 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: SKIP -------------------------------------------------------------------- VSSD - 03_vssd_gi_errs.py: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 03_definesystem_ess.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 04_definesystem_ers.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 05_destroysystem_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 06_addresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 07_addresource_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 08_modifyresource.py: PASS -------------------------------------------------------------------- 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 -------------------------------------------------------------------- Thanks and Regards, Deepti.

1 1

[PATCH] [TEST] Fixing the debug message in common_util.py
by Deepti B. Kalakeri 23 Sep '08

23 Sep '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1222170304 25200 # Node ID 3ecde3bb4f9be6f4d2df69e9ee6c1f3284eea753 # Parent c31e2516d65acc6383665768022a3f4fc1088add [TEST] Fixing the debug message in common_util.py. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r c31e2516d65a -r 3ecde3bb4f9b suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue Sep 23 04:43:08 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue Sep 23 04:45:04 2008 -0700 @@ -136,7 +136,7 @@ def verify_err_desc(exp_rc, exp_desc, er return PASS else: logger.error("Unexpected rc code %s and description %s\n", - (err_no, err_desc)) + err_no, err_desc) return FAIL def call_request_state_change(domain_name, ip, rs, time, virt='Xen'):

1 0

[PATCH] [TEST] Add a check to verify virtualization type is valid for system
by Kaitlin Rupert 23 Sep '08

23 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222102928 25200 # Node ID a680024808eb6878d71b90ef5632d28448475e66 # Parent 16fd8f75598442d71eeb0199fb680ca6564656bc [TEST] Add a check to verify virtualization type is valid for system. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 16fd8f755984 -r a680024808eb suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Mon Sep 22 09:45:55 2008 -0700 +++ b/suites/libvirt-cim/main.py Mon Sep 22 10:02:08 2008 -0700 @@ -89,7 +89,12 @@ print "Cleaned log files." -def pre_check(ip): +def pre_check(ip, virt): + cmd = "virsh -c %s version " % utils.virt2uri(virt) + ret, out = utils.run_remote(ip, cmd) + if ret != 0: + return "This libvirt install does not support %s" % virt + cmd = "ps -ef | grep -v grep | grep cimserver" rc, out = utils.run_remote(ip, cmd) if rc != 0: @@ -168,7 +173,7 @@ parser.print_help() return 1 - env_ready = pre_check(options.ip) + env_ready = pre_check(options.ip, options.virt) if env_ready != None: print "\n%s. Please check your environment.\n" % env_ready return 1

3 2

[PATCH] [TEST] #2 Check return code of run_remote() in create_netpool_conf()
by Kaitlin Rupert 23 Sep '08

23 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222133121 25200 # Node ID 7551f7d43bd39917cd936788dcfd1e319bed234b # Parent c76b2779aca9810f4c3bdf8a0ca768dc3dc9315f [TEST] #2 Check return code of run_remote() in create_netpool_conf() Instead of checking the output. Also, add log_param to main.py debug messages for errors encountered by main.py will be printed to stderr/stdout. Updates from 1 to 2: -Add -w flag to grep command Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r c76b2779aca9 -r 7551f7d43bd3 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Mon Sep 22 07:50:25 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Mon Sep 22 18:25:21 2008 -0700 @@ -428,10 +428,11 @@ test_network = vir_network[0] if test_network == None: - cmd = "virsh -c %s net-list --all | grep %s" % \ + cmd = "virsh -c %s net-list --all | grep -w %s" % \ (utils.virt2uri(virt), net_name) ret, out = utils.run_remote(server, cmd) - if out != "": + # If success, network pool with name net_name already exists + if ret == 0: logger.error("Network pool with name '%s' already exists", net_name) return FAIL, "Unknown" diff -r c76b2779aca9 -r 7551f7d43bd3 suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Mon Sep 22 07:50:25 2008 -0700 +++ b/suites/libvirt-cim/main.py Mon Sep 22 18:25:21 2008 -0700 @@ -27,6 +27,7 @@ import sys sys.path.append('../../lib') import TestSuite +from CimTest.Globals import logger, log_param import commands from VirtLib import groups import ConfigParser @@ -184,6 +185,7 @@ return 1 testsuite = TestSuite.TestSuite(log=True) + log_param(file_name=testsuite.log_file) set_python_path() @@ -209,6 +211,7 @@ status = setup_env(options.ip, options.virt) if status != PASS: print "Please check your environment.\n" + testsuite.finish() return 1 print "\nTesting " + options.virt + " hypervisor"

2 1

[PATCH 0 of 2] (#3) Add RedirectionServiceCapabilities provider
by Kaitlin Rupert 22 Sep '08

22 Sep '08

The KVM Redirection Profile (DSP1076) indicates that implementing a provider for this class is option. It's implemented here for consistency with other classes.

1 2

[PATCH] (#2) Fix the AddResources path to not expect an InstanceID from the client
by Dan Smith 22 Sep '08

22 Sep '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1222113268 25200 # Node ID b837bd3290ec14b305dd5c046a81b703a6a5d287 # Parent 3e653cbda42cf949a1c389938aed2c37ba9f90cf (#2) Fix the AddResources path to not expect an InstanceID from the client Remove the update_resource_settings() function that now no longer holds common functionality for add and modify. Make _update_resource_settings() take a domain name to be applied to each of the RASDs in the list, or NULL if the RASD's InstanceID should be honored. Changes: Pull out the correct property for a VSSD AffectedConfiguration Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 3e653cbda42c -r b837bd3290ec src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Sep 10 13:27:03 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon Sep 22 12:54:28 2008 -0700 @@ -1333,6 +1333,13 @@ int *count = NULL; int i; + if (devid == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing or incomplete InstanceID"); + goto out; + } + op = CMGetObjectPath(rasd, &s); if ((op == NULL) || (s.rc != CMPI_RC_OK)) goto out; @@ -1420,7 +1427,6 @@ dev = &list[*count]; dev->type = type; - dev->id = strdup(devid); rasd_to_vdev(rasd, dominfo, dev, ns); s = _resource_dynamic(dominfo, dev, RESOURCE_ADD, CLASSNAME(op)); @@ -1448,6 +1454,13 @@ struct virt_device *list; int *count; int i; + + if (devid == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing or incomplete InstanceID"); + goto out; + } op = CMGetObjectPath(rasd, &s); if ((op == NULL) || (s.rc != CMPI_RC_OK)) @@ -1541,7 +1554,32 @@ return s; } +static CMPIStatus get_instanceid(CMPIInstance *rasd, + char **domain, + char **devid) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + const char *id; + + if (cu_get_str_prop(rasd, "InstanceID", &id) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing InstanceID in RASD"); + return s; + } + + if (!parse_fq_devid(id, domain, devid)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Invalid InstanceID `%s'", id); + return s; + } + + return s; +} + static CMPIStatus _update_resource_settings(const CMPIObjectPath *ref, + const char *domain, CMPIArray *resources, const CMPIResult *results, resmod_fn func) @@ -1565,7 +1603,6 @@ for (i = 0; i < count; i++) { CMPIData item; CMPIInstance *inst; - const char *id = NULL; char *name = NULL; char *devid = NULL; virDomainPtr dom = NULL; @@ -1573,18 +1610,17 @@ item = CMGetArrayElementAt(resources, i, NULL); inst = item.value.inst; - if (cu_get_str_prop(inst, "InstanceID", &id) != CMPI_RC_OK) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing InstanceID"); - goto end; - } - - if (!parse_fq_devid(id, &name, &devid)) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Bad InstanceID `%s'", id); - goto end; + /* If we were passed a domain name, then we're doing + * an AddResources, which means we ignore the InstanceID + * of the RASD. If not, then we get the domain name + * from the InstanceID of the RASD each time through. + */ + if (domain == NULL) { + s = get_instanceid(inst, &name, &devid); + if (s.rc != CMPI_RC_OK) + break; + } else { + name = strdup(domain); } dom = virDomainLookupByName(conn, name); @@ -1614,27 +1650,6 @@ virConnectClose(conn); - return s; -} - -static CMPIStatus update_resource_settings(const CMPIObjectPath *ref, - const CMPIArgs *argsin, - const CMPIResult *results, - resmod_fn func) -{ - CMPIArray *arr; - CMPIStatus s; - - if (cu_get_array_arg(argsin, "ResourceSettings", &arr) != CMPI_RC_OK) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing ResourceSettings"); - goto out; - } - - s = _update_resource_settings(ref, arr, results, func); - - out: return s; } @@ -1706,10 +1721,40 @@ const CMPIArgs *argsin, CMPIArgs *argsout) { - return update_resource_settings(reference, - argsin, - results, - resource_add); + CMPIArray *arr; + CMPIStatus s; + CMPIObjectPath *sys; + char *domain = NULL; + + if (cu_get_array_arg(argsin, "ResourceSettings", &arr) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Missing ResourceSettings"); + return s; + } + + if (cu_get_ref_arg(argsin, "AffectedConfiguration", &sys) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing AffectedConfiguration parameter"); + return s; + } + + if (!parse_instanceid(sys, NULL, &domain)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "AffectedConfiguration has invalid InstanceID"); + return s; + } + + s = _update_resource_settings(reference, + domain, + arr, + results, + resource_add); + free(domain); + + return s; } static CMPIStatus mod_resource_settings(CMPIMethodMI *self, @@ -1719,10 +1764,21 @@ const CMPIArgs *argsin, CMPIArgs *argsout) { - return update_resource_settings(reference, - argsin, - results, - resource_mod); + CMPIArray *arr; + CMPIStatus s; + + if (cu_get_array_arg(argsin, "ResourceSettings", &arr) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Missing ResourceSettings"); + return s; + } + + return _update_resource_settings(reference, + NULL, + arr, + results, + resource_mod); } static CMPIStatus rm_resource_settings(CMPIMethodMI *self, @@ -1752,6 +1808,7 @@ goto out; s = _update_resource_settings(reference, + NULL, resource_arr, results, resource_del);

2 1

Re: Fw: [TEST] Test failure summary for Xen/XenFV with and without sblim base providers with current resource
by Guo Lian Yun 22 Sep '08

22 Sep '08

Guo Lian Yun/China/IBM wrote on 2008-09-10 15:46:25: > Deepti, > > Here is my updates today. > > Xen (8) > > XenFV (11) > > Xen with sblim base providers installed (33) > > Person Responsible > > ComputerSystem - 01_enum.py > > ComputerSystem - 32_start_reboot.py > > ComputerSystem - 32_start_reboot.py > > ComputerSystem - 32_start_reboot.py > > submitted patch for this. > > ElementCapabilities - 01_forward.py > > ElementCapabilities - 02_reverse.py > > ElementCapabilities - 05_hostsystem_cap.py > > ElementConforms - 01_forward.py > > ElementConforms - 02_reverse.py > > EnabledLogicalElementCapabilities - 01_enum.py > The Host* related tests fails because that I get none when enumerate HostSystem with sblim base provider installed. Below query return NULL to me. wbemcli ein http://root:password@localhost/root/virt:Xen_HostSystem Here is the output when I debug HostSystem - 01_enum.py test case. Virt_HostSystem.c(164): SBLIM: Returned instance misc_util.c(72): Connecting to libvirt with uri `xen' misc_util.c(199): URI of connection is: xen:/// Virt_HostSystem.c(164): SBLIM: Returned instance I will continue to look into this, please let me know if you know more about it. Thanks! > HostSystem - 01_enum.py > > HostSystem - 02_hostsystem_to_rasd.py > > HostSystem - 03_hs_to_settdefcap.py > > HostSystem - 04_hs_to_EAPF.py > > HostSystem - 05_hs_gi_errs.py > > HostSystem - 06_hs_to_vsms.py > > HostedDependency - 01_forward.py > > HostedDependency - 02_reverse.py > > HostedDependency - 03_enabledstate.py > > HostedDependency - 04_reverse_errs.py > > HostedResourcePool - 01_forward.py > > HostedResourcePool - 02_reverse.py > > HostedResourcePool - 03_forward_errs.py > > HostedService - 01_forward.py > > HostedService - 02_reverse.py > > HostedService - 03_forward_errs.py > > HostedService - 04_reverse_errs.py > > LogicalDisk - 02_nodevs.py > > #2 patch under review > > LogicalDisk - 03_ld_gi_errs.py > > LogicalDisk - 03_ld_gi_errs.py > > fix > > Memry - 01_memory.py > > Memory - 01_memory.py > > fix > > NetworkPort - 01_netport.py > > NetworkPort - 01_netport.py > > fix > > RASD - 02_enum.py > > fix > > ResourceAllocationFromPool - 01_forward.py > > fix > > ResourceAllocationFromPool - 05_RAPF_err.py > > fix > > ResourcePoolConfigurationService - 01_enum.py > > ResourcePoolConfigurationService - 02_rcps_gi_errors.py > > VSSD - 02_bootldr.py > > VSSD - 02_bootldr.py > > #2 patch under review > > VSSD - 04_vssd_to_rasd.py > > VSSD - 04_vssd_to_rasd.py > > #2 patch under review > > VirtualSystemManagementService - 06_addresource.py > > VirtualSystemManagementService - 06_addresource.py > > VirtualSystemManagementService - 06_addresource.py > > Sent the tc failures analysis > > VirtualSystemManagementService - 08_modifyresource.py > > VirtualSystemManagementService - 08_modifyresource.py > > VirtualSystemManagementService - 08_modifyresource.py > > This did not fail again for me. > > VirtualSystemMigrationService - 02_host_migrate_type.py > > Under analysis. > > VirtualSystemSnapshotService - 01_enum.py > > VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py > > Best, > Regards > > Daisy (运国莲) > VSM Team, China Systems & Technology Labs (CSTL) > E-mail: yunguol(a)cn.ibm.com > TEL: (86)-21-60922403 > Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203 > ----- Forwarded by Guo Lian Yun/China/IBM on 2008-09-10 15:46 ----- > > Guo Lian Yun/China/IBM > 2008-09-09 14:36 > > To > > Deepti B Kalakeri/India/IBM@IBMIN@IBMAU > > cc > > Kaitlin Rupert/Beaverton/IBM@IBMUS > > Subject > > Re: [TEST] Test failure summary for Xen/XenFV with and without sblim > base providers with current resource > > Update the table. > > Xen (8) > > XenFV (11) > > Xen with sblim base providers installed (33) > > Person Responsible > > ComputerSystem - 01_enum.py > > ComputerSystem - 32_start_reboot.py > > ComputerSystem - 32_start_reboot.py > > ComputerSystem - 32_start_reboot.py > > submitted patch for this. > > ElementCapabilities - 01_forward.py > > ElementCapabilities - 02_reverse.py > > ElementCapabilities - 05_hostsystem_cap.py > > ElementConforms - 01_forward.py > > ElementConforms - 02_reverse.py > > EnabledLogicalElementCapabilities - 01_enum.py > > HostSystem - 01_enum.py > > HostSystem - 02_hostsystem_to_rasd.py > > HostSystem - 03_hs_to_settdefcap.py > > HostSystem - 04_hs_to_EAPF.py > > HostSystem - 05_hs_gi_errs.py > > HostSystem - 06_hs_to_vsms.py > > HostedDependency - 01_forward.py > > HostedDependency - 02_reverse.py > > HostedDependency - 03_enabledstate.py > > HostedDependency - 04_reverse_errs.py > > HostedResourcePool - 01_forward.py > > HostedResourcePool - 02_reverse.py > > HostedResourcePool - 03_forward_errs.py > > HostedService - 01_forward.py > > HostedService - 02_reverse.py > > HostedService - 03_forward_errs.py > > HostedService - 04_reverse_errs.py > > LogicalDisk - 02_nodevs.py > > Patch under review > > LogicalDisk - 03_ld_gi_errs.py > > LogicalDisk - 03_ld_gi_errs.py > > Patch under review > > Memry - 01_memory.py > > Memory - 01_memory.py > > Patch under review > > NetworkPort - 01_netport.py > > NetworkPort - 01_netport.py > > Patch under review > > RASD - 02_enum.py > > Patch under review > > ResourceAllocationFromPool - 01_forward.py > > Patch under review > > ResourceAllocationFromPool - 05_RAPF_err.py > > Patch under review > > ResourcePoolConfigurationService - 01_enum.py > > ResourcePoolConfigurationService - 02_rcps_gi_errors.py > > VSSD - 02_bootldr.py > > VSSD - 02_bootldr.py > > VSSD - 04_vssd_to_rasd.py > > VSSD - 04_vssd_to_rasd.py > > VirtualSystemManagementService - 06_addresource.py > > VirtualSystemManagementService - 06_addresource.py > > VirtualSystemManagementService - 06_addresource.py > > Sent the tc failures analysis > > VirtualSystemManagementService - 08_modifyresource.py > > VirtualSystemManagementService - 08_modifyresource.py > > VirtualSystemManagementService - 08_modifyresource.py > > This did not fail again for me. > > VirtualSystemMigrationService - 02_host_migrate_type.py > > Under analysis. > > VirtualSystemSnapshotService - 01_enum.py > > VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py > > Best, > Regards > > Daisy (运国莲) > VSM Team, China Systems & Technology Labs (CSTL) > E-mail: yunguol(a)cn.ibm.com > TEL: (86)-21-60922403 > Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203 > > Deepti B Kalakeri/India/IBM@IBMIN > 2008-09-05 20:59 > > To > > Guo Lian Yun/China/IBM@IBMCN@IBMAU > > cc > > Kaitlin Rupert/Beaverton/IBM@IBMUS, Kaitlin Rupert/Beaverton/IBM@IBMUS > > Subject > > Re: [TEST] Test failure summary for Xen/XenFV with and without sblim > base providers with current resource > > Updated the table. > > Xen (8) > > XenFV (11) > > Xen with sblim base providers installed (33) > > Person Responsible > > ComputerSystem - 01_enum.py > > ComputerSystem - 32_start_reboot.py > > ComputerSystem - 32_start_reboot.py > > ComputerSystem - 32_start_reboot.py > > submitted patch for this. > > ElementCapabilities - 01_forward.py > > ElementCapabilities - 02_reverse.py > > ElementCapabilities - 05_hostsystem_cap.py > > ElementConforms - 01_forward.py > > ElementConforms - 02_reverse.py > > EnabledLogicalElementCapabilities - 01_enum.py > > HostSystem - 01_enum.py > > HostSystem - 02_hostsystem_to_rasd.py > > HostSystem - 03_hs_to_settdefcap.py > > HostSystem - 04_hs_to_EAPF.py > > HostSystem - 05_hs_gi_errs.py > > HostSystem - 06_hs_to_vsms.py > > HostedDependency - 01_forward.py > > HostedDependency - 02_reverse.py > > HostedDependency - 03_enabledstate.py > > HostedDependency - 04_reverse_errs.py > > HostedResourcePool - 01_forward.py > > HostedResourcePool - 02_reverse.py > > HostedResourcePool - 03_forward_errs.py > > HostedService - 01_forward.py > > HostedService - 02_reverse.py > > HostedService - 03_forward_errs.py > > HostedService - 04_reverse_errs.py > > LogicalDisk - 02_nodevs.py > > LogicalDisk - 03_ld_gi_errs.py > > LogicalDisk - 03_ld_gi_errs.py > > Memry - 01_memory.py > > Memory - 01_memory.py > > NetworkPort - 01_netport.py > > NetworkPort - 01_netport.py > > RASD - 02_enum.py > > ResourceAllocationFromPool - 01_forward.py > > ResourceAllocationFromPool - 05_RAPF_err.py > > ResourcePoolConfigurationService - 01_enum.py > > ResourcePoolConfigurationService - 02_rcps_gi_errors.py > > VSSD - 02_bootldr.py > > VSSD - 02_bootldr.py > > VSSD - 04_vssd_to_rasd.py > > VSSD - 04_vssd_to_rasd.py > > VirtualSystemManagementService - 06_addresource.py > > VirtualSystemManagementService - 06_addresource.py > > VirtualSystemManagementService - 06_addresource.py > > Sent the tc failures analysis > > VirtualSystemManagementService - 08_modifyresource.py > > VirtualSystemManagementService - 08_modifyresource.py > > VirtualSystemManagementService - 08_modifyresource.py > > This did not fail again for me. > > VirtualSystemMigrationService - 02_host_migrate_type.py > > Under analysis. > > VirtualSystemSnapshotService - 01_enum.py > > VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py > > Thanks and Regards, > Deepti. > > >

2 10

[PATCH] [TEST] Check return code of run_remote() in create_netpool_conf()
by Kaitlin Rupert 22 Sep '08

22 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222101955 25200 # Node ID 16fd8f75598442d71eeb0199fb680ca6564656bc # Parent c76b2779aca9810f4c3bdf8a0ca768dc3dc9315f [TEST] Check return code of run_remote() in create_netpool_conf() Instead of checking the output. Also, add log_param to main.py debug messages for errors encountered by main.py will be printed to stderr/stdout. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r c76b2779aca9 -r 16fd8f755984 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Mon Sep 22 07:50:25 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Mon Sep 22 09:45:55 2008 -0700 @@ -431,7 +431,8 @@ cmd = "virsh -c %s net-list --all | grep %s" % \ (utils.virt2uri(virt), net_name) ret, out = utils.run_remote(server, cmd) - if out != "": + # If success, network pool with name net_name already exists + if ret == 0: logger.error("Network pool with name '%s' already exists", net_name) return FAIL, "Unknown" diff -r c76b2779aca9 -r 16fd8f755984 suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Mon Sep 22 07:50:25 2008 -0700 +++ b/suites/libvirt-cim/main.py Mon Sep 22 09:45:55 2008 -0700 @@ -27,6 +27,7 @@ import sys sys.path.append('../../lib') import TestSuite +from CimTest.Globals import logger, log_param import commands from VirtLib import groups import ConfigParser @@ -184,6 +185,7 @@ return 1 testsuite = TestSuite.TestSuite(log=True) + log_param(file_name=testsuite.log_file) set_python_path() @@ -209,6 +211,7 @@ status = setup_env(options.ip, options.virt) if status != PASS: print "Please check your environment.\n" + testsuite.finish() return 1 print "\nTesting " + options.virt + " hypervisor"

2 2