From yunguol at cn.ibm.com  Mon Jun  2 01:36:35 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 2 Jun 2008 09:36:35 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Resubmit
	ElementConforms.01&03&04	for LXC support
In-Reply-To: <48404871.6010904@linux.vnet.ibm.com>
Message-ID: <OF177A8840.CC6BCD9B-ON4825745C.0009008C-4825745C.0009246D@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-05-31 02:33:21:

> yunguol at cn.ibm.com wrote:
> > # HG changeset patch
> > # User Guolian Yun <yunguol at cn.ibm.com>
> > # Date 1212115646 -28800
> > # Node ID 25c2af6bfccc73196fff0ce96f7162b8b22d0057
> > # Parent  3ac66cf562f082546883c1de0d748471b557cd39
> > [TEST] Resubmit ElementConforms.01&03&04 for LXC support
> > 
> > Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> wbemcli ain -ac LXC_ElementConformsToProfile 
> 'http://localhost:5988/root/virt:LXC_HostSystem.
> CreationClassName="LXC_HostSystem",Name="elm3b41"'
> 
> This query doesn't return any records, which is why I think I saw a 
> problem.  Does this work for you on your system?

  It does work for me, and below is the output of this query.

  
localhost:5988/root/virt:LXC_RegisteredProfile.InstanceID="CIM:DSP1042-SystemVirtualization-1.0.0"

> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080602/d4c93680/attachment.htm>

From zli at linux.vnet.ibm.com  Mon Jun  2 07:11:09 2008
From: zli at linux.vnet.ibm.com (Zhengang Li)
Date: Mon, 02 Jun 2008 15:11:09 +0800
Subject: [Libvirt-cim] Website and code repo down?
Message-ID: <48439D0D.4010006@linux.vnet.ibm.com>

It seems that all service under the 'libvirt.org' is down today.

Daniel,

Can you please check the server status?

-- 
- Zhengang




From veillard at redhat.com  Mon Jun  2 09:36:24 2008
From: veillard at redhat.com (Daniel Veillard)
Date: Mon, 2 Jun 2008 05:36:24 -0400
Subject: [Libvirt-cim] Website and code repo down?
In-Reply-To: <48439D0D.4010006@linux.vnet.ibm.com>
References: <48439D0D.4010006@linux.vnet.ibm.com>
Message-ID: <20080602093623.GA18371@redhat.com>

On Mon, Jun 02, 2008 at 03:11:09PM +0800, Zhengang Li wrote:
> It seems that all service under the 'libvirt.org' is down today.
> 
> Daniel,
> 
> Can you please check the server status?

  Yes sorry, we got a nice Oops from the kernel, and a filesystem
corruption required a manual intervention to restart it.

  It should be back up, and the kernel bug has been logged :-)

Daniel

-- 
Red Hat Virtualization group http://redhat.com/virtualization/
Daniel Veillard      | virtualization library  http://libvirt.org/
veillard at redhat.com  | libxml GNOME XML XSLT toolkit  http://xmlsoft.org/
http://veillard.com/ | Rpmfind RPM search engine  http://rpmfind.net/



From yunguol at cn.ibm.com  Mon Jun  2 10:09:19 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 2 Jun 2008 18:09:19 +0800
Subject: [Libvirt-cim] [TEST] Cimtest Report for LXC (2008/06/02)
Message-ID: <OFBE5187C7.A1576A41-ON4825745C.0037F010-4825745C.003815C4@cn.ibm.com>

stro: Fedora 9 Beta
Kernel: 2.6.25-0.121.rc5.git4.fc9
Libvirt: 0.4.2
CIMOM: 2.7.0-6.fc9
PyWBEM: 0.6-1
libcmpiutil: changeset-79
libvirt-cim: changeset-598
cimtest: changeset-171


===================== CIMTEST REPORT===============================

AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: PASS
ComputerSystem - 03_defineVS.py: PASS
ComputerSystem - 04_defineStartVS.py: SKIP
ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
ComputerSystem - 06_paused_active_suspend.py: SKIP
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: SKIP
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: SKIP
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: SKIP
ComputerSystemIndication - 01_created_indication.py: SKIP
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: SKIP
ElementAllocatedFromPool - 04_forward_errs.py: SKIP
ElementCapabilities - 01_forward.py: SKIP
ElementCapabilities - 02_reverse.py: SKIP
ElementCapabilities - 03_forward_errs.py: SKIP
ElementCapabilities - 04_reverse_errs.py: SKIP
ElementCapabilities - 05_hostsystem_cap.py: SKIP
ElementConforms - 01_forward.py: SKIP
ElementConforms - 02_reverse.py: SKIP
ElementConforms - 03_ectp_fwd_errs.py: SKIP
ElementConforms - 04_ectp_rev_errs.py: SKIP
ElementSettingData - 01_forward.py: PASS
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: SKIP
EnabledLogicalElementCapabilities - 01_enum.py: PASS
EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS
HostSystem - 01_enum.py: PASS
HostSystem - 02_hostsystem_to_rasd.py: SKIP
HostSystem - 03_hs_to_settdefcap.py: SKIP
HostSystem - 04_hs_to_EAPF.py: SKIP
HostSystem - 05_hs_gi_errs.py: PASS
HostSystem - 06_hs_to_vsms.py: SKIP
HostedDependency - 01_forward.py: PASS
HostedDependency - 02_reverse.py: PASS
HostedDependency - 03_enabledstate.py: SKIP
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: SKIP
LogicalDisk - 02_nodevs.py: SKIP
LogicalDisk - 03_ld_gi_errs.py: SKIP
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: SKIP
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: SKIP
NetworkPort - 02_np_gi_errors.py: SKIP
NetworkPort - 03_user_netport.py: SKIP
Processor - 01_processor.py: SKIP
Processor - 02_definesys_get_procs.py: SKIP
Processor - 03_proc_gi_errs.py: SKIP
Profile - 01_enum.py: PASS
Profile - 02_profile_to_elec.py: SKIP
Profile - 03_rprofile_gi_errs.py: PASS
RASD - 01_verify_rasd_fields.py: SKIP
RASD - 02_enum.py: SKIP
RASD - 03_rasd_errs.py: SKIP
ReferencedProfile - 01_verify_refprof.py: PASS
ReferencedProfile - 02_refprofile_errs.py: PASS
ResourceAllocationFromPool - 01_forward.py: SKIP
ResourceAllocationFromPool - 02_reverse.py: SKIP
ResourceAllocationFromPool - 03_forward_errs.py: SKIP
ResourceAllocationFromPool - 04_reverse_errs.py: SKIP
ResourceAllocationFromPool - 05_RAPF_err.py: SKIP
ResourcePool - 01_enum.py: SKIP
ResourcePool - 02_rp_gi_errors.py: SKIP
ResourcePoolConfigurationCapabilities - 01_enum.py: PASS
ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS
ResourcePoolConfigurationService - 01_enum.py: SKIP
ResourcePoolConfigurationService - 02_rcps_gi_errors.py: SKIP
ResourcePoolConfigurationService - 03_CreateResourcePool.py: SKIP
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: 
SKIP
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP
SettingsDefine - 01_forward.py: SKIP
SettingsDefine - 02_reverse.py: SKIP
SettingsDefine - 03_sds_fwd_errs.py: SKIP
SettingsDefine - 04_sds_rev_errs.py: SKIP
SettingsDefineCapabilities - 01_forward.py: SKIP
SettingsDefineCapabilities - 03_forward_errs.py: SKIP
SettingsDefineCapabilities - 04_forward_vsmsdata.py: SKIP
SettingsDefineCapabilities - 05_reverse_vsmcap.py: SKIP
SystemDevice - 01_forward.py: SKIP
SystemDevice - 02_reverse.py: SKIP
SystemDevice - 03_fwderrs.py: SKIP
VSSD - 01_enum.py: SKIP
VSSD - 02_bootldr.py: SKIP
VSSD - 03_vssd_gi_errs.py: SKIP
VSSD - 04_vssd_to_rasd.py: SKIP
VirtualSystemManagementCapabilities - 01_enum.py: SKIP
VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: SKIP
VirtualSystemManagementService - 01_definesystem_name.py: SKIP
VirtualSystemManagementService - 02_destroysystem.py: SKIP
VirtualSystemManagementService - 03_definesystem_ess.py: SKIP
VirtualSystemManagementService - 04_definesystem_ers.py: SKIP
VirtualSystemManagementService - 05_destroysystem_neg.py: SKIP
VirtualSystemManagementService - 06_addresource.py: SKIP
VirtualSystemManagementService - 07_addresource_neg.py: SKIP
VirtualSystemManagementService - 08_modifyresource.py: SKIP
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
VirtualSystemMigrationSettingData - 01_enum.py: SKIP
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: SKIP
VirtualSystemSettingDataComponent - 01_forward.py: SKIP
VirtualSystemSettingDataComponent - 02_reverse.py: SKIP
VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: SKIP
VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: SKIP
VirtualSystemSnapshotService - 01_enum.py: PASS
VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS
VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS
VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: 
PASS



Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080602/a34bceb6/attachment.htm>

From yunguol at cn.ibm.com  Mon Jun  2 10:18:26 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 2 Jun 2008 18:18:26 +0800
Subject: [Libvirt-cim] [TEST] CimTest Report for KVM on F9 (2008/06/02)
Message-ID: <OF9B32FEDF.7442AFCB-ON4825745C.0038BB5C-4825745C.0038EB3B@cn.ibm.com>

stro: Fedora 9 Beta
Kernel: 2.6.25-0.121.rc5.git4.fc9
Libvirt: 0.4.1-7.fc9
CIMOM: 2.7.0-6.fc9
PyWBEM: 0.6-1
libcmpiutil: 0.3-1.fc9
libvirt-cim: 0.3-4.fc9
cimtest: changeset-171


=================== FAIL ===========================================
ComputerSystemIndication - 01_created_indication.py: FAIL

ElementConforms - 02_reverse.py: FAIL

ElementSettingData - 03_esd_assoc_with_rasd_errs.py: FAIL

HostSystem - 02_hostsystem_to_rasd.py: FAIL

NetworkPort - 01_netport.py: FAIL

NetworkPort - 03_user_netport.py: FAIL

RASD - 01_verify_rasd_fields.py: FAIL

ResourceAllocationFromPool - 05_RAPF_err.py: FAIL

VirtualSystemManagementService - 08_modifyresource.py: FAIL

========FULL CIMTEST REPORT=PASS(95)=FAIL(9)=SKIP(18)=XFAIL(7)=======

AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: PASS
ComputerSystem - 03_defineVS.py: PASS
ComputerSystem - 04_defineStartVS.py: PASS
ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
ComputerSystem - 06_paused_active_suspend.py: XFAIL     Bug: 00002
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: SKIP
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: XFAIL Bug: 00001
InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed
Bug:<00001>
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: PASS
ComputerSystemIndication - 01_created_indication.py: FAIL
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: XFAIL    Bug: 88651
ElementAllocatedFromPool - 04_forward_errs.py: XFAIL    Bug: 88651
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: FAIL
ElementConforms - 03_ectp_fwd_errs.py: XFAIL    Bug: 92642
Bug:<92642>
Bug:<92642>
ElementConforms - 04_ectp_rev_errs.py: XFAIL    Bug: 92642
Bug:<92642>
Bug:<92642>
Bug:<92642>
Bug:<92642>
Bug:<92642>
Bug:<92642>
Bug:<92642>
Bug:<92642>
ElementSettingData - 01_forward.py: PASS
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: FAIL
EnabledLogicalElementCapabilities - 01_enum.py: PASS
EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS
HostSystem - 01_enum.py: PASS
HostSystem - 02_hostsystem_to_rasd.py: FAIL
HostSystem - 03_hs_to_settdefcap.py: PASS
HostSystem - 04_hs_to_EAPF.py: SKIP
HostSystem - 05_hs_gi_errs.py: PASS
HostSystem - 06_hs_to_vsms.py: PASS
HostedDependency - 01_forward.py: PASS
HostedDependency - 02_reverse.py: PASS
HostedDependency - 03_enabledstate.py: PASS
HostedDependency - 04_reverse_errs.py: PASS
HostedResourcePool - 01_forward.py: PASS
HostedResourcePool - 02_reverse.py: PASS
HostedResourcePool - 03_forward_errs.py: PASS
HostedResourcePool - 04_reverse_errs.py: PASS
HostedService - 01_forward.py: PASS
HostedService - 02_reverse.py: PASS
HostedService - 03_forward_errs.py: PASS
HostedService - 04_reverse_errs.py: PASS
LogicalDisk - 01_disk.py: PASS
LogicalDisk - 02_nodevs.py: PASS
LogicalDisk - 03_ld_gi_errs.py: PASS
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: PASS
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: FAIL
NetworkPort - 02_np_gi_errors.py: PASS
NetworkPort - 03_user_netport.py: FAIL
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: SKIP
Profile - 03_rprofile_gi_errs.py: SKIP
RASD - 01_verify_rasd_fields.py: FAIL
RASD - 02_enum.py: PASS
RASD - 03_rasd_errs.py: PASS
ReferencedProfile - 01_verify_refprof.py: SKIP
ReferencedProfile - 02_refprofile_errs.py: SKIP
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: FAIL
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: 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: FAIL
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: SKIP
VirtualSystemSettingDataComponent - 02_reverse.py: 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

Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080602/49cfaeae/attachment.htm>

From deeptik at linux.vnet.ibm.com  Mon Jun  2 13:38:09 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Mon, 02 Jun 2008 06:38:09 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 02_reverse.py of RAPF
Message-ID: <d478234fefe940f0ef73.1212413889@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1212413727 25200
# Node ID d478234fefe940f0ef738bbb83e6a3ab32736bec
# Parent  4a5a44d7b857df543af24d59380cb8fdbbb753a4
[TEST] Fixing 02_reverse.py of RAPF.

Added the following extra steps:
1) Defining a domain.
2) creating diskpool, netpool.

Without the steps 1 and 2 the tc used to simply pass.
The tc will fail on KVM with old libvirt-cim rpm as expected and will pass with the latest source.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 4a5a44d7b857 -r d478234fefe9 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Fri May 30 14:26:38 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Mon Jun 02 06:35:27 2008 -0700
@@ -6,6 +6,7 @@
 #    Guolian Yun <yunguol at cn.ibm.com>
 #    Kaitlin Rupert <karupert at us.ibm.com>
 #    Zhengang Li <lizg at cn.ibm.com>
+#    Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public
@@ -25,69 +26,164 @@ import sys
 import sys
 from VirtLib import utils
 from XenKvmLib import assoc
-from XenKvmLib import devices
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
+from XenKvmLib.const import CIM_REV
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
-from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import enumclass
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
+
 
 sup_types = ['Xen', 'XenFV', 'KVM']
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+proc_instid_rev = 590
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    else:
+        test_disk = "hda"
+
+    virtxml = get_class(virt)
+    vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                    mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def init_list(test_disk, diskid, test_network):
+
+    if CIM_REV < proc_instid_rev:
+        procid = '%s/%s' % (test_dom, 0)
+    else:
+        procid = '%s/%s' % (test_dom, 'proc')
+
+    proc = { 'rasd_id' : procid,
+             'pool_id' : 'ProcessorPool/0'
+           }
+
+    mem = { 'rasd_id' : '%s/%s' % (test_dom,'mem'),
+            'pool_id' : 'MemoryPool/0'
+          }
+
+    net  = { 
+             'rasd_id' : '%s/%s' % (test_dom, test_mac),
+             'pool_id' : 'NetworkPool/%s' %test_network
+           }
+
+    disk = { 'rasd_id' : '%s/%s' % (test_dom, test_disk),
+             'pool_id' : diskid
+           }
+
+    cn_id_list = {
+                   'MemResourceAllocationSettingData'  : mem,
+                   'ProcResourceAllocationSettingData' : proc,
+                   'NetResourceAllocationSettingData'  : net,
+                   'DiskResourceAllocationSettingData' : disk
+                }
+
+    return cn_id_list
+
+def get_rasd_instance(server, virt, key_list, cn):
+    inst = None 
+    try:
+        inst = enumclass.getInstance(server, cn, key_list, virt)
+    except Exception, details:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
+        logger.error("Exception details: %s", details)
+        return inst, FAIL
+
+    return inst, PASS
+
+def verify_pool_from_RAFP(server, virt, inst, pool_id, cn):
+    pool = []
+    try:
+        pool = assoc.AssociatorNames(server, "ResourceAllocationFromPool",
+                                     cn, virt, InstanceID = inst.InstanceID)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES, inst.InstanceID)
+        return FAIL
+
+    if len(pool) != 1:
+        logger.error("No associated pool for %s", inst.InstanceID)
+        return FAIL
+
+    if pool[0]['InstanceID'] != pool_id:
+        logger.error("InstanceID Mismatch")
+        logger.error("Returned %s instead of %s", pool[0]['InstanceID'] ,
+                      pool_id)
+        return FAIL
+
+    return PASS
+
+def get_rasdinst_verify_pool_from_RAFP(server, virt, vsxml, cn, id_info):
+    try:
+        key_list = {  'InstanceID' : id_info['rasd_id'] }
+        rasd_cn =  get_typed_class(virt, cn) 
+        rasdinst, status = get_rasd_instance(server, virt, key_list, rasd_cn)
+        if status != PASS or rasdinst.InstanceID == None:
+            vsxml.undefine(server)    
+            return status
+
+        status = verify_pool_from_RAFP(server, virt, rasdinst, 
+                                       id_info['pool_id'], cn)
+    except Exception, details:
+        logger.error("Exception in get_rasdinst_verify_pool_from_RAFP() fn")
+        logger.error("Exception Details %s", details)
+        status = FAIL
+
+    if status != PASS:
+        vsxml.undefine(server)    
+
+    return status
+    
 
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
+    server = options.ip
+    virt = options.virt
+    
+    status, vsxml, test_disk = setup_env(server, virt)
+    if status != PASS:
+        return status
 
-    key_list = ["DeviceID", "CreationClassName", "SystemName",
-                "SystemCreationClassName"]
-    try:
-        mem = devices.enumerate(options.ip, 'Memory', key_list, options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ENUMERATE % 'Memory')
-        return FAIL
+    status, diskid = create_diskpool_conf(server, virt)
+    if status != PASS:
+        return status
 
-    try:
-        proc = devices.enumerate(options.ip, 'Processor', key_list, options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ENUMERATE % 'Processor')
-        return FAIL
-        
-    for i in range(len(mem)):
-        try:
-            mempool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                            "MemResourceAllocationSettingData", 
-                                            options.virt,
-                                            InstanceID = mem[i].DeviceID)
-        except Exception:
-            logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mem[i].DeviceID)
-            status = FAIL
+    status, test_network = create_netpool_conf(server, virt)
+    if status != PASS:
+        return status
 
-        if len(mempool) < 1:
-            logger.error("No associated pool for %s" % mem[i].DeviceID)
-            return FAIL
+    cn_id_list = init_list(test_disk, diskid, test_network)
 
-        if mempool[0].keybindings['InstanceID'] != "MemoryPool/0":
-            logger.error("MemResourceAllocationSettingData association error")
-            return FAIL
-            
-    for j in range(len(proc)):
-        try:
-            procpool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                             "ProcResourceAllocationSettingData",
-                                             options.virt,
-                                             InstanceID = proc[j].DeviceID)
-        except Exception:
-            logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % proc[j].DeviceID)
-            return FAIL
-            
-        if len(procpool) < 1:
-            logger.error("No associated pool for %s" % proc[j].DeviceID)
-            return FAIL
+    for rasd_cn, id_info in cn_id_list.iteritems():
+        status = get_rasdinst_verify_pool_from_RAFP(server, virt, vsxml, 
+                                                    rasd_cn, id_info)
+        if status != PASS:
+            return status
 
-        if procpool[0].keybindings['InstanceID'] != "ProcessorPool/0":
-            logger.error("ProcResourceAllocationSettingData association failed")
-            status = FAIL
-
+    cleanup_restore(server, virt)
+    vsxml.undefine(server)    
     return status
 
 if __name__ == "__main__":



From deeptik at linux.vnet.ibm.com  Mon Jun  2 13:31:48 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Mon, 02 Jun 2008 19:01:48 +0530
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 02_reverse.py of RAPF
In-Reply-To: <483F2E36.2030700@linux.vnet.ibm.com>
References: <9fae4065c84575412d10.1212068887@elm3b216.beaverton.ibm.com>
	<483F2E36.2030700@linux.vnet.ibm.com>
Message-ID: <4843F644.1090805@linux.vnet.ibm.com>



Kaitlin Rupert wrote:
>> diff -r 3ac66cf562f0 -r 9fae4065c845 
>> suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
>
> This fails for me on latest sources running with KVM:
>
> ResourceAllocationFromPool - 02_reverse.py: FAIL
> ERROR - No associated pool for demo2/hda
> CIM_ERR_FAILED: Unable to determine pool of `demo2/hda'
>
> demo2 is a KVM guest that I have defined.
What could be the circumstances in which the provider is unable to 
determine the pool type ? Because I had more than one doms created and 
the same tc passed.
Btw I have submitted the changes that for the tc.

>
> You'll want to make sure that the RASD you're verifying is the RASD 
> that matches the guest you've defined.
>
>> +
>> +def get_rasd_or_pool_instid(server, virt, cn):
>> + key_list = ["InstanceID"]
>> + inst = []
>> + try:
>> + inst = enumclass.enumerate(server, cn, key_list, virt)
>> + except Exception:
>> + logger.error(Globals.CIM_ERROR_ENUMERATE, cn)
>> + return inst, FAIL
>> + return inst, PASS
>
> Instead of enumerating the RASDs and the pools, you can get the 
> instance of the RASD and pool directly (since you should know the 
> InstanceID of each).
>
> That way, you verify that the instance RAFP returns is the exact 
> instance you're expected it to be.
>
>> +
>> +def get_instance(server, virt, vsxml, cn, pool_list, app_val=0):
>> + instances, status = get_rasd_or_pool_instid(server, virt, cn)
>> + if status != PASS:
>> + vsxml.undefine(server) + return pool_list, status
>> +
>> + if app_val == 1:
>> + for inst in instances:
>> + pool_list.append(inst.InstanceID)
>
> I wouldn't create a list of pools, I'd just do a GetInstance to get 
> the expected pool instance for each case.
>
>> + return instances, pool_list, status
>> +
>> +
>> +def verify_pool_from_RAPF(server, virt, instances, pool_instid_list, 
>> cn):
>
> This should be RAFP, not RAPF.
>
>> + pool = []
>> + for inst in instances:
>> + try:
>> + pool = assoc.AssociatorNames(server, "ResourceAllocationFromPool",
>> + cn, virt, InstanceID = inst.InstanceID)
>> + except Exception:
>> + logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES, inst.InstanceID)
>> + status = FAIL
>> +
>> + if len(pool) < 1:
>> + logger.error("No associated pool for %s", inst.InstanceID)
>> + return FAIL
>> +
>> + if not pool[0]['InstanceID'] in pool_instid_list:
>
> I'd do an exact match here. You should be doing a 1 to 1 comparison on 
> InstanceIDs.
>
>
>> + status = get_inst_verify_pool_from_RAPF(server, virt, vsxml, 
>> 'MemoryPool', + 'MemResourceAllocationSettingData')
>> + if status != PASS:
>> + return status
>
>
> If you need to call get_inst_verify_pool_from_RAPF() for each 
> Pool/RASD type, you can create a list/dictionary with the argument 
> information. You can then create a for loop that walks through the 
> dictionary, that way you don't have to repeat the code block above 4 
> times.
>
> Something like:
>
> arg_list = { 'MemoryPool' : 'MemResourceAllocationSettingData',
> ...
> }
>
> for pool_cn, rasd_cn in arg_list.iteritems():
> status = get_inst_verify_pool_from_RAPF(server, virt, vsxml, pool_cn, 
> rasd_cn)
> if status != PASS:
> return status
>



From danms at us.ibm.com  Mon Jun  2 14:12:18 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 02 Jun 2008 07:12:18 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Make RHEL 5 XenFV guest grub conf
	use hda
In-Reply-To: <cefb85c07235328269cd.1212190258@elm3b41.beaverton.ibm.com>
	(Kaitlin Rupert's message of "Fri, 30 May 2008 16:30:58 -0700")
References: <cefb85c07235328269cd.1212190258@elm3b41.beaverton.ibm.com>
Message-ID: <87fxrwj58d.fsf@caffeine.beaverton.ibm.com>

KR> +CUR_QEMU_VER=`strings /usr/lib64/xen/bin/qemu-dm | awk '/version [0-9]/ { print $5; }' | sed 's/,//' | sed 's/\.//g'`

Perhaps we should handle the 32-bit variant as well?

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080602/dbd67d49/attachment.sig>

From kaitlin at linux.vnet.ibm.com  Mon Jun  2 14:20:59 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 07:20:59 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Make RHEL 5 XenFV guest grub
	conf use hda
In-Reply-To: <87fxrwj58d.fsf@caffeine.beaverton.ibm.com>
References: <cefb85c07235328269cd.1212190258@elm3b41.beaverton.ibm.com>
	<87fxrwj58d.fsf@caffeine.beaverton.ibm.com>
Message-ID: <484401CB.5010005@linux.vnet.ibm.com>

Dan Smith wrote:
> KR> +CUR_QEMU_VER=`strings /usr/lib64/xen/bin/qemu-dm | awk '/version [0-9]/ { print $5; }' | sed 's/,//' | sed 's/\.//g'`
> 
> Perhaps we should handle the 32-bit variant as well?
> 

Oops - yes.  Good call =)

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 14:42:35 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 07:42:35 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 02_reverse.py of RAPF
In-Reply-To: <4843F644.1090805@linux.vnet.ibm.com>
References: <9fae4065c84575412d10.1212068887@elm3b216.beaverton.ibm.com>
	<483F2E36.2030700@linux.vnet.ibm.com>
	<4843F644.1090805@linux.vnet.ibm.com>
Message-ID: <484406DB.5030605@linux.vnet.ibm.com>

Deepti B Kalakeri wrote:
> 
> 
> Kaitlin Rupert wrote:
>>> diff -r 3ac66cf562f0 -r 9fae4065c845 
>>> suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
>>
>> This fails for me on latest sources running with KVM:
>>
>> ResourceAllocationFromPool - 02_reverse.py: FAIL
>> ERROR - No associated pool for demo2/hda
>> CIM_ERR_FAILED: Unable to determine pool of `demo2/hda'
>>
>> demo2 is a KVM guest that I have defined.
> What could be the circumstances in which the provider is unable to 
> determine the pool type ? Because I had more than one doms created and 
> the same tc passed.

cimtest creates a pool for images in /tmp.  The guest I have defined has 
its image in /boot.  However, I don't have a pool defined for /boot, so 
it's disk device doesn't belong to any pool.

> Btw I have submitted the changes that for the tc.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 16:35:29 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 09:35:29 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #3 Make RHEL 5 XenFV guest grub conf
	use hda
Message-ID: <8e103fd87b6b284a9b64.1212424529@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1211564341 25200
# Node ID 8e103fd87b6b284a9b646e44fbf67441008ba3ba
# Parent  4a5a44d7b857df543af24d59380cb8fdbbb753a4
[TEST] #3 Make RHEL 5 XenFV guest grub conf use hda.

It looks like qemu on RHEL emulates an ide drive, not a scsi drive.

Update from 1 to 2:
 -Instead of using distro, use qemu-dm version.

Update from 2 to 3:
 -Handle case where qemu-dm is 32 bit, as well as 64 bit.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 4a5a44d7b857 -r 8e103fd87b6b suites/libvirt-cim/images/xmt-makefv.sh
--- a/suites/libvirt-cim/images/xmt-makefv.sh	Fri May 30 14:26:38 2008 +0800
+++ b/suites/libvirt-cim/images/xmt-makefv.sh	Fri May 23 10:39:01 2008 -0700
@@ -14,6 +14,20 @@
 PARTED="parted -s"
 TMPMOUNT=/tmp/cimtest_image_temp
 SIZE=16
+QEMU_VER=082
+QEMU_FILE=""
+
+if [ -e "/usr/lib64/xen/bin/qemu-dm" ]; then
+    QEMU_FILE="/usr/lib64/xen/bin/qemu-dm"
+elif [ -e "/usr/lib64/xen/bin/qemu-dm" ]; then
+    QEMU_FILE="/usr/lib/xen/bin/qemu-dm"
+fi
+
+if [ -z $QEMU_FILE ]; then
+    CU_QEMU_VER=0
+else
+    CUR_QEMU_VER=`strings $QEMU_FILE | awk '/version [0-9]/ { print $5; }' | sed 's/,//' | sed 's/\.//g'`
+fi
 
 die() {
     echo "FAILED: $i" >&2
@@ -110,10 +124,19 @@
 timeout 1
 title Test Environment
     root (hd0,0)
+EOF
+
+if [ $CUR_QEMU_VER -lt $QEMU_VER ]; then
+    cat >>${root}/grub/grub.conf <<EOF
+    kernel /vmlinuz root=/dev/hda1
+    initrd /initrd
+EOF
+else
+    cat >>${root}/grub/grub.conf <<EOF
     kernel /vmlinuz root=/dev/sda1
     initrd /initrd
 EOF
-
+fi
 }
 
 ramdisk=$1



From danms at us.ibm.com  Mon Jun  2 16:43:42 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 02 Jun 2008 09:43:42 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #3 Make RHEL 5 XenFV guest grub conf
	use hda
In-Reply-To: <8e103fd87b6b284a9b64.1212424529@elm3b41.beaverton.ibm.com>
	(Kaitlin Rupert's message of "Mon, 02 Jun 2008 09:35:29 -0700")
References: <8e103fd87b6b284a9b64.1212424529@elm3b41.beaverton.ibm.com>
Message-ID: <871w3fkcsh.fsf@caffeine.beaverton.ibm.com>

KR> +if [ -e "/usr/lib64/xen/bin/qemu-dm" ]; then
KR> +    QEMU_FILE="/usr/lib64/xen/bin/qemu-dm"
KR> +elif [ -e "/usr/lib64/xen/bin/qemu-dm" ]; then
KR> +    QEMU_FILE="/usr/lib/xen/bin/qemu-dm"
KR> +fi

I still don't think this works for 32-bit :)

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080602/225046e3/attachment.sig>

From kaitlin at linux.vnet.ibm.com  Mon Jun  2 16:58:28 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 09:58:28 -0700
Subject: [Libvirt-cim] [PATCH] Allow KVM and Xen to parse both network and
	bridge interfaces
Message-ID: <0c8d4baf3ee1f6eb96f7.1212425908@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212155823 25200
# Node ID 0c8d4baf3ee1f6eb96f7d1d49276fa6cc44c4685
# Parent  5b89d6aa5816613627a2869d8c72bde37a9f2e2c
Allow KVM and Xen to parse both network and bridge interfaces.

Since KVM and Xen guests are both created with network interfaces, there no longer needs to be a seperate function for KVM and Xen.

This change allow fixes an error seen when attempting to modify a KVM guest that was created with a non-network inteface (created using a method other than the providers).  Even though we don't create guests with bridge type interfaces, we should be able to parse their xmls.

This bit of code will probably need to be updated to support other interface types.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 5b89d6aa5816 -r 0c8d4baf3ee1 libxkutil/xmlgen.c
--- a/libxkutil/xmlgen.c	Fri May 30 06:57:03 2008 -0700
+++ b/libxkutil/xmlgen.c	Fri May 30 06:57:03 2008 -0700
@@ -189,7 +189,7 @@
         return true;
 }
 
-static bool xen_net_to_xml(char **xml, struct virt_device *dev)
+static bool bridge_net_to_xml(char **xml, struct virt_device *dev)
 {
         int ret;
         char *_xml;
@@ -198,10 +198,12 @@
 
         ret = asprintf(&_xml,
                        "<interface type='%s'>\n"
+                       "  <source bridge='%s'/>\n"
                        "  <mac address='%s'/>\n"
                        "  <script path='%s'/>\n"
                        "</interface>\n",
                        net->type,
+                       net->source,
                        net->mac,
                        script);
 
@@ -215,7 +217,7 @@
         return true;
 }
 
-static bool kvm_net_to_xml(char **xml, struct virt_device *dev)
+static bool network_net_to_xml(char **xml, struct virt_device *dev)
 {
         int ret;
         char *_xml;
@@ -245,9 +247,9 @@
 static bool net_to_xml(char **xml, struct virt_device *dev)
 {
         if (STREQ(dev->dev.net.type, "network"))
-                return kvm_net_to_xml(xml, dev);
+                return network_net_to_xml(xml, dev);
         else if (STREQ(dev->dev.net.type, "bridge"))
-                return xen_net_to_xml(xml, dev);
+                return bridge_net_to_xml(xml, dev);
         else
                 return false;
 }



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 16:59:36 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 09:59:36 -0700
Subject: [Libvirt-cim] [PATCH] Fix VSMS resource_add so that and additional
	tag is not added for processor
Message-ID: <7cf0b0142edb638ce43c.1212425976@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212425931 25200
# Node ID 7cf0b0142edb638ce43cc8f3209eef12b2f5e04b
# Parent  0c8d4baf3ee1f6eb96f7d1d49276fa6cc44c4685
Fix VSMS resource_add so that and additional tag is not added for processor.

The same is also true for memory.  Also, be sure not to increment the count for processor and memory since a guest will not have muultiple tags for these devices.

Remove check for memory after find_list().  We don't want to skip this becuase it's possible to update the memory of a defined guest.  It is not possible to update the memory of a running guest, but this case is already handled by attach_device() in device_parsing.c

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 0c8d4baf3ee1 -r 7cf0b0142edb src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Fri May 30 06:57:03 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Mon Jun 02 09:58:51 2008 -0700
@@ -1035,7 +1035,7 @@
                 goto out;
 
         _list = find_list(dominfo, type, &count);
-        if ((type == CIM_RES_TYPE_MEM) || (_list == NULL)) {
+        if (_list == NULL) {
                 cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Cannot add resources of type %" PRIu16, type);
@@ -1052,22 +1052,36 @@
                 goto out;
         }
 
-        list = realloc(*_list, ((*count)+1)*sizeof(struct virt_device));
-        if (list == NULL) {
-                /* No memory */
-                cu_statusf(_BROKER, &s,
+        if ((type == CIM_RES_TYPE_PROC) || (type == CIM_RES_TYPE_MEM)) {
+                if (_list == NULL) {
+                        cu_statusf(_BROKER, &s,
+                                   CMPI_RC_ERR_FAILED,
+                                   "Cannot modify resource: %" PRIu16, type);
+                        goto out;
+                }
+                list = *_list;
+
+                dev = &list[0];
+        } else {
+                list = realloc(*_list, ((*count)+1)*sizeof(struct virt_device));
+                if (list == NULL) {
+                        /* No memory */
+                        cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Failed to allocate memory");
-                goto out;
+                       goto out;
+                }
+
+                *_list = list;
+                memset(&list[*count], 0, sizeof(list[*count]));
+
+                dev = &list[*count];
+                dev->type = type;
+                dev->id = strdup(devid);
         }
-
-        *_list = list;
-        memset(&list[*count], 0, sizeof(list[*count]));
-
-        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));
@@ -1077,7 +1091,9 @@
         cu_statusf(_BROKER, &s,
                    CMPI_RC_OK,
                    "");
-        (*count)++;
+
+        if ((type != CIM_RES_TYPE_PROC) && (type != CIM_RES_TYPE_MEM))
+                (*count)++;
 
  out:
         return s;



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 17:04:50 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 10:04:50 -0700
Subject: [Libvirt-cim] [PATCH 0 of 2] [TEST] Update VSMS 06_addresource.py
	to support running guests.
Message-ID: <patchbomb.1212426290@elm3b41.beaverton.ibm.com>

Also support memory for defined guests.



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 17:04:51 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 10:04:51 -0700
Subject: [Libvirt-cim] [PATCH 1 of 2] [TEST] Add vsms_util.py
In-Reply-To: <patchbomb.1212426290@elm3b41.beaverton.ibm.com>
Message-ID: <76b7fc25cf2ed76481c0.1212426291@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212424933 25200
# Node ID 76b7fc25cf2ed76481c002c8d3fef1e2e4c6effa
# Parent  af001ec333a331b7ac10895ebcadaff9383303f3
[TEST] Add vsms_util.py

This module is for vsms related utility functions (for AddResource, ModifyResource, etc).

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r af001ec333a3 -r 76b7fc25cf2e suites/libvirt-cim/lib/XenKvmLib/vsms_util.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Mon Jun 02 09:42:13 2008 -0700
@@ -0,0 +1,96 @@
+#!/usr/bin/python
+#
+# Copyright 2008 IBM Corp.
+#
+# Authors:
+#    Kaitlin Rupert <karupert at us.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 CimTest import Globals
+from CimTest.ReturnCodes import FAIL, PASS
+from CimTest.Globals import logger
+
+def add_disk_res(server, service, cxml, vssd_ref, dasd, nddev):
+    try:
+        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
+                                    ResourceSettings=[str(dasd)])
+        cxml.dumpxml(server)
+        disk_dev = cxml.get_value_xpath(
+                    '/domain/devices/disk/target/@dev[. = "%s"]' % nddev)
+        if disk_dev != nddev:
+            raise Exception('Error adding rs for disk_dev')
+        logger.info('good status for disk_dev')
+    except Exception, details:
+        logger.error('Error invoking AddRS')
+        logger.error(details)
+        return FAIL 
+
+    return PASS
+
+def add_net_res(server, service, cxml, vssd_ref, nasd, nnmac):
+    try:
+        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
+                                    ResourceSettings=[str(nasd)])
+        cxml.dumpxml(server)
+        net_mac = cxml.get_value_xpath(
+                    '/domain/devices/interface/mac/@address[. = "%s"]' % nnmac)
+        if net_mac.lower() != nnmac:
+            raise Exception('Error adding rs for net_mac')
+        logger.info('good status for net_mac')
+    except Exception, details:
+        logger.error('Error invoking AddRS')
+        logger.error(details)
+        return FAIL 
+
+    return PASS
+
+def add_proc_res(server, service, cxml, vssd_ref, pasd, npvcpu):
+    try:
+        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
+                                    ResourceSettings=[str(pasd)])
+        cxml.dumpxml(server)
+        proc_vcpu = cxml.xml_get_vcpu()
+        if int(proc_vcpu) != int(npvcpu):
+            raise Exception('Error adding rs for proc_vcpu')
+        logger.info('good status for proc_vcpu')
+        status = PASS
+    except Exception, details:
+        logger.error('Error invoking AddRS')
+        logger.error(details)
+        return FAIL
+
+    return PASS 
+
+def add_mem_res(server, service, cxml, vssd_ref, masd, nmem):
+    try:
+        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
+                                    ResourceSettings=[str(masd)])
+        cxml.dumpxml(server)
+        mem = cxml.xml_get_mem()
+        if int(mem)/1024 != int(nmem):
+            raise Exception('Error adding rs for mem')
+        logger.info('good status for mem')
+        status = PASS
+    except Exception, details:
+        logger.error('Error invoking AddRS')
+        logger.error(details)
+        return FAIL
+
+    return PASS
+
+



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 17:04:52 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 10:04:52 -0700
Subject: [Libvirt-cim] [PATCH 2 of 2] [TEST] Modify VSMS 06 to support both
	a defined and running guest
In-Reply-To: <patchbomb.1212426290@elm3b41.beaverton.ibm.com>
Message-ID: <c43fd555c6f3d6e1ce67.1212426292@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212425305 25200
# Node ID c43fd555c6f3d6e1ce67004aa6a5fc297631c94d
# Parent  76b7fc25cf2ed76481c002c8d3fef1e2e4c6effa
[TEST] Modify VSMS 06 to support both a defined and running guest.

These changes also include:
 -Move the AddResource() calls to vsms_util.
 -Add support for adding memory resources.
 -Add logic so that test only adds mem/proc resources to a defined guest.
 -Add logic so the test doesn't add a disk ro a running KVM guest (KVM only supports attaching CD type devices, another test case is needed for this).

This test currently fails on KVM due to an issue adding network - will follow up on this.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 76b7fc25cf2e -r c43fd555c6f3 suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py	Mon Jun 02 09:42:13 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py	Mon Jun 02 09:48:25 2008 -0700
@@ -31,11 +31,13 @@
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import FAIL, PASS
+from XenKvmLib import vsms_util
 
 sup_types = ['Xen', 'KVM']
 default_dom = 'rstest_domain'
 nnmac = '99:aa:bb:cc:ee:ff'
 npvcpu = 2
+nmem = 256 
 
 @do_main(sup_types)
 def main():
@@ -49,8 +51,9 @@
     service = vsms.get_vsms_class(options.virt)(options.ip)
     cxml = vxml.get_class(options.virt)(default_dom)
     classname = get_typed_class(options.virt, 'VirtualSystemSettingData')
+    inst_id = '%s:%s' % (options.virt, default_dom)
     vssd_ref = CIMInstanceName(classname, keybindings = {
-                               'InstanceID' : '%s:%s' % (options.virt, default_dom),
+                               'InstanceID' : inst_id,
                                'CreationClassName' : classname})
     dasd = vsms.get_dasd_class(options.virt)(dev=nddev,
                                              source=cxml.secondary_disk_path,
@@ -58,41 +61,48 @@
     nasd = vsms.get_nasd_class(options.virt)(type='ethernet', mac=nnmac,
                                              name=default_dom)
     pasd = vsms.get_pasd_class(options.virt)(vcpu=npvcpu, name=default_dom)
+    masd = vsms.get_masd_class(options.virt)(megabytes=nmem, name=default_dom)
 
     status = FAIL
-    try:
-        cxml.define(options.ip)
-        # Add disk resource setting
-        service.AddResourceSettings(AffectedConfiguration=vssd_ref, 
-                                    ResourceSettings=[str(dasd)])
-        cxml.dumpxml(options.ip)
-        disk_dev = cxml.get_value_xpath(
-                    '/domain/devices/disk/target/@dev[. = "%s"]' % nddev) 
-        if disk_dev != nddev:
-            raise Exception('Error adding rs for disk_dev')
-        logger.info('good status for disk_dev')
-        # Add net resource setting
-        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
-                                    ResourceSettings=[str(nasd)])
-        cxml.dumpxml(options.ip)
-        net_mac = cxml.get_value_xpath(
-                    '/domain/devices/interface/mac/@address[. = "%s"]' % nnmac)
-        if net_mac.lower() != nnmac:
-            raise Exception('Error adding rs for net_mac')
-        logger.info('good status for net_mac')
-        # Add processor resource setting
-        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
-                                    ResourceSettings=[str(pasd)])
-        cxml.dumpxml(options.ip)
-        proc_vcpu = cxml.xml_get_vcpu()
-        if int(proc_vcpu) != int(npvcpu):
-            raise Exception('Error adding rs for proc_vcpu')
-        logger.info('good status for proc_vcpu')
-        status = PASS
-    except Exception, details:
-        logger.error('Error invoking AddRS')
-        logger.error(details)
 
+    test_cases = ["define", "start"]
+
+    for case in test_cases:
+        if case == "define":
+            ret = cxml.define(options.ip)
+            if not ret:
+                logger.error("Failed to define the dom: %s", default_dom)
+                return FAIL
+        else:
+            ret = cxml.start(options.ip)
+            if not ret:
+                cxml.undefine(options.ip)
+                logger.error("Failed to start the dom: %s", default_dom)
+                return FAIL
+
+        if case == "define" or options.virt == "Xen" or options.virt == "XenFV":
+            status = vsms_util.add_disk_res(options.ip, service, cxml, vssd_ref,
+                                            dasd, nddev)
+        if status != PASS:
+            break
+
+        status = vsms_util.add_net_res(options.ip, service, cxml, vssd_ref, 
+                                       nasd, nnmac)
+        if status != PASS:
+            break
+
+        if case == "define":
+            status = vsms_util.add_proc_res(options.ip, service, cxml, vssd_ref,
+                                            pasd, npvcpu)
+            if status != PASS:
+                break
+
+            status = vsms_util.add_mem_res(options.ip, service, cxml, vssd_ref,
+                                           masd, nmem)
+            if status != PASS:
+                break
+
+    cxml.destroy(options.ip)
     cxml.undefine(options.ip)
 
     return status



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 17:41:48 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 10:41:48 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #3 Make RHEL 5 XenFV guest grub
	conf use hda
In-Reply-To: <871w3fkcsh.fsf@caffeine.beaverton.ibm.com>
References: <8e103fd87b6b284a9b64.1212424529@elm3b41.beaverton.ibm.com>
	<871w3fkcsh.fsf@caffeine.beaverton.ibm.com>
Message-ID: <484430DC.2020408@linux.vnet.ibm.com>

Dan Smith wrote:
> KR> +if [ -e "/usr/lib64/xen/bin/qemu-dm" ]; then
> KR> +    QEMU_FILE="/usr/lib64/xen/bin/qemu-dm"
> KR> +elif [ -e "/usr/lib64/xen/bin/qemu-dm" ]; then
> KR> +    QEMU_FILE="/usr/lib/xen/bin/qemu-dm"
> KR> +fi
> 
> I still don't think this works for 32-bit :)

Arg.. yeah, that was silly of me.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 17:44:11 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 10:44:11 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #4 Make RHEL 5 XenFV guest grub conf
	use hda
Message-ID: <f3004051f9d21079d063.1212428651@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1211564341 25200
# Node ID f3004051f9d21079d063b73d9fd4bf751a8c4078
# Parent  4a5a44d7b857df543af24d59380cb8fdbbb753a4
[TEST] #4 Make RHEL 5 XenFV guest grub conf use hda.

It looks like qemu on RHEL emulates an ide drive, not a scsi drive.

Update from 1 to 2:
 -Instead of using distro, use qemu-dm version.

Update from 2 to 3:
 -Handle case where qemu-dm is 32 bit, as well as 64 bit.

Update from 3 to 4:
 -Make sure the elif actually checks for the 32 bit version, not the 54 bit version.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 4a5a44d7b857 -r f3004051f9d2 suites/libvirt-cim/images/xmt-makefv.sh
--- a/suites/libvirt-cim/images/xmt-makefv.sh	Fri May 30 14:26:38 2008 +0800
+++ b/suites/libvirt-cim/images/xmt-makefv.sh	Fri May 23 10:39:01 2008 -0700
@@ -14,6 +14,20 @@
 PARTED="parted -s"
 TMPMOUNT=/tmp/cimtest_image_temp
 SIZE=16
+QEMU_VER=082
+QEMU_FILE=""
+
+if [ -e "/usr/lib64/xen/bin/qemu-dm" ]; then
+    QEMU_FILE="/usr/lib64/xen/bin/qemu-dm"
+elif [ -e "/usr/lib/xen/bin/qemu-dm" ]; then
+    QEMU_FILE="/usr/lib/xen/bin/qemu-dm"
+fi
+
+if [ -z $QEMU_FILE ]; then
+    CU_QEMU_VER=0
+else
+    CUR_QEMU_VER=`strings $QEMU_FILE | awk '/version [0-9]/ { print $5; }' | sed 's/,//' | sed 's/\.//g'`
+fi
 
 die() {
     echo "FAILED: $i" >&2
@@ -110,10 +124,19 @@
 timeout 1
 title Test Environment
     root (hd0,0)
+EOF
+
+if [ $CUR_QEMU_VER -lt $QEMU_VER ]; then
+    cat >>${root}/grub/grub.conf <<EOF
+    kernel /vmlinuz root=/dev/hda1
+    initrd /initrd
+EOF
+else
+    cat >>${root}/grub/grub.conf <<EOF
     kernel /vmlinuz root=/dev/sda1
     initrd /initrd
 EOF
-
+fi
 }
 
 ramdisk=$1



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 17:59:33 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 10:59:33 -0700
Subject: [Libvirt-cim] [PATCH] Update ECTP registration so LXC is registered
	to both interop and virt
Message-ID: <fe071d08bfdc347ab577.1212429573@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212429483 25200
# Node ID fe071d08bfdc347ab577b78c44885638b5ef885a
# Parent  7cf0b0142edb638ce43cc8f3209eef12b2f5e04b
Update ECTP registration so LXC is registered to both interop and virt.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 7cf0b0142edb -r fe071d08bfdc schema/ElementConformsToProfile.registration
--- a/schema/ElementConformsToProfile.registration	Mon Jun 02 09:58:51 2008 -0700
+++ b/schema/ElementConformsToProfile.registration	Mon Jun 02 10:58:03 2008 -0700
@@ -4,4 +4,5 @@
 Xen_ElementConformsToProfile root/interop Virt_ElementConformsToProfile Virt_ElementConformsToProfile  association
 KVM_ElementConformsToProfile root/virt Virt_ElementConformsToProfile Virt_ElementConformsToProfile  association
 KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfile Virt_ElementConformsToProfile  association
+LXC_ElementConformsToProfile root/virt Virt_ElementConformsToProfile Virt_ElementConformsToProfile  association
 LXC_ElementConformsToProfile root/interop Virt_ElementConformsToProfile Virt_ElementConformsToProfile  association



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 18:11:53 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 11:11:53 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Resubmit ElementConforms.01&03&04
	for LXC support
In-Reply-To: <OF177A8840.CC6BCD9B-ON4825745C.0009008C-4825745C.0009246D@cn.ibm.com>
References: <OF177A8840.CC6BCD9B-ON4825745C.0009008C-4825745C.0009246D@cn.ibm.com>
Message-ID: <484437E9.5080909@linux.vnet.ibm.com>

Guo Lian Yun wrote:
> 
> libvirt-cim-bounces at redhat.com wrote on 2008-05-31 02:33:21:
> 
>  > yunguol at cn.ibm.com wrote:
>  > > # HG changeset patch
>  > > # User Guolian Yun <yunguol at cn.ibm.com>
>  > > # Date 1212115646 -28800
>  > > # Node ID 25c2af6bfccc73196fff0ce96f7162b8b22d0057
>  > > # Parent  3ac66cf562f082546883c1de0d748471b557cd39
>  > > [TEST] Resubmit ElementConforms.01&03&04 for LXC support
>  > >
>  > > Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
>  >
>  > wbemcli ain -ac LXC_ElementConformsToProfile
>  > 'http://localhost:5988/root/virt:LXC_HostSystem.
>  > CreationClassName="LXC_HostSystem",Name="elm3b41"'
>  >
>  > This query doesn't return any records, which is why I think I saw a
>  > problem.  Does this work for you on your system?
> 
>   It does work for me, and below is the output of this query.
> 
>   
> localhost:5988/root/virt:LXC_RegisteredProfile.InstanceID="CIM:DSP1042-SystemVirtualization-1.0.0"

Interesting - sfcb must handle the registration of cross-namespace 
providers better than Pegasus does.  I tracked my issue down to a bug in 
the ECTP registration (I've submitted a patch).

Sorry for the confusion there.  I've retested your patch, and it looks 
good to me. I've applied it.

Thanks!

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 18:13:54 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 11:13:54 -0700
Subject: [Libvirt-cim] [TEST] Cimtest Report for LXC (2008/06/02)
In-Reply-To: <OFBE5187C7.A1576A41-ON4825745C.0037F010-4825745C.003815C4@cn.ibm.com>
References: <OFBE5187C7.A1576A41-ON4825745C.0037F010-4825745C.003815C4@cn.ibm.com>
Message-ID: <48443862.2030007@linux.vnet.ibm.com>

Guo Lian Yun wrote:
> 
> stro: Fedora 9 Beta
> Kernel: 2.6.25-0.121.rc5.git4.fc9
> Libvirt: 0.4.2
> CIMOM: 2.7.0-6.fc9
> PyWBEM: 0.6-1
> libcmpiutil: changeset-79
> libvirt-cim: changeset-598
> cimtest: changeset-171
> 
> 
> ===================== CIMTEST REPORT===============================

Thanks Daisy for the LXC test run!  Can you do this every week?  I think 
this is useful for tracking progress.

Thanks!

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun  2 19:32:16 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 02 Jun 2008 12:32:16 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 02_reverse.py of RAPF
In-Reply-To: <d478234fefe940f0ef73.1212413889@elm3b217.beaverton.com>
References: <d478234fefe940f0ef73.1212413889@elm3b217.beaverton.com>
Message-ID: <48444AC0.5060907@linux.vnet.ibm.com>

Deepti B. Kalakeri wrote:
> # HG changeset patch
> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> # Date 1212413727 25200
> # Node ID d478234fefe940f0ef738bbb83e6a3ab32736bec
> # Parent  4a5a44d7b857df543af24d59380cb8fdbbb753a4
> [TEST] Fixing 02_reverse.py of RAPF.
> 
> Added the following extra steps:
> 1) Defining a domain.
> 2) creating diskpool, netpool.
> 
> Without the steps 1 and 2 the tc used to simply pass.
> The tc will fail on KVM with old libvirt-cim rpm as expected and will pass with the latest source.
> 

I failed to notice this during the last review, but this will fail on 
Xen because the Xen XML is creating a guest with a ethernet interface. 
An ethernet type interface won't be bound to any kind of network pool.

This doesn't happen with XenFV because the XenFV guest is created with a 
bridge guest.  Since DefineSystem() creates guests Xen/XenFV/KVM guests 
with network interface types, the XML for Xen and XenFV should be 
changed as well.

Also, when you send an updated patch, don't forget to put the revision 
number in the first line of the commit log.  Also, be sure to list the 
changes between the previous revision and the new revision.

Thanks!

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From jfehlig at novell.com  Mon Jun  2 22:17:27 2008
From: jfehlig at novell.com (Jim Fehlig)
Date: Mon, 02 Jun 2008 16:17:27 -0600
Subject: [Libvirt-cim] Adding a provider
In-Reply-To: <F089913638199841958E00B22EF169880A836CDEAB@USEA-EXCH7.na.uis.unisys.com>
References: <F089913638199841958E00B22EF169880A836CDEAB@USEA-EXCH7.na.uis.unisys.com>
Message-ID: <48447177.3070101@novell.com>

Szymanski, Lukasz K wrote:
> Hello,
>  
> I am playing with libvirt-cim providers and trying to figure out how
> to add another one to the mix.  I have version 0.4 of libvirt-cim.  I
> am running SLES10 SP1 as my host machine and a 2.6.16 version of the
> Xen kernel.

Hmm, just a reminder that libvirt is at version 0.2.0 in SLES10 SP1. 
Not very useful for hosting libvirt-cim IIRC.  You'll want to update it :-).

Jim



From yunguol at cn.ibm.com  Tue Jun  3 02:12:21 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Tue, 3 Jun 2008 10:12:21 +0800
Subject: [Libvirt-cim] [TEST] Cimtest Report for LXC (2008/06/02)
In-Reply-To: <48443862.2030007@linux.vnet.ibm.com>
Message-ID: <OF88A61E97.27CE225F-ON4825745D.000BD538-4825745D.000C6AFF@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-03 02:13:54:

> Guo Lian Yun wrote:
> > 
> > stro: Fedora 9 Beta
> > Kernel: 2.6.25-0.121.rc5.git4.fc9
> > Libvirt: 0.4.2
> > CIMOM: 2.7.0-6.fc9
> > PyWBEM: 0.6-1
> > libcmpiutil: changeset-79
> > libvirt-cim: changeset-598
> > cimtest: changeset-171
> > 
> > 
> > ===================== CIMTEST REPORT===============================
> 
> Thanks Daisy for the LXC test run!  Can you do this every week?  I think 

> this is useful for tracking progress.

  Sure, I'm glad to do so. I will run the LXC test and report the result 
  every week!
> 
> Thanks!
> 
> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080603/19b78d8b/attachment.htm>

From yunguol at cn.ibm.com  Tue Jun  3 03:19:30 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Tue, 03 Jun 2008 11:19:30 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	VirtualSystemManagementCapabilities.01&02 for LXC support
Message-ID: <887964b25e814fc74254.1212463170@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212463163 -28800
# Node ID 887964b25e814fc7425476e5739c821a756e7bab
# Parent  351d11163eaa0b0af28a9064177ad637aeeb2a8c
[TEST] Update VirtualSystemManagementCapabilities.01&02 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 351d11163eaa -r 887964b25e81 suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py	Tue Jun 03 11:19:23 2008 +0800
@@ -28,7 +28,7 @@
 from CimTest.Globals import do_main
 from XenKvmLib.classes import get_typed_class
 
-sup_types=['Xen', 'KVM', 'XenFV']
+sup_types=['Xen', 'KVM', 'XenFV', 'LXC']
 
 @do_main(sup_types)
 def main():
diff -r 351d11163eaa -r 887964b25e81 suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py	Tue Jun 03 11:19:23 2008 +0800
@@ -58,7 +58,7 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main
 
-sup_types=['Xen', 'KVM', 'XenFV']
+sup_types=['Xen', 'KVM', 'XenFV', 'LXC']
 
 expr_values = {
                 "invalid_instid_keyname" :  {  'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
diff -r 351d11163eaa -r 887964b25e81 suites/libvirt-cim/lib/XenKvmLib/enumclass.py
--- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py	Tue Jun 03 11:19:23 2008 +0800
@@ -141,6 +141,9 @@
     pass
 
 class KVM_VirtualSystemManagementCapabilities(CIM_VirtualSystemManagementCapabilities):
+    pass
+
+class LXC_VirtualSystemManagementCapabilities(CIM_VirtualSystemManagementCapabilities):
     pass
 
 class Xen_ResourcePoolConfigurationCapabilities(CIM_ResourcePoolConfigurationCapabilities):



From yunguol at cn.ibm.com  Tue Jun  3 05:23:05 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Tue, 03 Jun 2008 13:23:05 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	VirtualSystemMigrationSettingData.01&02 for lXC support
Message-ID: <285ab4b0f2c5f143fe81.1212470585@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212470446 -28800
# Node ID 285ab4b0f2c5f143fe813ee74d03cd17093911b6
# Parent  351d11163eaa0b0af28a9064177ad637aeeb2a8c
[TEST] Update VirtualSystemMigrationSettingData.01&02 for lXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 351d11163eaa -r 285ab4b0f2c5 suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py	Tue Jun 03 13:20:46 2008 +0800
@@ -28,6 +28,8 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
+
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 def print_error(fieldname, ret_value, exp_value):
     logger.error("%s Mismatch", fieldname)
diff -r 351d11163eaa -r 285ab4b0f2c5 suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/02_vsmsd_gi_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/02_vsmsd_gi_errs.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/02_vsmsd_gi_errs.py	Tue Jun 03 13:20:46 2008 +0800
@@ -52,6 +52,7 @@
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
 
+platform_sup = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 expr_values = {
                 "invalid_instid" :  { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
diff -r 351d11163eaa -r 285ab4b0f2c5 suites/libvirt-cim/lib/XenKvmLib/enumclass.py
--- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py	Tue Jun 03 13:20:46 2008 +0800
@@ -201,6 +201,9 @@
     pass
 
 class KVM_VirtualSystemMigrationSettingData(CIM_VirtualSystemMigrationSettingData):
+    pass
+
+class LXC_VirtualSystemMigrationSettingData(CIM_VirtualSystemMigrationSettingData):
     pass
 
 class Xen_VirtualSystemSnapshotService(CIM_VirtualSystemSnapshotService):



From yunguol at cn.ibm.com  Tue Jun  3 06:12:33 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Tue, 03 Jun 2008 14:12:33 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update SystemDevice.01~03 for LXC
	support
Message-ID: <37c9c0b22ced6e757a13.1212473553@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212473545 -28800
# Node ID 37c9c0b22ced6e757a1342aab7e509d06247118c
# Parent  351d11163eaa0b0af28a9064177ad637aeeb2a8c
[TEST] Update SystemDevice.01~03 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 351d11163eaa -r 37c9c0b22ced suites/libvirt-cim/cimtest/SystemDevice/01_forward.py
--- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py	Tue Jun 03 14:12:25 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "test_domain"
 test_mac = "00:11:22:33:44:55"
@@ -50,7 +50,10 @@
 
     status = PASS
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk)
+    if options.virt == "LXC":
+        cxml = virt_xml(test_dom, vcpus = test_cpu)
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk)
     ret = cxml.create(options.ip)
     if not ret:
         logger.error('Unable to create domain %s' % test_dom)
diff -r 351d11163eaa -r 37c9c0b22ced suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py
--- a/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py	Tue Jun 03 14:12:25 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL 
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "test_domain"
 test_mac = "00:11:22:33:44:55"
@@ -44,10 +44,14 @@
 
     status = FAIL
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, mac=test_mac)
+    if options.virt == "LXC":
+        cxml = virt_xml(test_dom)
+        devlist = [ "Memory" ]
+    else:
+        cxml = virt_xml(test_dom, mac=test_mac)
+        devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ]
     cxml.create(options.ip)
 
-    devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ]
 
     key_list = ["DeviceID", "CreationClassName", "SystemName",
                 "SystemCreationClassName"]
diff -r 351d11163eaa -r 37c9c0b22ced suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py
--- a/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py	Tue Jun 03 14:12:25 2008 +0800
@@ -40,7 +40,7 @@
 from CimTest import Globals
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "virt1"
 test_mac = "00:11:22:33:44:55"
@@ -64,15 +64,19 @@
 
     status = PASS
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac,
-                    disk = test_disk)
+    if options.virt == "LXC":
+        cxml = virt_xml(test_dom, vcpus = test_cpu)
+        devlist = [ "Memory" ]
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac,
+                        disk = test_disk)
+        devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ]
 
     ret = cxml.create(options.ip)
     if not ret :
         logger.info("error while 'create' of VS")
         return FAIL
 
-    devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ]
 
     # Building the dict for avoiding the correct key:val pairs 
     # while verifying with the Invalid values for the association
diff -r 351d11163eaa -r 37c9c0b22ced suites/libvirt-cim/lib/XenKvmLib/devices.py
--- a/suites/libvirt-cim/lib/XenKvmLib/devices.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py	Tue Jun 03 14:12:25 2008 +0800
@@ -75,10 +75,16 @@
 class KVM_LogicalDisk(CIM_LogicalDisk):
     pass
 
+class LXC_LogicalDisk(CIM_LogicalDisk):
+    pass
+
 class Xen_NetworkPort(CIM_NetworkPort):
     pass
 
 class KVM_NetworkPort(CIM_NetworkPort):
+    pass
+
+class LXC_NetworkPort(CIM_NetworkPort):
     pass
 
 class Xen_Memory(CIM_Memory):
@@ -94,6 +100,9 @@
     pass
 
 class KVM_Processor(CIM_Processor):
+    pass
+
+class LXC_Processor(CIM_Processor):
     pass
 
 def get_class(classname):



From zli at linux.vnet.ibm.com  Tue Jun  3 06:54:11 2008
From: zli at linux.vnet.ibm.com (Zhengang Li)
Date: Tue, 03 Jun 2008 14:54:11 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #2 LXC support using DefineSystem
	& VSMS.01
In-Reply-To: <4840751A.30300@linux.vnet.ibm.com>
References: <ddb52ec53368860a18b7.1212133236@localhost.localdomain>
	<4840751A.30300@linux.vnet.ibm.com>
Message-ID: <4844EA93.9000607@linux.vnet.ibm.com>

Kaitlin Rupert wrote:

>> +    # LXC only takes disk and memory device for now.
>> +    # Only disk __init__ takes different params.
>> +    if virt == 'LXC':
>> +        d = LXC_DiskResourceAllocationSettingData(
>> +                mountpoint=const.LXC_default_mp,
>> +                source=const.LXC_default_mp, name=dom_name)
> 
> Instead of using the same directory for the mountpoint and the source. 
> You could create a directory such as /tmp/lxc_files to mount on /tmp. 
> That way we can distinguish between the two.
I'll add this in the next revision.

> 
>> +    else:
>> +        class_dasd = get_dasd_class(virt)
>> +        if virt == 'KVM':
>> +            disk_dev = 'hda'
>> +            disk_source = const.KVM_disk_path
>> +        elif virt == 'XenFV':
>> +            disk_dev = 'hda'
>> +            disk_source = const.XenFV_disk_path
>> +        d = class_dasd(
>> +                    dev=disk_dev, +                    
>> source=disk_source,
>> +                    name=dom_name)
>> +         class_nasd = get_nasd_class(virt)
> 
> We'll need to skip over network and processor for now, since they aren't 
> supported.
I tried with 'None' and empty values to the network and processor 
mof-string. Pywbem had a problem parsing them. How do we skip the two 
devices?

> 
> I see the following error:
> 
> ERROR   - Unexpected rc code 1 and description:
>  CIM_ERR_FAILED: ResourceSettings Error: Resource type not supported on 
> this platform
> InvokeMethod(DefineSystem): CIM_ERR_FAILED: ResourceSettings Error: 
> Resource type not supported on this platform
> 


-- 
- Zhengang



From yunguol at cn.ibm.com  Tue Jun  3 07:12:29 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Tue, 3 Jun 2008 15:12:29 +0800
Subject: [Libvirt-cim] [TEST] Null of LXC_SettingsDefineState forward query
Message-ID: <OF660C0514.F1E075C8-ON4825745D.0027593C-4825745D.0027E555@cn.ibm.com>

Kaitlin,

Could you get expect result by below query?

wbemcli ain -ac LXC_SettingsDefineState 
http://root:password at localhost/root/virt:LXC_Memory.DeviceID="test_domain/mem",CreationClassName="LXC_Memory",SystemName="test_domain",SystemCreationClassName="LXC_ComputerSystem"

But ein and reverse query work for me.

wbemcli ein http://root:password at localhost/root/virt:LXC_Memory
localhost:5988/root/virt:LXC_Memory.DeviceID="test_domain/mem",CreationClassName="LXC_Memory",SystemName="test_domain",SystemCreationClassName="LXC_ComputerSystem"

wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
http://root:password at localhost:5988/root/virt:LXC_VirtualSystemSettingData.InstanceID="LXC:test_domain"
localhost:5988/root/virt:LXC_MemResourceAllocationSettingData.InstanceID="test_domain/mem"




Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080603/2776bf90/attachment.htm>

From yunguol at cn.ibm.com  Tue Jun  3 07:35:16 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Tue, 03 Jun 2008 15:35:16 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	ResourcePoolConfigurationService.01&02 for LXC support
Message-ID: <05b78b7632d59087df90.1212478516@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212478509 -28800
# Node ID 05b78b7632d59087df9076e09ffb10978d5f3bf4
# Parent  351d11163eaa0b0af28a9064177ad637aeeb2a8c
[TEST] Update ResourcePoolConfigurationService.01&02 for LXC support

diff -r 351d11163eaa -r 05b78b7632d5 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py	Tue Jun 03 15:35:09 2008 +0800
@@ -31,6 +31,7 @@
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
 
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 @do_main(platform_sup)
 def main():
     options = main.options
diff -r 351d11163eaa -r 05b78b7632d5 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py	Tue Jun 03 15:35:09 2008 +0800
@@ -35,6 +35,7 @@
 from XenKvmLib.classes import get_typed_class
 
 
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 expr_values = {
           "invalid_sysname" : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
                                 'desc' : 'No such instance (SystemName)' }, \



From deeptik at linux.vnet.ibm.com  Tue Jun  3 11:42:44 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Tue, 03 Jun 2008 04:42:44 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Adding set_interface_details() fn to
	the vxml.py
Message-ID: <05e8d5b17fd7e4d7eb3a.1212493364@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1212493242 25200
# Node ID 05e8d5b17fd7e4d7eb3a6f1903fd834fcebcd311
# Parent  351d11163eaa0b0af28a9064177ad637aeeb2a8c
[TEST] Adding set_interface_details() fn to the vxml.py.

This function give choice to add different network types to
Xen/XenFV/KVM guest.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 351d11163eaa -r 05e8d5b17fd7 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Fri May 30 10:47:26 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Tue Jun 03 04:40:42 2008 -0700
@@ -300,6 +300,10 @@ class VirtXML(Virsh, XMLClass):
         self.set_attributes('/domain/devices/interface/source', 
                             bridge=bridgename)
 
+    def set_nettype(self, nettype):
+        self.set_attributes('/domain/devices/interface/type', 
+                            type=nettype)
+
     def set_diskimg(self, diskimg):
         self.set_attributes('/domain/devices/disk/source', file=diskimg)
 
@@ -437,6 +441,39 @@ class VirtXML(Virsh, XMLClass):
 
         return vbr
 
+    def set_interface_details(self, devices, net_mac, net_type, req_net_type, virt_type):
+        if net_type != req_net_type:
+            interface = self.add_sub_node(devices, 'interface', type=req_net_type)
+        else:
+            interface = self.add_sub_node(devices, 'interface', type=net_type)
+        self.add_sub_node(interface, 'mac', address=net_mac)
+        if req_net_type == 'bridge':
+            self._set_vbridge(CIM_IP, virt_type)
+        elif req_net_type == 'network':
+            self.set_vnetwork(interface, virt_type)
+        elif req_net_type == 'ethernet':
+            pass
+        else:
+            logger.error("%s is not a valid network type", net_type)
+            sys.exit(1)
+
+    def set_vnetwork(self, interface, virt_type):
+        network_list = live.net_list(CIM_IP, virt_type)
+        if len(network_list) > 0:
+            nname = network_list[0]
+        else:
+            logger.info('No virutal network found')
+            logger.info('Trying to create one ......')
+            netxml = NetXML(CIM_IP, virt_type)
+            ret = netxml.create_vnet()
+            if not ret:
+                logger.error('Failed to create the virtual network "%s"',
+                             netxml.net_name)
+                sys.exit(SKIP)
+            nname = netxml.xml_get_netpool_name()
+        self.add_sub_node(interface, 'source', network=nname)
+
+
 
 class VirtCIM:
     def __init__(self, virt, dom_name, disk_dev, disk_source,
@@ -497,7 +534,8 @@ class XenXML(VirtXML, VirtCIM):
                        vcpus=const.default_vcpus,
                        mac=const.Xen_default_mac,
                        disk_file_path=const.Xen_disk_path,
-                       disk=const.Xen_default_disk_dev):
+                       disk=const.Xen_default_disk_dev, 
+                       req_nettype=const.Xen_default_net_type):
         if not (os.path.exists(const.Xen_kernel_path) \
                 and os.path.exists(const.Xen_init_path)):
             logger.error('ERROR: Either the kernel image '
@@ -505,7 +543,8 @@ class XenXML(VirtXML, VirtCIM):
             sys.exit(1)
         VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus)
         self._os(const.Xen_kernel_path, const.Xen_init_path)
-        self._devices(disk_file_path, disk, const.Xen_default_net_type, mac)
+        self._devices(disk_file_path, disk, const.Xen_default_net_type, mac, 
+                      req_nettype)
 
         VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path, 
                          const.Xen_default_net_type, mac, vcpus, mem)
@@ -517,16 +556,15 @@ class XenXML(VirtXML, VirtCIM):
         self.add_sub_node(os, 'initrd', os_initrd)
         self.add_sub_node(os, 'cmdline', 'TERM=xterm')
 
-    def _devices(self, disk_img, disk_dev, net_type, net_mac):
+    def _devices(self, disk_img, disk_dev, net_type, net_mac, req_nettype):
         devices = self.get_node('/domain/devices')
         
         disk = self.add_sub_node(devices, 'disk', type='file', device='disk')
         self.add_sub_node(disk, 'driver', name='file')
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)
-        
-        interface = self.add_sub_node(devices, 'interface', type=net_type)
-        self.add_sub_node(interface, 'mac', address=net_mac)
+        self.set_interface_details(devices, net_mac, net_type, req_nettype, 
+                                   virt_type='Xen')
 
     def set_bootloader(self, ip, gtype=0):
         bldr = live.bootloader(ip, gtype)
@@ -552,19 +590,20 @@ class KVMXML(VirtXML):
                        vcpus=const.default_vcpus,
                        mac=const.KVM_default_mac,
                        disk_file_path=const.KVM_disk_path,
-                       disk=const.KVM_default_disk_dev):
+                       disk=const.KVM_default_disk_dev,
+                       req_nettype=const.KVM_default_net_type):
         if not os.path.exists(disk_file_path):
             logger.error('Error: Disk image does not exist')
             sys.exit(1)
         VirtXML.__init__(self, 'kvm', test_dom, set_uuid(), mem, vcpus)
         self._os()
         self._devices(const.KVM_default_emulator, const.KVM_default_net_type,
-                      disk_file_path, disk, mac)
+                      disk_file_path, disk, mac, req_nettype)
 
     def _os(self):
         self.add_sub_node('/domain/os', 'type', 'hvm')
 
-    def _devices(self, emu, net_type, disk_img, disk_dev, net_mac):
+    def _devices(self, emu, net_type, disk_img, disk_dev, net_mac, req_nettype):
         devices = self.get_node('/domain/devices')
 
         self.add_sub_node(devices, 'emulator', emu)
@@ -572,33 +611,9 @@ class KVMXML(VirtXML):
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)
 
-        interface = self.add_sub_node(devices, 'interface', type=net_type)
-        self.add_sub_node(interface, 'mac', address=net_mac)
+        self.set_interface_details(devices, net_mac, net_type, req_nettype, 
+                                   virt_type='KVM')
 
-        if net_type == 'bridge':
-            self.set_vbridge(CIM_IP)    
-        elif net_type == 'network':
-            self.set_vnetwork(interface)
-        else:
-            logger.error("%s is not a valid network type", net_type)
-            sys.exit(1)
-
-    def set_vnetwork(self, interface): 
-        network_list = live.net_list(CIM_IP, virt='KVM')
-        if len(network_list) > 0:
-            nname = network_list[0]
-        else:
-            logger.info('No virutal network found')
-            logger.info('Trying to create one ......')
-            netxml = NetXML(CIM_IP, virt='KVM')
-            ret = netxml.create_vnet()
-            if not ret:
-                logger.error('Failed to create the virtual network "%s"',
-                             netxml.net_name)
-                sys.exit(SKIP)
-            nname = netxml.xml_get_netpool_name()
-        self.add_sub_node(interface, 'source', network=nname)
-    
     def set_emulator(self, emu):
         return self._set_emulator(emu)
     
@@ -618,14 +633,16 @@ class XenFVXML(VirtXML):
                        vcpus=const.default_vcpus,
                        mac=const.XenFV_default_mac,
                        disk_file_path=const.XenFV_disk_path,
-                       disk=const.XenFV_default_disk_dev):
+                       disk=const.XenFV_default_disk_dev,
+                       req_nettype=const.XenFV_default_net_type):
         if not os.path.exists(disk_file_path):
             logger.error('Error: Disk image does not exist')
             sys.exit(1)
         VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus)
         self._os(const.XenFV_default_loader)
         self._devices(const.XenFV_default_emulator,
-                      const.XenFV_default_net_type, mac, disk_file_path, disk)
+                      const.XenFV_default_net_type, mac, disk_file_path, 
+                      disk, req_nettype)
 
     def _os(self, os_loader):
         os = self.get_node('/domain/os')
@@ -633,18 +650,16 @@ class XenFVXML(VirtXML):
         self.add_sub_node(os, 'loader', os_loader)
         self.add_sub_node(os, 'boot', dev='hd')
 
-    def _devices(self, emu, net_type, net_mac, disk_img, disk_dev):
+    def _devices(self, emu, net_type, net_mac, disk_img, disk_dev, 
+                 req_nettype):
         devices = self.get_node('/domain/devices')
 
         self.add_sub_node(devices, 'emulator', emu)
-
-        interface = self.add_sub_node(devices, 'interface', type=net_type)
-        self.add_sub_node(interface, 'mac', address=net_mac)
-        self.set_bridge(CIM_IP)
-
         disk = self.add_sub_node(devices, 'disk', type='file')
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)
+        self.set_interface_details(devices, net_mac, net_type, req_nettype, 
+                                   virt_type='XenFV')
 
     def set_emulator(self, emu):
         return self._set_emulator(emu)



From deeptik at linux.vnet.ibm.com  Tue Jun  3 11:55:09 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Tue, 03 Jun 2008 04:55:09 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #3 Fixing 02_reverse.py of RAPF
Message-ID: <22f10ada8a6af53e1fad.1212494109@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1212494097 25200
# Node ID 22f10ada8a6af53e1fad84fb6b137182ccdc2179
# Parent  05e8d5b17fd7e4d7eb3a6f1903fd834fcebcd311
[TEST] #3 Fixing 02_reverse.py of RAPF.

Changes:

>From 2 to 3 patch:
1) Passed the req_nettype arg to virtxml that can be used to specify the network type, when we
   need a guest with a network details other than the default network types.

This patch will require the vxml.py changes that was submitted today.

>From 1 to 2 patch:
1) Used getInstance instead of enumerate for RASD info.
2) Used the changeset no to reflect the ProcRASD InstanceID changes.

Added the following extra steps:
1) Defining a domain.
2) creating diskpool, netpool.


Without the steps 1 and 2 the tc used to simply pass.
The tc will fail on KVM with old libvirt-cim rpm as expected and will pass with the latest source.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 05e8d5b17fd7 -r 22f10ada8a6a suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Tue Jun 03 04:40:42 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Tue Jun 03 04:54:57 2008 -0700
@@ -6,6 +6,7 @@
 #    Guolian Yun <yunguol at cn.ibm.com>
 #    Kaitlin Rupert <karupert at us.ibm.com>
 #    Zhengang Li <lizg at cn.ibm.com>
+#    Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public
@@ -25,69 +26,165 @@ import sys
 import sys
 from VirtLib import utils
 from XenKvmLib import assoc
-from XenKvmLib import devices
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
+from XenKvmLib.const import CIM_REV
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
-from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import enumclass
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
+
 
 sup_types = ['Xen', 'XenFV', 'KVM']
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+proc_instid_rev = 590
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    else:
+        test_disk = "hda"
+
+    virtxml = get_class(virt)
+    vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                    mac = test_mac, disk = test_disk,
+                    req_nettype='network')
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def init_list(test_disk, diskid, test_network):
+
+    if CIM_REV < proc_instid_rev:
+        procid = '%s/%s' % (test_dom, 0)
+    else:
+        procid = '%s/%s' % (test_dom, 'proc')
+
+    proc = { 'rasd_id' : procid,
+             'pool_id' : 'ProcessorPool/0'
+           }
+
+    mem =  { 'rasd_id' : '%s/%s' % (test_dom,'mem'),
+             'pool_id' : 'MemoryPool/0'
+           }
+
+    net  = { 
+             'rasd_id' : '%s/%s' % (test_dom, test_mac),
+             'pool_id' : 'NetworkPool/%s' %test_network
+           }
+
+    disk = { 'rasd_id' : '%s/%s' % (test_dom, test_disk),
+             'pool_id' : diskid
+           }
+
+    cn_id_list = {
+                   'MemResourceAllocationSettingData'  : mem,
+                   'ProcResourceAllocationSettingData' : proc,
+                   'NetResourceAllocationSettingData'  : net,
+                   'DiskResourceAllocationSettingData' : disk
+                }
+
+    return cn_id_list
+
+def get_rasd_instance(server, virt, key_list, cn):
+    inst = None 
+    try:
+        inst = enumclass.getInstance(server, cn, key_list, virt)
+    except Exception, details:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
+        logger.error("Exception details: %s", details)
+        return inst, FAIL
+
+    return inst, PASS
+
+def verify_pool_from_RAFP(server, virt, inst, pool_id, cn):
+    pool = []
+    try:
+        pool = assoc.AssociatorNames(server, "ResourceAllocationFromPool",
+                                     cn, virt, InstanceID = inst.InstanceID)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES, inst.InstanceID)
+        return FAIL
+
+    if len(pool) != 1:
+        logger.error("No associated pool for %s", inst.InstanceID)
+        return FAIL
+
+    if pool[0]['InstanceID'] != pool_id:
+        logger.error("InstanceID Mismatch")
+        logger.error("Returned %s instead of %s", pool[0]['InstanceID'] ,
+                      pool_id)
+        return FAIL
+
+    return PASS
+
+def get_rasdinst_verify_pool_from_RAFP(server, virt, vsxml, cn, id_info):
+    try:
+        key_list = {  'InstanceID' : id_info['rasd_id'] }
+        rasd_cn =  get_typed_class(virt, cn) 
+        rasdinst, status = get_rasd_instance(server, virt, key_list, rasd_cn)
+        if status != PASS or rasdinst.InstanceID == None:
+            vsxml.undefine(server)    
+            return status
+
+        status = verify_pool_from_RAFP(server, virt, rasdinst, 
+                                       id_info['pool_id'], cn)
+    except Exception, details:
+        logger.error("Exception in get_rasdinst_verify_pool_from_RAFP() fn")
+        logger.error("Exception Details %s", details)
+        status = FAIL
+
+    if status != PASS:
+        vsxml.undefine(server)    
+
+    return status
+    
 
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
+    server = options.ip
+    virt = options.virt
+    
+    status, vsxml, test_disk = setup_env(server, virt)
+    if status != PASS:
+        return status
 
-    key_list = ["DeviceID", "CreationClassName", "SystemName",
-                "SystemCreationClassName"]
-    try:
-        mem = devices.enumerate(options.ip, 'Memory', key_list, options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ENUMERATE % 'Memory')
-        return FAIL
+    status, diskid = create_diskpool_conf(server, virt)
+    if status != PASS:
+        return status
 
-    try:
-        proc = devices.enumerate(options.ip, 'Processor', key_list, options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ENUMERATE % 'Processor')
-        return FAIL
-        
-    for i in range(len(mem)):
-        try:
-            mempool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                            "MemResourceAllocationSettingData", 
-                                            options.virt,
-                                            InstanceID = mem[i].DeviceID)
-        except Exception:
-            logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mem[i].DeviceID)
-            status = FAIL
+    status, test_network = create_netpool_conf(server, virt)
+    if status != PASS:
+        return status
 
-        if len(mempool) < 1:
-            logger.error("No associated pool for %s" % mem[i].DeviceID)
-            return FAIL
+    cn_id_list = init_list(test_disk, diskid, test_network)
 
-        if mempool[0].keybindings['InstanceID'] != "MemoryPool/0":
-            logger.error("MemResourceAllocationSettingData association error")
-            return FAIL
-            
-    for j in range(len(proc)):
-        try:
-            procpool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                             "ProcResourceAllocationSettingData",
-                                             options.virt,
-                                             InstanceID = proc[j].DeviceID)
-        except Exception:
-            logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % proc[j].DeviceID)
-            return FAIL
-            
-        if len(procpool) < 1:
-            logger.error("No associated pool for %s" % proc[j].DeviceID)
-            return FAIL
+    for rasd_cn, id_info in cn_id_list.iteritems():
+        status = get_rasdinst_verify_pool_from_RAFP(server, virt, vsxml, 
+                                                    rasd_cn, id_info)
+        if status != PASS:
+            return status
 
-        if procpool[0].keybindings['InstanceID'] != "ProcessorPool/0":
-            logger.error("ProcResourceAllocationSettingData association failed")
-            status = FAIL
-
+    cleanup_restore(server, virt)
+    vsxml.undefine(server)    
     return status
 
 if __name__ == "__main__":



From kaitlin at linux.vnet.ibm.com  Tue Jun  3 16:01:19 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 09:01:19 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update SystemDevice.01~03 for LXC
	support
In-Reply-To: <37c9c0b22ced6e757a13.1212473553@localhost.localdomain>
References: <37c9c0b22ced6e757a13.1212473553@localhost.localdomain>
Message-ID: <48456ACF.1070903@linux.vnet.ibm.com>

> diff -r 351d11163eaa -r 37c9c0b22ced suites/libvirt-cim/cimtest/SystemDevice/01_forward.py
> --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py	Fri May 30 10:47:26 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py	Tue Jun 03 14:12:25 2008 +0800
> @@ -33,7 +33,7 @@
>  from CimTest.Globals import logger, do_main
>  from CimTest.ReturnCodes import PASS, FAIL
> 
> -sup_types = ['Xen', 'KVM', 'XenFV']
> +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
>  test_dom = "test_domain"
>  test_mac = "00:11:22:33:44:55"
> @@ -50,7 +50,10 @@
> 
>      status = PASS
>      virt_xml = vxml.get_class(options.virt)
> -    cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk)
> +    if options.virt == "LXC":
> +        cxml = virt_xml(test_dom, vcpus = test_cpu)

For LXC, it would make more sense to define a guest with memory.  You 
can specify the <vcpu> tag when you create a container, however, the tag 
is currently ignored.

The container's XML will preserve the <memory> tag, but the value isn't 
being used for anything at the moment.  But this value should be used in 
the future.

> diff -r 351d11163eaa -r 37c9c0b22ced suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py
> --- a/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py	Fri May 30 10:47:26 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py	Tue Jun 03 14:12:25 2008 +0800
> @@ -40,7 +40,7 @@
>  from CimTest import Globals
>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
> 
> -sup_types = ['Xen', 'KVM', 'XenFV']
> +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
>  test_dom = "virt1"
>  test_mac = "00:11:22:33:44:55"
> @@ -64,15 +64,19 @@
> 
>      status = PASS
>      virt_xml = vxml.get_class(options.virt)
> -    cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac,
> -                    disk = test_disk)
> +    if options.virt == "LXC":
> +        cxml = virt_xml(test_dom, vcpus = test_cpu)
> +        devlist = [ "Memory" ]

Same here - this vcpu value will be ignored when the container is created.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun  3 16:10:05 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 09:10:05 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	ResourcePoolConfigurationService.01&02 for LXC support
In-Reply-To: <05b78b7632d59087df90.1212478516@localhost.localdomain>
References: <05b78b7632d59087df90.1212478516@localhost.localdomain>
Message-ID: <48456CDD.2010506@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1212478509 -28800
> # Node ID 05b78b7632d59087df9076e09ffb10978d5f3bf4
> # Parent  351d11163eaa0b0af28a9064177ad637aeeb2a8c
> [TEST] Update ResourcePoolConfigurationService.01&02 for LXC support
> 

This is missing your DCO.  Otherwise, the patch looks fine.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun  3 16:32:56 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 09:32:56 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Adding set_interface_details() fn
	to the vxml.py
In-Reply-To: <05e8d5b17fd7e4d7eb3a.1212493364@elm3b217.beaverton.com>
References: <05e8d5b17fd7e4d7eb3a.1212493364@elm3b217.beaverton.com>
Message-ID: <48457238.2000905@linux.vnet.ibm.com>

> 
> +    def set_interface_details(self, devices, net_mac, net_type, req_net_type, virt_type):
> +        if net_type != req_net_type:
> +            interface = self.add_sub_node(devices, 'interface', type=req_net_type)
> +        else:
> +            interface = self.add_sub_node(devices, 'interface', type=net_type)

I'm not sure I understand the need for two net_type parameters here.  No 
matter what the value of net_type is, you're always setting the value of 
the interface to req_net_type.

In the case of the RAFP test, the test was assuming that all guests had 
a network device that belonged to a specific pool.  So for that test 
case, creating a guest with an ethernet interface would not be valid.

However, you could have situations where you'd want to verify that the 
providers are properly managing a guest that doesn't have a network 
type.  One such example would be to verify that adding a new ethernet 
resource to a Xen guest with an ethernet interface is successful.  Even 
though we don't create guests with ethernet devices, we should still be 
able to manage them.

So, I like the idea of being able to specify the network type.  I think 
the req_net_type parameter is unnecessary here.

> +        self.add_sub_node(interface, 'mac', address=net_mac)
> +        if req_net_type == 'bridge':
> +            self._set_vbridge(CIM_IP, virt_type)
> +        elif req_net_type == 'network':
> +            self.set_vnetwork(interface, virt_type)
> +        elif req_net_type == 'ethernet':
> +            pass

You'll also want to support the "user" network type for KVM since 
NetworkPort/03_user_netport.py uses it.

The user network type is only valid for KVM, so you wouldn't want to be 
able to create Xen guests of this type.

> +        else:
> +            logger.error("%s is not a valid network type", net_type)
> +            sys.exit(1)

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun  3 16:49:02 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 09:49:02 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 LXC support using DefineSystem
	& VSMS.01
In-Reply-To: <4844EA93.9000607@linux.vnet.ibm.com>
References: <ddb52ec53368860a18b7.1212133236@localhost.localdomain>
	<4840751A.30300@linux.vnet.ibm.com>
	<4844EA93.9000607@linux.vnet.ibm.com>
Message-ID: <484575FE.2000504@linux.vnet.ibm.com>

Zhengang Li wrote:
> Kaitlin Rupert wrote:
> 
>>> +    # LXC only takes disk and memory device for now.
>>> +    # Only disk __init__ takes different params.
>>> +    if virt == 'LXC':
>>> +        d = LXC_DiskResourceAllocationSettingData(
>>> +                mountpoint=const.LXC_default_mp,
>>> +                source=const.LXC_default_mp, name=dom_name)
>>
>> Instead of using the same directory for the mountpoint and the source. 
>> You could create a directory such as /tmp/lxc_files to mount on /tmp. 
>> That way we can distinguish between the two.
> I'll add this in the next revision.

Sure - no problem.

> 
>>
>>> +    else:
>>> +        class_dasd = get_dasd_class(virt)
>>> +        if virt == 'KVM':
>>> +            disk_dev = 'hda'
>>> +            disk_source = const.KVM_disk_path
>>> +        elif virt == 'XenFV':
>>> +            disk_dev = 'hda'
>>> +            disk_source = const.XenFV_disk_path
>>> +        d = class_dasd(
>>> +                    dev=disk_dev, +                    
>>> source=disk_source,
>>> +                    name=dom_name)
>>> +         class_nasd = get_nasd_class(virt)
>>
>> We'll need to skip over network and processor for now, since they 
>> aren't supported.
> I tried with 'None' and empty values to the network and processor 
> mof-string. Pywbem had a problem parsing them. How do we skip the two 
> devices?

You don't need to specify RASDs for every device.  So, you can return 
something like the following for containers:

return vssd.mof(), [d.mof(), m.mof()]

So, you could reorder things so that disk and memory are created first, 
then check if the virt type is LXC and return.  Or you can just skip 
over the network and proc RASD creation in the case of LXC.  And then 
return accordingly at the end.

Either way is fine. I think the latter might be useful - it'll be easier 
to enable containers for network/processor should that kind of support 
come available.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun  3 17:53:21 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 10:53:21 -0700
Subject: [Libvirt-cim] [PATCH] Fix VSMS resource_add so that and additional
	tag is not added for processor
In-Reply-To: <7cf0b0142edb638ce43c.1212425976@elm3b41.beaverton.ibm.com>
References: <7cf0b0142edb638ce43c.1212425976@elm3b41.beaverton.ibm.com>
Message-ID: <48458511.2090901@linux.vnet.ibm.com>

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1212425931 25200
> # Node ID 7cf0b0142edb638ce43cc8f3209eef12b2f5e04b
> # Parent  0c8d4baf3ee1f6eb96f7d1d49276fa6cc44c4685
> Fix VSMS resource_add so that and additional tag is not added for processor.
> 
> The same is also true for memory.  Also, be sure not to increment the count for processor and memory since a guest will not have muultiple tags for these devices.
> 
> Remove check for memory after find_list().  We don't want to skip this becuase it's possible to update the memory of a defined guest.  It is not possible to update the memory of a running guest, but this case is already handled by attach_device() in device_parsing.c
> 
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
> 
> diff -r 0c8d4baf3ee1 -r 7cf0b0142edb src/Virt_VirtualSystemManagementService.c

Please ignore this patch.  If we need to modify the memory or processors 
of a guest, ModifyResource() should be used.

This patch was to address the problem where AddResource() returns a 
success if a user attempts to add processors to a defined guest. 
However, the number of processors doesn't change, so an error should be 
returned.

Will send a different patch to handle this.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun  3 18:13:29 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 11:13:29 -0700
Subject: [Libvirt-cim] [PATCH] Return an error for type processor in
	AddResource and RemoveResource
Message-ID: <bad698c7ab90ec47167f.1212516809@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212516442 25200
# Node ID bad698c7ab90ec47167f078c4bbf96648351269e
# Parent  0c8d4baf3ee1f6eb96f7d1d49276fa6cc44c4685
Return an error for type processor in AddResource and RemoveResource.

A user should use ModifyResource to change the number of processors.

Also fix a warning caused by this change.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 0c8d4baf3ee1 -r bad698c7ab90 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Fri May 30 06:57:03 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Tue Jun 03 11:07:22 2008 -0700
@@ -979,7 +979,7 @@
         CMPIObjectPath *op;
         struct virt_device **_list;
         struct virt_device *list;
-        int *count;
+        int *count = NULL;
         int i;
 
         op = CMGetObjectPath(rasd, &s);
@@ -987,7 +987,8 @@
                 goto out;
 
         _list = find_list(dominfo, type, &count);
-        if ((type == CIM_RES_TYPE_MEM) || (_list != NULL))
+        if ((type == CIM_RES_TYPE_MEM) || (type == CIM_RES_TYPE_PROC) ||
+           (_list != NULL))
                 list = *_list;
         else {
                 cu_statusf(_BROKER, &s,
@@ -1028,14 +1029,15 @@
         struct virt_device **_list;
         struct virt_device *list;
         struct virt_device *dev;
-        int *count;
+        int *count = NULL;
 
         op = CMGetObjectPath(rasd, &s);
         if ((op == NULL) || (s.rc != CMPI_RC_OK))
                 goto out;
 
         _list = find_list(dominfo, type, &count);
-        if ((type == CIM_RES_TYPE_MEM) || (_list == NULL)) {
+        if ((type == CIM_RES_TYPE_MEM) || (type == CIM_RES_TYPE_PROC) ||
+           (_list != NULL)) {
                 cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Cannot add resources of type %" PRIu16, type);



From kaitlin at linux.vnet.ibm.com  Tue Jun  3 18:47:31 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 11:47:31 -0700
Subject: [Libvirt-cim] [PATCH] (#2) Return an error for type processor in
	AddResource and RemoveResource
Message-ID: <4f7942780a4186e3526b.1212518851@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212518806 25200
# Node ID 4f7942780a4186e3526b0c6435b0b32c05385013
# Parent  0c8d4baf3ee1f6eb96f7d1d49276fa6cc44c4685
(#2) Return an error for type processor in AddResource and RemoveResource.

A user should use ModifyResource to change the number of processors.

Also fix a warning caused by this change.

Update:
 -Fix copy and paste error.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 0c8d4baf3ee1 -r 4f7942780a41 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Fri May 30 06:57:03 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Tue Jun 03 11:46:46 2008 -0700
@@ -979,7 +979,7 @@
         CMPIObjectPath *op;
         struct virt_device **_list;
         struct virt_device *list;
-        int *count;
+        int *count = NULL;
         int i;
 
         op = CMGetObjectPath(rasd, &s);
@@ -987,7 +987,8 @@
                 goto out;
 
         _list = find_list(dominfo, type, &count);
-        if ((type == CIM_RES_TYPE_MEM) || (_list != NULL))
+        if ((type == CIM_RES_TYPE_MEM) || (type == CIM_RES_TYPE_PROC) ||
+           (_list != NULL))
                 list = *_list;
         else {
                 cu_statusf(_BROKER, &s,
@@ -1028,14 +1029,15 @@
         struct virt_device **_list;
         struct virt_device *list;
         struct virt_device *dev;
-        int *count;
+        int *count = NULL;
 
         op = CMGetObjectPath(rasd, &s);
         if ((op == NULL) || (s.rc != CMPI_RC_OK))
                 goto out;
 
         _list = find_list(dominfo, type, &count);
-        if ((type == CIM_RES_TYPE_MEM) || (_list == NULL)) {
+        if ((type == CIM_RES_TYPE_MEM) || (type == CIM_RES_TYPE_PROC) ||
+           (_list == NULL)) {
                 cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Cannot add resources of type %" PRIu16, type);



From kaitlin at linux.vnet.ibm.com  Tue Jun  3 19:45:43 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 12:45:43 -0700
Subject: [Libvirt-cim] [PATCH 0 of 2] [TEST] Update VSMS 06_addresource.py
	to support running guests.
In-Reply-To: <patchbomb.1212426290@elm3b41.beaverton.ibm.com>
References: <patchbomb.1212426290@elm3b41.beaverton.ibm.com>
Message-ID: <48459F67.6080001@linux.vnet.ibm.com>

Kaitlin Rupert wrote:
> Also support memory for defined guests.
> 
> _______________________________________________

Please ignore this set. This was dependent on the "Fix VSMS resource_add 
so that and additional tag is not added for processor" patch, which has 
been re-written.

The changes in provider will impact the changes in this test.  Will 
update and resend once the patch is in the tree.
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From danms at us.ibm.com  Tue Jun  3 19:49:02 2008
From: danms at us.ibm.com (Dan Smith)
Date: Tue, 03 Jun 2008 12:49:02 -0700
Subject: [Libvirt-cim] [PATCH 2 of 2] [TEST] Modify VSMS 06 to support
	both a defined and running guest
In-Reply-To: <c43fd555c6f3d6e1ce67.1212426292@elm3b41.beaverton.ibm.com>
	(Kaitlin Rupert's message of "Mon, 02 Jun 2008 10:04:52 -0700")
References: <c43fd555c6f3d6e1ce67.1212426292@elm3b41.beaverton.ibm.com>
Message-ID: <87skvuguz5.fsf@caffeine.beaverton.ibm.com>

KR>  -Add logic so that test only adds mem/proc resources to a defined guest.

This is a valid thing to do in Xen, and changing memory will probably
be supported in KVM pretty soon.  It will also, of course, be
something easily supported by LXC.

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080603/8ef9ab84/attachment.sig>

From deeptik at linux.vnet.ibm.com  Tue Jun  3 20:13:51 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Tue, 03 Jun 2008 13:13:51 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Resubmitting #2 Fixing 02_reverse.py
	of RAPF with desc in commit log
Message-ID: <577b765748f176681e6c.1212524031@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1212524019 25200
# Node ID 577b765748f176681e6c5cff2f6734436714bc76
# Parent  79f0d0723ae6425b141bec84f83b2ef3c7dd4fc3
[TEST] Resubmitting #2 Fixing 02_reverse.py of RAPF with desc in commit log.

Changes:

>From 1 to 2 patch:
1) Used getInstance instead of enumerate for RASD info.
2) Used the changeset no to reflect the ProcRASD InstanceID changes.

Added the following extra steps:
1) Defining a domain.
2) creating diskpool, netpool.


Without the steps 1 and 2 the tc used to simply pass.
The tc will fail on KVM with old libvirt-cim rpm .
It will also fail for Xen on latest sources.
The tc will pass with XenFV/KVM with the latest source.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 79f0d0723ae6 -r 577b765748f1 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Tue Jun 03 13:20:46 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Tue Jun 03 13:13:39 2008 -0700
@@ -6,6 +6,7 @@
 #    Guolian Yun <yunguol at cn.ibm.com>
 #    Kaitlin Rupert <karupert at us.ibm.com>
 #    Zhengang Li <lizg at cn.ibm.com>
+#    Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public
@@ -25,69 +26,164 @@ import sys
 import sys
 from VirtLib import utils
 from XenKvmLib import assoc
-from XenKvmLib import devices
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
+from XenKvmLib.const import CIM_REV
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
-from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import enumclass
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
+
 
 sup_types = ['Xen', 'XenFV', 'KVM']
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+proc_instid_rev = 590
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    else:
+        test_disk = "hda"
+
+    virtxml = get_class(virt)
+    vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                    mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def init_list(test_disk, diskid, test_network):
+
+    if CIM_REV < proc_instid_rev:
+        procid = '%s/%s' % (test_dom, 0)
+    else:
+        procid = '%s/%s' % (test_dom, 'proc')
+
+    proc = { 'rasd_id' : procid,
+             'pool_id' : 'ProcessorPool/0'
+           }
+
+    mem = { 'rasd_id' : '%s/%s' % (test_dom,'mem'),
+            'pool_id' : 'MemoryPool/0'
+          }
+
+    net  = { 
+             'rasd_id' : '%s/%s' % (test_dom, test_mac),
+             'pool_id' : 'NetworkPool/%s' %test_network
+           }
+
+    disk = { 'rasd_id' : '%s/%s' % (test_dom, test_disk),
+             'pool_id' : diskid
+           }
+
+    cn_id_list = {
+                   'MemResourceAllocationSettingData'  : mem,
+                   'ProcResourceAllocationSettingData' : proc,
+                   'NetResourceAllocationSettingData'  : net,
+                   'DiskResourceAllocationSettingData' : disk
+                }
+
+    return cn_id_list
+
+def get_rasd_instance(server, virt, key_list, cn):
+    inst = None 
+    try:
+        inst = enumclass.getInstance(server, cn, key_list, virt)
+    except Exception, details:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
+        logger.error("Exception details: %s", details)
+        return inst, FAIL
+
+    return inst, PASS
+
+def verify_pool_from_RAFP(server, virt, inst, pool_id, cn):
+    pool = []
+    try:
+        pool = assoc.AssociatorNames(server, "ResourceAllocationFromPool",
+                                     cn, virt, InstanceID = inst.InstanceID)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES, inst.InstanceID)
+        return FAIL
+
+    if len(pool) != 1:
+        logger.error("No associated pool for %s", inst.InstanceID)
+        return FAIL
+
+    if pool[0]['InstanceID'] != pool_id:
+        logger.error("InstanceID Mismatch")
+        logger.error("Returned %s instead of %s", pool[0]['InstanceID'] ,
+                      pool_id)
+        return FAIL
+
+    return PASS
+
+def get_rasdinst_verify_pool_from_RAFP(server, virt, vsxml, cn, id_info):
+    try:
+        key_list = {  'InstanceID' : id_info['rasd_id'] }
+        rasd_cn =  get_typed_class(virt, cn) 
+        rasdinst, status = get_rasd_instance(server, virt, key_list, rasd_cn)
+        if status != PASS or rasdinst.InstanceID == None:
+            vsxml.undefine(server)    
+            return status
+
+        status = verify_pool_from_RAFP(server, virt, rasdinst, 
+                                       id_info['pool_id'], cn)
+    except Exception, details:
+        logger.error("Exception in get_rasdinst_verify_pool_from_RAFP() fn")
+        logger.error("Exception Details %s", details)
+        status = FAIL
+
+    if status != PASS:
+        vsxml.undefine(server)    
+
+    return status
+    
 
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
+    server = options.ip
+    virt = options.virt
+    
+    status, vsxml, test_disk = setup_env(server, virt)
+    if status != PASS:
+        return status
 
-    key_list = ["DeviceID", "CreationClassName", "SystemName",
-                "SystemCreationClassName"]
-    try:
-        mem = devices.enumerate(options.ip, 'Memory', key_list, options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ENUMERATE % 'Memory')
-        return FAIL
+    status, diskid = create_diskpool_conf(server, virt)
+    if status != PASS:
+        return status
 
-    try:
-        proc = devices.enumerate(options.ip, 'Processor', key_list, options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ENUMERATE % 'Processor')
-        return FAIL
-        
-    for i in range(len(mem)):
-        try:
-            mempool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                            "MemResourceAllocationSettingData", 
-                                            options.virt,
-                                            InstanceID = mem[i].DeviceID)
-        except Exception:
-            logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mem[i].DeviceID)
-            status = FAIL
+    status, test_network = create_netpool_conf(server, virt)
+    if status != PASS:
+        return status
 
-        if len(mempool) < 1:
-            logger.error("No associated pool for %s" % mem[i].DeviceID)
-            return FAIL
+    cn_id_list = init_list(test_disk, diskid, test_network)
 
-        if mempool[0].keybindings['InstanceID'] != "MemoryPool/0":
-            logger.error("MemResourceAllocationSettingData association error")
-            return FAIL
-            
-    for j in range(len(proc)):
-        try:
-            procpool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                             "ProcResourceAllocationSettingData",
-                                             options.virt,
-                                             InstanceID = proc[j].DeviceID)
-        except Exception:
-            logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % proc[j].DeviceID)
-            return FAIL
-            
-        if len(procpool) < 1:
-            logger.error("No associated pool for %s" % proc[j].DeviceID)
-            return FAIL
+    for rasd_cn, id_info in cn_id_list.iteritems():
+        status = get_rasdinst_verify_pool_from_RAFP(server, virt, vsxml, 
+                                                    rasd_cn, id_info)
+        if status != PASS:
+            return status
 
-        if procpool[0].keybindings['InstanceID'] != "ProcessorPool/0":
-            logger.error("ProcResourceAllocationSettingData association failed")
-            status = FAIL
-
+    cleanup_restore(server, virt)
+    vsxml.undefine(server)    
     return status
 
 if __name__ == "__main__":



From deeptik at linux.vnet.ibm.com  Tue Jun  3 20:47:09 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Wed, 04 Jun 2008 02:17:09 +0530
Subject: [Libvirt-cim] libvir Error .
Message-ID: <4845ADCD.4040304@linux.vnet.ibm.com>

Hi ,

I have noticed error messages like the following in the test case logs:

libvir: Xen error : Domain not found: xenUnifiedDomainLookupByName
libvir: Domain error : invalid domain pointer in virDomainFree

Can you let me know if its a known problem ?

Thanks and Regards,
Deepti.



From kaitlin at linux.vnet.ibm.com  Wed Jun  4 00:05:57 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 17:05:57 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fix CIM_REV to handle non integer
	strings
In-Reply-To: <7e4310cd6913605148b0.1212194930@elm3b41.beaverton.ibm.com>
References: <7e4310cd6913605148b0.1212194930@elm3b41.beaverton.ibm.com>
Message-ID: <4845DC65.1010802@linux.vnet.ibm.com>

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1212165521 25200
> # Node ID 7e4310cd6913605148b038b46d244ed670730727
> # Parent  4a5a44d7b857df543af24d59380cb8fdbbb753a4
> [TEST] Fix CIM_REV to handle non integer strings.
> 
> When working with patches, the changeset revision has a + appended to it.
> 
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
> 
> diff -r 4a5a44d7b857 -r 7e4310cd6913 suites/libvirt-cim/lib/XenKvmLib/const.py

Can someone review this?

Thanks!

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun  4 00:41:36 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 17:41:36 -0700
Subject: [Libvirt-cim] [PATCH] Add KVM proc/mem check in _resource_dynamic()
Message-ID: <8fdff95eb25e04745c99.1212540096@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212540049 25200
# Node ID 8fdff95eb25e04745c992a76a85f45039e5022a5
# Parent  345ed17b623f12a2befafa7841c2ae89b1a47dc7
Add KVM proc/mem check in _resource_dynamic().

KVM doesn't support VCPU / memory modification of running guests.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 345ed17b623f -r 8fdff95eb25e src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Tue Jun 03 11:48:18 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Tue Jun 03 17:40:49 2008 -0700
@@ -912,6 +912,7 @@
         virConnectPtr conn;
         virDomainPtr dom;
         int (*func)(virDomainPtr, struct virt_device *);
+        char *prefix = NULL;
 
         if (action == RESOURCE_ADD)
                 func = attach_device;
@@ -951,6 +952,17 @@
                 goto out;
         }
 
+        prefix = class_prefix_name(refcn); 
+        
+        if  (((dev->type == CIM_RES_TYPE_PROC) || 
+            (dev->type == CIM_RES_TYPE_MEM)) && (STREQ(prefix, "KVM"))) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Running guest cannot modify resource type %" PRIu16,
+                           dev->type);
+                goto out;
+        }
+
         CU_DEBUG("Doing dynamic device update for `%s'", dominfo->name);
 
         if (func(dom, dev) == 0) {
@@ -963,6 +975,7 @@
                            "");
         }
  out:
+        free(prefix);
         virDomainFree(dom);
         virConnectClose(conn);
 



From kaitlin at linux.vnet.ibm.com  Wed Jun  4 00:41:56 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 17:41:56 -0700
Subject: [Libvirt-cim] [PATCH] Fix association class name typo in SDS
Message-ID: <0d18506e1ede6669ecbd.1212540116@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212540052 25200
# Node ID 0d18506e1ede6669ecbd2f6cf54f496fc032e69f
# Parent  8fdff95eb25e04745c992a76a85f45039e5022a5
Fix association class name typo in SDS.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 8fdff95eb25e -r 0d18506e1ede src/Virt_SettingsDefineState.c
--- a/src/Virt_SettingsDefineState.c	Tue Jun 03 17:40:49 2008 -0700
+++ b/src/Virt_SettingsDefineState.c	Tue Jun 03 17:40:52 2008 -0700
@@ -370,7 +370,7 @@
 static char* assoc_classname[] = {
         "Xen_SettingsDefineState",
         "KVM_SettingsDefineState",
-        "LXC_VirtualSystemSettingData",
+        "LXC_SettingsDefineState",
         NULL
 };
 



From kaitlin at linux.vnet.ibm.com  Wed Jun  4 00:42:14 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 03 Jun 2008 17:42:14 -0700
Subject: [Libvirt-cim] [TEST] Null of LXC_SettingsDefineState forward query
In-Reply-To: <OF660C0514.F1E075C8-ON4825745D.0027593C-4825745D.0027E555@cn.ibm.com>
References: <OF660C0514.F1E075C8-ON4825745D.0027593C-4825745D.0027E555@cn.ibm.com>
Message-ID: <4845E4E6.2000904@linux.vnet.ibm.com>

Guo Lian Yun wrote:
> 
> Kaitlin,
> 
> Could you get expect result by below query?
> 
> wbemcli ain -ac LXC_SettingsDefineState 
> http://root:password at localhost/root/virt:LXC_Memory.DeviceID="test_domain/mem",CreationClassName="LXC_Memory",SystemName="test_domain",SystemCreationClassName="LXC_ComputerSystem" 

Nice find =)  This is due to a typo in SDS (see my patch to the list).

Thanks for catching this!
> 
> 
> But ein and reverse query work for me.
> 
> wbemcli ein http://root:password at localhost/root/virt:LXC_Memory
> localhost:5988/root/virt:LXC_Memory.DeviceID="test_domain/mem",CreationClassName="LXC_Memory",SystemName="test_domain",SystemCreationClassName="LXC_ComputerSystem" 
> 
> 
> wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
> http://root:password at localhost:5988/root/virt:LXC_VirtualSystemSettingData.InstanceID="LXC:test_domain" 

This isn't the correct query for the reverse.  The correct query would be:

wbemcli ain -ac LXC_SettingsDefineState 
'http://localhost/root/virt:LXC_MemResourceAllocationSettingData.InstanceID="test_domain/mem"'

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From zli at linux.vnet.ibm.com  Wed Jun  4 02:06:25 2008
From: zli at linux.vnet.ibm.com (zli at linux.vnet.ibm.com)
Date: Wed, 04 Jun 2008 10:06:25 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #3 LXC support using DefineSystem &
	VSMS.01
Message-ID: <277b821188f247baaa02.1212545185@localhost.localdomain>

# HG changeset patch
# User Zhengang Li <lizg at cn.ibm.com>
# Date 1212545171 -28800
# Node ID 277b821188f247baaa02f0668915a57f9e8c83b1
# Parent  5c77329cb53e6340cd6ddbf9c044462fb994eb88
[TEST] #3 LXC support using DefineSystem & VSMS.01

Updates:
.2# add the missing address property
.3#
   - Skip network and processor device
   - Use different values for mountpoint and source


Signed-off-by: Zhengang Li <lizg at cn.ibm.com>

diff -r 5c77329cb53e -r 277b821188f2 suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py	Fri May 30 14:26:38 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py	Wed Jun 04 10:06:11 2008 +0800
@@ -30,7 +30,7 @@
 from CimTest.Globals import do_main
 from CimTest.Globals import logger
 
-SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV']
+SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC']
 default_dom = 'test_domain'
 
 @do_main(SUPPORTED_TYPES)
diff -r 5c77329cb53e -r 277b821188f2 suites/libvirt-cim/lib/XenKvmLib/const.py
--- a/suites/libvirt-cim/lib/XenKvmLib/const.py	Fri May 30 14:26:38 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/const.py	Wed Jun 04 10:06:11 2008 +0800
@@ -85,3 +85,5 @@
 #vxml.LXCXML
 LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init')
 LXC_default_tty = '/dev/ptmx'
+LXC_default_mp = '/tmp'
+LXC_default_source = '/tmp/lxc_files'
diff -r 5c77329cb53e -r 277b821188f2 suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Fri May 30 14:26:38 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Wed Jun 04 10:06:11 2008 +0800
@@ -102,6 +102,8 @@
         self.isFullVirt = (type == 'KVM' or virt == 'XenFV')
         if self.isFullVirt:
             self.BootDevice = 'hd'
+        elif type == 'LXC':
+            self.InitPath = const.LXC_init_path
         else:
             self.Bootloader = live.bootloader(Globals.CIM_IP, 0)
             self.BootloaderArgs = ''
@@ -113,6 +115,9 @@
     pass
 
 class KVM_VirtualSystemSettingData(CIM_VirtualSystemSettingData):
+    pass
+
+class LXC_VirtualSystemSettingData(CIM_VirtualSystemSettingData):
     pass
 
 @eval_cls('VirtualSystemSettingData')
@@ -134,6 +139,12 @@
 
 class KVM_DiskResourceAllocationSettingData(CIM_DiskResourceAllocationSettingData):
     pass
+
+class LXC_DiskResourceAllocationSettingData(CIMClassMOF):
+    def __init__(self, mountpoint, source, name):
+        self.MountPoint = mountpoint
+        self.Address = source
+        self.InstanceID = '%s/%s' % (name, mountpoint)
 
 @eval_cls('DiskResourceAllocationSettingData')
 def get_dasd_class(virt):
@@ -157,6 +168,9 @@
 class KVM_NetResourceAllocationSettingData(CIM_NetResourceAllocationSettingData):
     pass
 
+class LXC_NetResourceAllocationSettingData(CIM_NetResourceAllocationSettingData):
+    pass
+
 @eval_cls('NetResourceAllocationSettingData')
 def get_nasd_class(virt):
     pass
@@ -175,6 +189,9 @@
     pass
 
 class KVM_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData):
+    pass
+
+class LXC_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData):
     pass
 
 @eval_cls('ProcResourceAllocationSettingData')
@@ -197,6 +214,9 @@
 class KVM_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData):
     pass
 
+class LXC_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData):
+    pass
+
 @eval_cls('MemResourceAllocationSettingData')
 def get_masd_class(virt):
     pass
@@ -212,17 +232,32 @@
     class_vssd = get_vssd_class(virt)
     vssd = class_vssd(name=dom_name, virt=virt)
 
-    class_dasd = get_dasd_class(virt)
-    if virt == 'KVM':
-        disk_dev = 'hda'
-        disk_source = const.KVM_disk_path
-    elif virt == 'XenFV':
-        disk_dev = 'hda'
-        disk_source = const.XenFV_disk_path
-    d = class_dasd(
-                dev=disk_dev, 
-                source=disk_source,
+    # LXC only takes disk and memory device for now.
+    # Only disk __init__ takes different params.
+    if virt == 'LXC':
+        d = LXC_DiskResourceAllocationSettingData(
+                mountpoint=const.LXC_default_mp,
+                source=const.LXC_default_source, name=dom_name)
+    else:
+        class_dasd = get_dasd_class(virt)
+        if virt == 'KVM':
+            disk_dev = 'hda'
+            disk_source = const.KVM_disk_path
+        elif virt == 'XenFV':
+            disk_dev = 'hda'
+            disk_source = const.XenFV_disk_path
+        d = class_dasd(
+                    dev=disk_dev, 
+                    source=disk_source,
+                    name=dom_name)
+    
+    class_masd = get_masd_class(virt)
+    m = class_masd(
+                megabytes=mem_mb,
                 name=dom_name)
+    if virt == 'LXC':
+        return vssd.mof(), [d.mof(), m.mof()]
+    
     class_nasd = get_nasd_class(virt)
     if virt == 'KVM':
         net_mac= const.KVM_default_mac
@@ -236,10 +271,6 @@
     p = class_pasd(
                 vcpu=proc_vcpu,
                 name=dom_name)
-    class_masd = get_masd_class(virt)
-    m = class_masd(
-                megabytes=mem_mb,
-                name=dom_name)
 
     return vssd.mof(), [d.mof(), n.mof(), p.mof(), m.mof()]
 



From zli at linux.vnet.ibm.com  Wed Jun  4 02:15:07 2008
From: zli at linux.vnet.ibm.com (Zhengang Li)
Date: Wed, 04 Jun 2008 10:15:07 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #3 LXC support using DefineSystem
	& VSMS.01
In-Reply-To: <277b821188f247baaa02.1212545185@localhost.localdomain>
References: <277b821188f247baaa02.1212545185@localhost.localdomain>
Message-ID: <4845FAAB.1030400@linux.vnet.ibm.com>

zli at linux.vnet.ibm.com wrote:

> diff -r 5c77329cb53e -r 277b821188f2 suites/libvirt-cim/lib/XenKvmLib/const.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/const.py	Fri May 30 14:26:38 2008 +0800
> +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py	Wed Jun 04 10:06:11 2008 +0800
> @@ -85,3 +85,5 @@
>  #vxml.LXCXML
>  LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init')
>  LXC_default_tty = '/dev/ptmx'
> +LXC_default_mp = '/tmp'
> +LXC_default_source = '/tmp/lxc_files'

The LXC_init_path used to be created by 'create_lxc_files' in vxml.py. 
It's not created here. But somehow libvirt shows me a running container 
even if the init_path file doesn't exist.
The same with LXC_default_source. It's a non-exist directory.

I am inclined to move the init_path and default_source to the place 
where xen/kvm kernel image and disk image is created. Then we don't need 
to create a init_path upon every test case execution.

Thoughts?

-- 
- Zhengang



From yunguol at cn.ibm.com  Wed Jun  4 02:49:14 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 04 Jun 2008 10:49:14 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] 2# Update SystemDevice.01~03 for LXC
	support, ignore the vcpu tag in define a container guest
Message-ID: <62a1d45d71d9329f29bd.1212547754@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212547749 -28800
# Node ID 62a1d45d71d9329f29bd17961f7fdd44256b9bc3
# Parent  9b2e8889d7937c66e73968e53ec31bf93f535224
[TEST] 2# Update SystemDevice.01~03 for LXC support, ignore the vcpu tag in define a container guest

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 9b2e8889d793 -r 62a1d45d71d9 suites/libvirt-cim/cimtest/SystemDevice/01_forward.py
--- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py	Wed Jun 04 10:49:09 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "test_domain"
 test_mac = "00:11:22:33:44:55"
@@ -50,7 +50,10 @@
 
     status = PASS
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk)
     ret = cxml.create(options.ip)
     if not ret:
         logger.error('Unable to create domain %s' % test_dom)
diff -r 9b2e8889d793 -r 62a1d45d71d9 suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py
--- a/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py	Wed Jun 04 10:49:09 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL 
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "test_domain"
 test_mac = "00:11:22:33:44:55"
@@ -44,10 +44,14 @@
 
     status = FAIL
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, mac=test_mac)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+        devlist = ["Memory"]
+    else:
+        cxml = virt_xml(test_dom, mac=test_mac)
+        devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ]
     cxml.create(options.ip)
 
-    devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ]
 
     key_list = ["DeviceID", "CreationClassName", "SystemName",
                 "SystemCreationClassName"]
diff -r 9b2e8889d793 -r 62a1d45d71d9 suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py
--- a/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py	Wed Jun 04 10:49:09 2008 +0800
@@ -40,7 +40,7 @@
 from CimTest import Globals
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "virt1"
 test_mac = "00:11:22:33:44:55"
@@ -64,15 +64,19 @@
 
     status = PASS
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac,
-                    disk = test_disk)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+        devlist = ["Memory"]
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac,
+                        disk = test_disk)
+        devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ]
 
     ret = cxml.create(options.ip)
     if not ret :
         logger.info("error while 'create' of VS")
         return FAIL
 
-    devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ]
 
     # Building the dict for avoiding the correct key:val pairs 
     # while verifying with the Invalid values for the association



From yunguol at cn.ibm.com  Wed Jun  4 05:19:21 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 04 Jun 2008 13:19:21 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update SettingsDefine.01~04 for LXC
	support
Message-ID: <9d471559a53aee205854.1212556761@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212556756 -28800
# Node ID 9d471559a53aee2058545de88471c0288c14af46
# Parent  9b2e8889d7937c66e73968e53ec31bf93f535224
[TEST] Update SettingsDefine.01~04 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 9b2e8889d793 -r 9d471559a53a suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py	Wed Jun 04 13:19:16 2008 +0800
@@ -37,7 +37,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL 
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "domu1"
 test_mac = "00:11:22:33:44:aa"
@@ -71,19 +71,23 @@
     else:
         test_disk = 'hda'
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, 
-                    disk = test_disk)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+        cn_id = {'Memory' : 'mem'}
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, 
+                        disk = test_disk)
+        cn_id = {
+                'LogicalDisk' : test_disk,
+                'Memory'      : 'mem',
+                'NetworkPort' : test_mac,
+                'Processor'   : test_vcpus -1 }
+
 
     ret = cxml.create(options.ip)
     if not ret:
         Globals.logger.error("Failed to Create the dom: %s", test_dom)
         return FAIL 
-
-    cn_id = {
-            'LogicalDisk' : test_disk,
-            'Memory'      : 'mem',
-            'NetworkPort' : test_mac,
-            'Processor'   : test_vcpus -1 }
 
 
     devlist = {}
diff -r 9b2e8889d793 -r 9d471559a53a suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py	Wed Jun 04 13:19:16 2008 +0800
@@ -62,7 +62,7 @@
 from XenKvmLib.const import CIM_REV
 
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom    = "virtgst"
 test_vcpus  = 1
@@ -166,8 +166,11 @@
     
     status = PASS 
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, mem = test_mem, vcpus = test_vcpus,
-                    mac = test_mac, disk = test_disk)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+    else:
+        cxml = virt_xml(test_dom, mem = test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
     ret = cxml.create(options.ip)
     if not ret:
         logger.error("Failed to create the dom: %s", test_dom)
diff -r 9b2e8889d793 -r 9d471559a53a suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py	Wed Jun 04 13:19:16 2008 +0800
@@ -154,7 +154,7 @@
 from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
 from CimTest.Globals import do_main
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "domu1"
 test_mac = "00:11:22:33:44:aa"
@@ -215,8 +215,11 @@
         test_disk = 'hda'
 
     virt_xml = vxml.get_class(options.virt)
-    cxml= virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac,
-                   disk = test_disk)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+    else:
+        cxml= virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac,
+                       disk = test_disk)
 
     ret = cxml.create(options.ip)
     if not ret:
@@ -226,13 +229,15 @@
     global conn
     conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, \
                                                         CIM_PASS), CIM_NS)
-
-    class_id = {
-                get_typed_class(options.virt, 'LogicalDisk') : test_disk,
-                get_typed_class(options.virt, 'Memory')      : 'mem',
-                get_typed_class(options.virt, 'NetworkPort') : test_mac,
-                get_typed_class(options.virt, 'Processor')   : test_vcpus - 1
-               }
+    if options.virt == 'LXC':
+        class_id = {get_typed_class(options.virt, 'Memory')      : 'mem'}
+    else:
+        class_id = {
+                    get_typed_class(options.virt, 'LogicalDisk') : test_disk,
+                    get_typed_class(options.virt, 'Memory')      : 'mem',
+                    get_typed_class(options.virt, 'NetworkPort') : test_mac,
+                    get_typed_class(options.virt, 'Processor')   : test_vcpus - 1
+                   }
 
     tc_scen = [
                 'INVALID_DevID_Keyname',   'INVALID_DevID_Keyval', \
diff -r 9b2e8889d793 -r 9d471559a53a suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py	Wed Jun 04 13:19:16 2008 +0800
@@ -63,7 +63,7 @@
 from CimTest.Globals import do_main, logger
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "domu1"
 test_mac = "00:11:22:33:44:aa"
@@ -104,8 +104,11 @@
         test_disk = 'hda'
     
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac,
-                    disk = test_disk)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac,
+                        disk = test_disk)
 
     ret = cxml.create(options.ip)
     if not ret:
@@ -117,12 +120,19 @@
                                                         CIM_PASS), CIM_NS)
 
     rasd_base= 'ResourceAllocationSettingData'
-    class_id = {
-                get_typed_class(options.virt, 'Disk' + rasd_base) : test_disk,
-                get_typed_class(options.virt, 'Mem' + rasd_base)  : 'mem',
-                get_typed_class(options.virt, 'Net' + rasd_base)  : test_mac,
-                get_typed_class(options.virt, 'Proc' + rasd_base) : test_vcpus - 1
-               }
+    if options.virt == 'LXC':
+        class_id = {
+                    get_typed_class(options.virt, 'Disk' + rasd_base) : test_disk,
+                    get_typed_class(options.virt, 'Mem' + rasd_base)  : 'mem',
+                    get_typed_class(options.virt, 'Proc' + rasd_base) : test_vcpus - 1
+                   }
+    else:
+        class_id = {
+                    get_typed_class(options.virt, 'Disk' + rasd_base) : test_disk,
+                    get_typed_class(options.virt, 'Mem' + rasd_base)  : 'mem',
+                    get_typed_class(options.virt, 'Net' + rasd_base)  : test_mac,
+                    get_typed_class(options.virt, 'Proc' + rasd_base) : test_vcpus - 1
+                   }
 
     tc_scen = ['INVALID_InstID_Keyname', 'INVALID_InstID_Keyval']
 



From zli at linux.vnet.ibm.com  Wed Jun  4 05:41:22 2008
From: zli at linux.vnet.ibm.com (Zhengang Li)
Date: Wed, 04 Jun 2008 13:41:22 +0800
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] KVMXML cim_define() support
	and KVM support for Profile.02
In-Reply-To: <48067841.4080504@linux.vnet.ibm.com>
References: <32614eca2a5579389cc5.1208334614@zeit.cn.ibm.com>
	<48067841.4080504@linux.vnet.ibm.com>
Message-ID: <48462B02.9090107@linux.vnet.ibm.com>

Kaitlin Rupert wrote:

> zli at linux.vnet.ibm.com wrote:
>> # HG changeset patch
>> # User Zhengang Li <lizg at cn.ibm.com>
>> # Date 1208332735 -28800
>> # Node ID 32614eca2a5579389cc5b262eff8243b0ca2da82
>> # Parent  7c20d87e25c0cd53deba4dc8c48529d84bb740d9
>> [TEST] KVMXML cim_define() support and KVM support for Profile.02
>>
>> Signed-off-by: Zhengang Li <lizg at cn.ibm.com>
>>
>> diff -r 7c20d87e25c0 -r 32614eca2a55 
>> suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py
> 
> This is a nice clean up and looks good to me.  However, the test fails 
> due to the "Address field missing from vsms.py" issue Deepti noted in 
> her e-mail about Dan's emulator fix.
> 
> For the Address fix, we'll need conditional behavior based on the 
> changeset.  So I'll hold off on applying this set.

I saw this patch when I was trying to update the cim_define() support 
for KVM and others.
Is this still true that we'll need to do conditional behavior on
changeset?

> 


-- 
- Zhengang



From yunguol at cn.ibm.com  Wed Jun  4 06:08:54 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 04 Jun 2008 14:08:54 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ElementCapabilities.01~04 for
	LXC support
Message-ID: <88f9482289b7035eeb03.1212559734@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212559730 -28800
# Node ID 88f9482289b7035eeb03fcdeb8b9531709cc4fa7
# Parent  9b2e8889d7937c66e73968e53ec31bf93f535224
[TEST] Update ElementCapabilities.01~04 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 9b2e8889d793 -r 88f9482289b7 suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py	Wed Jun 04 14:08:50 2008 +0800
@@ -33,7 +33,7 @@
 from XenKvmLib.const import CIM_REV
 from XenKvmLib.enumclass import enumerate
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 ac_to_pool_version = 561
 
 def append_to_list(server, virt, poolname, valid_elc_id):
diff -r 9b2e8889d793 -r 88f9482289b7 suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py	Wed Jun 04 14:08:50 2008 +0800
@@ -32,7 +32,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL, SKIP
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 def call_assoc(ip, cn, id, virt="Xen"):
     status = PASS
diff -r 9b2e8889d793 -r 88f9482289b7 suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py	Wed Jun 04 14:08:50 2008 +0800
@@ -30,7 +30,7 @@
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 exp_rc = 6 #CIM_ERR_NOT_FOUND
 exp_desc = "No such instance"
diff -r 9b2e8889d793 -r 88f9482289b7 suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py	Wed Jun 04 14:08:50 2008 +0800
@@ -29,7 +29,7 @@
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, SKIP
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 exp_rc = 6 #CIM_ERR_NOT_FOUND
 exp_desc = "No such instance"



From deeptik at linux.vnet.ibm.com  Wed Jun  4 06:35:37 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Wed, 04 Jun 2008 12:05:37 +0530
Subject: [Libvirt-cim] [PATCH] [TEST] Fix CIM_REV to handle non integer
	strings
In-Reply-To: <7e4310cd6913605148b0.1212194930@elm3b41.beaverton.ibm.com>
References: <7e4310cd6913605148b0.1212194930@elm3b41.beaverton.ibm.com>
Message-ID: <484637B9.1030702@linux.vnet.ibm.com>



Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1212165521 25200
> # Node ID 7e4310cd6913605148b038b46d244ed670730727
> # Parent  4a5a44d7b857df543af24d59380cb8fdbbb753a4
> [TEST] Fix CIM_REV to handle non integer strings.
>
> When working with patches, the changeset revision has a + appended to it.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r 4a5a44d7b857 -r 7e4310cd6913 suites/libvirt-cim/lib/XenKvmLib/const.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/const.py	Fri May 30 14:26:38 2008 +0800
> +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py	Fri May 30 09:38:41 2008 -0700
> @@ -26,7 +26,11 @@
>  global CIM_REV
>  global CIM_SET
>
> -CIM_REV = int(os.getenv("CIM_REV"))
> +rev = os.getenv("CIM_REV").strip("+")
> +if rev.isalnum():
>   
Are we planning to use alphabets in the REV string, if yes then the I 
say +1 for the changes.
If the REV string does not contain alphabets then we can use isdigit() 
instead.

Thanks and Regards,
Deepti.
> +    CIM_REV = int(rev)
> +else:
> +    CIM_REV = 0
>  CIM_SET = os.getenv("CIM_SET")
>
>  if not CIM_REV or not CIM_SET:
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From yunguol at cn.ibm.com  Wed Jun  4 07:02:02 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 04 Jun 2008 15:02:02 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ResourcePool.01&02 for LXC
	support
Message-ID: <ed86d8901057e45ff9a2.1212562922@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212562914 -28800
# Node ID ed86d8901057e45ff9a2173da0232746626bff0c
# Parent  9b2e8889d7937c66e73968e53ec31bf93f535224
[TEST] Update ResourcePool.01&02 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 9b2e8889d793 -r ed86d8901057 suites/libvirt-cim/cimtest/ResourcePool/01_enum.py
--- a/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py	Wed Jun 04 15:01:54 2008 +0800
@@ -39,7 +39,7 @@
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 
-sup_types = ['Xen', 'KVM']
+sup_types = ['Xen', 'KVM', 'LXC']
 
 diskid = "%s/%s" % ("DiskPool", test_dpath)
 dp_cn = 'DiskPool'
@@ -127,12 +127,13 @@
         return FAIL
     status = verify_fields(pool_list, propool, get_typed_class(virt, pp_cn))
     
-    try:
-        diskpool = enumerate(ip, dp_cn, key_list, virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ENUMERATE % dp_cn)
-        return FAIL
-    status = verify_fields(pool_list, diskpool, get_typed_class(virt, dp_cn))
+    if virt == 'LXC':
+        try:
+            diskpool = enumerate(ip, dp_cn, key_list, virt)
+        except Exception:
+            logger.error(Globals.CIM_ERROR_ENUMERATE % dp_cn)
+            return FAIL
+        status = verify_fields(pool_list, diskpool, get_typed_class(virt, dp_cn))
     
     try:
         netpool = enumerate(ip, np_cn, key_list, virt)
diff -r 9b2e8889d793 -r ed86d8901057 suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py
--- a/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py	Wed Jun 04 15:01:54 2008 +0800
@@ -40,7 +40,7 @@
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 
-sup_types = ['Xen', 'KVM']
+sup_types = ['Xen', 'KVM', 'LXC']
 
 expr_values = {
         "invalid_keyname"  : { 'rc'   : pywbem.CIM_ERR_FAILED,
@@ -112,13 +112,19 @@
             cleanup_restore(ip, virt)
             return SKIP
     netid = "%s/%s" % ("NetworkPool", test_network)
-
-    cn_instid_list = {
-            get_typed_class(virt, "DiskPool")      : "DiskPool/foo",
-            get_typed_class(virt, "MemoryPool")    : "MemoryPool/0",
-            get_typed_class(virt, "NetworkPool")   : netid,
-            get_typed_class(virt, "ProcessorPool") : "ProcessorPool/0"
-            }
+    if virt == 'LXC':
+        cn_instid_list = {
+                          get_typed_class(virt, "MemoryPool")    : "MemoryPool/0",
+                          get_typed_class(virt, "NetworkPool")   : netid,
+                          get_typed_class(virt, "ProcessorPool") : "ProcessorPool/0"
+                         }
+    else:
+        cn_instid_list = {
+                          get_typed_class(virt, "DiskPool")      : "DiskPool/foo",
+                          get_typed_class(virt, "MemoryPool")    : "MemoryPool/0",
+                          get_typed_class(virt, "NetworkPool")   : netid,
+                          get_typed_class(virt, "ProcessorPool") : "ProcessorPool/0"
+                          }
 
     for cn, instid in cn_instid_list.items():
         ret_value = err_invalid_instid_keyname(conn, cn, instid)



From yunguol at cn.ibm.com  Wed Jun  4 08:16:59 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 04 Jun 2008 16:16:59 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update RASD.01&03 for LXC support
Message-ID: <7ca197434dfef26fd9cc.1212567419@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212567414 -28800
# Node ID 7ca197434dfef26fd9cca7b3551c85a2178a2071
# Parent  9b2e8889d7937c66e73968e53ec31bf93f535224
[TEST] Update RASD.01&03 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 9b2e8889d793 -r 7ca197434dfe suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Wed Jun 04 16:16:54 2008 +0800
@@ -58,7 +58,7 @@
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom    = "VSSDC_dom"
 test_vcpus  = 1
@@ -102,9 +102,14 @@
 
 def assoc_values(assoc_info, xml, disk, virt="Xen"):
     procrasd, netrasd, diskrasd, memrasd = init_list(xml, disk, virt)
-    proc_status = 1
+    if virt == 'LXC':
+        proc_status = 0
+        disk_status = 0
+    else:
+        proc_status = 1
+        disk_status = 1
+
     net_status  = 0
-    disk_status = 1
     mem_status  = 1
     status = 0
     try: 
@@ -140,8 +145,11 @@
         test_disk = 'hda'
 
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus,
-                    mac = test_mac, disk = test_disk)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+    else:
+        cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
     ret = cxml.create(options.ip)
     if not ret:
         logger.error('Unable to create domain %s' % test_dom)
diff -r 9b2e8889d793 -r 7ca197434dfe suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py
--- a/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py	Wed Jun 04 16:16:54 2008 +0800
@@ -63,7 +63,7 @@
 from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, CIM_ERROR_GETINSTANCE
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom    = "VSSDC_dom"
 test_vcpus  = 1
@@ -81,7 +81,7 @@
                                              }
               }
 
-def init_list():
+def init_list(virt="Xen"):
     disk = {
              'cn'     : get_typed_class(virt, "DiskResourceAllocationSettingData"), \
              'instid' : '%s/%s' %(test_dom, test_disk)
@@ -99,8 +99,11 @@
              'cn'     : get_typed_class(virt, "NetResourceAllocationSettingData"), \
              'instid' : '%s/%s' %(test_dom,test_mac)
           }    
- 
-    rasd_values_list =[ disk, mem, proc, net ]
+    
+    if virt == 'LXC':
+        rasd_values_list =[ mem ]
+    else:
+        rasd_values_list =[ disk, mem, proc, net ]
     return rasd_values_list
 
 def verify_rasd_err(field, keys, rasd_type):
@@ -130,14 +133,16 @@
         test_disk = "xvda"
     else:
         test_disk = "hda"
-
-    vsxml = get_class(virt)(test_dom, \
-                            mem=test_mem, \
-                            vcpus = test_vcpus, \
-                            mac = test_mac, \
-                            disk = test_disk)
+    if options.virt == 'LXC':
+        vsxml = get_class(virt)(test_dom)
+    else:
+        vsxml = get_class(virt)(test_dom, \
+                                mem=test_mem, \
+                                vcpus = test_vcpus, \
+                                mac = test_mac, \
+                                disk = test_disk)
+        bridge = vsxml.set_vbridge(server)
     try:
-        bridge = vsxml.set_vbridge(server)
         ret = vsxml.define(options.ip)
         if not ret:
             logger.error("Failed to Define the domain: %s", test_dom)



From yunguol at cn.ibm.com  Wed Jun  4 08:40:31 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 04 Jun 2008 16:40:31 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	ResourcePoolConfigurationService.01&02 for LXC support
Message-ID: <bafe19dae50b5b43f234.1212568831@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212568826 -28800
# Node ID bafe19dae50b5b43f234d808a787a5ba0db463e9
# Parent  9b2e8889d7937c66e73968e53ec31bf93f535224
[TEST] Update ResourcePoolConfigurationService.01&02 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 9b2e8889d793 -r bafe19dae50b suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py	Wed Jun 04 16:40:26 2008 +0800
@@ -30,6 +30,8 @@
 from CimTest.Globals import logger
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
+
+platform_sup = ['Xen', 'XenFV', 'LXC', 'KVM']
 
 @do_main(platform_sup)
 def main():
diff -r 9b2e8889d793 -r bafe19dae50b suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py	Wed Jun 04 16:40:26 2008 +0800
@@ -34,7 +34,7 @@
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
 
-
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 expr_values = {
           "invalid_sysname" : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
                                 'desc' : 'No such instance (SystemName)' }, \



From yunguol at cn.ibm.com  Wed Jun  4 09:21:41 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Wed, 4 Jun 2008 17:21:41 +0800
Subject: [Libvirt-cim] SIGSEGV error of LXC_VirtualSystemSettingData with
	invalid InstanceID value
Message-ID: <OF63B98A8F.3D9073DD-ON4825745E.0032C5DB-4825745E.0033B925@cn.ibm.com>

Hi,

If the InstanceID setting below, the provider Virt_VSSD will report 
SIGSEGV error:

wbemcli gi 
http://root:password at localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="invalid"
*
* wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider Virt_VSSD(30284) exiting 
due to a SIGSEGV signal
*

If the InstanceID set as "invalid:invalid", we can get expect result.
wbemcli gi 
http://root:password at localhost/root/virt:KVM_VirtualSystemSettingData.InstanceID="invalid:invalid"
*
* wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (invalid)
*


Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080604/c925e9d1/attachment.htm>

From yunguol at cn.ibm.com  Wed Jun  4 09:30:26 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 04 Jun 2008 17:30:26 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update VSSD.01 for LXC support
Message-ID: <4a07684ca9eafeac67df.1212571826@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212571822 -28800
# Node ID 4a07684ca9eafeac67dfe6ad7cc01a438a890a37
# Parent  9b2e8889d7937c66e73968e53ec31bf93f535224
[TEST] Update VSSD.01 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 9b2e8889d793 -r 4a07684ca9ea suites/libvirt-cim/cimtest/VSSD/01_enum.py
--- a/suites/libvirt-cim/cimtest/VSSD/01_enum.py	Tue Jun 03 13:13:39 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VSSD/01_enum.py	Wed Jun 04 17:30:22 2008 +0800
@@ -33,6 +33,8 @@
 from XenKvmLib.vxml import get_class
 from CimTest.Globals import do_main, platform_sup, logger
 from CimTest.ReturnCodes import PASS, FAIL
+
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "VSSD_dom"
 



From deeptik at linux.vnet.ibm.com  Wed Jun  4 12:19:35 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Wed, 04 Jun 2008 17:49:35 +0530
Subject: [Libvirt-cim] CimTest Report for KVM on F9  04-06-2008
Message-ID: <48468857.3000706@linux.vnet.ibm.com>

========================================================================
CIM Test Report for KVM  on F9 with latest libvirt-cim  and libcmpiutil
========================================================================
Distro      : Fedora 9 Beta
Kernel      : 2.6.25-0.121.rc5.git4.fc9
Libvirt     : libvirt-0.4.2-1.fc9.x86_64
CIMOM       : pegasus
PyWBEM      : pywbem-0.6
CIM Schema  : cimv216Experimental
LibCMPIutil :  79
LibVirtCIM  : 599
CIMTEST     : 175
=======================================================
PASS        : 101
FAIL        :   8
XFAIL       :   2
SKIP        :  18
-----------------
Total       : 129
=======================================================

List of tc that are failing

HostSystem - 02_hostsystem_to_rasd.py: FAIL
RASD - 01_verify_rasd_fields.py: FAIL
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL

All the above fail because of the KVMXML changes.

NetworkPort - 03_user_netport.py: FAIL
VSSD - 03_vssd_gi_errs.py: FAIL
VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL
VirtualSystemManagementService - 06_addresource.py: FAIL
VirtualSystemManagementService - 08_modifyresource.py: FAIL


Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.




-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Jun4-KVM-result
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080604/2cc506b6/attachment.ksh>

From kaitlin at linux.vnet.ibm.com  Wed Jun  4 17:13:18 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 04 Jun 2008 10:13:18 -0700
Subject: [Libvirt-cim] CimTest Report for KVM on F9  04-06-2008
In-Reply-To: <48468857.3000706@linux.vnet.ibm.com>
References: <48468857.3000706@linux.vnet.ibm.com>
Message-ID: <4846CD2E.7080307@linux.vnet.ibm.com>

> List of tc that are failing

Thanks Deepti!

> 
> HostSystem - 02_hostsystem_to_rasd.py: FAIL
> RASD - 01_verify_rasd_fields.py: FAIL
> ResourceAllocationFromPool - 05_RAPF_err.py: FAIL
> 
> All the above fail because of the KVMXML changes.
> 
> NetworkPort - 03_user_netport.py: FAIL
> VSSD - 03_vssd_gi_errs.py: FAIL
> VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL
> VirtualSystemManagementService - 06_addresource.py: FAIL
> VirtualSystemManagementService - 08_modifyresource.py: FAIL

I'm working on fixes for these 2.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun  4 19:35:47 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 04 Jun 2008 12:35:47 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #3 LXC support using DefineSystem
	& VSMS.01
In-Reply-To: <4845FAAB.1030400@linux.vnet.ibm.com>
References: <277b821188f247baaa02.1212545185@localhost.localdomain>
	<4845FAAB.1030400@linux.vnet.ibm.com>
Message-ID: <4846EE93.7080502@linux.vnet.ibm.com>

Zhengang Li wrote:
> zli at linux.vnet.ibm.com wrote:
> 
>> diff -r 5c77329cb53e -r 277b821188f2 
>> suites/libvirt-cim/lib/XenKvmLib/const.py
>> --- a/suites/libvirt-cim/lib/XenKvmLib/const.py    Fri May 30 14:26:38 
>> 2008 +0800
>> +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py    Wed Jun 04 10:06:11 
>> 2008 +0800
>> @@ -85,3 +85,5 @@
>>  #vxml.LXCXML
>>  LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init')
>>  LXC_default_tty = '/dev/ptmx'
>> +LXC_default_mp = '/tmp'
>> +LXC_default_source = '/tmp/lxc_files'
> 
> The LXC_init_path used to be created by 'create_lxc_files' in vxml.py. 
> It's not created here. But somehow libvirt shows me a running container 
> even if the init_path file doesn't exist.

I believe this is a bug in the containers support in libvirt.  The 
container attempts to execute the script, but the execution fails.

The ID of the container is the pid of the process the container executes 
to run the script.  If you no longer see the pid in the ps output, then 
the container is not actually running.

> The same with LXC_default_source. It's a non-exist directory.
> 
> I am inclined to move the init_path and default_source to the place 
> where xen/kvm kernel image and disk image is created. Then we don't need 
> to create a init_path upon every test case execution.
> 
> Thoughts?

Initially, I thought it'd be a bad idea to leave the script lying 
around.  However, all the script does is run bash, so I don't think it 
will be a problem to live it lying around in /tmp.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun  4 20:13:05 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 04 Jun 2008 13:13:05 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fix CIM_REV to handle non integer
	strings
In-Reply-To: <484637B9.1030702@linux.vnet.ibm.com>
References: <7e4310cd6913605148b0.1212194930@elm3b41.beaverton.ibm.com>
	<484637B9.1030702@linux.vnet.ibm.com>
Message-ID: <4846F751.70106@linux.vnet.ibm.com>

>>
>> -CIM_REV = int(os.getenv("CIM_REV"))
>> +rev = os.getenv("CIM_REV").strip("+")
>> +if rev.isalnum():
>>   
> Are we planning to use alphabets in the REV string, if yes then the I 
> say +1 for the changes.
> If the REV string does not contain alphabets then we can use isdigit() 
> instead.
> 
> Thanks and Regards,
> Deepti.

Good point. I don't expect there to be any alphabetic characters. I'll 
send a new patch using isdigit().

Thanks!

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun  4 23:01:31 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 04 Jun 2008 16:01:31 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update ResourcePool.01&02 for LXC
	support
In-Reply-To: <ed86d8901057e45ff9a2.1212562922@localhost.localdomain>
References: <ed86d8901057e45ff9a2.1212562922@localhost.localdomain>
Message-ID: <48471ECB.7080506@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1212562914 -28800
> # Node ID ed86d8901057e45ff9a2173da0232746626bff0c
> # Parent  9b2e8889d7937c66e73968e53ec31bf93f535224
> [TEST] Update ResourcePool.01&02 for LXC support
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r 9b2e8889d793 -r ed86d8901057 suites/libvirt-cim/cimtest/ResourcePool/01_enum.py

>      
> -    try:
> -        diskpool = enumerate(ip, dp_cn, key_list, virt)
> -    except Exception:
> -        logger.error(Globals.CIM_ERROR_ENUMERATE % dp_cn)
> -        return FAIL
> -    status = verify_fields(pool_list, diskpool, get_typed_class(virt, dp_cn))
> +    if virt == 'LXC':

Should this be:

if virt != 'LXC'

We don't have proper storage pool support for containers yet.

> +        try:
> +            diskpool = enumerate(ip, dp_cn, key_list, virt)
> +        except Exception:
> +            logger.error(Globals.CIM_ERROR_ENUMERATE % dp_cn)
> +            return FAIL
> +        status = verify_fields(pool_list, diskpool, get_typed_class(virt, dp_cn))


-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun  4 23:13:47 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 04 Jun 2008 16:13:47 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Fix CIM_REV to handle non integer
	strings
Message-ID: <2ab3883ed2a7e9343292.1212621227@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212165521 25200
# Node ID 2ab3883ed2a7e9343292abcf765b809c1badcb4d
# Parent  959719c32cc9d5a60fe3d6474e3fcc09f2e44875
[TEST] #2 Fix CIM_REV to handle non integer strings.

When working with patches, the changeset revision has a + appended to it.

Update:
 -Changed isalnum() to isdigit() because we expect the revision string to be all digits.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 959719c32cc9 -r 2ab3883ed2a7 suites/libvirt-cim/lib/XenKvmLib/const.py
--- a/suites/libvirt-cim/lib/XenKvmLib/const.py	Wed Jun 04 17:30:22 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/const.py	Fri May 30 09:38:41 2008 -0700
@@ -26,7 +26,11 @@
 global CIM_REV
 global CIM_SET
 
-CIM_REV = int(os.getenv("CIM_REV"))
+rev = os.getenv("CIM_REV").strip("+")
+if rev.isdigit():
+    CIM_REV = int(rev)
+else:
+    CIM_REV = 0
 CIM_SET = os.getenv("CIM_SET")
 
 if not CIM_REV or not CIM_SET:



From kaitlin at linux.vnet.ibm.com  Thu Jun  5 00:28:30 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 04 Jun 2008 17:28:30 -0700
Subject: [Libvirt-cim] SIGSEGV error of LXC_VirtualSystemSettingData with
	invalid InstanceID value
In-Reply-To: <OF63B98A8F.3D9073DD-ON4825745E.0032C5DB-4825745E.0033B925@cn.ibm.com>
References: <OF63B98A8F.3D9073DD-ON4825745E.0032C5DB-4825745E.0033B925@cn.ibm.com>
Message-ID: <4847332E.5070209@linux.vnet.ibm.com>

Guo Lian Yun wrote:
> 
> Hi,
> 
> If the InstanceID setting below, the provider Virt_VSSD will report 
> SIGSEGV error:
> 
> wbemcli gi 
> http://root:password at localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="invalid" 
> 
> *
> * wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider Virt_VSSD(30284) 
> exiting due to a SIGSEGV signal
> *

Is this with SFCB?  I don't see this issue on my system - I'm using Pegasus.

Do you see any debug info before the seg fault?

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Thu Jun  5 01:51:13 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 05 Jun 2008 09:51:13 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] 2# Update ResourcePool.01&02 for LXC
	support, ignore storage pool
Message-ID: <531569acf45a5ec8df31.1212630673@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212630664 -28800
# Node ID 531569acf45a5ec8df3164507832dccbc6487d48
# Parent  959719c32cc9d5a60fe3d6474e3fcc09f2e44875
[TEST] 2# Update ResourcePool.01&02 for LXC support, ignore storage pool

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 959719c32cc9 -r 531569acf45a suites/libvirt-cim/cimtest/ResourcePool/01_enum.py
--- a/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py	Wed Jun 04 17:30:22 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py	Thu Jun 05 09:51:04 2008 +0800
@@ -39,7 +39,7 @@
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 
-sup_types = ['Xen', 'KVM']
+sup_types = ['Xen', 'KVM', 'LXC']
 
 diskid = "%s/%s" % ("DiskPool", test_dpath)
 dp_cn = 'DiskPool'
@@ -126,13 +126,14 @@
         logger.error(Globals.CIM_ERROR_ENUMERATE % pp_cn)
         return FAIL
     status = verify_fields(pool_list, propool, get_typed_class(virt, pp_cn))
-    
-    try:
-        diskpool = enumerate(ip, dp_cn, key_list, virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ENUMERATE % dp_cn)
-        return FAIL
-    status = verify_fields(pool_list, diskpool, get_typed_class(virt, dp_cn))
+   
+    if virt != 'LXC': 
+        try:
+            diskpool = enumerate(ip, dp_cn, key_list, virt)
+        except Exception:
+            logger.error(Globals.CIM_ERROR_ENUMERATE % dp_cn)
+            return FAIL
+        status = verify_fields(pool_list, diskpool, get_typed_class(virt, dp_cn))
     
     try:
         netpool = enumerate(ip, np_cn, key_list, virt)
diff -r 959719c32cc9 -r 531569acf45a suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py
--- a/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py	Wed Jun 04 17:30:22 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py	Thu Jun 05 09:51:04 2008 +0800
@@ -40,7 +40,7 @@
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 
-sup_types = ['Xen', 'KVM']
+sup_types = ['Xen', 'KVM', 'LXC']
 
 expr_values = {
         "invalid_keyname"  : { 'rc'   : pywbem.CIM_ERR_FAILED,
@@ -113,12 +113,19 @@
             return SKIP
     netid = "%s/%s" % ("NetworkPool", test_network)
 
-    cn_instid_list = {
-            get_typed_class(virt, "DiskPool")      : "DiskPool/foo",
-            get_typed_class(virt, "MemoryPool")    : "MemoryPool/0",
-            get_typed_class(virt, "NetworkPool")   : netid,
-            get_typed_class(virt, "ProcessorPool") : "ProcessorPool/0"
-            }
+    if virt == 'LXC':
+        cn_instid_list = {
+                          get_typed_class(virt, "MemoryPool")    : "MemoryPool/0",
+                          get_typed_class(virt, "NetworkPool")   : netid,
+                          get_typed_class(virt, "ProcessorPool") : "ProcessorPool/0"
+                         }
+    else:
+        cn_instid_list = {
+                          get_typed_class(virt, "DiskPool")      : "DiskPool/foo",
+                          get_typed_class(virt, "MemoryPool")    : "MemoryPool/0",
+                          get_typed_class(virt, "NetworkPool")   : netid,
+                          get_typed_class(virt, "ProcessorPool") : "ProcessorPool/0"
+                          }
 
     for cn, instid in cn_instid_list.items():
         ret_value = err_invalid_instid_keyname(conn, cn, instid)



From yunguol at cn.ibm.com  Thu Jun  5 05:07:29 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Thu, 5 Jun 2008 13:07:29 +0800
Subject: [Libvirt-cim] on the LXC_SettingsDefineCapabilities association
Message-ID: <OF5BD365C5.01B2FB86-ON4825745F.001194F6-4825745F.001C71C8@cn.ibm.com>

Kaitlin, 

Containers currently only really support memory and disk pools.

I'm not sure if the unsupported error make sense below.

[root at nine cimtest]# wbemcli ain -ac LXC_SettingsDefineCapabilities 
http://root:password at localhost/root/virt:LXC_AllocationCapabilities.InstanceID="NetworkPool/default"
*
* wbemcli: Cim: (7) CIM_ERR_NOT_SUPPORTED: Unsupported hypervisor: ';LXC';
*

Actually, I get all types of instance list by ein querying.

[root at nine cimtest]# wbemcli ein 
http://root:password at localhost/root/virt:LXC_AllocationCapabilities
localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="ProcessorPool/0"
localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="MemoryPool/0"
localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="NetworkPool/default"
localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="DiskPool/testpool"



Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080605/a3a01ccd/attachment.htm>

From yunguol at cn.ibm.com  Thu Jun  5 06:06:07 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Thu, 5 Jun 2008 14:06:07 +0800
Subject: [Libvirt-cim] SIGSEGV error of LXC_VirtualSystemSettingData with
	invalid InstanceID value
In-Reply-To: <4847332E.5070209@linux.vnet.ibm.com>
Message-ID: <OFA5F938EC.78AABC10-ON4825745F.0020BA62-4825745F.0021D00D@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-05 08:28:30:

> Guo Lian Yun wrote:
> > 
> > Hi,
> > 
> > If the InstanceID setting below, the provider Virt_VSSD will report 
> > SIGSEGV error:
> > 
> > wbemcli gi 
> > http://root:password at localhost/root/virt:
> LXC_VirtualSystemSettingData.InstanceID="invalid" 
> > 
> > *
> > * wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider Virt_VSSD(30284) 
> > exiting due to a SIGSEGV signal
> > *
> 
> Is this with SFCB?  I don't see this issue on my system - I'm using 
Pegasus.

  Yup, I do it with sfcb. But the invalid InstanceID works for me on other 
machine
  with sfcb, you can refer to below:

  wbemcli gi 
http://root:elm3b197 at localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="invalid"
  *
  * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID)
  *

  Then I make twice install and postinstall of provider in my own machine, 
but it doesn't fix the issue. 

> 
> Do you see any debug info before the seg fault?
 
  Below is the debug info I can get now.

[root at nine cimtest]# /usr/sbin/sfcbd -c /etc/sfcb/sfcb.cfg
--- sfcbd V1.3.0 started - 19921
--- Using /etc/sfcb/sfcb.cfg
--- SSL not configured
--- User authentication disabled
--- Max provider procs: 32
--- initSocketPairs: 64
--- localConnectServer started
--- Max Http procs: 8
--- sfcbd HTTP  Daemon V1.3.0 started - 19923 - port 5988
--- Keep-alive timeout: 1 seconds
--- Maximum requests per connection: 10
--- Caching ClassProvider for 
/var/lib/sfcb/registration/repository/root/virt/classSchemas (1.0-3) using 
5376 bytes
--- Caching ClassProvider for 
/var/lib/sfcb/registration/repository/root/interop/classSchemas (1.0-3) 
using 1288 bytes
-#- Virt_VSSD - 19960 provider exiting due to a SIGSEGV signal

 
> 
> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080605/e3ee3505/attachment.htm>

From deeptik at linux.vnet.ibm.com  Thu Jun  5 10:38:19 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Thu, 05 Jun 2008 16:08:19 +0530
Subject: [Libvirt-cim] CimTest Report  on XenFV 29-05-2008
Message-ID: <4847C21B.2030308@linux.vnet.ibm.com>

======================================
CIM Test Report for XenFV
======================================
Distro      : RHEL 5.2 Beta
Kernel      : 2.6.18-88.el5xen
Xen version : 3.1.2-88.el5
Libvirt     : libvirt-0.3.3-7.el5
CIMOM       : pegasus
PyWBEM      : pywbem-3.14
CIM Schema  : cimv216Experimental
LibCMPIutil :  79
LibVirtCIM  : 599
CIMTEST     : 182
======================================
PASS        : 88
FAIL        : 18  [ 10 test cases passed when ran manually , so 8 tc are 
failing now]
SKIP        : 22
XFAIL       :  1
-----------------
Total       : 129
====================================== 
List of test cases that are failing:
ComputerSystem - 04_defineStartVS.py: FAIL
ComputerSystem - 06_paused_active_suspend.py: FAIL
ComputerSystem - 23_suspend_suspend.py: FAIL
ComputerSystem - 32_start_reboot.py: FAIL
ComputerSystem - 33_suspend_reboot.py: FAIL
ComputerSystem - 35_start_reset.py: FAIL
ElementAllocatedFromPool - 04_forward_errs.py: FAIL                     
--Passed when run manually
ElementConforms - 02_reverse.py: FAIL                                   
--Passed when run manually
EnabledLogicalElementCapabilities - 01_enum.py: FAIL                    
--Passed when run manually
HostSystem - 02_hostsystem_to_rasd.py: FAIL                             
--Passed when run manually
LogicalDisk - 03_ld_gi_errs.py: FAIL                                    
--Passed when run manually
Memory - 01_memory.py: FAIL                                             
--Passed when run manually
NetworkPort - 01_netport.py: FAIL                                       
--Passed when run manually                               
ResourceAllocationFromPool - 02_reverse.py: FAIL                        
--Passed when run manually
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL                       
--Passed when run manually
VSSD - 04_vssd_to_rasd.py: FAIL                                         
--Passed when run manually
VirtualSystemManagementService - 02_destroysystem.py: FAIL
VirtualSystemManagementService - 08_modifyresource.py: FAIL


Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.


-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Jun5-XenFV-report
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080605/7cab6bdc/attachment.ksh>

From deeptik at linux.vnet.ibm.com  Thu Jun  5 11:17:04 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Thu, 05 Jun 2008 16:47:04 +0530
Subject: [Libvirt-cim] [Resending with appropriate date] CimTest Report on
	XenFV 05-06-2008
Message-ID: <4847CB30.8030308@linux.vnet.ibm.com>

======================================
CIM Test Report for XenFV
======================================
Distro      : RHEL 5.2 Beta
Kernel      : 2.6.18-88.el5xen
Xen version : 3.1.2-88.el5
Libvirt     : libvirt-0.3.3-7.el5
CIMOM       : pegasus
PyWBEM      : pywbem-3.14
CIM Schema  : cimv216Experimental
LibCMPIutil :  79
LibVirtCIM  : 599
CIMTEST     : 182
======================================
PASS        : 88
FAIL        : 18  [ 10 test cases passed when ran manually , so 8 tc are 
failing now]
SKIP        : 22
XFAIL       :  1
-----------------
Total       : 129
======================================

List of test cases that are failing:

ComputerSystem - 04_defineStartVS.py: FAIL
ComputerSystem - 06_paused_active_suspend.py: FAIL
ComputerSystem - 23_suspend_suspend.py: FAIL
ComputerSystem - 32_start_reboot.py: FAIL
ComputerSystem - 33_suspend_reboot.py: FAIL
ComputerSystem - 35_start_reset.py: FAIL
ElementAllocatedFromPool - 04_forward_errs.py: FAIL                     
--Passed when run manually
ElementConforms - 02_reverse.py: FAIL                                   
--Passed when run manually
EnabledLogicalElementCapabilities - 01_enum.py: FAIL                    
--Passed when run manually
HostSystem - 02_hostsystem_to_rasd.py: FAIL                             
--Passed when run manually
LogicalDisk - 03_ld_gi_errs.py: FAIL                                    
--Passed when run manually
Memory - 01_memory.py: FAIL                                             
--Passed when run manually
NetworkPort - 01_netport.py: FAIL                                       
--Passed when run manually
ResourceAllocationFromPool - 02_reverse.py: FAIL                        
--Passed when run manually
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL                       
--Passed when run manually
VSSD - 04_vssd_to_rasd.py: FAIL                                         
--Passed when run manually
VirtualSystemManagementService - 02_destroysystem.py: FAIL
VirtualSystemManagementService - 08_modifyresource.py: FAIL


Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Jun5-XenFV-report
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080605/43af7d5c/attachment.ksh>

From deeptik at linux.vnet.ibm.com  Thu Jun  5 12:36:59 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 05 Jun 2008 05:36:59 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Adding set_interface_details() fn
	to the vxml.py
Message-ID: <8252a996154a47991c16.1212669419@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1212669379 25200
# Node ID 8252a996154a47991c165ef8286f55aa1cc55654
# Parent  959719c32cc9d5a60fe3d6474e3fcc09f2e44875
[TEST] #2 Adding set_interface_details() fn to the vxml.py.

This function give choice to add different network types to Xen/XenFV/KVM guest.

Changes:

>From patch 1 to 2:
-----------------
1) Removed the extra param used in the set_interface_details() fn.
2) Made the xxx_default_net_type defined in const.py for Xen/XenFV/KVM as network.
3) Removed the individual xxx_default_net_type for Xen/XenFV/KVM.
4) Defined common variable default_net_type in const.py the individual.
5) Changed the vxml.py to use the common variable default_net_type of const.py.


Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 959719c32cc9 -r 8252a996154a suites/libvirt-cim/lib/XenKvmLib/const.py
--- a/suites/libvirt-cim/lib/XenKvmLib/const.py	Wed Jun 04 17:30:22 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/const.py	Thu Jun 05 05:36:19 2008 -0700
@@ -44,6 +44,7 @@ default_domname = 'domU1'
 default_domname = 'domU1'
 default_memory = 128
 default_vcpus = 1
+default_net_type = 'network'
 
 
 _image_dir = '/tmp'
@@ -55,7 +56,6 @@ Xen_secondary_disk_path = os.path.join(_
 Xen_secondary_disk_path = os.path.join(_image_dir, 'default-xen-dimage.2ND')
 Xen_default_disk_dev = 'xvda'
 Xen_default_mac = '11:22:33:aa:bb:cc'
-Xen_default_net_type = 'ethernet'
 
 # vxml.KVMXML
 if fv_cap(CIM_IP):
@@ -66,7 +66,6 @@ KVM_secondary_disk_path = os.path.join(_
 KVM_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND')
 KVM_default_disk_dev = 'hda'
 KVM_default_mac = '11:22:33:aa:bb:cc'
-KVM_default_net_type = 'network'
 
 # vxml.XenFVXML
 s, o = platform.architecture()
@@ -80,10 +79,7 @@ XenFV_secondary_disk_path = os.path.join
 XenFV_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND')
 XenFV_default_disk_dev = 'hda'
 XenFV_default_mac = '00:16:3e:5d:c7:9e'
-XenFV_default_net_type = 'bridge'
 
 #vxml.LXCXML
 LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init')
 LXC_default_tty = '/dev/ptmx'
-LXC_default_mp = '/tmp'
-LXC_default_source = '/tmp/lxc_files'
diff -r 959719c32cc9 -r 8252a996154a suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Wed Jun 04 17:30:22 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Thu Jun 05 05:36:19 2008 -0700
@@ -300,6 +300,10 @@ class VirtXML(Virsh, XMLClass):
         self.set_attributes('/domain/devices/interface/source', 
                             bridge=bridgename)
 
+    def set_nettype(self, nettype):
+        self.set_attributes('/domain/devices/interface/type', 
+                            type=nettype)
+
     def set_diskimg(self, diskimg):
         self.set_attributes('/domain/devices/disk/source', file=diskimg)
 
@@ -437,6 +441,38 @@ class VirtXML(Virsh, XMLClass):
 
         return vbr
 
+    def set_interface_details(self, devices, net_mac, net_type, virt_type):
+        interface = self.add_sub_node(devices, 'interface', type=net_type)
+        self.add_sub_node(interface, 'mac', address=net_mac)
+        if net_type == 'bridge':
+            self._set_vbridge(CIM_IP, virt_type)
+        elif net_type == 'network':
+            self.set_vnetwork(interface, virt_type)
+        elif net_type == 'ethernet':
+            pass
+        elif net_type == 'user':
+            pass
+        else:
+            logger.error("%s is not a valid network type", net_type)
+            sys.exit(1)
+
+    def set_vnetwork(self, interface, virt_type):
+        network_list = live.net_list(CIM_IP, virt_type)
+        if len(network_list) > 0:
+            nname = network_list[0]
+        else:
+            logger.info('No virutal network found')
+            logger.info('Trying to create one ......')
+            netxml = NetXML(CIM_IP, virt_type)
+            ret = netxml.create_vnet()
+            if not ret:
+                logger.error('Failed to create the virtual network "%s"',
+                             netxml.net_name)
+                sys.exit(SKIP)
+            nname = netxml.xml_get_netpool_name()
+        self.add_sub_node(interface, 'source', network=nname)
+
+
 
 class VirtCIM:
     def __init__(self, virt, dom_name, disk_dev, disk_source,
@@ -497,7 +533,7 @@ class XenXML(VirtXML, VirtCIM):
                        vcpus=const.default_vcpus,
                        mac=const.Xen_default_mac,
                        disk_file_path=const.Xen_disk_path,
-                       disk=const.Xen_default_disk_dev):
+                       disk=const.Xen_default_disk_dev): 
         if not (os.path.exists(const.Xen_kernel_path) \
                 and os.path.exists(const.Xen_init_path)):
             logger.error('ERROR: Either the kernel image '
@@ -505,10 +541,10 @@ class XenXML(VirtXML, VirtCIM):
             sys.exit(1)
         VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus)
         self._os(const.Xen_kernel_path, const.Xen_init_path)
-        self._devices(disk_file_path, disk, const.Xen_default_net_type, mac)
+        self._devices(disk_file_path, disk, const.default_net_type, mac)
 
         VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path, 
-                         const.Xen_default_net_type, mac, vcpus, mem)
+                         const.default_net_type, mac, vcpus, mem)
 
     def _os(self, os_kernel, os_initrd):
         os = self.get_node('/domain/os')
@@ -524,9 +560,7 @@ class XenXML(VirtXML, VirtCIM):
         self.add_sub_node(disk, 'driver', name='file')
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)
-        
-        interface = self.add_sub_node(devices, 'interface', type=net_type)
-        self.add_sub_node(interface, 'mac', address=net_mac)
+        self.set_interface_details(devices, net_mac, net_type, virt_type='Xen')
 
     def set_bootloader(self, ip, gtype=0):
         bldr = live.bootloader(ip, gtype)
@@ -558,7 +592,7 @@ class KVMXML(VirtXML):
             sys.exit(1)
         VirtXML.__init__(self, 'kvm', test_dom, set_uuid(), mem, vcpus)
         self._os()
-        self._devices(const.KVM_default_emulator, const.KVM_default_net_type,
+        self._devices(const.KVM_default_emulator, const.default_net_type,
                       disk_file_path, disk, mac)
 
     def _os(self):
@@ -572,33 +606,8 @@ class KVMXML(VirtXML):
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)
 
-        interface = self.add_sub_node(devices, 'interface', type=net_type)
-        self.add_sub_node(interface, 'mac', address=net_mac)
+        self.set_interface_details(devices, net_mac, net_type, virt_type='KVM')
 
-        if net_type == 'bridge':
-            self.set_vbridge(CIM_IP)    
-        elif net_type == 'network':
-            self.set_vnetwork(interface)
-        else:
-            logger.error("%s is not a valid network type", net_type)
-            sys.exit(1)
-
-    def set_vnetwork(self, interface): 
-        network_list = live.net_list(CIM_IP, virt='KVM')
-        if len(network_list) > 0:
-            nname = network_list[0]
-        else:
-            logger.info('No virutal network found')
-            logger.info('Trying to create one ......')
-            netxml = NetXML(CIM_IP, virt='KVM')
-            ret = netxml.create_vnet()
-            if not ret:
-                logger.error('Failed to create the virtual network "%s"',
-                             netxml.net_name)
-                sys.exit(SKIP)
-            nname = netxml.xml_get_netpool_name()
-        self.add_sub_node(interface, 'source', network=nname)
-    
     def set_emulator(self, emu):
         return self._set_emulator(emu)
     
@@ -625,7 +634,7 @@ class XenFVXML(VirtXML):
         VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus)
         self._os(const.XenFV_default_loader)
         self._devices(const.XenFV_default_emulator,
-                      const.XenFV_default_net_type, mac, disk_file_path, disk)
+                      const.default_net_type, mac, disk_file_path, disk) 
 
     def _os(self, os_loader):
         os = self.get_node('/domain/os')
@@ -637,14 +646,10 @@ class XenFVXML(VirtXML):
         devices = self.get_node('/domain/devices')
 
         self.add_sub_node(devices, 'emulator', emu)
-
-        interface = self.add_sub_node(devices, 'interface', type=net_type)
-        self.add_sub_node(interface, 'mac', address=net_mac)
-        self.set_bridge(CIM_IP)
-
         disk = self.add_sub_node(devices, 'disk', type='file')
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)
+        self.set_interface_details(devices, net_mac, net_type, virt_type='XenFV')
 
     def set_emulator(self, emu):
         return self._set_emulator(emu)



From deeptik at linux.vnet.ibm.com  Thu Jun  5 12:35:21 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Thu, 05 Jun 2008 18:05:21 +0530
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Fix CIM_REV to handle non integer
	strings
In-Reply-To: <2ab3883ed2a7e9343292.1212621227@elm3b41.beaverton.ibm.com>
References: <2ab3883ed2a7e9343292.1212621227@elm3b41.beaverton.ibm.com>
Message-ID: <4847DD89.5060408@linux.vnet.ibm.com>

+1 for me.

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1212165521 25200
> # Node ID 2ab3883ed2a7e9343292abcf765b809c1badcb4d
> # Parent  959719c32cc9d5a60fe3d6474e3fcc09f2e44875
> [TEST] #2 Fix CIM_REV to handle non integer strings.
>
> When working with patches, the changeset revision has a + appended to it.
>
> Update:
>  -Changed isalnum() to isdigit() because we expect the revision string to be all digits.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r 959719c32cc9 -r 2ab3883ed2a7 suites/libvirt-cim/lib/XenKvmLib/const.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/const.py	Wed Jun 04 17:30:22 2008 +0800
> +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py	Fri May 30 09:38:41 2008 -0700
> @@ -26,7 +26,11 @@
>  global CIM_REV
>  global CIM_SET
>
> -CIM_REV = int(os.getenv("CIM_REV"))
> +rev = os.getenv("CIM_REV").strip("+")
> +if rev.isdigit():
> +    CIM_REV = int(rev)
> +else:
> +    CIM_REV = 0
>  CIM_SET = os.getenv("CIM_SET")
>
>  if not CIM_REV or not CIM_SET:
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From danms at us.ibm.com  Thu Jun  5 19:26:34 2008
From: danms at us.ibm.com (Dan Smith)
Date: Thu, 05 Jun 2008 12:26:34 -0700
Subject: [Libvirt-cim] [PATCH] Add KVM proc/mem check in
	_resource_dynamic()
In-Reply-To: <8fdff95eb25e04745c99.1212540096@elm3b41.beaverton.ibm.com>
	(Kaitlin Rupert's message of "Tue, 03 Jun 2008 17:41:36 -0700")
References: <8fdff95eb25e04745c99.1212540096@elm3b41.beaverton.ibm.com>
Message-ID: <87zlpzel91.fsf@caffeine.beaverton.ibm.com>

KR> +        if  (((dev->type == CIM_RES_TYPE_PROC) || 
KR> +            (dev->type == CIM_RES_TYPE_MEM)) && (STREQ(prefix, "KVM"))) {
KR> +                cu_statusf(_BROKER, &s,
KR> +                           CMPI_RC_ERR_FAILED,
KR> +                           "Running guest cannot modify resource type %" PRIu16,
KR> +                           dev->type);
KR> +                goto out;
KR> +        }

Hmm, this means we need to update the provider code when KVM gains
specific features like that.  Is there some way we can just ignore
failures to dynamically add/rem/mod resources, or perhaps ignore
ENOTSUPPORTED or something?

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080605/fde23d27/attachment.sig>

From danms at us.ibm.com  Thu Jun  5 19:55:50 2008
From: danms at us.ibm.com (Dan Smith)
Date: Thu, 05 Jun 2008 12:55:50 -0700
Subject: [Libvirt-cim] SIGSEGV error of LXC_VirtualSystemSettingData with
	invalid InstanceID value
In-Reply-To: <OFA5F938EC.78AABC10-ON4825745F.0020BA62-4825745F.0021D00D@cn.ibm.com>
	(Guo Lian Yun's message of "Thu, 5 Jun 2008 14:06:07 +0800")
References: <OFA5F938EC.78AABC10-ON4825745F.0020BA62-4825745F.0021D00D@cn.ibm.com>
Message-ID: <87ve0nejw9.fsf@caffeine.beaverton.ibm.com>

GY>   Below is the debug info I can get now.

Hmm, that's not very helpful.  Can you try the SFCB debug procedure
documented here:

  https://www.redhat.com/archives/libvirt-cim/2008-March/msg00032.html

to see if you can get a stack trace?

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080605/37e6aa0a/attachment.sig>

From danms at us.ibm.com  Thu Jun  5 20:07:52 2008
From: danms at us.ibm.com (Dan Smith)
Date: Thu, 05 Jun 2008 13:07:52 -0700
Subject: [Libvirt-cim] on the LXC_SettingsDefineCapabilities association
In-Reply-To: <OF5BD365C5.01B2FB86-ON4825745F.001194F6-4825745F.001C71C8@cn.ibm.com>
	(Guo Lian Yun's message of "Thu, 5 Jun 2008 13:07:29 +0800")
References: <OF5BD365C5.01B2FB86-ON4825745F.001194F6-4825745F.001C71C8@cn.ibm.com>
Message-ID: <87r6bbejc7.fsf@caffeine.beaverton.ibm.com>

GY> Containers currently only really support memory and disk pools.

Well, actually only memory and network at this point.  I'm not sure
how to handle disk pools at the moment, since containers handle things
differently than the other platforms.

GY> I'm not sure if the unsupported error make sense below.

GY> [root at nine cimtest]# wbemcli ain -ac LXC_SettingsDefineCapabilities http://
GY> root:password at localhost/root/virt:LXC_AllocationCapabilities.InstanceID=
GY> "NetworkPool/default"
GY> *
GY> * wbemcli: Cim: (7) CIM_ERR_NOT_SUPPORTED: Unsupported hypervisor: ';LXC';
GY> *

NetworkPool should be supportable, so I can look into that.

GY> Actually, I get all types of instance list by ein querying.

GY> [root at nine cimtest]# wbemcli ein http://root:password at localhost/root/
GY> virt:LXC_AllocationCapabilities
GY> localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="ProcessorPool/
GY> 0"
GY> localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="MemoryPool/0"
GY> localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="NetworkPool/
GY> default"
GY> localhost:5988/root/virt:LXC_AllocationCapabilities.InstanceID="DiskPool/
GY> testpool"

Yeah, we should probably trim DiskPool out of here at some point,
depending on what we decide to do.  We should have Memory and Network
working now (meaning, it *should* work, but doesn't).  Processor
should come in the next month or so.

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080605/6950e448/attachment.sig>

From kaitlin at linux.vnet.ibm.com  Fri Jun  6 00:52:46 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 05 Jun 2008 17:52:46 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Adding set_interface_details()
	fn to the vxml.py
In-Reply-To: <8252a996154a47991c16.1212669419@elm3b217.beaverton.com>
References: <8252a996154a47991c16.1212669419@elm3b217.beaverton.com>
Message-ID: <48488A5E.6080408@linux.vnet.ibm.com>

> [TEST] #2 Adding set_interface_details() fn to the vxml.py.
> 
> This function give choice to add different network types to Xen/XenFV/KVM guest.
> 
> Changes:
> 
>>From patch 1 to 2:
> -----------------
> 1) Removed the extra param used in the set_interface_details() fn.
> 2) Made the xxx_default_net_type defined in const.py for Xen/XenFV/KVM as network.
> 3) Removed the individual xxx_default_net_type for Xen/XenFV/KVM.
> 4) Defined common variable default_net_type in const.py the individual.
> 5) Changed the vxml.py to use the common variable default_net_type of const.py.
> 
> 
> Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

Excellent Deepti - this looks great.  Just a few minor notes:

> 
> diff -r 959719c32cc9 -r 8252a996154a suites/libvirt-cim/lib/XenKvmLib/const.py

> 
>  #vxml.LXCXML
>  LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init')
>  LXC_default_tty = '/dev/ptmx'
> -LXC_default_mp = '/tmp'
> -LXC_default_source = '/tmp/lxc_files'

We don't want to remove the LXC pieces.  This probably a result of the 
difference between your working copy and the updates Zhengang recently made.

Othwerwise, this looks great.  Thanks!

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Sat Jun  7 12:49:01 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Sat, 07 Jun 2008 20:49:01 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update RASD.02 for LXC support
Message-ID: <4972af55a4c008623537.1212842941@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212842935 -28800
# Node ID 4972af55a4c0086235375b02b97114803752baaa
# Parent  fee941e683a399cb96994f863026ec3837841934
[TEST] Update RASD.02 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r fee941e683a3 -r 4972af55a4c0 suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py	Thu Jun 05 09:51:04 2008 +0800
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py	Sat Jun 07 20:48:55 2008 +0800
@@ -38,7 +38,7 @@
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom    = "VSSDC_dom"
 test_vcpus  = 1
@@ -154,10 +154,20 @@
     else:
         test_disk = "hda"
     virtxml = get_class(virt)
-    vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+        class_list = [get_typed_class(virt, rasd.masd_cn)]
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
                     mac = test_mac, disk = test_disk)
+        vsxml.set_vbridge(server)
+        class_list = [ get_typed_class(virt, rasd.dasd_cn),
+                       get_typed_class(virt, rasd.masd_cn),
+                       get_typed_class(virt, rasd.pasd_cn),
+                       get_typed_class(virt, rasd.nasd_cn)
+                     ]
+
     try:
-        vsxml.set_vbridge(server)
         ret = vsxml.define(server)
         if not ret:
             logger.error("Failed to Define the domain: %s", test_dom)
@@ -165,11 +175,7 @@
     except Exception, details:
         logger.error("Exception : %s", details)
         return FAIL
-    class_list = [ get_typed_class(virt, rasd.dasd_cn), 
-                   get_typed_class(virt, rasd.masd_cn), 
-                   get_typed_class(virt, rasd.pasd_cn), 
-                   get_typed_class(virt, rasd.nasd_cn)
-                 ]  
+    
     status = PASS 
     procrasd, netrasd, diskrasd, memrasd = init_list(virt)
     
diff -r fee941e683a3 -r 4972af55a4c0 suites/libvirt-cim/lib/XenKvmLib/enumclass.py
--- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py	Thu Jun 05 09:51:04 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py	Sat Jun 07 20:48:55 2008 +0800
@@ -233,6 +233,9 @@
 class KVM_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData):
     pass
 
+class LXC_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData):
+    pass
+
 class Xen_NetResourceAllocationSettingData(CIM_NetResourceAllocationSettingData):
     pass
 



From yunguol at cn.ibm.com  Sat Jun  7 13:11:51 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Sat, 07 Jun 2008 21:11:51 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update VSSD.04 for LXC support
Message-ID: <a59fe03154cb7dcafd34.1212844311@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212844304 -28800
# Node ID a59fe03154cb7dcafd34cdd4f26e2b653a027f41
# Parent  fee941e683a399cb96994f863026ec3837841934
[TEST] Update VSSD.04 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r fee941e683a3 -r a59fe03154cb suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py
--- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Thu Jun 05 09:51:04 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Sat Jun 07 21:11:44 2008 +0800
@@ -55,7 +55,7 @@
 verify_diskrasd_values, verify_memrasd_values 
 from XenKvmLib.const import CIM_REV
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom    = "VSSDC_dom"
 test_vcpus  = 1
@@ -64,13 +64,21 @@
 proc_rev = 531
 mem_rev = 529
 
-def setup_env():  
+def setup_env(virt):  
     vsxml_info = None
     virt_xml = get_class(virt)
-    vsxml_info = virt_xml(test_dom,  mem=test_mem, vcpus = test_vcpus,
-                                             mac = test_mac, disk = test_disk)
+    if virt == 'LXC':
+        vsxml_info = virt_xml(test_dom)
+    else:
+        vsxml_info = virt_xml(test_dom,  mem=test_mem, vcpus = test_vcpus,
+                              mac = test_mac, disk = test_disk)
+        try:
+            bridge = vsxml_info.set_vbridge(server)
+        except Exception, details:
+            logger.error("Exception : %s", details)
+            return FAIL, vsxml_info
+
     try:
-        bridge = vsxml_info.set_vbridge(server)
         ret = vsxml_info.define(server)
         if not ret:
             logger.error("Failed to Define the domain: %s", test_dom)
@@ -177,7 +185,10 @@
     assoc_cname = get_typed_class(virt, 'VirtualSystemSettingDataComponent')
     try:
         vssdc_assoc_info = assoc.Associators(server, assoc_cname, qcn, virt, InstanceID = instIdval)
-        if len(vssdc_assoc_info) < 4:
+        if len(vssdc_assoc_info) == 1 and \
+           vssdc_assoc_info[0].classname == 'LXC_MemResourceAllocationSettingData':
+           logger.info("%s returned expect objects" % assoc_cname)
+        elif len(vssdc_assoc_info) < 4:
             logger.error("%s returned %i %s objects, expected 4" % (assoc_cname, len(vssdc_assoc_info), qcn))
             status = FAIL
             
@@ -223,7 +234,7 @@
     else:
         test_disk = "hda"
 
-    status, vsxml = setup_env()
+    status, vsxml = setup_env(virt)
     if status != PASS:
         return status
 



From yunguol at cn.ibm.com  Sat Jun  7 13:25:33 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Sat, 07 Jun 2008 21:25:33 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ElementSettingData.03 for LXC
	support
Message-ID: <779ea9944c79488d4586.1212845133@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212845129 -28800
# Node ID 779ea9944c79488d4586aae3e0174d82801aa5af
# Parent  fee941e683a399cb96994f863026ec3837841934
[TEST] Update ElementSettingData.03 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r fee941e683a3 -r 779ea9944c79 suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py
--- a/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py	Thu Jun 05 09:51:04 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py	Sat Jun 07 21:25:29 2008 +0800
@@ -60,7 +60,7 @@
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM']
+sup_types = ['Xen', 'KVM', 'LXC']
 
 test_dom = "hd_domain1"
 test_mac = "00:11:22:33:44:55"
@@ -82,7 +82,10 @@
 
     status = PASS
     virtxml = vxml.get_class(options.virt)
-    cxml = virtxml(test_dom, mac = test_mac)
+    if options.virt == 'LXC':
+        cxml = virtxml(test_dom)
+    else:
+        cxml = virtxml(test_dom, mac = test_mac)
     ret = cxml.create(options.ip)
     if not ret:
         logger.error("Failed to Create the dom: %s" % test_dom)



From yunguol at cn.ibm.com  Sat Jun  7 13:31:51 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Sat, 07 Jun 2008 21:31:51 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update VSSD.03 for LXC support
Message-ID: <f3763e64079cf352abd1.1212845511@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1212845506 -28800
# Node ID f3763e64079cf352abd10186b893c670c3b52bfd
# Parent  fee941e683a399cb96994f863026ec3837841934
[TEST] Update VSSD.03 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r fee941e683a3 -r f3763e64079c suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py
--- a/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py	Thu Jun 05 09:51:04 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py	Sat Jun 07 21:31:46 2008 +0800
@@ -58,6 +58,7 @@
 from XenKvmLib.common_util import try_getinstance
 from XenKvmLib.test_doms import destroy_and_undefine_all
 
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 test_dom  = "VSSD_domain"
 
 expr_values = {



From deeptik at linux.vnet.ibm.com  Fri Jun  6 09:06:00 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Fri, 06 Jun 2008 02:06:00 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #3 Adding set_interface_details() fn
	to the vxml.py
Message-ID: <3a9f19764e3aef9b73e9.1212743160@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1212743134 25200
# Node ID 3a9f19764e3aef9b73e9998e91613a21d2df0384
# Parent  fee941e683a399cb96994f863026ec3837841934
[TEST] #3 Adding set_interface_details() fn to the vxml.py.

This function is used add network details to Xen/XenFV/KVM guest.

Changes:

>From patch 2 to 3:
------------------
1) Retained the LXC changes from const.py which was accidentally removed in previous patch.

>From patch 1 to 2:
-----------------
1) Removed the extra param used in the set_interface_details() fn.
2) Made the xxx_default_net_type defined in const.py for Xen/XenFV/KVM as network.
3) Removed the individual xxx_default_net_type for Xen/XenFV/KVM.
4) Defined common variable default_net_type in const.py the individual.
5) Changed the vxml.py to use the common variable default_net_type of const.py.


Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r fee941e683a3 -r 3a9f19764e3a suites/libvirt-cim/lib/XenKvmLib/const.py
--- a/suites/libvirt-cim/lib/XenKvmLib/const.py	Thu Jun 05 09:51:04 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/const.py	Fri Jun 06 02:05:34 2008 -0700
@@ -40,6 +40,7 @@ if not CIM_REV or not CIM_SET:
 # vxml.NetXML
 default_bridge_name = 'testbridge'
 default_network_name = 'default-net'
+default_net_type = 'network'
 
 #vxml.PoolXML
 default_pool_name = 'testpool'
@@ -59,7 +60,6 @@ Xen_secondary_disk_path = os.path.join(_
 Xen_secondary_disk_path = os.path.join(_image_dir, 'default-xen-dimage.2ND')
 Xen_default_disk_dev = 'xvda'
 Xen_default_mac = '11:22:33:aa:bb:cc'
-Xen_default_net_type = 'ethernet'
 
 # vxml.KVMXML
 if fv_cap(CIM_IP):
@@ -70,7 +70,6 @@ KVM_secondary_disk_path = os.path.join(_
 KVM_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND')
 KVM_default_disk_dev = 'hda'
 KVM_default_mac = '11:22:33:aa:bb:cc'
-KVM_default_net_type = 'network'
 
 # vxml.XenFVXML
 s, o = platform.architecture()
@@ -84,7 +83,6 @@ XenFV_secondary_disk_path = os.path.join
 XenFV_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND')
 XenFV_default_disk_dev = 'hda'
 XenFV_default_mac = '00:16:3e:5d:c7:9e'
-XenFV_default_net_type = 'bridge'
 
 #vxml.LXCXML
 LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init')
diff -r fee941e683a3 -r 3a9f19764e3a suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Thu Jun 05 09:51:04 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Fri Jun 06 02:05:34 2008 -0700
@@ -300,6 +300,10 @@ class VirtXML(Virsh, XMLClass):
         self.set_attributes('/domain/devices/interface/source', 
                             bridge=bridgename)
 
+    def set_nettype(self, nettype):
+        self.set_attributes('/domain/devices/interface/type', 
+                            type=nettype)
+
     def set_diskimg(self, diskimg):
         self.set_attributes('/domain/devices/disk/source', file=diskimg)
 
@@ -437,6 +441,38 @@ class VirtXML(Virsh, XMLClass):
 
         return vbr
 
+    def set_interface_details(self, devices, net_mac, net_type, virt_type):
+        interface = self.add_sub_node(devices, 'interface', type=net_type)
+        self.add_sub_node(interface, 'mac', address=net_mac)
+        if net_type == 'bridge':
+            self._set_vbridge(CIM_IP, virt_type)
+        elif net_type == 'network':
+            self.set_vnetwork(interface, virt_type)
+        elif net_type == 'ethernet':
+            pass
+        elif net_type == 'user':
+            pass
+        else:
+            logger.error("%s is not a valid network type", net_type)
+            sys.exit(1)
+
+    def set_vnetwork(self, interface, virt_type):
+        network_list = live.net_list(CIM_IP, virt_type)
+        if len(network_list) > 0:
+            nname = network_list[0]
+        else:
+            logger.info('No virutal network found')
+            logger.info('Trying to create one ......')
+            netxml = NetXML(CIM_IP, virt_type)
+            ret = netxml.create_vnet()
+            if not ret:
+                logger.error('Failed to create the virtual network "%s"',
+                             netxml.net_name)
+                sys.exit(SKIP)
+            nname = netxml.xml_get_netpool_name()
+        self.add_sub_node(interface, 'source', network=nname)
+
+
 
 class VirtCIM:
     def __init__(self, virt, dom_name, disk_dev, disk_source,
@@ -497,7 +533,7 @@ class XenXML(VirtXML, VirtCIM):
                        vcpus=const.default_vcpus,
                        mac=const.Xen_default_mac,
                        disk_file_path=const.Xen_disk_path,
-                       disk=const.Xen_default_disk_dev):
+                       disk=const.Xen_default_disk_dev): 
         if not (os.path.exists(const.Xen_kernel_path) \
                 and os.path.exists(const.Xen_init_path)):
             logger.error('ERROR: Either the kernel image '
@@ -505,10 +541,10 @@ class XenXML(VirtXML, VirtCIM):
             sys.exit(1)
         VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus)
         self._os(const.Xen_kernel_path, const.Xen_init_path)
-        self._devices(disk_file_path, disk, const.Xen_default_net_type, mac)
+        self._devices(disk_file_path, disk, const.default_net_type, mac)
 
         VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path, 
-                         const.Xen_default_net_type, mac, vcpus, mem)
+                         const.default_net_type, mac, vcpus, mem)
 
     def _os(self, os_kernel, os_initrd):
         os = self.get_node('/domain/os')
@@ -524,9 +560,7 @@ class XenXML(VirtXML, VirtCIM):
         self.add_sub_node(disk, 'driver', name='file')
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)
-        
-        interface = self.add_sub_node(devices, 'interface', type=net_type)
-        self.add_sub_node(interface, 'mac', address=net_mac)
+        self.set_interface_details(devices, net_mac, net_type, virt_type='Xen')
 
     def set_bootloader(self, ip, gtype=0):
         bldr = live.bootloader(ip, gtype)
@@ -558,7 +592,7 @@ class KVMXML(VirtXML):
             sys.exit(1)
         VirtXML.__init__(self, 'kvm', test_dom, set_uuid(), mem, vcpus)
         self._os()
-        self._devices(const.KVM_default_emulator, const.KVM_default_net_type,
+        self._devices(const.KVM_default_emulator, const.default_net_type,
                       disk_file_path, disk, mac)
 
     def _os(self):
@@ -572,33 +606,8 @@ class KVMXML(VirtXML):
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)
 
-        interface = self.add_sub_node(devices, 'interface', type=net_type)
-        self.add_sub_node(interface, 'mac', address=net_mac)
+        self.set_interface_details(devices, net_mac, net_type, virt_type='KVM')
 
-        if net_type == 'bridge':
-            self.set_vbridge(CIM_IP)    
-        elif net_type == 'network':
-            self.set_vnetwork(interface)
-        else:
-            logger.error("%s is not a valid network type", net_type)
-            sys.exit(1)
-
-    def set_vnetwork(self, interface): 
-        network_list = live.net_list(CIM_IP, virt='KVM')
-        if len(network_list) > 0:
-            nname = network_list[0]
-        else:
-            logger.info('No virutal network found')
-            logger.info('Trying to create one ......')
-            netxml = NetXML(CIM_IP, virt='KVM')
-            ret = netxml.create_vnet()
-            if not ret:
-                logger.error('Failed to create the virtual network "%s"',
-                             netxml.net_name)
-                sys.exit(SKIP)
-            nname = netxml.xml_get_netpool_name()
-        self.add_sub_node(interface, 'source', network=nname)
-    
     def set_emulator(self, emu):
         return self._set_emulator(emu)
     
@@ -625,7 +634,7 @@ class XenFVXML(VirtXML):
         VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus)
         self._os(const.XenFV_default_loader)
         self._devices(const.XenFV_default_emulator,
-                      const.XenFV_default_net_type, mac, disk_file_path, disk)
+                      const.default_net_type, mac, disk_file_path, disk) 
 
     def _os(self, os_loader):
         os = self.get_node('/domain/os')
@@ -637,14 +646,10 @@ class XenFVXML(VirtXML):
         devices = self.get_node('/domain/devices')
 
         self.add_sub_node(devices, 'emulator', emu)
-
-        interface = self.add_sub_node(devices, 'interface', type=net_type)
-        self.add_sub_node(interface, 'mac', address=net_mac)
-        self.set_bridge(CIM_IP)
-
         disk = self.add_sub_node(devices, 'disk', type='file')
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)
+        self.set_interface_details(devices, net_mac, net_type, virt_type='XenFV')
 
     def set_emulator(self, emu):
         return self._set_emulator(emu)



From yunguol at cn.ibm.com  Wed Jun 11 10:26:45 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 11 Jun 2008 18:26:45 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ElementConforms.02 for LXC
	support
Message-ID: <5af69c19fc1b3c247050.1213180005@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213179999 -28800
# Node ID 5af69c19fc1b3c2470500b2918936764ee4f975a
# Parent  ca8841f47805d5d2a23069220563713412d6a7bd
[TEST] Update ElementConforms.02 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r ca8841f47805 -r 5af69c19fc1b suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py	Fri Jun 06 02:05:34 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py	Wed Jun 11 18:26:39 2008 +0800
@@ -53,7 +53,7 @@
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 test_dom = "domgst"
 



From yunguol at cn.ibm.com  Wed Jun 11 12:40:46 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 11 Jun 2008 20:40:46 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	SettingsDefineCapabilities.04&05 for LXC support
Message-ID: <7d6929a806cf9bd23f9d.1213188046@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213188039 -28800
# Node ID 7d6929a806cf9bd23f9dee481fc48abf134ebfcb
# Parent  ca8841f47805d5d2a23069220563713412d6a7bd
[TEST] Update SettingsDefineCapabilities.04&05 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r ca8841f47805 -r 7d6929a806cf suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py	Fri Jun 06 02:05:34 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py	Wed Jun 11 20:40:39 2008 +0800
@@ -43,6 +43,7 @@
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.common_util import print_field_error
 
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 @do_main(platform_sup)
 def main():
     options = main.options
diff -r ca8841f47805 -r 7d6929a806cf suites/libvirt-cim/cimtest/SettingsDefineCapabilities/05_reverse_vsmcap.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/05_reverse_vsmcap.py	Fri Jun 06 02:05:34 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/05_reverse_vsmcap.py	Wed Jun 11 20:40:39 2008 +0800
@@ -45,6 +45,7 @@
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.common_util import print_field_error
 
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 @do_main(platform_sup)
 def main():
     options = main.options



From yunguol at cn.ibm.com  Wed Jun 11 12:56:13 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 11 Jun 2008 20:56:13 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update SettingsDefineCapabilities.01
	for LXC support
Message-ID: <8bf3a489f215999dd76e.1213188973@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213188967 -28800
# Node ID 8bf3a489f215999dd76e31730ea6725fb95678b7
# Parent  ca8841f47805d5d2a23069220563713412d6a7bd
[TEST] Update SettingsDefineCapabilities.01 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r ca8841f47805 -r 8bf3a489f215 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Fri Jun 06 02:05:34 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Wed Jun 11 20:56:07 2008 +0800
@@ -67,6 +67,8 @@
 from XenKvmLib.common_util import print_field_error
 from XenKvmLib.const import CIM_REV
 
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
+
 memid = "%s/%s" % ("MemoryPool", 0)
 procid = "%s/%s" % ("ProcessorPool", 0)
 libvirtcim_sdc_rasd_rev = 571
@@ -93,24 +95,29 @@
         Creating the lists that will be used for comparisons.
     """
 
-    instlist = [ 
-                 dpool.InstanceID,
-                 mpool.InstanceID, 
-                 npool.InstanceID, 
-                 ppool.InstanceID
-               ]
-    cllist = [ 
-              get_typed_class(virt, "DiskResourceAllocationSettingData"),
-              get_typed_class(virt, "MemResourceAllocationSettingData"), 
-              get_typed_class(virt, "NetResourceAllocationSettingData"), 
-              get_typed_class(virt, "ProcResourceAllocationSettingData")
-             ]
-    rtype = { 
-              get_typed_class(virt, "DiskResourceAllocationSettingData") : 17, 
-              get_typed_class(virt, "MemResourceAllocationSettingData")  :  4, 
-              get_typed_class(virt, "NetResourceAllocationSettingData")  : 10, 
-              get_typed_class(virt, "ProcResourceAllocationSettingData") :  3
-             }
+    if virt == 'LXC':
+        instlist = [ mpool.InstanceID ]
+        cllist = [ get_typed_class(virt, "MemResourceAllocationSettingData") ]
+        rtype = { get_typed_class(virt, "MemResourceAllocationSettingData")  :  4 }
+    else:    
+        instlist = [ 
+                    dpool.InstanceID,
+                    mpool.InstanceID, 
+                    npool.InstanceID, 
+                    ppool.InstanceID
+                   ]
+        cllist = [ 
+                  get_typed_class(virt, "DiskResourceAllocationSettingData"),
+                  get_typed_class(virt, "MemResourceAllocationSettingData"), 
+                  get_typed_class(virt, "NetResourceAllocationSettingData"), 
+                  get_typed_class(virt, "ProcResourceAllocationSettingData")
+                 ]
+        rtype = { 
+                  get_typed_class(virt, "DiskResourceAllocationSettingData") : 17, 
+                  get_typed_class(virt, "MemResourceAllocationSettingData")  :  4, 
+                  get_typed_class(virt, "NetResourceAllocationSettingData")  : 10, 
+                  get_typed_class(virt, "ProcResourceAllocationSettingData") :  3
+                }
     rangelist = {
                   "Default"   : 0, 
                   "Minimum"   : 1, 



From yunguol at cn.ibm.com  Tue Jun 10 07:49:05 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Tue, 10 Jun 2008 15:49:05 +0800
Subject: [Libvirt-cim] Cimtest Report for LXC (2008/06/10)
Message-ID: <OFE6CFEB78.C0DDC8ED-ON48257464.002B2CAD-48257464.002B3E67@cn.ibm.com>

stro: Fedora 9 Beta
Kernel: 2.6.25-0.121.rc5.git4.fc9
Libvirt: 0.4.2
CIMOM: 2.7.0-6.fc9
PyWBEM: 0.6-1
libcmpiutil: changeset-79
libvirt-cim: changeset-603
cimtest: changeset-189


===================== CIMTEST 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: SKIP
ComputerSystem - 05_activate_defined_start.py: FAIL
ComputerSystem - 06_paused_active_suspend.py: SKIP
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: SKIP
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: SKIP
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: SKIP
ComputerSystemIndication - 01_created_indication.py: SKIP
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: SKIP
ElementAllocatedFromPool - 04_forward_errs.py: SKIP
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: SKIP
ElementConforms - 01_forward.py: PASS
ElementConforms - 02_reverse.py: SKIP
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: SKIP
HostSystem - 03_hs_to_settdefcap.py: SKIP
HostSystem - 04_hs_to_EAPF.py: SKIP
HostSystem - 05_hs_gi_errs.py: PASS
HostSystem - 06_hs_to_vsms.py: SKIP
HostedDependency - 01_forward.py: PASS
HostedDependency - 02_reverse.py: PASS
HostedDependency - 03_enabledstate.py: SKIP
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: SKIP
LogicalDisk - 02_nodevs.py: SKIP
LogicalDisk - 03_ld_gi_errs.py: SKIP
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: SKIP
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: SKIP
NetworkPort - 02_np_gi_errors.py: SKIP
NetworkPort - 03_user_netport.py: SKIP
Processor - 01_processor.py: SKIP
Processor - 02_definesys_get_procs.py: SKIP
Processor - 03_proc_gi_errs.py: SKIP
Profile - 01_enum.py: PASS
Profile - 02_profile_to_elec.py: SKIP
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
ReferencedProfile - 01_verify_refprof.py: PASS
ReferencedProfile - 02_refprofile_errs.py: PASS
ResourceAllocationFromPool - 01_forward.py: SKIP
ResourceAllocationFromPool - 02_reverse.py: SKIP
ResourceAllocationFromPool - 03_forward_errs.py: SKIP
ResourceAllocationFromPool - 04_reverse_errs.py: SKIP
ResourceAllocationFromPool - 05_RAPF_err.py: SKIP
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: SKIP
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: 
SKIP
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP
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: SKIP
SettingsDefineCapabilities - 03_forward_errs.py: SKIP
SettingsDefineCapabilities - 04_forward_vsmsdata.py: SKIP
SettingsDefineCapabilities - 05_reverse_vsmcap.py: SKIP
SystemDevice - 01_forward.py: PASS
SystemDevice - 02_reverse.py: PASS
SystemDevice - 03_fwderrs.py: PASS
VSSD - 01_enum.py: PASS
VSSD - 02_bootldr.py: SKIP
VSSD - 03_vssd_gi_errs.py: FAIL
VSSD - 04_vssd_to_rasd.py: PASS
VirtualSystemManagementCapabilities - 01_enum.py: PASS
VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS
VirtualSystemManagementService - 01_definesystem_name.py: FAIL
InvokeMethod(DefineSystem): *** Provider 
Virt_VirtualSystemManagementService(2854) exiting due to a SIGSEGV signal
VirtualSystemManagementService - 02_destroysystem.py: SKIP
VirtualSystemManagementService - 03_definesystem_ess.py: SKIP
VirtualSystemManagementService - 04_definesystem_ers.py: SKIP
VirtualSystemManagementService - 05_destroysystem_neg.py: SKIP
VirtualSystemManagementService - 06_addresource.py: SKIP
VirtualSystemManagementService - 07_addresource_neg.py: SKIP
VirtualSystemManagementService - 08_modifyresource.py: SKIP
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: SKIP
VirtualSystemSettingDataComponent - 02_reverse.py: SKIP
VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: SKIP
VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: SKIP
VirtualSystemSnapshotService - 01_enum.py: PASS
VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS
VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS
VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: 
PASS

Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080610/f5949349/attachment.htm>

From deeptik at linux.vnet.ibm.com  Tue Jun 10 12:50:37 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Tue, 10 Jun 2008 05:50:37 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing the tc 40_RSC_start.py of
	ComputerSystem
Message-ID: <342e77cf74f768587855.1213102237@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213102213 25200
# Node ID 342e77cf74f7685878555d30678b5ad07a3893f5
# Parent  ca8841f47805d5d2a23069220563713412d6a7bd
[TEST] Fixing the tc 40_RSC_start.py of ComputerSystem.

The tc was passing with false positive.
The parameters passed to check_attributes() were incorrect and fixed it.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r ca8841f47805 -r 342e77cf74f7 suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Fri Jun 06 02:05:34 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Tue Jun 10 05:50:13 2008 -0700
@@ -85,7 +85,7 @@ def main():
             raise Exception("Unable start dom %s using RequestedStateChange()", 
                             default_dom)
 
-        rc = check_attributes(domain_name, ip, options.virt)
+        rc = check_attributes(default_dom, options.ip, options.virt)
         if rc != 0:
             raise Exception("Attributes for %s not set as expected.",
                             default_dom)



From kaitlin at linux.vnet.ibm.com  Tue Jun 10 17:16:05 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 10:16:05 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing the tc 40_RSC_start.py of
	ComputerSystem
In-Reply-To: <342e77cf74f768587855.1213102237@elm3b217.beaverton.com>
References: <342e77cf74f768587855.1213102237@elm3b217.beaverton.com>
Message-ID: <484EB6D5.2040101@linux.vnet.ibm.com>

Deepti B. Kalakeri wrote:
> # HG changeset patch
> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> # Date 1213102213 25200
> # Node ID 342e77cf74f7685878555d30678b5ad07a3893f5
> # Parent  ca8841f47805d5d2a23069220563713412d6a7bd
> [TEST] Fixing the tc 40_RSC_start.py of ComputerSystem.
> 
> The tc was passing with false positive.
> The parameters passed to check_attributes() were incorrect and fixed it.
> 
> Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> 
> diff -r ca8841f47805 -r 342e77cf74f7 suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py
> --- a/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Fri Jun 06 02:05:34 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Tue Jun 10 05:50:13 2008 -0700
> @@ -85,7 +85,7 @@ def main():
>              raise Exception("Unable start dom %s using RequestedStateChange()", 
>                              default_dom)
> 
> -        rc = check_attributes(domain_name, ip, options.virt)
> +        rc = check_attributes(default_dom, options.ip, options.virt)
>          if rc != 0:
>              raise Exception("Attributes for %s not set as expected.",
>                              default_dom)

Good catch!  Since this was a false positive, can you also include a fix 
that would cause the test to return a failure without this patch 
applied? It looks like there is an issue with the way the test is 
reporting status.

Thanks!

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From danms at us.ibm.com  Tue Jun 10 19:02:13 2008
From: danms at us.ibm.com (Dan Smith)
Date: Tue, 10 Jun 2008 12:02:13 -0700
Subject: [Libvirt-cim] [PATCH] Put the <features> block into the XenFV XML
	we generate
Message-ID: <ad4804559dd83bd2afd1.1213124533@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1213124529 25200
# Node ID ad4804559dd83bd2afd10fa0768b087f6a9914a9
# Parent  7b10cae6440e138e9db809f8360c1ef7cb5f6d20
Put the <features> block into the XenFV XML we generate

I think that this is a sane set of defaults for most situations.  Later
it might be good to provide settings for these in the VSSD, but this
should do for now.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 7b10cae6440e -r ad4804559dd8 libxkutil/xmlgen.c
--- a/libxkutil/xmlgen.c	Thu Jun 05 12:29:31 2008 -0700
+++ b/libxkutil/xmlgen.c	Tue Jun 10 12:02:09 2008 -0700
@@ -502,7 +502,12 @@
                        "  %s\n"
                        "  %s\n"
                        "  %s\n"
-                       "</os>\n",
+                       "</os>\n"
+                       "<features>\n"
+                       "  <pae/>\n"
+                       "  <acpi/>\n"
+                       "  <apic/>\n"
+                       "</features>\n",
                        type,
                        loader,
                        boot);



From kaitlin at linux.vnet.ibm.com  Tue Jun 10 19:49:40 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 12:49:40 -0700
Subject: [Libvirt-cim] Cimtest Report for LXC (2008/06/10)
In-Reply-To: <OFE6CFEB78.C0DDC8ED-ON48257464.002B2CAD-48257464.002B3E67@cn.ibm.com>
References: <OFE6CFEB78.C0DDC8ED-ON48257464.002B2CAD-48257464.002B3E67@cn.ibm.com>
Message-ID: <484EDAD4.5070805@linux.vnet.ibm.com>

> ComputerSystem - 05_activate_defined_start.py: FAIL

> VSSD - 03_vssd_gi_errs.py: FAIL

> VirtualSystemManagementService - 01_definesystem_name.py: FAIL
> InvokeMethod(DefineSystem): *** Provider 
> Virt_VirtualSystemManagementService(2854) exiting due to a SIGSEGV signal

Thanks Daisy!  Can you look into why these failed?

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun 10 21:26:21 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 14:26:21 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Add graphics and input devices to
	XenFV guest XML
Message-ID: <fdc71e98f2d1417fcd50.1213133181@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1211564341 25200
# Node ID fdc71e98f2d1417fcd50bb8b2b6a91300a8296c4
# Parent  ce82fc9aff4863ee737475bf7eb647138ad000ed
[TEST] #2 Add graphics and input devices to XenFV guest XML.

Also add pae, acpi, apic features.

Adding these tags fixes several issues:
 -The ramdisk is 32 bit, so we need to use pae in order to boot properly.
 -The guest uses a graphical console, so we need to define one in order to start the guest.

Updates:
  -Rebased one recent sources.
  -Fixed compatibility issue with KVM and Xen

Note:  This will not fix issues with tests that use DefineSystem() to create guests.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r ce82fc9aff48 -r fdc71e98f2d1 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Fri May 23 10:39:01 2008 -0700
@@ -253,6 +253,11 @@
     dname = ""                # domain name
 
     def __init__(self, domain_type, name, uuid, mem, vcpu):
+        is_XenFV = False
+        if domain_type == "xenfv":
+            is_XenFV = True
+            domain_type = "xen"
+
         XMLClass.__init__(self)
         Virsh.__init__(self, domain_type)
         # domain root nodes
@@ -260,6 +265,10 @@
 
         self.add_sub_node(domain, 'name', name)
         self.add_sub_node(domain, 'uuid', uuid)
+        
+        if is_XenFV is True:
+            self.add_sub_node(domain, 'features')
+
         self.add_sub_node(domain, 'os')
         self.add_sub_node(domain, 'memory', mem * 1024)
         self.add_sub_node(domain, 'vcpu', vcpu)
@@ -631,10 +640,17 @@
         if not os.path.exists(disk_file_path):
             logger.error('Error: Disk image does not exist')
             sys.exit(1)
-        VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus)
+        VirtXML.__init__(self, 'xenfv', test_dom, set_uuid(), mem, vcpus)
+        self._features()
         self._os(const.XenFV_default_loader)
         self._devices(const.XenFV_default_emulator,
                       const.default_net_type, mac, disk_file_path, disk) 
+
+    def _features(self):
+        features = self.get_node('/domain/features')
+        self.add_sub_node(features, 'pae')
+        self.add_sub_node(features, 'acpi')
+        self.add_sub_node(features, 'apic')
 
     def _os(self, os_loader):
         os = self.get_node('/domain/os')
@@ -646,6 +662,9 @@
         devices = self.get_node('/domain/devices')
 
         self.add_sub_node(devices, 'emulator', emu)
+        self.add_sub_node(devices, 'graphics', type='vnc', port='5900',
+                          keymap='en-us')
+        self.add_sub_node(devices, 'input', type='mouse', bus='xen')
         disk = self.add_sub_node(devices, 'disk', type='file')
         self.add_sub_node(disk, 'source', file=disk_img)
         self.add_sub_node(disk, 'target', dev=disk_dev)



From kaitlin at linux.vnet.ibm.com  Tue Jun 10 21:33:03 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 14:33:03 -0700
Subject: [Libvirt-cim] [PATCH] Remove revision branches
Message-ID: <58f7c9cf54677356b88b.1213133583@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213121071 25200
# Node ID 58f7c9cf54677356b88b30e2b5a5db9685a15604
# Parent  fdc71e98f2d1417fcd50bb8b2b6a91300a8296c4
Remove revision branches.

These brances were needed to distinguish the behavior between the 0.3.0 release and the current head of the mercurial tree.  Now that the cimtest tree has been tagged, cimtest release_0_1 should correspond with the functionality in libvirt-cim 0.4.0.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py
--- a/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -62,14 +62,12 @@
 from XenKvmLib.test_doms import create_vnet
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 
 diskid = "%s/%s" % ("DiskPool", test_dpath)
 memid = "%s/%s" % ("MemoryPool", 0)
 procid = "%s/%s" % ("ProcessorPool", 0)
-rev = 463
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 @do_main(sup_types)     
@@ -112,8 +110,6 @@
                                   'desc' : 'No InstanceID specified' },
             "invalid_keyvalue" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND,
                                    'desc' : 'Instance not found' }}
-    if CIM_REV < rev:
-        exp['invalid_keyvalue']['desc'] = 'Object could not be found'
 
     ret_value = try_getinstance(conn, classname, keys, field_name=field,
                                 expr_values=exp['invalid_keyvalue'], bug_no="")
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -34,7 +34,6 @@
 from CimTest import Globals
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.common_util import try_assoc
-from XenKvmLib.const import CIM_REV
 from CimTest.ReturnCodes import PASS, FAIL	
 from CimTest.Globals import do_main, platform_sup, logger
 from XenKvmLib.vxml import get_class
@@ -60,7 +59,6 @@
                                         'desc'  : 'No such instance'
                                     } 
               }
-libvirt_rev = 393
 
 def err_invalid_ccname():
 # This is used to verify the that the  
@@ -157,10 +155,6 @@
               get_typed_class(virt, "ProcessorPool")
              ]
 
-    if CIM_REV < libvirt_rev:
-        expr_values['invalid_keyvalue']['desc'] = 'Invalid InstanceID or unsupported pool type'
-        expr_values['invalid_keyvalue']['rc'] = pywbem.CIM_ERR_FAILED
-
     for classname in sorted(lelist):
         keys = { "InstanceID" : "InvalidKeyValue" }
         field = "InstanceID_KeyValue"    
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py	Tue Jun 10 11:04:31 2008 -0700
@@ -30,11 +30,9 @@
 from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORNAMES, \
 CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL, SKIP
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.enumclass import enumerate
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
-ac_to_pool_version = 561
 
 def append_to_list(server, virt, poolname, valid_elc_id):
     keys_list = ['InstanceID']
@@ -87,11 +85,10 @@
     valid_elc_id = ["ManagementCapabilities", 
                     "MigrationCapabilities"]
 
-    if CIM_REV >= ac_to_pool_version:
-        valid_elc_name.append(get_typed_class(virt, "AllocationCapabilities"))
-        status, valid_elc_id = set_pool_info(server, virt, valid_elc_id)
-        if status != PASS:
-            return status
+    valid_elc_name.append(get_typed_class(virt, "AllocationCapabilities"))
+    status, valid_elc_id = set_pool_info(server, virt, valid_elc_id)
+    if status != PASS:
+        return status
 
     if len(elc) == 0:
         logger.error("ElementCapabilities association failed, excepted at least one instance")
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Tue Jun 10 11:04:31 2008 -0700
@@ -58,7 +58,6 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
 verify_diskrasd_values, verify_memrasd_values
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 
@@ -67,8 +66,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-rev = 529
-proc_instid_rev = 590
 
 def init_list(vsxml, virt="Xen"):
     """
@@ -103,11 +100,6 @@
                                               "VirtualQuantity" : (test_mem * 1024), 
                                            }
                   } 
-    if CIM_REV < rev:
-       rasd_values[mem_cn]['AllocationUnits'] = "MegaBytes"
-
-    if CIM_REV < proc_instid_rev:
-       rasd_values[proc_cn]['InstanceID'] = '%s/%s' %(test_dom, 0)
 
     return rasd_values
 
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py
--- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Tue Jun 10 11:04:31 2008 -0700
@@ -49,12 +49,10 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.test_xml import testxml
 from XenKvmLib.test_doms import destroy_and_undefine_all
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 test_dom = "domgst"
 test_vcpus = 1
-libvirtcim_sdc_rasd_rev = 571
 
 def setup_env(server, virt="Xen"):
     status = PASS
@@ -243,26 +241,6 @@
             logger.error("In ResourceType for %s " % rt)
             return FAIL
  
-        # The following properties have been removed in the patchset 571
-        # but is present in the rpm libvirt-cim and hence retained it.
-
-        if CIM_REV < libvirtcim_sdc_rasd_rev:
-            ppolicy = inst['PropertyPolicy']
-            if ppolicy != 0 and ppolicy != 1:
-                logger.error("In PropertyPolicy for %s " % ppolicy)
-                return FAIL
-
-            vrole  = inst['ValueRole']
-            if vrole < 0 or vrole > 4:
-                logger.error("In ValueRole %s " % vrole)
-                return FAIL
-
-            insid  = inst['InstanceID']
-            vrange = rangelist[insid]
-            if vrange != inst['ValueRange']:
-                logger.error("In ValueRange for %s " % vrange)
-                return FAIL
-
     except Exception, detail:
         logger.error("Error checking RASD attribute values %s" % detail)
         return FAIL
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/Memory/01_memory.py
--- a/suites/libvirt-cim/cimtest/Memory/01_memory.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py	Tue Jun 10 11:04:31 2008 -0700
@@ -31,13 +31,11 @@
 from XenKvmLib.vxml import XenXML, KVMXML, get_class
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "test_domain"
 mem = 256 #MB
-mem_change_version=585
 
 @do_main(sup_types)
 def main():
@@ -45,10 +43,7 @@
     
     vsxml = get_class(options.virt)(test_dom, mem)
     vsxml.define(options.ip)
-    if CIM_REV >= mem_change_version: 
-        alloc_mem = int(vsxml.xml_get_mem())
-    else:
-        alloc_mem = int(vsxml.xml_get_mem())/1024
+    alloc_mem = int(vsxml.xml_get_mem())
     
     devid = "%s/mem" % test_dom
     key_list = { 'DeviceID' : devid,
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Tue Jun 10 11:04:31 2008 -0700
@@ -54,7 +54,6 @@
 from XenKvmLib import vxml 
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib import rasd 
-from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 
@@ -64,8 +63,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-prev = 531
-mrev = 529
 
 def init_list(xml, disk, virt="Xen"):
     """
@@ -93,10 +90,6 @@
             "AllocationUnits" : "KiloBytes",
             "VirtualQuantity" : (test_mem * 1024),
             "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
-    if CIM_REV < prev:
-        procrasd['InstanceID'] = '%s/0' % test_dom
-    if CIM_REV < mrev:
-        memrasd['AllocationUnits'] = 'MegaBytes'
 
     return procrasd, netrasd, diskrasd, memrasd
 
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py	Tue Jun 10 11:04:31 2008 -0700
@@ -34,7 +34,6 @@
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib import rasd 
-from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 
@@ -44,8 +43,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-prev = 531
-mrev = 529
 
 def init_list(virt):
     """
@@ -73,10 +70,6 @@
             "AllocationUnits" : "KiloBytes",
             "VirtualQuantity" : (test_mem * 1024),
             "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
-    if CIM_REV < prev:
-        proc['InstanceID'] = '%s/0' % test_dom
-    if CIM_REV < mrev:
-        mem['AllocationUnits'] = 'MegaBytes'
 
     return proc, net, disk, mem
 
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py
--- a/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py	Tue Jun 10 11:04:31 2008 -0700
@@ -79,12 +79,9 @@
 from CimTest.Globals import do_main
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.common_util import print_field_error
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
-
-libvirtcim_rev = 501
 
 def get_proflist():
     proflist = []
@@ -167,12 +164,6 @@
     server = options.ip
     status = PASS
 
-    # Referenced Profile was introduced as part of changeset 501 
-    # and is not available in the libvirt-cim rpm, hence skipping tc
-    # if CIM_REV  501
-    if CIM_REV < libvirtcim_rev:
-        return SKIP
-
     prev_namespace = Globals.CIM_NS
     Globals.CIM_NS = 'root/interop'
     reg_classname = get_typed_class(virt, 'RegisteredProfile')
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py
--- a/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -60,10 +60,8 @@
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
 from XenKvmLib.common_util import try_assoc
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
-libvirtcim_rev = 501
 
 expr_values = {
                 'INVALID_Instid_KeyName'  :  {
@@ -124,11 +122,6 @@
     virt = options.virt
     server = options.ip
     status = PASS
-    # Referenced Profile was introduced as part of changeset 501 
-    # and is not available in the libvirt-cim rpm, hence skipping tc
-    # if CIM_REV  501
-    if CIM_REV < libvirtcim_rev:
-        return SKIP
 
     prev_namespace = Globals.CIM_NS
     Globals.CIM_NS = 'root/interop'
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -28,11 +28,9 @@
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'XenFV', 'KVM']
 
-rev = 466
 
 @do_main(sup_types)
 def main():
@@ -49,9 +47,6 @@
 
     exp_rc = 6 #CIM_ERR_NOT_FOUND
     exp_desc = "No such instance (wrong) - resource pool type mismatch"
-    if CIM_REV < rev:
-        exp_rc = 1 # CIM_ERR_FAILED
-        exp_desc = "Invalid InstanceID or unsupported pool type"
 
     for k, v in poollist.items():
         instanceref = CIMInstanceName(k, 
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py	Tue Jun 10 11:04:31 2008 -0700
@@ -32,7 +32,6 @@
 from XenKvmLib import assoc
 from XenKvmLib import devices
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from CimTest import Globals
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL 
@@ -42,8 +41,6 @@
 test_dom = "domu1"
 test_mac = "00:11:22:33:44:aa"
 test_vcpus = 1
-proc_instid_rev = 590
-
 
 def print_error(cn, detail):
     Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
@@ -96,7 +93,7 @@
     for cn in cn_id.keys():
         key_list = get_keys(cn, cn_id[cn], 'ComputerSystem', options.virt)
 
-        if CIM_REV >= proc_instid_rev and cn == 'Processor':
+        if cn == 'Processor':
             exp_inst_id_val[cn] = "%s/%s" % (test_dom, "proc") 
         else:
             exp_inst_id_val[cn] = key_list['DeviceID']
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py	Tue Jun 10 11:04:31 2008 -0700
@@ -59,8 +59,6 @@
 from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class, get_class_basename
 from XenKvmLib.rasd import InstId_err
-from XenKvmLib.const import CIM_REV
-
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -68,9 +66,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-proc_instid_rev = 590
-
-
 
 def call_assoc(ip, inst, exp_id, ccn, virt):
     if inst['InstanceID'] != exp_id:
@@ -196,9 +191,6 @@
             'DiskResourceAllocationSettingData' : '%s/%s' % (test_dom, test_disk),
             'MemResourceAllocationSettingData'  : '%s/%s' % (test_dom, 'mem')}
 
-    if CIM_REV < proc_instid_rev :
-        rasd_devid['ProcResourceAllocationSettingData'] = "%s/%s" % (test_dom, "0")
-
     global dev_devid
     dev_devid = {
             'Processor'   : '%s/%s' % (test_dom, test_vcpus-1),
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Tue Jun 10 11:04:31 2008 -0700
@@ -65,14 +65,11 @@
 from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
 create_netpool_conf
 from XenKvmLib.common_util import print_field_error
-from XenKvmLib.const import CIM_REV
 
 platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 memid = "%s/%s" % ("MemoryPool", 0)
 procid = "%s/%s" % ("ProcessorPool", 0)
-libvirtcim_sdc_rasd_rev = 571
-
 
 def get_or_bail(virt, ip, id, pool_class):
     """
@@ -165,27 +162,6 @@
                               rtype[cllist[loop]])
             return FAIL 
 
-        # The following properties have been removed in the patchset 571
-        # but is present in the rpm libvirt-cim and hence retained it.
-
-        if CIM_REV < libvirtcim_sdc_rasd_rev:
-            ppolicy = inst['PropertyPolicy']
-            if ppolicy != 0 and ppolicy != 1:
-                print_field_error("PropertyPolicy", inst['PropertyPolicy'], 
-                                   ppolicy)
-                return FAIL 
-
-            vrole  = inst['ValueRole']
-            if vrole < 0 or vrole > 4:
-                print_field_error("ValueRole", inst['ValueRole'], vrole)
-                return FAIL 
-
-            insid  = inst['InstanceID']
-            vrange = rangelist[insid]
-            if vrange != inst['ValueRange']:
-                print_field_error("ValueRange", inst['ValueRange'], vrange)
-                return FAIL 
-
     return PASS
 
 def verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool):
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py
--- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Tue Jun 10 11:04:31 2008 -0700
@@ -53,7 +53,6 @@
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
 verify_diskrasd_values, verify_memrasd_values 
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -61,8 +60,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-proc_rev = 531
-mem_rev = 529
 
 def setup_env(virt):  
     vsxml_info = None
@@ -97,8 +94,6 @@
                  "ResourceType" : 3,
                  "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
                 }
-    if CIM_REV < proc_rev:
-        procrasd['InstanceID'] = '%s/%s' %(test_dom, "0")
 
     netrasd = {
                 "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
@@ -122,8 +117,7 @@
                "VirtualQuantity" : (test_mem * 1024), 
                "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
               }
-    if CIM_REV < mem_rev:
-        memrasd['AllocationUnits'] = "MegaBytes"
+
     return procrasd, netrasd, diskrasd, memrasd
 
 def get_inst_from_list(classname, vssd_list, filter_name, exp_val):
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Tue Jun 10 11:04:31 2008 -0700
@@ -28,14 +28,12 @@
 from VirtLib.live import domain_list, active_domain_list
 from XenKvmLib import vsms, vxml
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from CimTest.Globals import do_main
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 default_dom = 'test_domain'
-rev = 528
 
 @do_main(sup_types)
 def main():
@@ -50,11 +48,7 @@
     cs_ref = CIMInstanceName(classname, keybindings = {
                                         'Name':default_dom,
                                         'CreationClassName':classname})
-    if CIM_REV < rev:
-        dl_func = active_domain_list
-    else:
-        dl_func = domain_list
-    list_before = dl_func(options.ip, options.virt)
+    list_before = domain_list(options.ip, options.virt)
     status = PASS
     rc = -1
     
@@ -66,7 +60,7 @@
         logger.error(details)
         status = FAIL
 
-    list_after = dl_func(options.ip, options.virt)
+    list_after = domain_list(options.ip, options.virt)
 
     status = PASS
     if default_dom not in list_before:
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Tue Jun 10 11:04:31 2008 -0700
@@ -27,14 +27,12 @@
 from VirtLib import utils
 from XenKvmLib import vsms
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.test_doms import undefine_test_domain
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
 
 sup_types = ['Xen', 'KVM', 'XenFV']
-vsms_status_version = 534
 
 def destroysystem_fail(tc, options):
     service = vsms.get_vsms_class(options.virt)(options.ip)
@@ -45,25 +43,19 @@
         cs_ref = CIMInstanceName(classname, 
                               keybindings = {'CreationClassName':classname})
 
-        if CIM_REV < vsms_status_version:
-            exp_rc = 2 #IM_RC_FAILED
-        else:
-            exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
-                          'desc'  : 'CIM_ERR_FAILED: Unable to retrieve domain\
+        exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
+                      'desc'  : 'CIM_ERR_FAILED: Unable to retrieve domain\
  name.'
-                        }
+                    }
 
     elif tc == 'nonexistent':
         cs_ref = CIMInstanceName(classname,keybindings = {
                                 'Name':'##@@!!cimtest_domain',
                                 'CreationClassName':classname})
 
-        if CIM_REV < vsms_status_version:
-            exp_rc = 4 #IM_RC_SYS_NOT_FOUND
-        else:
-            exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
-                          'desc' : 'CIM_ERR_FAILED: Failed to find domain' 
-                        }
+        exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
+                      'desc' : 'CIM_ERR_FAILED: Failed to find domain' 
+                    }
 
     else:
         return SKIP
@@ -71,25 +63,15 @@
     status = FAIL
     try:
         ret = service.DestroySystem(AffectedSystem=cs_ref)
-        if CIM_REV < vsms_status_version:
-            if ret[0] == exp_rc:
-                logger.info('destroy_fail>>%s: Got expected return code %s', 
-                            tc, exp_rc)
-                return PASS 
-            else:
-                logger.error('destroy_fail>>%s: Got rc: %s, but we expect %s',
-                            tc, ret[0], exp_rc)
-                return FAIL 
 
     except Exception, details:
-        if CIM_REV >= vsms_status_version:
-            err_no   = details[0]
-            err_desc = details[1]
-            if err_no == exp_value['rc'] and err_desc == exp_value['desc']:
-                logger.error("For Invalid Scenario '%s'", tc)
-                logger.info('Got expected error no: %s', err_no)
-                logger.info('Got expected error desc: %s',err_desc)
-                return PASS
+        err_no   = details[0]
+        err_desc = details[1]
+        if err_no == exp_value['rc'] and err_desc == exp_value['desc']:
+            logger.error("For Invalid Scenario '%s'", tc)
+            logger.info('Got expected error no: %s', err_no)
+            logger.info('Got expected error desc: %s',err_desc)
+            return PASS
 
         logger.error('destroy_fail>> %s: Error executing DestroySystem' % tc)
         logger.error(details)
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Tue Jun 10 11:04:31 2008 -0700
@@ -55,7 +55,6 @@
 from XenKvmLib.rasd import InstId_err
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'XenFV', 'KVM']
 
@@ -63,7 +62,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-rev = 531
 
 def check_rasd_values(id, exp_id):
     try:
@@ -90,8 +88,6 @@
                  "disk_rasd" : '%s/%s' %(test_dom, test_disk),
                  "mem_rasd"  : '%s/%s' %(test_dom, "mem")
                 }
-    if CIM_REV < rev:
-        rasd_list['proc_rasd'] = '%s/%s' %(test_dom, "0")
 
     try: 
         if len(assoc_info) <= 0: 
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -62,14 +62,12 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest.Globals import do_main, logger
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'XenFV', 'KVM']
 
 test_dom     = "domu1"
 test_mac     = "00:11:22:33:44:aa"
 test_vcpus   = 1
-rev = 417
 
 expr_values = {
     "INVALID_InstID_Keyname"   : { 'rc'   : pywbem.CIM_ERR_FAILED, \
@@ -77,10 +75,6 @@
     "INVALID_InstID_Keyval"    : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
                      'desc' : 'No such instance (INVALID_InstID_Keyval)'}
 }
-
-if CIM_REV < rev:
-    expr_values['INVALID_InstID_Keyval'] = {'rc' : pywbem.CIM_ERR_FAILED, \
-                                            'desc' : 'Invalid InstanceID'}
 
 def try_invalid_assoc(classname, name_val, i, field, virt="Xen"):
     ac_classname = get_typed_class(virt, "VirtualSystemSettingDataComponent")
diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-cim/lib/XenKvmLib/common_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Fri May 23 10:39:01 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Tue Jun 10 11:04:31 2008 -0700
@@ -33,17 +33,11 @@
 from XenKvmLib.classes import get_typed_class
 from CimTest.Globals import logger, log_param, CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
-from XenKvmLib.const import CIM_REV
 from VirtLib.live import diskpool_list, virsh_version, net_list
 from XenKvmLib.vxml import PoolXML, NetXML
 
 test_dpath = "foo"
-diskpoolconf_rev = 558
-
-if CIM_REV < diskpoolconf_rev:
-    disk_file = '/tmp/diskpool.conf'
-else:
-    disk_file = '/etc/libvirt/diskpool.conf'
+disk_file = '/etc/libvirt/diskpool.conf'
 
 back_disk_file = disk_file + "." + "backup"
 
@@ -276,11 +270,10 @@
     status = PASS
     libvirt_version = virsh_version(server, virt)
     # The conf file is not present on  the machine if 
-    # libvirt_version >= 0.4.1 and CIM_REV > 558
+    # libvirt_version >= 0.4.1
     # Hence Skipping the logic to delete the new conf file
     # and just returning PASS
-    if libvirt_version >= '0.4.1' and \
-       CIM_REV > diskpoolconf_rev:
+    if libvirt_version >= '0.4.1':
         return status
     try:
         if os.path.exists(back_disk_file):
@@ -328,8 +321,7 @@
 
 def create_diskpool_conf(server, virt):
     libvirt_version = virsh_version(server, virt)
-    if libvirt_version >= '0.4.1' and \
-       CIM_REV > diskpoolconf_rev:
+    if libvirt_version >= '0.4.1':
         status, dpoolname = create_diskpool(server, virt=virt)
         diskid = "%s/%s" % ("DiskPool", dpoolname)
     else:



From kaitlin at linux.vnet.ibm.com  Tue Jun 10 22:39:56 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 15:39:56 -0700
Subject: [Libvirt-cim] [PATCH] Put the <features> block into the XenFV
	XML we generate
In-Reply-To: <ad4804559dd83bd2afd1.1213124533@guaranine.danplanet.com>
References: <ad4804559dd83bd2afd1.1213124533@guaranine.danplanet.com>
Message-ID: <484F02BC.1070901@linux.vnet.ibm.com>

Dan Smith wrote:
> # HG changeset patch
> # User Dan Smith <danms at us.ibm.com>
> # Date 1213124529 25200
> # Node ID ad4804559dd83bd2afd10fa0768b087f6a9914a9
> # Parent  7b10cae6440e138e9db809f8360c1ef7cb5f6d20
> Put the <features> block into the XenFV XML we generate
> 
> I think that this is a sane set of defaults for most situations.  Later
> it might be good to provide settings for these in the VSSD, but this
> should do for now.
> 
> Signed-off-by: Dan Smith <danms at us.ibm.com>
> 

Looks reasonable to me. +1

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 01:04:01 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 18:04:01 -0700
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] KVMXML cim_define() support
	and KVM support for Profile.02
In-Reply-To: <48462B02.9090107@linux.vnet.ibm.com>
References: <32614eca2a5579389cc5.1208334614@zeit.cn.ibm.com>
	<48067841.4080504@linux.vnet.ibm.com>
	<48462B02.9090107@linux.vnet.ibm.com>
Message-ID: <484F2481.2010403@linux.vnet.ibm.com>

Zhengang Li wrote:
> Kaitlin Rupert wrote:
> 
>> zli at linux.vnet.ibm.com wrote:
>>> # HG changeset patch
>>> # User Zhengang Li <lizg at cn.ibm.com>
>>> # Date 1208332735 -28800
>>> # Node ID 32614eca2a5579389cc5b262eff8243b0ca2da82
>>> # Parent  7c20d87e25c0cd53deba4dc8c48529d84bb740d9
>>> [TEST] KVMXML cim_define() support and KVM support for Profile.02
>>>
>>> Signed-off-by: Zhengang Li <lizg at cn.ibm.com>
>>>
>>> diff -r 7c20d87e25c0 -r 32614eca2a55 
>>> suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py
>>
>> This is a nice clean up and looks good to me.  However, the test fails 
>> due to the "Address field missing from vsms.py" issue Deepti noted in 
>> her e-mail about Dan's emulator fix.
>>
>> For the Address fix, we'll need conditional behavior based on the 
>> changeset.  So I'll hold off on applying this set.
> 
> I saw this patch when I was trying to update the cim_define() support 
> for KVM and others.
> Is this still true that we'll need to do conditional behavior on
> changeset?

I've tagged a release of the cimtest tree.  So now, we'll be able to 
check out a release that is tied to the latest release of libvirt-cim.

You won't need to use the conditional branch on this patch.

Sorry for the slow reply!
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Thu Jun 12 09:13:32 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 17:13:32 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ElementCapabilities.05 for LXC
	support
Message-ID: <7a8e2732d1281077c9db.1213262012@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213262003 -28800
# Node ID 7a8e2732d1281077c9dbaac0e8a3eb056e44fafa
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update ElementCapabilities.05 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r 7a8e2732d128 suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py	Thu Jun 12 17:13:23 2008 +0800
@@ -56,7 +56,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 def print_err(err, detail, cn):
     logger.error(err % cn)



From yunguol at cn.ibm.com  Wed Jun 11 02:13:14 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Wed, 11 Jun 2008 10:13:14 +0800
Subject: [Libvirt-cim] [TEST] NULL of LXC_ElementCapabilities assocaition
 with LXC_ManagementService
Message-ID: <OFCACC2DF1.B9EDA563-ON48257465.000BD2E4-48257465.000C7F3A@cn.ibm.com>

Hi, 

I can get any instance by  ElementCapabilities associations with 
ManagementService, that is to say, below querying return NULL.

wbemcli ain -ac LXC_ElementCapabilities 
'http://root:password at localhost/root/virt:LXC_VirtualSystemManagementService.SystemCreationClassName="LXC_HostSystem",SystemName="nine",CreationClassName="LXC_VirtualSystemManagementService",Name="Management 
Service"'

But LXC_ElementCapabilities associations with 
LXC_VirtualSystemMigrationService return expect result.

wbemcli ain -ac LXC_ElementCapabilities 
'http://root:password at localhost/root/virt:LXC_VirtualSystemMigrationService.SystemCreationClassName="LXC_HostSystem",SystemName="nine",CreationClassName="LXC_VirtualSystemMigrationService",Name="MigrationService"'
localhost:5988/root/virt:LXC_VirtualSystemMigrationCapabilities.InstanceID="MigrationCapabilities"


Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080611/7e1d5a90/attachment.htm>

From yunguol at cn.ibm.com  Thu Jun 12 10:20:05 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 18:20:05 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update SettingsDefineCapabilities.03
	for LXC support
Message-ID: <a69394e8052f65132dce.1213266005@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213266000 -28800
# Node ID a69394e8052f65132dce5886e0a8670717133bf1
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update SettingsDefineCapabilities.03 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r a69394e8052f suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py	Thu Jun 12 18:20:00 2008 +0800
@@ -35,14 +35,16 @@
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
 
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
+
 expr_values = {
    "invalid_instid_keyname"  : { 'rc'   : pywbem.CIM_ERR_FAILED, 
-                                 'desc' : 'CIM_ERR_FAILED: Missing InstanceID'},
+                                 'desc' : 'Missing InstanceID'},
    "invalid_instid_keyvalue" : { 'rc' : pywbem.CIM_ERR_FAILED, 
-                                 'desc' : 'CIM_ERR_FAILED: Unable to determine\
+                                 'desc' : 'Unable to determine\
  resource type' },
    "invalid_ccname_keyname"  : { 'rc'   : pywbem.CIM_ERR_INVALID_PARAMETER, 
-                                 'desc' : 'CIM_ERR_INVALID_PARAMETER' }
+                                 'desc' : 'One or more parameter values passed to the method were invalid' }
               }
 
 def err_invalid_instid_keyname(virt, conn, field):



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 03:26:52 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 20:26:52 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fix proc InstanceID in vsms.py
Message-ID: <00ed91b75fd62cdcdcfb.1213154812@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213153446 25200
# Node ID 00ed91b75fd62cdcdcfb51c403646118edb91c54
# Parent  58f7c9cf54677356b88b30e2b5a5db9685a15604
[TEST] Fix proc InstanceID in vsms.py

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 58f7c9cf5467 -r 00ed91b75fd6 suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Tue Jun 10 11:04:31 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Tue Jun 10 20:04:06 2008 -0700
@@ -183,7 +183,7 @@
             self.VirtualQuantity = vcpu
         
         if name != None:
-            self.InstanceID = '%s/0' % name
+            self.InstanceID = '%s/proc' % name
 
 class Xen_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData):
     pass



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 03:27:12 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 20:27:12 -0700
Subject: [Libvirt-cim] [PATCH 0 of 3] [TEST] Patchset to fix VSMS
	08_modifyresource.py
Message-ID: <patchbomb.1213154832@elm3b41.beaverton.ibm.com>

This test is out of date.   The network portions needed to be updated to support the network interface type.

Also, test only attempted to modify a defined guest, not a running guest.



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 03:27:14 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 20:27:14 -0700
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] Add vsms_util.py
In-Reply-To: <patchbomb.1213154832@elm3b41.beaverton.ibm.com>
Message-ID: <c6fdcb5088bbe5040976.1213154834@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213147576 25200
# Node ID c6fdcb5088bbe504097625265a0d8fc0c4ed73c9
# Parent  1a4f0bc12b84af40d1ebef71ea3d6d30b300af05
[TEST] Add vsms_util.py

This module is for vsms related utility functions (for AddResource, ModifyResource, etc).

Add the mod_<> functions.  These are identical the code paths in VSMS 08_modifyresource.py except for mod_net_res().

mod_net_res() - In the case of Xen, the bridge name needs to be verified.  This is because the network interface type is converted to a bridge interface by libvirt.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 1a4f0bc12b84 -r c6fdcb5088bb suites/libvirt-cim/lib/XenKvmLib/vsms_util.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Tue Jun 10 18:26:16 2008 -0700
@@ -0,0 +1,102 @@
+#!/usr/bin/python
+#
+# Copyright 2008 IBM Corp.
+#
+# Authors:
+#    Kaitlin Rupert <karupert at us.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 CimTest import Globals
+from CimTest.ReturnCodes import FAIL, PASS
+from CimTest.Globals import logger
+from VirtLib.live import network_by_bridge
+
+def mod_disk_res(server, service, cxml, dasd, ndpath):
+    try:
+        service.ModifyResourceSettings(ResourceSettings = [str(dasd)])
+        cxml.dumpxml(server)
+        dpath = cxml.xml_get_disk_source()
+        if dpath != ndpath:
+            logger.error("Got %s, exp %s." % (dpath, ndpath))
+            raise Exception('Error changing rs for disk path')
+        logger.info('good status for disk path')
+    except Exception, details:
+        logger.error('Error invoking ModifyRS')
+        logger.error(details)
+        return FAIL
+
+    return PASS
+
+def mod_net_res(server, service, virt, cxml, nasd, ntype, net_name):
+    try:
+        service.ModifyResourceSettings(ResourceSettings = [str(nasd)])
+        cxml.dumpxml(server)
+        type = cxml.xml_get_net_type()
+
+        if virt == "KVM":
+            name = cxml.xml_get_net_network()
+        else:
+            if type == "bridge":
+                type = "network"
+            br_name = cxml.xml_get_net_bridge()
+            name = network_by_bridge(br_name, server, virt)
+
+        if type != ntype or name != net_name:
+            logger.error('Got %s, exp %s. Got %s, exp %s' %
+                         (type, ntype, name, net_name))
+            raise Exception('Error changing rs for net mac')
+        logger.info('good status for net mac')
+    except Exception, details:
+        logger.error('Error invoking ModifyRS')
+        logger.error(details)
+        return FAIL
+
+    return PASS
+
+def mod_mem_res(server, service, cxml, masd, nmem):
+    try:
+        service.ModifyResourceSettings(ResourceSettings=[str(masd)])
+        cxml.dumpxml(server)
+        mem = cxml.xml_get_mem()
+        if int(mem) != int(nmem) * 1024:
+            logger.error("Got %d, exp %d." % (int(mem), (int(nmem) * 1024)))
+            raise Exception('Error changing rs for mem')
+        logger.info('good status for mem')
+    except Exception, details:
+        logger.error('Error invoking ModifyRS')
+        logger.error(details)
+        return FAIL
+
+    return PASS
+
+def mod_vcpu_res(server, service, cxml, pasd, ncpu):
+    try:
+        service.ModifyResourceSettings(ResourceSettings = [str(pasd)])
+        cxml.dumpxml(server)
+        cpu = cxml.xml_get_vcpu()
+        if int(cpu) != int(ncpu):
+            logger.error("Got %d, exp %d." % (int(cpu), int(ncpu)))
+            raise Exception('Error changing rs for vcpu')
+        logger.info('good status for vcpu')
+    except Exception, details:
+        logger.error('Error invoking ModifyRS')
+        logger.error(details)
+        return FAIL
+
+    return PASS
+



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 03:27:13 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 20:27:13 -0700
Subject: [Libvirt-cim] [PATCH 1 of 3] [TEST] Update create_netpool_conf() to
	support new pool creation
In-Reply-To: <patchbomb.1213154832@elm3b41.beaverton.ibm.com>
Message-ID: <1a4f0bc12b84af40d1eb.1213154833@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1211403918 25200
# Node ID 1a4f0bc12b84af40d1ebef71ea3d6d30b300af05
# Parent  00ed91b75fd62cdcdcfb51c403646118edb91c54
[TEST] Update create_netpool_conf() to support new pool creation.

This includes the following changes:
 -Updated create_netpool_conf() so that caller can specify whether to use an existing pool or create a new pool.
 -Added destroy_netpool() / destroy_vnet()
 -Updated CIM_NetResourceAllocationSettingData to set the PoolID
 -Added xml_get_net_network().

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 00ed91b75fd6 -r 1a4f0bc12b84 suites/libvirt-cim/lib/XenKvmLib/common_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Tue Jun 10 20:04:06 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Wed May 21 14:05:18 2008 -0700
@@ -22,6 +22,7 @@
 #
 import os
 import pywbem
+import random
 from distutils.file_util import move_file
 from XenKvmLib.test_xml import * 
 from XenKvmLib.test_doms import * 
@@ -331,19 +332,22 @@
     return status, diskid
 
 
-def create_netpool_conf(server, virt):
+def create_netpool_conf(server, virt, use_existing=True):
     status = PASS
     test_network = None
     try:
-        vir_network = net_list(server, virt)
-        if len(vir_network) > 0:
-            test_network = vir_network[0]
-        else:
-            netxml = NetXML(server, virt=virt)
+        if use_existing == True:
+            vir_network = net_list(server, virt)
+            if len(vir_network) > 0:
+                test_network = vir_network[0]
+
+        if test_network == None:
+            net_name = "default-net" + str(random.randint(1, 100))
+            netxml = NetXML(server, virt=virt, networkname=net_name)
             ret = netxml.create_vnet()
             if not ret:
                 logger.error("Failed to create Virtual Network '%s'",
-                              test_network)
+                              net_name)
                 status = FAIL
             else:
                 test_network = netxml.xml_get_netpool_name()
@@ -351,3 +355,17 @@
         logger.error("Exception: In fn create_netpool_conf(): %s", detail)
         status=FAIL
     return status, test_network
+
+def destroy_netpool(server, virt, net_name):
+    if net_name == None:
+        return FAIL
+  
+    netxml = NetXML(server, virt=virt, networkname=net_name)
+    ret = netxml.destroy_vnet()
+    if not ret:
+        logger.error("Failed to destroy Virtual Network '%s'",
+                     net_name)
+        return FAIL
+
+    return PASS 
+
diff -r 00ed91b75fd6 -r 1a4f0bc12b84 suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Tue Jun 10 20:04:06 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Wed May 21 14:05:18 2008 -0700
@@ -151,13 +151,16 @@
     pass
 
 class CIM_NetResourceAllocationSettingData(CIMClassMOF):
-    def __init__(self, type, mac, name):
+    def __init__(self, type, mac, name, virt_net=None): 
         self.Address = mac
         self.NetworkType = type
         if type == 'ethernet' or type == 'bridge' :
             self.ResourceType = RASD_TYPE_NET_ETHER
         else:
             self.ResourceType = RASD_TYPE_NET_OTHER
+
+        if virt_net != None :
+            self.PoolID = "NetworkPool/%s" % virt_net
         
         if mac != None:
             self.InstanceID = '%s/%s' % (name, mac)
diff -r 00ed91b75fd6 -r 1a4f0bc12b84 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Tue Jun 10 20:04:06 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Wed May 21 14:05:18 2008 -0700
@@ -215,6 +215,9 @@
     def create_vnet(self):
         return self.run(self.server, 'net-create', self.xml_string)
 
+    def destroy_vnet(self):
+        return self.run(self.server, 'net-destroy', self.net_name)
+
     def xml_get_netpool_name(self):
         npoolname = self.get_value_xpath('/network/name')
         return npoolname
@@ -403,7 +406,12 @@
         bridgeStr = self.get_value_xpath(
                 '/domain/devices/interface/source/@bridge')
         return bridgeStr
- 
+
+    def xml_get_net_network(self):
+        networkStr = self.get_value_xpath(
+                '/domain/devices/interface/source/@network')
+        return networkStr
+
     def dumpxml(self, ip):
         cmd = 'virsh -c %s dumpxml %s' % (self.vuri, self.dname)
         s, o = utils.run_remote(ip, cmd)



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 03:27:15 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 10 Jun 2008 20:27:15 -0700
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] Fix VSMS 08_modifyresource.py
	on Xen and KVM
In-Reply-To: <patchbomb.1213154832@elm3b41.beaverton.ibm.com>
Message-ID: <9f168dca6251330adcb1.1213154835@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213154736 25200
# Node ID 9f168dca6251330adcb158f6b64fea51ee72d45e
# Parent  c6fdcb5088bbe504097625265a0d8fc0c4ed73c9
[TEST] Fix VSMS 08_modifyresource.py on Xen and KVM.

This still fails on XenFV because of a provider bug.  It looks like the ModifyResource call strips the <emulator> tag from a XenFV guest.  So the test is unable to start the guest.

Updates to this test:
  -Call create_netpool_conf() to create a new network pool to use in modify calls.
  -Create network RASD instead of bridge
  -Replaced modify calls with functions from vsms_util
  -Added support for modifying a running guest (mem and vcpu only)
  -Remove XFAIL

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r c6fdcb5088bb -r 9f168dca6251 suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py	Tue Jun 10 18:26:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py	Tue Jun 10 20:25:36 2008 -0700
@@ -26,19 +26,25 @@
 import pywbem
 from pywbem.cim_obj import CIMInstanceName
 from VirtLib import utils
+from VirtLib.live import network_by_bridge
 from XenKvmLib import vsms
 from XenKvmLib import vxml
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
+from XenKvmLib.common_util import create_netpool_conf, destroy_netpool
+from XenKvmLib import vsms_util
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 default_dom = 'rstest_domain'
-ntype = 'bridge'
+ntype = 'network'
 ncpu = 3
 nmem = 78
 
-bug_cpu = '90079'
+def cleanup_env(ip, virt, cxml, net_name):
+    destroy_netpool(ip, virt, net_name)
+    cxml.destroy(ip)
+    cxml.undefine(ip)
 
 @do_main(sup_types)
 def main():
@@ -50,54 +56,65 @@
     dasd = vsms.get_dasd_class(options.virt)(dev=cxml.xml_get_disk_dev(),
                                              source=ndpath, 
                                              name=default_dom)
+    
+    status, net_name = create_netpool_conf(options.ip, options.virt, 
+                                           use_existing=False)
+    if status != PASS:
+        logger.error('Unable to create network pool')
+        return FAIL 
+
     nasd = vsms.get_nasd_class(options.virt)(type=ntype, 
                                              mac=cxml.xml_get_net_mac(),
-                                             name=default_dom)
+                                             name=default_dom,
+                                             virt_net=net_name)
     masd = vsms.get_masd_class(options.virt)(megabytes=nmem, name=default_dom)
     pasd = vsms.get_pasd_class(options.virt)(vcpu=ncpu, name=default_dom)
 
     status = FAIL
     rc = 0
-    try:
-        cxml.define(options.ip)
-        # Modify disk setting
-        service.ModifyResourceSettings(ResourceSettings = [str(dasd)])
-        cxml.dumpxml(options.ip)
-        dpath = cxml.xml_get_disk_source()
-        if dpath != ndpath:
-            raise Exception('Error changing rs for disk path')
-        logger.info('good status for disk path')
-        # Modify net setting
-        service.ModifyResourceSettings(ResourceSettings = [str(nasd)])
-        cxml.dumpxml(options.ip)
-        type = cxml.xml_get_net_type()
-        if type != ntype:
-            raise Exception('Error changing rs for net mac')
-        logger.info('good status for net mac')
-        # Modify memory resource setting
-        service.ModifyResourceSettings(ResourceSettings=[str(masd)])
-        cxml.dumpxml(options.ip)
-        mem = cxml.xml_get_mem()
-        if mem != '%i' % (nmem * 1024):
-            raise Exception('Error changing rs for mem')
-        logger.info('good status for mem')
-        # Modify cpu setting
-        service.ModifyResourceSettings(ResourceSettings = [str(pasd)])
-        cxml.dumpxml(options.ip)
-        cpu = cxml.xml_get_vcpu()
-        if cpu != '%i' % ncpu:
-            rc = -1
-            raise Exception('Error changing rs for vcpu')
-        logger.info('good status for vcpu')
-        status = PASS
-    except Exception, details:
-        logger.error('Error invoking ModifyRS')
-        logger.error(details)
-        return FAIL
+  
+    if options.virt == "KVM":
+        test_cases = ["define"]
+    else:
+        test_cases = ["define", "start"]
 
-    cxml.undefine(options.ip)
-    if rc == -1:
-        return XFAIL_RC(bug_cpu)
+    for case in test_cases:
+        cxml.undefine(options.ip)
+        ret = cxml.define(options.ip)
+        if not ret:
+            logger.error("Failed to define the dom: %s", default_dom)
+            cleanup_env(options.ip, options.virt, cxml, net_name)
+            return FAIL
+        if case == "start":
+            ret = cxml.start(options.ip)
+            if not ret:
+                logger.error("Failed to start the dom: %s", default_dom)
+                cleanup_env(options.ip, options.virt, cxml, net_name)
+                return FAIL
+
+        status = vsms_util.mod_vcpu_res(options.ip, service, cxml, pasd, ncpu)
+        if status != PASS:
+            break
+
+        status = vsms_util.mod_mem_res(options.ip, service, cxml, masd, nmem)
+        if status != PASS:
+            break
+
+        #Unable to modify net and disk devices while guest is running
+        if case == "start":
+            break
+
+        status = vsms_util.mod_disk_res(options.ip, service, cxml, dasd, ndpath)
+        if status != PASS:
+            break
+
+        status = vsms_util.mod_net_res(options.ip, service, options.virt, cxml,
+                                       nasd, ntype, net_name)
+        if status != PASS:
+            break
+
+    cleanup_env(options.ip, options.virt, cxml, net_name)
+    destroy_netpool(options.ip, options.virt, net_name)
 
     return status
 



From yunguol at cn.ibm.com  Thu Jun 12 13:19:43 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 21:19:43 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	VirtualSystemSettingDataComponent.02&03 for LXC support
Message-ID: <73e4e701cb907af69177.1213276783@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213276778 -28800
# Node ID 73e4e701cb907af69177fe92fa741b9e0428615d
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update VirtualSystemSettingDataComponent.02&03 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r 73e4e701cb90 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Thu Jun 12 21:19:38 2008 +0800
@@ -57,7 +57,7 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.const import CIM_REV
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 test_dom    = "VSSDC_dom"
 test_vcpus  = 1
@@ -143,7 +143,10 @@
     else:
         test_disk = "hdb"
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+    if options.virt == "LXC":
+        cxml = virt_xml(test_dom)
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
     ret = cxml.create(options.ip)
     if not ret:
         logger.error("Failed to create the dom: %s", test_dom)
@@ -152,6 +155,8 @@
 
     if options.virt == "Xen" or options.virt == "XenFV":
         instIdval = "Xen:%s" % test_dom
+    elif options.virt == "LXC":
+        instIdval = "LXC:%s" % test_dom
     else:
         instIdval = "KVM:%s" % test_dom
     
diff -r 254bc5464030 -r 73e4e701cb90 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Thu Jun 12 21:19:38 2008 +0800
@@ -64,7 +64,7 @@
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
 from XenKvmLib.const import CIM_REV
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 test_dom     = "domu1"
 test_mac     = "00:11:22:33:44:aa"
@@ -115,7 +115,10 @@
         test_disk = "hda"
 
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+    if options.virt == "LXC":
+        cxml = virt_xml(test_dom)
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
     ret = cxml.create(options.ip)
     if not ret:
         logger.error('Unable to create domain %s' % test_dom)



From yunguol at cn.ibm.com  Wed Jun 11 06:43:17 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Wed, 11 Jun 2008 14:43:17 +0800
Subject: [Libvirt-cim] SIGSEGV error of VirtualSystemSettingDataComponent
	assocation querying
Message-ID: <OF88BB5601.FA801DD2-ON48257465.002421B4-48257465.00253886@cn.ibm.com>

Kaitlin,

I hit a SIGSEGV error of LXC_VirtualSystemSettingDataComponent 
associations querying in sfcb, would you please test it on your machine 
with Pegasus? 
I'm sorry I can't provide more SFCB debug info to you now. 
 
wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
http://root:password at localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="invalid"
*
* wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider Virt_VSSDComponent(23814) 
exiting due to a SIGSEGV signal
*

Also, if the invalid InstanceID set as "LXC:invalid", I can get expect 
result.

wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
http://root:password at localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="LXC:invalid"
*
* wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (invalid)
*


Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080611/a66d0198/attachment.htm>

From yunguol at cn.ibm.com  Thu Jun 12 14:00:33 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 22:00:33 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	VirtualSystemSettingDataComponent.04 for LXC support
Message-ID: <2fff464cfcf81a56ffb6.1213279233@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213279228 -28800
# Node ID 2fff464cfcf81a56ffb627085eebf995a54b3833
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update VirtualSystemSettingDataComponent.04 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r 2fff464cfcf8 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py	Thu Jun 12 22:00:28 2008 +0800
@@ -66,15 +66,15 @@
 from CimTest.Globals import do_main, logger
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 test_dom     = "domu1"
 
 expr_values = {
     "INVALID_InstID_Keyname"   : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
-                     'desc' : 'No such instance (InstanceID)' }, \
+                     'desc' : 'No such instance' }, \
     "INVALID_InstID_Keyval"    : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
-                     'desc' : 'No such instance (InstanceID)'}
+                     'desc' : 'No such instance'}
 }
 
 def try_invalid_assoc(name_val, i, field, virt="Xen"):
@@ -120,6 +120,8 @@
   
     if options.virt == "Xen" or options.virt == "XenFV":
         inst_id = "Xen:%s" % test_dom
+    elif options.virt == "LXC":
+        inst_id = "LXC:%s" % test_dom
     else:
         inst_id = "KVM:%s" % test_dom
   



From yunguol at cn.ibm.com  Wed Jun 11 07:07:04 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Wed, 11 Jun 2008 15:07:04 +0800
Subject: [Libvirt-cim] Cimtest Report for LXC (2008/06/10)
In-Reply-To: <484EDAD4.5070805@linux.vnet.ibm.com>
Message-ID: <OF8D36EDA2.2A241220-ON48257465.00269606-48257465.00276622@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-11 03:49:40:

> > ComputerSystem - 05_activate_defined_start.py: FAIL
> 
> > VSSD - 03_vssd_gi_errs.py: FAIL

    This fails because of LXC_VirtualSystemSettingData association 
querying with invalid 
    InstanceID with SFCB, but you don't see this issue on you system with 
Pegasus.
    I will look into this and try to provide more debug info before the 
seg fault.
 
> 
> > VirtualSystemManagementService - 01_definesystem_name.py: FAIL
> > InvokeMethod(DefineSystem): *** Provider 
> > Virt_VirtualSystemManagementService(2854) exiting due to a SIGSEGV 
signal
> 
> Thanks Daisy!  Can you look into why these failed?
> 
> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080611/55edc4b8/attachment.htm>

From yunguol at cn.ibm.com  Thu Jun 12 15:51:29 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 23:51:29 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update HostSystem.03 for LXC support
Message-ID: <b90b6fe46296b90cb87f.1213285889@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213285886 -28800
# Node ID b90b6fe46296b90cb87f5169b2654c7ba0970f98
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update HostSystem.03 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r b90b6fe46296 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py
--- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Thu Jun 12 23:51:26 2008 +0800
@@ -51,7 +51,7 @@
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.const import CIM_REV
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 test_dom = "domgst"
 test_vcpus = 1
 libvirtcim_sdc_rasd_rev = 571
@@ -115,10 +115,13 @@
     status = PASS
     devpool = []
     
-    ccnlist = { '%s_ProcessorPool' % virt : 'Processors',
-                '%s_MemoryPool' % virt : 'KiloBytes',
-                '%s_DiskPool' % virt : 'Megabytes' ,
-                '%s_NetworkPool' % virt : None }
+    if virt == "LXC":
+        ccnlist = { '%s_MemoryPool' % virt : 'KiloBytes'}
+    else:    
+        ccnlist = { '%s_ProcessorPool' % virt : 'Processors',
+                    '%s_MemoryPool' % virt : 'KiloBytes' ,
+                    '%s_DiskPool' % virt : 'Megabytes' ,
+                    '%s_NetworkPool' % virt : None }
     try:
         assoc_info = Associators(server,
                                  an1,
@@ -151,11 +154,13 @@
     alloccap = []
     filter =  {"key" : "ResourceType"}
 
-
-    ccnlist = { '%s_ProcessorPool' % virt: 3,
-                '%s_MemoryPool' % virt : 4, 
-                '%s_DiskPool' % virt : 17 ,
-                '%s_NetworkPool' % virt : 10 }
+    if virt == 'LXC':
+        ccnlist = {'%s_MemoryPool' % virt : 4}
+    else:
+        ccnlist = { '%s_ProcessorPool' % virt: 3,
+                    '%s_MemoryPool' % virt : 4,
+                    '%s_DiskPool' % virt : 17 ,
+                    '%s_NetworkPool' % virt : 10 }
    
     for inst in devpool:
         try:
@@ -193,11 +198,14 @@
     ccn = '%s_AllocationCapabilities' % virt
     an = '%s_SettingsDefineCapabilities' % virt
 
-    rtype = {
-              "%s_DiskResourceAllocationSettingData" % virt : 17, \
-              "%s_MemResourceAllocationSettingData" % virt :  4, \
-              "%s_NetResourceAllocationSettingData" % virt : 10, \
-              "%s_ProcResourceAllocationSettingData" % virt :  3
+    if virt == 'LXC':
+        rtype = {"%s_MemResourceAllocationSettingData" % virt :  4}
+    else:
+        rtype = {
+                  "%s_DiskResourceAllocationSettingData" % virt : 17, \
+                  "%s_MemResourceAllocationSettingData" % virt :  4, \
+                  "%s_NetResourceAllocationSettingData" % virt : 10, \
+                  "%s_ProcResourceAllocationSettingData" % virt :  3
              }
     rangelist = {
                   "Default"   : 0, \



From yunguol at cn.ibm.com  Thu Jun 12 15:55:26 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 23:55:26 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update HostSystem.06 for LXC support
Message-ID: <cda16d4e1b97710b5621.1213286126@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213286123 -28800
# Node ID cda16d4e1b97710b5621c7f0665586136720d84a
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update HostSystem.06 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r cda16d4e1b97 suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py
--- a/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py	Thu Jun 12 23:55:23 2008 +0800
@@ -53,7 +53,7 @@
 CIM_ERROR_ASSOCIATORS
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 def print_err(err, detail, cn):
     logger.error(err % cn)



From yunguol at cn.ibm.com  Thu Jun 12 16:03:42 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Fri, 13 Jun 2008 00:03:42 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update HostSystem.02 for LXC support
Message-ID: <05258fbd1be6829c9fba.1213286622@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213286618 -28800
# Node ID 05258fbd1be6829c9fba3184f15f0af773474c29
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update HostSystem.02 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r 05258fbd1be6 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Fri Jun 13 00:03:38 2008 +0800
@@ -60,7 +60,7 @@
 verify_diskrasd_values, verify_memrasd_values
 from XenKvmLib.const import CIM_REV
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 
 test_dom    = "CrossClass_GuestDom"
@@ -121,10 +121,13 @@
     else: 
         test_disk = "hda"
     virt_xml =  get_class(virt)
-    vsxml_info = virt_xml(test_dom, mem = test_mem,
-                            vcpus=test_vcpus,
-                            mac = test_mac,
-                            disk = test_disk)
+    if virt == 'LXC':
+        vsxml_info = virt_xml(test_dom)
+    else:
+        vsxml_info = virt_xml(test_dom, mem = test_mem,
+                              vcpus=test_vcpus,
+                              mac = test_mac,
+                              disk = test_disk)
     
     ret = vsxml_info.define(server)
     if not ret:



From yunguol at cn.ibm.com  Thu Jun 12 16:15:42 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Fri, 13 Jun 2008 00:15:42 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update Memory.02 for LXC support
Message-ID: <582c48faa865827bedf5.1213287342@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213287338 -28800
# Node ID 582c48faa865827bedf570c9acdb5eac7d2cd7f0
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update Memory.02 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r 582c48faa865 suites/libvirt-cim/cimtest/Memory/02_defgetmem.py
--- a/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py	Fri Jun 13 00:15:38 2008 +0800
@@ -34,7 +34,7 @@
 from XenKvmLib.devices import get_dom_mem_inst
 from CimTest.Globals import logger, do_main
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 default_dom = "domu"
 
 def check_mem(memInst):



From yunguol at cn.ibm.com  Thu Jun 12 16:35:35 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Fri, 13 Jun 2008 00:35:35 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	VirtualSystemManagementService.02~04 for LXC support
Message-ID: <843d6dc15815f6f54b01.1213288535@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213288529 -28800
# Node ID 843d6dc15815f6f54b0123d783398c84553dfb30
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update VirtualSystemManagementService.02~04 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r 843d6dc15815 suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Fri Jun 13 00:35:29 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 default_dom = 'test_domain'
 rev = 528
 
diff -r 254bc5464030 -r 843d6dc15815 suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py	Fri Jun 13 00:35:29 2008 +0800
@@ -32,7 +32,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 exp_rc = 1 #CMPI_RC_ERR_FAILED
 exp_desc = 'Unable to parse embedded object'
 
diff -r 254bc5464030 -r 843d6dc15815 suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py	Fri Jun 13 00:35:29 2008 +0800
@@ -32,7 +32,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 exp_rc = 1 #CMPI_RC_ERR_FAILED
 exp_desc = 'Unable to parse embedded object'
 



From yunguol at cn.ibm.com  Thu Jun 12 16:47:10 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Fri, 13 Jun 2008 00:47:10 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	VirtualSystemManagementService.05&07 for LXC support
Message-ID: <c465678745cd134b76ff.1213289230@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213289225 -28800
# Node ID c465678745cd134b76ff5cca6a9ac01881a4990a
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update VirtualSystemManagementService.05&07 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 254bc5464030 -r c465678745cd suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Fri Jun 13 00:47:05 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 vsms_status_version = 534
 
 def destroysystem_fail(tc, options):
diff -r 254bc5464030 -r c465678745cd suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py	Fri Jun 13 00:47:05 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 exp_rc = 1 #CMPI_RC_ERR_FAILED
 exp_desc = 'Unable to parse embedded object'
 



From deeptik at linux.vnet.ibm.com  Wed Jun 11 10:39:05 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 11 Jun 2008 03:39:05 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing the tc 40_RSC_start.py of
	ComputerSystem
Message-ID: <b9100cec9aedb9f9243d.1213180745@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213180729 25200
# Node ID b9100cec9aedb9f9243d753111a9a856e9480335
# Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Fixing the tc 40_RSC_start.py of ComputerSystem.

Changes:

Patch 1 to 2:
-------------
Fixed the return value , setting FAIL instead of rc.

Patch 1:
--------
The tc was passing with false positive.
The parameters passed to check_attributes() were incorrect and fixed it.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 254bc5464030 -r b9100cec9aed suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Wed Jun 11 20:56:07 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Wed Jun 11 03:38:49 2008 -0700
@@ -85,14 +85,14 @@ def main():
             raise Exception("Unable start dom %s using RequestedStateChange()", 
                             default_dom)
 
-        rc = check_attributes(domain_name, ip, options.virt)
+        rc = check_attributes(default_dom, options.ip, options.virt)
         if rc != 0:
             raise Exception("Attributes for %s not set as expected.",
                             default_dom)
 
     except Exception, detail:
         logger.error("Exception: %s", detail)
-        status = rc
+        status = FAIL
 
     undefine_test_domain(default_dom, options.ip, options.virt)
 



From deeptik at linux.vnet.ibm.com  Wed Jun 11 10:34:24 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Wed, 11 Jun 2008 16:04:24 +0530
Subject: [Libvirt-cim] CimTest Report for KVM on F9  11-06-2008
Message-ID: <484FAA30.7000302@linux.vnet.ibm.com>

========================================================================
CIM Test Report for KVM  on F9 with latest libvirt-cim  and libcmpiutil
========================================================================
Distro      : Fedora 9 Beta
Kernel      : 2.6.25-0.121.rc5.git4.fc9
Libvirt     : libvirt-0.4.2-1.fc9.x86_64
CIMOM       : pegasus
PyWBEM      : pywbem-0.6
CIM Schema  : cimv216Experimental
LibCMPIutil :  79
LibVirtCIM  : 603
CIMTEST     : 175
=======================================================
PASS        : 101
FAIL        :   8
XFAIL       :   2
SKIP        :  18
-----------------
Total       : 129
=======================================================

List of tc that are failing

HostSystem - 02_hostsystem_to_rasd.py: FAIL
RASD - 01_verify_rasd_fields.py: FAIL
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL

All the above fail because of the changes to the default interface type 
that is being used.

NetworkPort - 03_user_netport.py: FAIL
VSSD - 03_vssd_gi_errs.py: FAIL
VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL
VirtualSystemManagementService - 06_addresource.py: FAIL
VirtualSystemManagementService - 08_modifyresource.py: FAIL


Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Jun11-KVM-report
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080611/416dca65/attachment.ksh>

From deeptik at linux.vnet.ibm.com  Wed Jun 11 12:54:39 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 11 Jun 2008 05:54:39 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Moving the init_list()  to rasd.py
Message-ID: <9fb67711f2dfe3010d20.1213188879@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213188838 25200
# Node ID 9fb67711f2dfe3010d20862f36160b5a91b36c49
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] Moving the init_list()  to rasd.py

1) Most of the tc use init_list() fn to verify the RASD values, hence moved it to rasd.py.
2) Added the logic to pick up the networktype used by the guest while creating to verify the RASD values.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>.

diff -r b9100cec9aed -r 9fb67711f2df suites/libvirt-cim/lib/XenKvmLib/rasd.py
--- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Wed Jun 11 05:53:58 2008 -0700
@@ -21,28 +21,96 @@
 #
 
 import sys
-from CimTest import Globals 
 from CimTest.Globals import log_param, logger
 from CimTest.ReturnCodes import FAIL, PASS
+from XenKvmLib.const import CIM_REV
+from XenKvmLib import vxml
+from XenKvmLib.classes import get_typed_class
+
 
 pasd_cn = 'ProcResourceAllocationSettingData'
 nasd_cn = 'NetResourceAllocationSettingData'
 dasd_cn = 'DiskResourceAllocationSettingData'
 masd_cn = 'MemResourceAllocationSettingData'
+global proc_cn, mem_cn, net_cn, disk_cn
+
+
+mem_units_rev = 529
+proc_instid_rev = 590
+
+def rasd_init_list(vsxml, virt, test_disk, test_dom, test_mac, test_mem):
+    """
+        Creating the lists that will be used for comparisons.
+    """
+    global proc_cn, mem_cn, net_cn, disk_cn
+    proc_cn = get_typed_class(virt, "Processor")
+    mem_cn = get_typed_class(virt, "Memory")
+    net_cn = get_typed_class(virt, "NetworkPort")
+    disk_cn = get_typed_class(virt, "LogicalDisk")
+    try:
+
+        disk_path = vsxml.xml_get_disk_source()
+
+        if CIM_REV < mem_units_rev:
+          alloc_units  = "MegaBytes"
+        else:
+          alloc_units  = "KiloBytes"
+
+        if CIM_REV < proc_instid_rev:
+           proc_id = '%s/%s' %(test_dom, 0)
+        else:
+           proc_id = '%s/%s' %(test_dom, "proc")
+       
+
+        rasd_values = { 
+                        proc_cn  : {
+                                     "InstanceID"   : proc_id,
+                                     "ResourceType" : 3,
+                                    }, 
+                        disk_cn  : {
+                                     "InstanceID"   : '%s/%s' %(test_dom, 
+                                                                test_disk), 
+                                     "ResourceType" : 17, 
+                                     "Address"      : disk_path, 
+                                    }, 
+                        net_cn   : {
+                                      "InstanceID"   : '%s/%s' %(test_dom, 
+                                                                 test_mac), 
+                                      "ResourceType" : 10 , 
+                                      "ntype"        : [ 'bridge', 'user',
+                                                         'network', 'ethernet'] 
+                                   }, 
+                        mem_cn   : {
+                                      "InstanceID"    : '%s/%s' %(test_dom, "mem"), 
+                                      "ResourceType"  : 4, 
+                                      "AllocationUnits" : alloc_units,
+                                      "VirtualQuantity" : (test_mem * 1024), 
+                                   }
+                      } 
+    except Exception, details:
+        logger.error("Exception: In fn rasd_init_list %s", details)
+        return FAIL, rasd_values
+
+    nettype   = vsxml.xml_get_net_type()
+    if not nettype in rasd_values[net_cn]['ntype']:
+        logger.info("Adding the %s net type", nettype)
+        rasd_values[net_cn]['ntype'].append(nettype)
+
+    return PASS, rasd_values
 
 def CCN_err(assoc_info, list):
-    Globals.logger.error("%s Mismatch", 'CreationClassName')
-    Globals.logger.error("Returned %s instead of %s", \
+    logger.error("%s Mismatch", 'CreationClassName')
+    logger.error("Returned %s instead of %s", \
          assoc_info['CreationClassName'], list['CreationClassName'])
     
 def RType_err(assoc_info, list):
-    Globals.logger.error("%s Mismatch", 'ResourceType')
-    Globals.logger.error("Returned %s instead of %s", \
+    logger.error("%s Mismatch", 'ResourceType')
+    logger.error("Returned %s instead of %s", \
          assoc_info['ResourceType'], list['ResourceType'])
 
 def InstId_err(assoc_info, list):
-    Globals.logger.error("%s Mismatch", 'InstanceID')
-    Globals.logger.error("Returned %s instead of %s", \
+    logger.error("%s Mismatch", 'InstanceID')
+    logger.error("Returned %s instead of %s", \
          assoc_info['InstanceID'], list['InstanceID'])
 
 def verify_procrasd_values(assoc_info, procrasd_list):
@@ -63,12 +131,10 @@ def verify_netrasd_values(assoc_info, ne
     if assoc_info['ResourceType'] != netrasd_list['ResourceType']:
         RType_err(assoc_info, netrasd_list)
         status = FAIL
-    if assoc_info['NetworkType'] != netrasd_list['ntype1'] and \
-       assoc_info['NetworkType'] != netrasd_list['ntype2']:
-        Globals.logger.error("%s Mismatch", 'NetworkType')
-        Globals.logger.error("Returned %s instead of %s or %s", \
-                             assoc_info['NetworkType'], netrasd_list['ntype1'],
-                             netrasd_list['ntype2'])
+    if not assoc_info['NetworkType'] in netrasd_list['ntype']:
+        logger.error("%s Mismatch", 'NetworkType')
+        logger.error("Returned '%s' instead of returning one of %s types",
+                         assoc_info['NetworkType'], netrasd_list['ntype'])
         status = FAIL
     return status
 
@@ -81,8 +147,8 @@ def verify_diskrasd_values(assoc_info, d
         RType_err(assoc_info, diskrasd_list)
         status = FAIL
     if assoc_info['Address'] != diskrasd_list['Address']:
-        Globals.logger.error("%s Mismatch", 'Address')
-        Globals.logger.error("Returned %s instead of %s ", \
+        logger.error("%s Mismatch", 'Address')
+        logger.error("Returned %s instead of %s ", \
               assoc_info['Address'], diskrasd_list['Address'])
         status = FAIL
     return status
@@ -96,13 +162,13 @@ def verify_memrasd_values(assoc_info, me
         RType_err(assoc_info, memrasd_list)
         status = FAIL
     if assoc_info['AllocationUnits'] != memrasd_list['AllocationUnits']:
-        Globals.logger.error("%s Mismatch", 'AllocationUnits')
-        Globals.logger.error("Returned %s instead of %s ", \
+        logger.error("%s Mismatch", 'AllocationUnits')
+        logger.error("Returned %s instead of %s ", \
               assoc_info['AllocationUnits'],  memrasd_list['AllocationUnits'])
         status = FAIL 
     if assoc_info['VirtualQuantity'] != memrasd_list['VirtualQuantity']:
-        Globals.logger.error("%s mismatch", 'VirtualQuantity')
-        Globals.logger.error("Returned %s instead of %s ", \
+        logger.error("%s mismatch", 'VirtualQuantity')
+        logger.error("Returned %s instead of %s ", \
               assoc_info['VirtualQuantity'], memrasd_list['VirtualQuantity'])
         status = FAIL 
     return status



From deeptik at linux.vnet.ibm.com  Wed Jun 11 13:02:03 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 11 Jun 2008 06:02:03 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Updating the tc to use the
	rasd_init_list() fn of rasd.py
Message-ID: <87e9c774d6e0d0500911.1213189323@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213189297 25200
# Node ID 87e9c774d6e0d0500911ecd7763a592449eb0e3c
# Parent  9fb67711f2dfe3010d20862f36160b5a91b36c49
[TEST] Updating the tc to use the rasd_init_list() fn of rasd.py.


Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 9fb67711f2df -r 87e9c774d6e0 suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Wed Jun 11 05:53:58 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Wed Jun 11 06:01:37 2008 -0700
@@ -57,6 +57,9 @@ from XenKvmLib.const import CIM_REV
 from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import rasd
+from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -64,44 +67,18 @@ test_vcpus  = 1
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-prev = 531
-mrev = 529
-
-def init_list(xml, disk, virt="Xen"):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    procrasd = {
-            "InstanceID" : '%s/%s' % (test_dom, "proc"),
-            "ResourceType" : 3,
-            "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
-    netrasd = {
-            "InstanceID" : '%s/%s' % (test_dom,test_mac),
-            "ResourceType" : 10 ,
-            "ntype1" : "bridge",
-            "ntype2" : "ethernet",
-            "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
-    address = xml.xml_get_disk_source()
-    diskrasd = {
-            "InstanceID" : '%s/%s' % (test_dom, disk),
-            "ResourceType" : 17,
-            "Address" : address,
-            "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
-    memrasd = {
-            "InstanceID" : '%s/%s' % (test_dom, "mem"),
-            "ResourceType" : 4,
-            "AllocationUnits" : "KiloBytes",
-            "VirtualQuantity" : (test_mem * 1024),
-            "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
-    if CIM_REV < prev:
-        procrasd['InstanceID'] = '%s/0' % test_dom
-    if CIM_REV < mrev:
-        memrasd['AllocationUnits'] = 'MegaBytes'
-
-    return procrasd, netrasd, diskrasd, memrasd
 
 def assoc_values(assoc_info, xml, disk, virt="Xen"):
-    procrasd, netrasd, diskrasd, memrasd = init_list(xml, disk, virt)
+    status, rasd_values = rasd_init_list(xml, virt, disk, test_dom,
+                                         test_mac, test_mem)
+    if status != PASS:
+        return status
+
+    procrasd =  rasd_values['%s' %rasd.proc_cn]
+    netrasd  =  rasd_values['%s'  %rasd.net_cn] 
+    diskrasd =  rasd_values['%s'  %rasd.disk_cn]
+    memrasd  =  rasd_values['%s'  %rasd.mem_cn]
+
     if virt == 'LXC':
         proc_status = 0
         disk_status = 0
diff -r 9fb67711f2df -r 87e9c774d6e0 suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py	Wed Jun 11 05:53:58 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py	Wed Jun 11 06:01:37 2008 -0700
@@ -37,6 +37,10 @@ from XenKvmLib.const import CIM_REV
 from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import rasd
+from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
+
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -44,41 +48,6 @@ test_vcpus  = 1
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-prev = 531
-mrev = 529
-
-def init_list(virt):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    proc = {
-            "InstanceID" : '%s/%s' % (test_dom, "proc"),
-            "ResourceType" : 3,
-            "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
-    net = {
-            "InstanceID" : '%s/%s' % (test_dom,test_mac),
-            "ResourceType" : 10 ,
-            "ntype1" : "bridge",
-            "ntype2" : "ethernet",
-            "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
-    address = vsxml.xml_get_disk_source()
-    disk = {
-            "InstanceID"  : '%s/%s' % (test_dom, test_disk),
-            "ResourceType" : 17,
-            "Address" : address,
-            "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
-    mem = {
-            "InstanceID" : '%s/%s' % (test_dom, "mem"),
-            "ResourceType" : 4,
-            "AllocationUnits" : "KiloBytes",
-            "VirtualQuantity" : (test_mem * 1024),
-            "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
-    if CIM_REV < prev:
-        proc['InstanceID'] = '%s/0' % test_dom
-    if CIM_REV < mrev:
-        mem['AllocationUnits'] = 'MegaBytes'
-
-    return proc, net, disk, mem
 
 def get_inst_from_list(server, classname, rasd_list, filter_name, exp_val):
     status = PASS
@@ -125,7 +94,7 @@ def verify_rasd_values(rasd_values_info)
         for rasd_instance in rasd_values_info:
             CCName = rasd_instance.classname
             if rasd.pasd_cn in CCName :
-                status = rasd.verify_procrasd_values(rasd_instance, procrasd,)
+                status = rasd.verify_procrasd_values(rasd_instance, procrasd)
             elif rasd.nasd_cn in CCName :
                 status = rasd.verify_netrasd_values(rasd_instance, netrasd)
             elif rasd.dasd_cn in CCName:
@@ -176,8 +145,15 @@ def main():
         logger.error("Exception : %s", details)
         return FAIL
     
-    status = PASS 
-    procrasd, netrasd, diskrasd, memrasd = init_list(virt)
+    status, rasd_values_list = rasd_init_list(vsxml, virt, test_disk, test_dom,
+                                         test_mac, test_mem)
+    if status != PASS:
+        return status
+
+    procrasd =  rasd_values_list['%s'  %rasd.proc_cn]
+    netrasd  =  rasd_values_list['%s'  %rasd.net_cn]
+    diskrasd =  rasd_values_list['%s'  %rasd.disk_cn]
+    memrasd  =  rasd_values_list['%s'  %rasd.mem_cn]
     
     # For each loop
     # 1) Enumerate one RASD type
diff -r 9fb67711f2df -r 87e9c774d6e0 suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py
--- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Wed Jun 11 05:53:58 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Wed Jun 11 06:01:37 2008 -0700
@@ -51,8 +51,9 @@ from XenKvmLib import assoc
 from XenKvmLib import assoc
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
+from XenKvmLib import rasd
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values 
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
@@ -87,44 +88,6 @@ def setup_env(virt):
         logger.error("Exception : %s", details)
         return FAIL, vsxml_info
     return PASS, vsxml_info
-
-def init_list(virt):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    procrasd = {
-                 "InstanceID" : '%s/%s' %(test_dom, "proc"),
-                 "ResourceType" : 3,
-                 "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
-                }
-    if CIM_REV < proc_rev:
-        procrasd['InstanceID'] = '%s/%s' %(test_dom, "0")
-
-    netrasd = {
-                "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
-                "ResourceType" : 10 , 
-                "ntype1": "bridge", 
-                "ntype2": "ethernet", 
-                "CreationClassName": get_typed_class(virt, 'NetResourceAllocationSettingData')
-               }
-
-    address = vsxml.xml_get_disk_source()
-    diskrasd = {
-                "InstanceID"  : '%s/%s' %(test_dom, test_disk), 
-                "ResourceType" : 17, 
-                "Address"      : address, 
-                "CreationClassName": get_typed_class(virt, 'DiskResourceAllocationSettingData')
-               }
-    memrasd = {
-               "InstanceID"  : '%s/%s' %(test_dom, "mem"), 
-               "ResourceType" : 4, 
-               "AllocationUnits" : "KiloBytes",
-               "VirtualQuantity" : (test_mem * 1024), 
-               "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
-              }
-    if CIM_REV < mem_rev:
-        memrasd['AllocationUnits'] = "MegaBytes"
-    return procrasd, netrasd, diskrasd, memrasd
 
 def get_inst_from_list(classname, vssd_list, filter_name, exp_val):
     status = PASS
@@ -199,7 +162,16 @@ def get_rasd_values_from_vssdc_assoc(vss
     return status, vssdc_assoc_info
 
 def verify_rasd_values(rasd_values_info):
-    procrasd, netrasd, diskrasd, memrasd = init_list(virt)
+    status, rasd_values = rasd_init_list(vsxml, virt, test_disk, test_dom,
+                                         test_mac, test_mem)
+    if status != PASS:
+        return status
+
+    procrasd =  rasd_values['%s' %rasd.proc_cn]
+    netrasd  =  rasd_values['%s'  %rasd.net_cn]
+    diskrasd =  rasd_values['%s'  %rasd.disk_cn]
+    memrasd  =  rasd_values['%s'  %rasd.mem_cn]
+
     try:
         for rasd_instance in rasd_values_info:
             CCName = rasd_instance.classname



From deeptik at linux.vnet.ibm.com  Wed Jun 11 13:05:22 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 11 Jun 2008 06:05:22 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing the 02_hostsystem_to_rasd.py tc
	of HostSystem
Message-ID: <104523eca0848e00d546.1213189522@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213189504 25200
# Node ID 104523eca0848e00d54656d329a9e5829c21ce1a
# Parent  87e9c774d6e0d0500911ecd7763a592449eb0e3c
[TEST] Fixing the 02_hostsystem_to_rasd.py tc of HostSystem.

1) Fixing the tc failure bcs of the modifications that was done to default network type.
2) Using the rasd_init_list() fn of the rasd.py .

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 87e9c774d6e0 -r 104523eca084 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Wed Jun 11 06:01:37 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Wed Jun 11 06:05:04 2008 -0700
@@ -57,7 +57,7 @@ CIM_ERROR_ASSOCIATORS
 CIM_ERROR_ASSOCIATORS
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV']
@@ -69,47 +69,6 @@ test_mac    = "00:11:22:33:44:aa"
 test_mac    = "00:11:22:33:44:aa"
 rev = 529
 proc_instid_rev = 590
-
-def init_list(vsxml, virt="Xen"):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    disk_path = vsxml.xml_get_disk_source()
-    proc_cn = get_typed_class(virt, "Processor")
-    mem_cn = get_typed_class(virt, "Memory")
-    net_cn = get_typed_class(virt, "NetworkPort")
-    disk_cn = get_typed_class(virt, "LogicalDisk")
-
-    rasd_values = { 
-                    proc_cn              : {
-                                             "InstanceID" : '%s/%s' %(test_dom, "proc"),
-                                             "ResourceType" : 3,
-                                            }, 
-                    disk_cn              : {
-                                             "InstanceID"  : '%s/%s' %(test_dom, test_disk), 
-                                             "ResourceType" : 17, 
-                                             "Address"      : disk_path, 
-                                            }, 
-                    net_cn               : {
-                                              "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
-                                              "ResourceType" : 10 , 
-                                              "ntype1": "bridge", 
-                                              "ntype2": "ethernet", 
-                                           }, 
-                    mem_cn               : {
-                                              "InstanceID"  : '%s/%s' %(test_dom, "mem"), 
-                                              "ResourceType" : 4, 
-                                              "AllocationUnits" : "KiloBytes",
-                                              "VirtualQuantity" : (test_mem * 1024), 
-                                           }
-                  } 
-    if CIM_REV < rev:
-       rasd_values[mem_cn]['AllocationUnits'] = "MegaBytes"
-
-    if CIM_REV < proc_instid_rev:
-       rasd_values[proc_cn]['InstanceID'] = '%s/%s' %(test_dom, 0)
-
-    return rasd_values
 
 def setup_env(server, virt="Xen"):
     vsxml_info = None
@@ -185,7 +144,12 @@ def verify_RASD_values(server, sd_assoc_
                 classname_keyvalue = sd_assoc_info[i]['CreationClassName']
                 deviceid =  sd_assoc_info[i]['DeviceID']
                 in_setting_define_state[classname_keyvalue] = deviceid
-        rasd_values = init_list(vsxml, virt)
+
+        status, rasd_values = rasd_init_list(vsxml, virt, test_disk, test_dom, 
+                                            test_mac, test_mem)
+        if status != PASS:
+            return status
+
         an = get_typed_class(virt, 'SettingsDefineState')
         sccn = get_typed_class(virt, 'ComputerSystem')
         for cn, devid in sorted(in_setting_define_state.items()):



From deeptik at linux.vnet.ibm.com  Wed Jun 11 13:09:22 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 11 Jun 2008 06:09:22 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Updating the
	41_cs_to_settingdefinestate.py tc of ComputerSystem
Message-ID: <7988bef766e44f1da43b.1213189762@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213189732 25200
# Node ID 7988bef766e44f1da43b188e802be3c18b7b098d
# Parent  104523eca0848e00d54656d329a9e5829c21ce1a
[TEST] Updating the 41_cs_to_settingdefinestate.py tc of ComputerSystem.

1) Updated the tc to use vxml fn().
2) Updated the tc to use rasd_init_list() fn of rasd.py.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 104523eca084 -r 7988bef766e4 suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py	Wed Jun 11 06:05:04 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py	Wed Jun 11 06:08:52 2008 -0700
@@ -59,15 +59,17 @@ import sys
 import sys
 from VirtLib import utils
 from XenKvmLib import computersystem
-from XenKvmLib.test_xml import testxml, disk_path
-from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
+from XenKvmLib.classes import get_typed_class
+from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.assoc import Associators, AssociatorNames
 from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \
 CIM_ERROR_ASSOCIATORS
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import rasd
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 
 sup_types = ['Xen']
 
@@ -75,43 +77,7 @@ test_vcpus  = 1
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-test_disk   = 'xvda'
 vstype      = 'Xen'
-
-
-def rasd_init_list():
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    proc_rasd = {
-                         "InstanceID" : '%s/%s' %(test_dom, "proc"),\
-                       "ResourceType" : 3,\
-                }
-
-    disk_rasd = {
-                       "InstanceID"  : '%s/%s' %(test_dom, test_disk), \
-                      "ResourceType" : 17, \
-                      "Address"      : disk_path, \
-                }
-    net_rasd =  {
-                       "InstanceID"  : '%s/%s' %(test_dom,test_mac), \
-                      "ResourceType" : 10 , \
-                             "ntype1": "bridge", \
-                             "ntype2": "ethernet", \
-                }
-    mem_rasd =  {
-                       "InstanceID"  : '%s/%s' %(test_dom, "mem"), \
-                      "ResourceType" : 4, \
-                   "AllocationUnits" : "KiloBytes",\
-                   "VirtualQuantity" : (test_mem * 1024), \
-                }
-    rasd_values = {  "Xen_Processor"   : proc_rasd, \
-                     "Xen_LogicalDisk" : disk_rasd, \
-                     "Xen_NetworkPort" : net_rasd, \
-                     "Xen_Memory"      : mem_rasd 
-                  }
-    return rasd_values
-
 
 def vssd_init_list():
     """
@@ -142,19 +108,27 @@ def cs_init_list(cs_dom):
                  }
     return cs_values 
 
-def setup_env(server):
+def setup_env(server, virt):
+    vsxml_info = None
     status = PASS
     destroy_and_undefine_all(server)
-    test_xml = testxml(test_dom, mem = test_mem,    \
-                                 vcpus = test_vcpus, \
-                                     mac = test_mac,  \
-                                      disk = test_disk)
+    if virt == "Xen":
+        test_disk = "xvda"
+    else:
+        test_disk = "hda"
+    virt_xml =  get_class(virt)
+    vsxml_info = virt_xml(test_dom, mem = test_mem,
+                                  vcpus=test_vcpus,
+                                    mac = test_mac,
+                                  disk = test_disk)
 
-    ret = test_domain_function(test_xml, server, cmd = "create")
+    ret = vsxml_info.create(server)
     if not ret:
         logger.error("Failed to create the dom: %s", test_dom)
         status = FAIL
-    return status
+
+    return status, vsxml_info, test_disk
+
 
 def print_err(err, detail, cn):
     logger.error(err % cn)
@@ -168,7 +142,7 @@ def vssd_sds_err( an, fieldname, ret_val
     logger.error(err)
     logger.error(detail)
 
-def get_inst_from_list(server, cn, cs_list, exp_val):
+def get_inst_from_list(server, vsxml, cn, cs_list, exp_val):
     status = PASS
     ret = -1
     inst = None 
@@ -179,12 +153,12 @@ def get_inst_from_list(server, cn, cs_li
 
     if ret != PASS:
         logger.error("%s with %s was not returned" % (cn, exp_val))
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         status = FAIL
 
     return status, inst
 
-def get_associatornames_info(server, cn, an, qcn, name):
+def get_associatornames_info(server, vsxml, cn, an, qcn, name):
     status = PASS
     assoc_info = []
     try:
@@ -201,11 +175,11 @@ def get_associatornames_info(server, cn,
         status = FAIL
 
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
 
     return status, assoc_info
 
-def get_associators_info(server, cn, an, qcn, instid):
+def get_associators_info(server, vsxml, cn, an, qcn, instid):
     status = PASS
     assoc_info = []
     try:
@@ -223,17 +197,19 @@ def get_associators_info(server, cn, an,
         status = FAIL
 
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
 
     return status, assoc_info
 
 def check_len(an, assoc_list_info, qcn, exp_len):
     if len(assoc_list_info) != exp_len:
-        logger.error("%s returned %i %s objects" % (an, len(assoc_list_info), qcn))
+        logger.error("%s returned %i %s objects" % (an, 
+                                                    len(assoc_list_info), qcn))
         return FAIL 
     return PASS 
 
-def get_setdefstate_verify_RASD_build_vssdc_input(server, sd_assoc_info):
+def get_setdefstate_verify_RASD_build_vssdc_input(server, virt, vsxml, test_disk, 
+                                                                  sd_assoc_info):
     status = PASS
     in_setting_define_state = {} 
     in_vssdc = {}
@@ -254,7 +230,11 @@ def get_setdefstate_verify_RASD_build_vs
             return FAIL, in_setting_define_state
 # Get the rasd values that will be used to compare with the Xen_SettingsDefineState
 # output.
-        rasd_values = rasd_init_list()
+        status, rasd_values = rasd_init_list(vsxml, virt, test_disk, test_dom,
+                                             test_mac, test_mem)
+        if status != PASS:
+            return status
+
         sccn = "Xen_ComputerSystem"
         an = "Xen_SettingsDefineState"
         for cn, devid in sorted(in_setting_define_state.items()):
@@ -350,21 +330,23 @@ def verify_CS_values(assoc_info, cs_valu
 @do_main(sup_types)
 def main():
     server = main.options.ip
-    status = setup_env(server)
+    virt   = main.options.virt
+    status, vsxml, test_disk = setup_env(server, virt)
     if status != PASS:
         return status
 
     cs_enum = computersystem.enumerate(server)
     if len(cs_enum) == 0:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
     cn = cs_enum[0].CreationClassName
     status, cs_dom = get_inst_from_list(server,
+                                         vsxml,
                                             cn,
                                        cs_enum,
                                       test_dom)
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
 
 # Creating the cs info list which will be used later for comparison.
@@ -372,26 +354,30 @@ def main():
     if cs_values['EnabledState'] != 2 :
         logger.error("Improper EnabledState value set for domain %s", test_dom)
         logger.error("Should have been 2 instead of %s", cs_values['EnabledState'])
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return FAIL 
     
     cn        = cs_dom.CreationClassName
     an        = 'Xen_SystemDevice'
     qcn       = 'Logical Devices'
     name      = test_dom
-    status, sd_assoc_info = get_associatornames_info(server, cn, an, qcn, name)
+    status, sd_assoc_info = get_associatornames_info(server, vsxml, 
+                                                     cn, an, qcn, name)
     if status != PASS or len(sd_assoc_info) == 0:
         return status
-    status, in_vssdc_list = get_setdefstate_verify_RASD_build_vssdc_input(server, \
-                                                                     sd_assoc_info)
+    status, in_vssdc_list = get_setdefstate_verify_RASD_build_vssdc_input(server, 
+                                                                            virt,
+                                                                            vsxml,
+                                                                        test_disk,
+                                                                    sd_assoc_info)
     if status != PASS or len(in_vssdc_list) == 0 :
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
 # Verifying that the in_vssdc_list contains 4 entries one each for mem rasd,
 # network rasd, processor rasd and disk rasd.
     exp_len = 4
     if check_len(an, in_vssdc_list, qcn, exp_len) != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return FAIL 
 # Get the vssd values which will be used for verifying the Xen_VirtualSystemSettingData 
 # output from the Xen_VirtualSystemSettingDataComponent results.
@@ -399,14 +385,15 @@ def main():
     an  = 'Xen_VirtualSystemSettingDataComponent'
     qcn = 'Xen_VirtualSystemSettingData'
     for cn, instid in sorted((in_vssdc_list.items())):
-        status, vssd_assoc_info = get_associators_info(server, cn, an, qcn, instid)
+        status, vssd_assoc_info = get_associators_info(server, vsxml, cn, an, qcn,
+                                                       instid)
         if status != PASS or len(vssd_assoc_info) == 0:
             break 
         status = verify_VSSD_values(vssd_assoc_info, vssd_values, an, qcn)    
         if status != PASS:
             break
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
 # Since the Xen_VirtualSystemSettingDataComponent returns similar output when queried with 
 # every RASD, we are taking the output of the last associtaion query as inputs for 
@@ -415,13 +402,13 @@ def main():
     an     = 'Xen_SettingsDefineState'
     qcn    = 'Xen_ComputerSystem'
     instid = vssd_assoc_info[0]['InstanceID']
-    status, cs_assoc_info = get_associators_info(server, cn, an, qcn, instid)
+    status, cs_assoc_info = get_associators_info(server, vsxml, cn, an, qcn, instid)
     if status != PASS or len(cs_assoc_info) == 0:
         return status
 # verify the results of Xen_SettingsDefineState with the cs_values list that was 
 # built using the output of the enumeration on Xen_ComputerSystem.
     status = verify_CS_values(cs_assoc_info, cs_values, an, qcn)
-    test_domain_function(test_dom, server, "destroy")
+    vsxml.destroy(server)
     return status
 if __name__ == "__main__":
     sys.exit(main())



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 15:16:59 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 08:16:59 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update ElementCapabilities.05 for
	LXC support
In-Reply-To: <7a8e2732d1281077c9db.1213262012@localhost.localdomain>
References: <7a8e2732d1281077c9db.1213262012@localhost.localdomain>
Message-ID: <484FEC6B.9060003@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213262003 -28800
> # Node ID 7a8e2732d1281077c9dbaac0e8a3eb056e44fafa
> # Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
> [TEST] Update ElementCapabilities.05 for LXC support
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r 254bc5464030 -r 7a8e2732d128 suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py
> --- a/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py	Wed Jun 11 20:56:07 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py	Thu Jun 12 17:13:23 2008 +0800

This failed for me:

Testing LXC hypervisor
ElementCapabilities - 05_hostsystem_cap.py: FAIL
ERROR   - LXC_ElementCapabilities returned 0 Capabilities objects
ERROR   - ManagementCapabilities Verification failed

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 15:25:19 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 08:25:19 -0700
Subject: [Libvirt-cim] [TEST] NULL of LXC_ElementCapabilities assocaition
	with LXC_ManagementService
In-Reply-To: <OFCACC2DF1.B9EDA563-ON48257465.000BD2E4-48257465.000C7F3A@cn.ibm.com>
References: <OFCACC2DF1.B9EDA563-ON48257465.000BD2E4-48257465.000C7F3A@cn.ibm.com>
Message-ID: <484FEE5F.6090402@linux.vnet.ibm.com>

Guo Lian Yun wrote:
> 
> Hi,
> 
> I can get any instance by  ElementCapabilities associations with 
> ManagementService, that is to say, below querying return NULL.
> 
> wbemcli ain -ac LXC_ElementCapabilities 
>  'http://root:password at localhost/root/virt:LXC_VirtualSystemManagementService.SystemCreationClassName="LXC_HostSystem",SystemName="nine",CreationClassName="LXC_VirtualSystemManagementService",Name="Management 
> Service"'
> 
> But LXC_ElementCapabilities associations with 
> LXC_VirtualSystemMigrationService return expect result.
> 
> wbemcli ain -ac LXC_ElementCapabilities 
>  'http://root:password at localhost/root/virt:LXC_VirtualSystemMigrationService.SystemCreationClassName="LXC_HostSystem",SystemName="nine",CreationClassName="LXC_VirtualSystemMigrationService",Name="MigrationService"' 
> 
> localhost:5988/root/virt:LXC_VirtualSystemMigrationCapabilities.InstanceID="MigrationCapabilities" 
> 

Hi Daisy,

I'm not sure what you mean here.  In both these queries, you've using 
"nine" as the system name.  Is that the name of your system?  If "nine" 
is the name of your host system, then you'll get instances back.

The subject of the e-mail says you were having trouble with NULL - 
here's what I see when I use NULL as the system name:

wbemcli ain -ac LXC_ElementCapabilities 
'http://localhost/root/virt:LXC_VirtualSystemMigrationService.SystemCreationClassName="LXC_HostSystem",SystemName="NULL",CreationClassName="LXC_VirtualSystemMigrationService",Name="MigrationService"' 

*
* wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (SystemName)

Did I misunderstand your question?

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 15:29:08 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 08:29:08 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update SettingsDefineCapabilities.03
	for LXC support
In-Reply-To: <a69394e8052f65132dce.1213266005@localhost.localdomain>
References: <a69394e8052f65132dce.1213266005@localhost.localdomain>
Message-ID: <484FEF44.7090908@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213266000 -28800
> # Node ID a69394e8052f65132dce5886e0a8670717133bf1
> # Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
> [TEST] Update SettingsDefineCapabilities.03 for LXC support
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r 254bc5464030 -r a69394e8052f suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py

I saw the following failure:

Testing LXC hypervisor
SettingsDefineCapabilities - 03_forward_errs.py: FAIL
ERROR   - Unexpected rc code 4 and description 
CIM_ERR_INVALID_PARAMETER: WrongClassName.InstanceID="MemoryPool/0"

ERROR   - ------ FAILED: Invalid CCName Key Name.------

I also saw the same issue on Xen, XenFV, and KVM.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From danms at us.ibm.com  Wed Jun 11 15:33:50 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 11 Jun 2008 08:33:50 -0700
Subject: [Libvirt-cim] [PATCH] Add a default graphics device to all domains
	so that we create the
Message-ID: <cb1993563ebbca5bb4f7.1213198430@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1213198304 25200
# Node ID cb1993563ebbca5bb4f7392f42d33019af7668bc
# Parent  ad4804559dd83bd2afd10fa0768b087f6a9914a9
Add a default graphics device to all domains so that we create the
<graphics ...> tag in the resulting XML.  Later, this will be replaced
by a proper conversion of a console RASD, like the rest of the devices.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r ad4804559dd8 -r cb1993563ebb src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Tue Jun 10 12:02:09 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Wed Jun 11 08:31:44 2008 -0700
@@ -192,6 +192,22 @@
         return 1;
 }
 
+static bool default_graphics_device(CMPIInstance *inst,
+                                    struct domain *domain)
+{
+        free(domain->dev_graphics);
+        domain->dev_graphics = calloc(1, sizeof(*domain->dev_graphics));
+        if (domain->dev_graphics == NULL) {
+                CU_DEBUG("Failed to allocate default graphics device");
+                return false;
+        }
+
+        domain->dev_graphics->dev.graphics.type = strdup("vnc");
+        domain->dev_graphics->dev.graphics.port = strdup("-1");
+
+        return true;
+}
+
 static int vssd_to_domain(CMPIInstance *inst,
                           struct domain *domain)
 {
@@ -240,6 +256,10 @@
         else {
                 CU_DEBUG("Unknown domain prefix: %s", pfx);
         }
+
+        if (!default_graphics_device(inst, domain))
+                ret = 0;
+
  out:
         free(pfx);
 



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 15:42:20 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 08:42:20 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	VirtualSystemSettingDataComponent.02&03 for LXC support
In-Reply-To: <73e4e701cb907af69177.1213276783@localhost.localdomain>
References: <73e4e701cb907af69177.1213276783@localhost.localdomain>
Message-ID: <484FF25C.2080007@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213276778 -28800
> # Node ID 73e4e701cb907af69177fe92fa741b9e0428615d
> # Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
> [TEST] Update VirtualSystemSettingDataComponent.02&03 for LXC support
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r 254bc5464030 -r 73e4e701cb90 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
> --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Wed Jun 11 20:56:07 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Thu Jun 12 21:19:38 2008 +0800
> @@ -57,7 +57,7 @@
>  from CimTest.ReturnCodes import PASS, FAIL
>  from XenKvmLib.const import CIM_REV
> 
> -sup_types = ['Xen', 'XenFV', 'KVM']
> +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
> 
>  test_dom    = "VSSDC_dom"
>  test_vcpus  = 1
> @@ -143,7 +143,10 @@
>      else:
>          test_disk = "hdb"
>      virt_xml = vxml.get_class(options.virt)
> -    cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
> +    if options.virt == "LXC":
> +        cxml = virt_xml(test_dom)
> +    else:
> +        cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
>      ret = cxml.create(options.ip)
>      if not ret:
>          logger.error("Failed to create the dom: %s", test_dom)
> @@ -152,6 +155,8 @@
> 
>      if options.virt == "Xen" or options.virt == "XenFV":
>          instIdval = "Xen:%s" % test_dom

Since both Xen and XenFV both use the Xen prefix in the InstanceID, it 
makes sense to handle them as a separate case.

> +    elif options.virt == "LXC":
> +        instIdval = "LXC:%s" % test_dom
>      else:
>          instIdval = "KVM:%s" % test_dom

However, instead of adding an additional case for LXC, you could instead 
change the else here to:

else:
     instIdval = "%s:%s" % (options.virt, test_dom)

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 16:03:03 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 09:03:03 -0700
Subject: [Libvirt-cim] [PATCH] Add a default graphics device to all domains
	so that we create the
In-Reply-To: <cb1993563ebbca5bb4f7.1213198430@guaranine.danplanet.com>
References: <cb1993563ebbca5bb4f7.1213198430@guaranine.danplanet.com>
Message-ID: <484FF737.2010308@linux.vnet.ibm.com>

Dan Smith wrote:
> # HG changeset patch
> # User Dan Smith <danms at us.ibm.com>
> # Date 1213198304 25200
> # Node ID cb1993563ebbca5bb4f7392f42d33019af7668bc
> # Parent  ad4804559dd83bd2afd10fa0768b087f6a9914a9
> Add a default graphics device to all domains so that we create the
> <graphics ...> tag in the resulting XML.  Later, this will be replaced
> by a proper conversion of a console RASD, like the rest of the devices.
> 
> Signed-off-by: Dan Smith <danms at us.ibm.com>
> 
> diff -r ad4804559dd8 -r cb1993563ebb src/Virt_VirtualSystemManagementService.c

+1 I think this is a good thing to do until we get the console RASD 
pieces in place.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From danms at us.ibm.com  Wed Jun 11 16:08:16 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 11 Jun 2008 09:08:16 -0700
Subject: [Libvirt-cim] [PATCH] Make configure.ac attempt to set the default
	xen emulator
Message-ID: <4490ff0e39c77b64e938.1213200496@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1213200322 25200
# Node ID 4490ff0e39c77b64e9380151dd9b6f3b217836f4
# Parent  cb1993563ebbca5bb4f7392f42d33019af7668bc
Make configure.ac attempt to set the default xen emulator
by checking lib and lib64

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r cb1993563ebb -r 4490ff0e39c7 configure.ac
--- a/configure.ac	Wed Jun 11 08:31:44 2008 -0700
+++ b/configure.ac	Wed Jun 11 09:05:22 2008 -0700
@@ -87,10 +87,18 @@
 AC_SUBST(MIG_CHECKS_DIR)
 AC_DEFINE_UNQUOTED(MIG_CHECKS_DIR, "$MIG_CHECKS_DIR", [External migration check timeout])
 
+if test -x /usr/lib64/xen/bin/qemu-dm; then
+   default_xen_emulator=/usr/lib64/xen/bin/qemu-dm
+elif test -x /usr/lib/xen/bin/qemu-dm; then
+   default_xen_emulator=/usr/lib/xen/bin/qemu-dm
+else
+   default_xen_emulator=/bin/false
+fi
+
 AC_ARG_WITH([xen_emulator],
 	    [  --with-xen_emulator=emu  Location of Xen FullVirt emulator],
 	    [test "x$withval" != "x" && XEN_EMULATOR="$withval"],
-	    [XEN_EMULATOR=/usr/lib/xen/bin/qemu-dm])
+	    [XEN_EMULATOR=$default_xen_emulator])
 AC_SUBST(XEN_EMULATOR)
 AC_DEFINE_UNQUOTED(XEN_EMULATOR, "$XEN_EMULATOR", [Location of Xen FullVirt emulator])
 



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 16:09:47 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 09:09:47 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	VirtualSystemSettingDataComponent.04 for LXC support
In-Reply-To: <2fff464cfcf81a56ffb6.1213279233@localhost.localdomain>
References: <2fff464cfcf81a56ffb6.1213279233@localhost.localdomain>
Message-ID: <484FF8CB.1090306@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213279228 -28800
> # Node ID 2fff464cfcf81a56ffb627085eebf995a54b3833
> # Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
> [TEST] Update VirtualSystemSettingDataComponent.04 for LXC support
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r 254bc5464030 -r 2fff464cfcf8 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py
> --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py	Wed Jun 11 20:56:07 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py	Thu Jun 12 22:00:28 2008 +0800
> @@ -66,15 +66,15 @@
>  from CimTest.Globals import do_main, logger
>  from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
> 
> -sup_types = ['Xen', 'XenFV', 'KVM']
> +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
> 
>  test_dom     = "domu1"
> 
>  expr_values = {
>      "INVALID_InstID_Keyname"   : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
> -                     'desc' : 'No such instance (InstanceID)' }, \
> +                     'desc' : 'No such instance' }, \
>      "INVALID_InstID_Keyval"    : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
> -                     'desc' : 'No such instance (InstanceID)'}
> +                     'desc' : 'No such instance'}
>  }

Why the change here?  I see the following errors:

  wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
'http://localhost/root/virt:LXC_VirtualSystemSettingData.Invalid="LXC:meep"'
*
* wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID)

wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
'http://localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="Invalid"'

*
* wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID)
*

Are you seeing a different error?

> 
>  def try_invalid_assoc(name_val, i, field, virt="Xen"):
> @@ -120,6 +120,8 @@
>    
>      if options.virt == "Xen" or options.virt == "XenFV":
>          inst_id = "Xen:%s" % test_dom
> +    elif options.virt == "LXC":
> +        inst_id = "LXC:%s" % test_dom
>      else:
>          inst_id = "KVM:%s" % test_dom
>    

Instead of adding another condition here, you can just modify the else 
to be:

inst_id = "%s:%s" % (options.virt, test_dom)

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 16:22:40 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 09:22:40 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update HostSystem.03 for LXC support
In-Reply-To: <b90b6fe46296b90cb87f.1213285889@localhost.localdomain>
References: <b90b6fe46296b90cb87f.1213285889@localhost.localdomain>
Message-ID: <484FFBD0.1080202@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213285886 -28800
> # Node ID b90b6fe46296b90cb87f5169b2654c7ba0970f98
> # Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
> [TEST] Update HostSystem.03 for LXC support
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r 254bc5464030 -r b90b6fe46296 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py

This fails for me with the following error:

Testing LXC hypervisor
HostSystem - 03_hs_to_settdefcap.py: FAIL
ERROR   - HostedResourcePool has returned 3 instances, expected 4 instances

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 16:26:59 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 09:26:59 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update HostSystem.06 for LXC support
In-Reply-To: <cda16d4e1b97710b5621.1213286126@localhost.localdomain>
References: <cda16d4e1b97710b5621.1213286126@localhost.localdomain>
Message-ID: <484FFCD3.5030805@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213286123 -28800
> # Node ID cda16d4e1b97710b5621c7f0665586136720d84a
> # Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
> [TEST] Update HostSystem.06 for LXC support
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r 254bc5464030 -r cda16d4e1b97 suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py
> --- a/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py	Wed Jun 11 20:56:07 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py	Thu Jun 12 23:55:23 2008 +0800

This looks good, but the patch is postmarked for tomorrow's date.  Can 
you fix the date on the system you sent from and resend?

Can you do the same for:

"Update HostSystem.06 for LXC support"
"Update Memory.02 for LXC support"
"Update VirtualSystemManagementService.02~04 for LXC support"
"Update VirtualSystemManagementService.05&07 for LXC support"

Thanks!

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 18:14:54 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 11:14:54 -0700
Subject: [Libvirt-cim] [PATCH] Make configure.ac attempt to set the default
	xen emulator
In-Reply-To: <4490ff0e39c77b64e938.1213200496@guaranine.danplanet.com>
References: <4490ff0e39c77b64e938.1213200496@guaranine.danplanet.com>
Message-ID: <4850161E.3010208@linux.vnet.ibm.com>

Dan Smith wrote:
> # HG changeset patch
> # User Dan Smith <danms at us.ibm.com>
> # Date 1213200322 25200
> # Node ID 4490ff0e39c77b64e9380151dd9b6f3b217836f4
> # Parent  cb1993563ebbca5bb4f7392f42d33019af7668bc
> Make configure.ac attempt to set the default xen emulator
> by checking lib and lib64
> 
> Signed-off-by: Dan Smith <danms at us.ibm.com>
> 
> diff -r cb1993563ebb -r 4490ff0e39c7 configure.ac

+1 Excellent - this, combined with the previous 2 FV related patches 
fixes the issue starting XenFV guests that I was seeing.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 18:42:31 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 11:42:31 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Moving the init_list()  to rasd.py
In-Reply-To: <9fb67711f2dfe3010d20.1213188879@elm3b217.beaverton.com>
References: <9fb67711f2dfe3010d20.1213188879@elm3b217.beaverton.com>
Message-ID: <48501C97.1040406@linux.vnet.ibm.com>

Deepti B. Kalakeri wrote:
> # HG changeset patch
> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> # Date 1213188838 25200
> # Node ID 9fb67711f2dfe3010d20862f36160b5a91b36c49
> # Parent  b9100cec9aedb9f9243d753111a9a856e9480335
> [TEST] Moving the init_list()  to rasd.py
> 
> 1) Most of the tc use init_list() fn to verify the RASD values, hence moved it to rasd.py.
> 2) Added the logic to pick up the networktype used by the guest while creating to verify the RASD values.
> 
> Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>.
> 
> diff -r b9100cec9aed -r 9fb67711f2df suites/libvirt-cim/lib/XenKvmLib/rasd.py

This is a good idea, since this is done is several places.  However, 
this patch conflicts with Daisy's patch to add support for containers.

Maybe you can roll her changes into this patch?

> +       
> +
> +        rasd_values = { 
> +                        proc_cn  : {
> +                                     "InstanceID"   : proc_id,
> +                                     "ResourceType" : 3,
> +                                    }, 
> +                        disk_cn  : {
> +                                     "InstanceID"   : '%s/%s' %(test_dom, 
> +                                                                test_disk), 
> +                                     "ResourceType" : 17, 
> +                                     "Address"      : disk_path, 
> +                                    }, 
> +                        net_cn   : {
> +                                      "InstanceID"   : '%s/%s' %(test_dom, 
> +                                                                 test_mac), 
> +                                      "ResourceType" : 10 , 
> +                                      "ntype"        : [ 'bridge', 'user',
> +                                                         'network', 'ethernet'] 
> +                                   }, 
> +                        mem_cn   : {
> +                                      "InstanceID"    : '%s/%s' %(test_dom, "mem"), 
> +                                      "ResourceType"  : 4, 
> +                                      "AllocationUnits" : alloc_units,
> +                                      "VirtualQuantity" : (test_mem * 1024), 
> +                                   }
> +                      } 


-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 11 19:49:52 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 11 Jun 2008 12:49:52 -0700
Subject: [Libvirt-cim] SIGSEGV error of VirtualSystemSettingDataComponent
	assocation querying
In-Reply-To: <OF88BB5601.FA801DD2-ON48257465.002421B4-48257465.00253886@cn.ibm.com>
References: <OF88BB5601.FA801DD2-ON48257465.002421B4-48257465.00253886@cn.ibm.com>
Message-ID: <48502C60.70401@linux.vnet.ibm.com>

Guo Lian Yun wrote:
> 
> Kaitlin,
> 
> I hit a SIGSEGV error of LXC_VirtualSystemSettingDataComponent 
> associations querying in sfcb, would you please test it on your machine 
> with Pegasus?
> I'm sorry I can't provide more SFCB debug info to you now.  
>  
> wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
> http://root:password at localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="invalid" 
> 
> *
> * wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider 
> Virt_VSSDComponent(23814) exiting due to a SIGSEGV signal
> *

I see the following:

wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
http://localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="invalid" 

*
* wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID)

You were also seeing an issue with:

wbemcli gi 
http://root:password at localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="invalid"
*
* wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider Virt_VSSD(30284) 
exiting due to a SIGSEGV signal
*

Both call the get_vssd_by_ref() function, so you'd see the same response 
from both.

I also tested this on a machine running sfcb 1.2.5 - I don't see a seg 
fault there.

Which version are you using?  Do you have a problem when you try with 
KVM or Xen?


> 
> Also, if the invalid InstanceID set as "LXC:invalid", I can get expect 
> result.
> 
> wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
> http://root:password at localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="LXC:invalid" 
> 
> *
> * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (invalid)
> *
> 

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Thu Jun 12 02:19:56 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 10:19:56 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] 2# HostSystem.06 for LXC support,
	fix the date on my machine
Message-ID: <f0da87170442a8f6e2e2.1213237196@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213237178 -28800
# Node ID f0da87170442a8f6e2e26e11fcbcf3cb8bafff1d
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] 2# HostSystem.06 for LXC support, fix the date on my machine

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r f0da87170442 suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py
--- a/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py	Thu Jun 12 10:19:38 2008 +0800
@@ -53,7 +53,7 @@
 CIM_ERROR_ASSOCIATORS
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 def print_err(err, detail, cn):
     logger.error(err % cn)



From yunguol at cn.ibm.com  Thu Jun 12 02:23:09 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 10:23:09 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] 2# Memory.02 for LXC support,
	fix the sending date on my own system
Message-ID: <e614f60678f2e914b572.1213237389@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213237386 -28800
# Node ID e614f60678f2e914b572c8c8e8ca58fbbc4c3138
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] 2# Memory.02 for LXC support, fix the sending date on my own system

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r e614f60678f2 suites/libvirt-cim/cimtest/Memory/02_defgetmem.py
--- a/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py	Thu Jun 12 10:23:06 2008 +0800
@@ -34,7 +34,7 @@
 from XenKvmLib.devices import get_dom_mem_inst
 from CimTest.Globals import logger, do_main
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 default_dom = "domu"
 
 def check_mem(memInst):



From yunguol at cn.ibm.com  Thu Jun 12 02:26:57 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 10:26:57 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] 2#
	VirtualSystemManagementService.02~04 for LXC
	support, fix the sending date on my own system
Message-ID: <fe22d8d479a4421e4e8d.1213237617@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213237614 -28800
# Node ID fe22d8d479a4421e4e8d8aa0062f1f5532209384
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] 2# VirtualSystemManagementService.02~04 for LXC support, fix the sending date on my own system

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r fe22d8d479a4 suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Thu Jun 12 10:26:54 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 default_dom = 'test_domain'
 rev = 528
 
diff -r b9100cec9aed -r fe22d8d479a4 suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py	Thu Jun 12 10:26:54 2008 +0800
@@ -32,7 +32,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 exp_rc = 1 #CMPI_RC_ERR_FAILED
 exp_desc = 'Unable to parse embedded object'
 
diff -r b9100cec9aed -r fe22d8d479a4 suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py	Thu Jun 12 10:26:54 2008 +0800
@@ -32,7 +32,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 exp_rc = 1 #CMPI_RC_ERR_FAILED
 exp_desc = 'Unable to parse embedded object'
 



From yunguol at cn.ibm.com  Thu Jun 12 02:30:48 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 10:30:48 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] 2#
	VirtualSystemManagementService.05&07 for LXC
	support, fix the sending date on my own system
Message-ID: <9bbf8a02a4e610814381.1213237848@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213237841 -28800
# Node ID 9bbf8a02a4e6108143812c27161287241de2536e
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] 2# VirtualSystemManagementService.05&07 for LXC support, fix the sending date on my own system

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r 9bbf8a02a4e6 suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Thu Jun 12 10:30:41 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 vsms_status_version = 534
 
 def destroysystem_fail(tc, options):
diff -r b9100cec9aed -r 9bbf8a02a4e6 suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py	Thu Jun 12 10:30:41 2008 +0800
@@ -33,7 +33,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 exp_rc = 1 #CMPI_RC_ERR_FAILED
 exp_desc = 'Unable to parse embedded object'
 



From yunguol at cn.ibm.com  Thu Jun 12 02:43:35 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Thu, 12 Jun 2008 10:43:35 +0800
Subject: [Libvirt-cim] [PATCH] [TEST]
	Update	VirtualSystemSettingDataComponent.04 for LXC support
In-Reply-To: <484FF8CB.1090306@linux.vnet.ibm.com>
Message-ID: <OF5D092DE3.77AA8048-ON48257466.000E2374-48257466.000F450B@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-12 00:09:47:

> yunguol at cn.ibm.com wrote:
> > # HG changeset patch
> > # User Guolian Yun <yunguol at cn.ibm.com>
> > # Date 1213279228 -28800
> > # Node ID 2fff464cfcf81a56ffb627085eebf995a54b3833
> > # Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
> > [TEST] Update VirtualSystemSettingDataComponent.04 for LXC support
> > 
> > Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> > 
> > diff -r 254bc5464030 -r 2fff464cfcf8 suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py
> > --- a/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py 
> Wed Jun 11 20:56:07 2008 +0800
> > +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py 
> Thu Jun 12 22:00:28 2008 +0800
> > @@ -66,15 +66,15 @@
> >  from CimTest.Globals import do_main, logger
> >  from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
> > 
> > -sup_types = ['Xen', 'XenFV', 'KVM']
> > +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
> > 
> >  test_dom     = "domu1"
> > 
> >  expr_values = {
> >      "INVALID_InstID_Keyname"   : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, 
\
> > -                     'desc' : 'No such instance (InstanceID)' }, \
> > +                     'desc' : 'No such instance' }, \
> >      "INVALID_InstID_Keyval"    : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, 
\
> > -                     'desc' : 'No such instance (InstanceID)'}
> > +                     'desc' : 'No such instance'}
> >  }
> 
> Why the change here?  I see the following errors:
> 
>   wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
> 
'http://localhost/root/virt:LXC_VirtualSystemSettingData.Invalid="LXC:meep"'
> *
> * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID)
> 
> wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
> 
'http://localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="Invalid"'
> 
> *
> * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID)
> *
> 
> Are you seeing a different error?
> 
  Yes, here is the error on my system.

wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
http://localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="LXC:Invalid"
*
* wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (Invalid)
*

wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
http://localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="Invalid"
*
* wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider Virt_VSSDComponent(4156) 
exiting due to a SIGSEGV signal
*

All the test are done with sblim-sfcb-1.3.0-0.i386.

> > 
> >  def try_invalid_assoc(name_val, i, field, virt="Xen"):
> > @@ -120,6 +120,8 @@
> > 
> >      if options.virt == "Xen" or options.virt == "XenFV":
> >          inst_id = "Xen:%s" % test_dom
> > +    elif options.virt == "LXC":
> > +        inst_id = "LXC:%s" % test_dom
> >      else:
> >          inst_id = "KVM:%s" % test_dom
> > 
> 
> Instead of adding another condition here, you can just modify the else 
> to be:
> 
> inst_id = "%s:%s" % (options.virt, test_dom)
> 
> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080612/d4a89db4/attachment.htm>

From yunguol at cn.ibm.com  Thu Jun 12 02:55:05 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 10:55:05 +0800
Subject: [Libvirt-cim] [PATCH] [TEST]2# Update
	VirtualSystemSettingDataComponent.04 for LXC support
Message-ID: <e9d50146ccde3d1eaef5.1213239305@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213239299 -28800
# Node ID e9d50146ccde3d1eaef531dcbd99f30a8db94183
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST]2# Update VirtualSystemSettingDataComponent.04 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r e9d50146ccde suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py	Thu Jun 12 10:54:59 2008 +0800
@@ -66,7 +66,7 @@
 from CimTest.Globals import do_main, logger
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 test_dom     = "domu1"
 
@@ -121,7 +121,7 @@
     if options.virt == "Xen" or options.virt == "XenFV":
         inst_id = "Xen:%s" % test_dom
     else:
-        inst_id = "KVM:%s" % test_dom
+        inst_id = "%s:%s" % (options.virt, test_dom)
   
     name_val = ['InstanceID', inst_id]
 



From yunguol at cn.ibm.com  Thu Jun 12 03:07:32 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 11:07:32 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] 2#
	VirtualSystemSettingDataComponent.02&03 for LXC
	support, perfect conditional case for prefix
Message-ID: <4e6f7c50a5b403b88d0d.1213240052@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213240048 -28800
# Node ID 4e6f7c50a5b403b88d0d2a8b1cb83d92b4873532
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] 2# VirtualSystemSettingDataComponent.02&03 for LXC support, perfect conditional case for prefix

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r 4e6f7c50a5b4 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Thu Jun 12 11:07:28 2008 +0800
@@ -57,7 +57,7 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.const import CIM_REV
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 test_dom    = "VSSDC_dom"
 test_vcpus  = 1
@@ -143,17 +143,20 @@
     else:
         test_disk = "hdb"
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
     ret = cxml.create(options.ip)
     if not ret:
         logger.error("Failed to create the dom: %s", test_dom)
         status = FAIL
         return status
 
-    if options.virt == "Xen" or options.virt == "XenFV":
+    if options.virt == "XenFV":
         instIdval = "Xen:%s" % test_dom
     else:
-        instIdval = "KVM:%s" % test_dom
+        instIdval = "%s:%s" % (options.virt, test_dom)
     
     try:
         assoc_info = assoc.AssociatorNames(options.ip,
diff -r b9100cec9aed -r 4e6f7c50a5b4 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Thu Jun 12 11:07:28 2008 +0800
@@ -64,7 +64,7 @@
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
 from XenKvmLib.const import CIM_REV
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 test_dom     = "domu1"
 test_mac     = "00:11:22:33:44:aa"
@@ -115,7 +115,10 @@
         test_disk = "hda"
 
     virt_xml = vxml.get_class(options.virt)
-    cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+    if options.virt == 'LXC':
+        cxml = virt_xml(test_dom)
+    else:
+        cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
     ret = cxml.create(options.ip)
     if not ret:
         logger.error('Unable to create domain %s' % test_dom)



From yunguol at cn.ibm.com  Thu Jun 12 06:30:18 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Thu, 12 Jun 2008 14:30:18 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	SettingsDefineCapabilities.03	for LXC support
In-Reply-To: <484FEF44.7090908@linux.vnet.ibm.com>
Message-ID: <OF83D371AA.BC2D453C-ON48257466.002292A0-48257466.00240681@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-11 23:29:08:

> yunguol at cn.ibm.com wrote:
> > # HG changeset patch
> > # User Guolian Yun <yunguol at cn.ibm.com>
> > # Date 1213266000 -28800
> > # Node ID a69394e8052f65132dce5886e0a8670717133bf1
> > # Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
> > [TEST] Update SettingsDefineCapabilities.03 for LXC support
> > 
> > Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> > 
> > diff -r 254bc5464030 -r a69394e8052f suites/libvirt-
> cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py
> 
> I saw the following failure:
> 
> Testing LXC hypervisor
> SettingsDefineCapabilities - 03_forward_errs.py: FAIL
> ERROR   - Unexpected rc code 4 and description 
> CIM_ERR_INVALID_PARAMETER: WrongClassName.InstanceID="MemoryPool/0"
> 
> ERROR   - ------ FAILED: Invalid CCName Key Name.------
> 
> I also saw the same issue on Xen, XenFV, and KVM.
> 
  Do you test it with Pegasus or SFCB? It passes with Pegasus when I
  test on your machine, and pass on Deepti's cimtest report. 
 
  I think it fails with sfcb because that the WrongClassName can't
  be parsed by sfcb, so there is none output with the wrongclassname
  querying as follows:
  wbemcli ain -ac LXC_SettingsDefineCapabilities 
http://root:password at localhost/root/virt:WrongClassName.InstanceID="MemoryPool/0"

  However, we can get output with Pegasus.

  wbemcli ain -ac LXC_SettingsDefineCapabilities 
http://root:password at localhost/root/virt:WrongClassName.InstanceID="MemoryPool/0"
  *
  * wbemcli: Cim: (4) CIM_ERR_INVALID_PARAMETER: 
WrongClassName.InstanceID="MemoryPool/0"
  *
 
 

> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080612/4bbd8756/attachment.htm>

From yunguol at cn.ibm.com  Thu Jun 12 06:41:56 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 12 Jun 2008 14:41:56 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] fix error description in
	SettingsDefineCapabilities.03, which result in fails with sfcb
Message-ID: <5ba940289209e59d649d.1213252916@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213252913 -28800
# Node ID 5ba940289209e59d649d11272142b8ffec071730
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] fix error description in SettingsDefineCapabilities.03, which result in fails with sfcb

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r 5ba940289209 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py	Thu Jun 12 14:41:53 2008 +0800
@@ -37,9 +37,9 @@
 
 expr_values = {
    "invalid_instid_keyname"  : { 'rc'   : pywbem.CIM_ERR_FAILED, 
-                                 'desc' : 'CIM_ERR_FAILED: Missing InstanceID'},
+                                 'desc' : 'Missing InstanceID'},
    "invalid_instid_keyvalue" : { 'rc' : pywbem.CIM_ERR_FAILED, 
-                                 'desc' : 'CIM_ERR_FAILED: Unable to determine\
+                                 'desc' : 'Unable to determine\
  resource type' },
    "invalid_ccname_keyname"  : { 'rc'   : pywbem.CIM_ERR_INVALID_PARAMETER, 
                                  'desc' : 'CIM_ERR_INVALID_PARAMETER' }



From deeptik at linux.vnet.ibm.com  Thu Jun 12 07:01:08 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Thu, 12 Jun 2008 12:31:08 +0530
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Add graphics and input devices
	to XenFV guest XML
In-Reply-To: <fdc71e98f2d1417fcd50.1213133181@elm3b41.beaverton.ibm.com>
References: <fdc71e98f2d1417fcd50.1213133181@elm3b41.beaverton.ibm.com>
Message-ID: <4850C9B4.5020201@linux.vnet.ibm.com>

+1 for me.

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1211564341 25200
> # Node ID fdc71e98f2d1417fcd50bb8b2b6a91300a8296c4
> # Parent  ce82fc9aff4863ee737475bf7eb647138ad000ed
> [TEST] #2 Add graphics and input devices to XenFV guest XML.
>
> Also add pae, acpi, apic features.
>
> Adding these tags fixes several issues:
>  -The ramdisk is 32 bit, so we need to use pae in order to boot properly.
>  -The guest uses a graphical console, so we need to define one in order to start the guest.
>
> Updates:
>   -Rebased one recent sources.
>   -Fixed compatibility issue with KVM and Xen
>
> Note:  This will not fix issues with tests that use DefineSystem() to create guests.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r ce82fc9aff48 -r fdc71e98f2d1 suites/libvirt-cim/lib/XenKvmLib/vxml.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Fri May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Fri May 23 10:39:01 2008 -0700
> @@ -253,6 +253,11 @@
>      dname = ""                # domain name
>
>      def __init__(self, domain_type, name, uuid, mem, vcpu):
> +        is_XenFV = False
> +        if domain_type == "xenfv":
> +            is_XenFV = True
> +            domain_type = "xen"
> +
>          XMLClass.__init__(self)
>          Virsh.__init__(self, domain_type)
>          # domain root nodes
> @@ -260,6 +265,10 @@
>
>          self.add_sub_node(domain, 'name', name)
>          self.add_sub_node(domain, 'uuid', uuid)
> +        
> +        if is_XenFV is True:
> +            self.add_sub_node(domain, 'features')
> +
>          self.add_sub_node(domain, 'os')
>          self.add_sub_node(domain, 'memory', mem * 1024)
>          self.add_sub_node(domain, 'vcpu', vcpu)
> @@ -631,10 +640,17 @@
>          if not os.path.exists(disk_file_path):
>              logger.error('Error: Disk image does not exist')
>              sys.exit(1)
> -        VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus)
> +        VirtXML.__init__(self, 'xenfv', test_dom, set_uuid(), mem, vcpus)
> +        self._features()
>          self._os(const.XenFV_default_loader)
>          self._devices(const.XenFV_default_emulator,
>                        const.default_net_type, mac, disk_file_path, disk) 
> +
> +    def _features(self):
> +        features = self.get_node('/domain/features')
> +        self.add_sub_node(features, 'pae')
> +        self.add_sub_node(features, 'acpi')
> +        self.add_sub_node(features, 'apic')
>
>      def _os(self, os_loader):
>          os = self.get_node('/domain/os')
> @@ -646,6 +662,9 @@
>          devices = self.get_node('/domain/devices')
>
>          self.add_sub_node(devices, 'emulator', emu)
> +        self.add_sub_node(devices, 'graphics', type='vnc', port='5900',
> +                          keymap='en-us')
> +        self.add_sub_node(devices, 'input', type='mouse', bus='xen')
>          disk = self.add_sub_node(devices, 'disk', type='file')
>          self.add_sub_node(disk, 'source', file=disk_img)
>          self.add_sub_node(disk, 'target', dev=disk_dev)
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From deeptik at linux.vnet.ibm.com  Thu Jun 12 07:01:28 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Thu, 12 Jun 2008 12:31:28 +0530
Subject: [Libvirt-cim] [PATCH] [TEST] #4 Make RHEL 5 XenFV guest grub
	conf use hda
In-Reply-To: <f3004051f9d21079d063.1212428651@elm3b41.beaverton.ibm.com>
References: <f3004051f9d21079d063.1212428651@elm3b41.beaverton.ibm.com>
Message-ID: <4850C9C8.7050701@linux.vnet.ibm.com>

+1 for me.

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1211564341 25200
> # Node ID f3004051f9d21079d063b73d9fd4bf751a8c4078
> # Parent  4a5a44d7b857df543af24d59380cb8fdbbb753a4
> [TEST] #4 Make RHEL 5 XenFV guest grub conf use hda.
>
> It looks like qemu on RHEL emulates an ide drive, not a scsi drive.
>
> Update from 1 to 2:
>  -Instead of using distro, use qemu-dm version.
>
> Update from 2 to 3:
>  -Handle case where qemu-dm is 32 bit, as well as 64 bit.
>
> Update from 3 to 4:
>  -Make sure the elif actually checks for the 32 bit version, not the 54 bit version.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r 4a5a44d7b857 -r f3004051f9d2 suites/libvirt-cim/images/xmt-makefv.sh
> --- a/suites/libvirt-cim/images/xmt-makefv.sh	Fri May 30 14:26:38 2008 +0800
> +++ b/suites/libvirt-cim/images/xmt-makefv.sh	Fri May 23 10:39:01 2008 -0700
> @@ -14,6 +14,20 @@
>  PARTED="parted -s"
>  TMPMOUNT=/tmp/cimtest_image_temp
>  SIZE=16
> +QEMU_VER=082
> +QEMU_FILE=""
> +
> +if [ -e "/usr/lib64/xen/bin/qemu-dm" ]; then
> +    QEMU_FILE="/usr/lib64/xen/bin/qemu-dm"
> +elif [ -e "/usr/lib/xen/bin/qemu-dm" ]; then
> +    QEMU_FILE="/usr/lib/xen/bin/qemu-dm"
> +fi
> +
> +if [ -z $QEMU_FILE ]; then
> +    CU_QEMU_VER=0
> +else
> +    CUR_QEMU_VER=`strings $QEMU_FILE | awk '/version [0-9]/ { print $5; }' | sed 's/,//' | sed 's/\.//g'`
> +fi
>
>  die() {
>      echo "FAILED: $i" >&2
> @@ -110,10 +124,19 @@
>  timeout 1
>  title Test Environment
>      root (hd0,0)
> +EOF
> +
> +if [ $CUR_QEMU_VER -lt $QEMU_VER ]; then
> +    cat >>${root}/grub/grub.conf <<EOF
> +    kernel /vmlinuz root=/dev/hda1
> +    initrd /initrd
> +EOF
> +else
> +    cat >>${root}/grub/grub.conf <<EOF
>      kernel /vmlinuz root=/dev/sda1
>      initrd /initrd
>  EOF
> -
> +fi
>  }
>
>  ramdisk=$1
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From deeptik at linux.vnet.ibm.com  Thu Jun 12 07:02:18 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Thu, 12 Jun 2008 12:32:18 +0530
Subject: [Libvirt-cim] CimTest Report  on XenFV 12-06-2008
Message-ID: <4850C9FA.8070005@linux.vnet.ibm.com>

======================================
CIM Test Report for XenFV
======================================
Distro      : RHEL 5.2 Beta
Kernel      : 2.6.18-88.el5xen
Xen version : 3.1.2-88.el5
Libvirt     : libvirt-0.3.3-7.el5
CIMOM       : pegasus
PyWBEM      : pywbem-3.14
CIM Schema  : cimv216Experimental
LibCMPIutil :  79
LibVirtCIM  : 606
CIMTEST     : 194
======================================
PASS        : 88
FAIL        : 18  [ 8 test cases passed when ran manually , so 10 tc are 
failing now]
XFAIL       :  1
SKIP        : 22
-----------------
Total       : 129
====================================== 
List of tc that are failing:

ComputerSystem - 04_defineStartVS.py: FAIL
ComputerSystem - 06_paused_active_suspend.py: FAIL
ComputerSystem - 23_suspend_suspend.py: FAIL
ComputerSystem - 32_start_reboot.py: FAIL
ComputerSystem - 33_suspend_reboot.py: FAIL
ComputerSystem - 35_start_reset.py: FAIL
ComputerSystem - 40_RSC_start.py: FAIL
ElementAllocatedFromPool - 04_forward_errs.py: FAIL                     
--Passed when run manually
ElementConforms - 02_reverse.py: FAIL                                   
--Passed when run manually
HostSystem - 02_hostsystem_to_rasd.py: FAIL                             
--Passed when run manually
LogicalDisk - 03_ld_gi_errs.py: FAIL                                    
--Passed when run manually
Memory - 01_memory.py: FAIL                                             
--Passed when run manually
NetworkPort - 01_netport.py: FAIL                                       
--Passed when run manually
ResourceAllocationFromPool - 02_reverse.py: FAIL                        
--Passed when run manually
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL
VSSD - 04_vssd_to_rasd.py: FAIL                                         
--Passed when run manually
VirtualSystemManagementService - 02_destroysystem.py: FAIL
VirtualSystemManagementService - 08_modifyresource.py: FAIL


Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Jun12-XenFV-report
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080612/9ad569dd/attachment.ksh>

From yunguol at cn.ibm.com  Thu Jun 12 07:11:32 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Thu, 12 Jun 2008 15:11:32 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ElementCapabilities.05 for	LXC
	support
In-Reply-To: <484FEC6B.9060003@linux.vnet.ibm.com>
Message-ID: <OFA75154B4.17B5C0DA-ON48257466.00256455-48257466.0027CCB1@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-11 23:16:59:

> yunguol at cn.ibm.com wrote:
> > # HG changeset patch
> > # User Guolian Yun <yunguol at cn.ibm.com>
> > # Date 1213262003 -28800
> > # Node ID 7a8e2732d1281077c9dbaac0e8a3eb056e44fafa
> > # Parent  254bc5464030a03b6f791fd49acd208f6ec1db23
> > [TEST] Update ElementCapabilities.05 for LXC support
> > 
> > Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> > 
> > diff -r 254bc5464030 -r 7a8e2732d128 suites/libvirt-
> cim/cimtest/ElementCapabilities/05_hostsystem_cap.py
> > --- a/suites/libvirt-
> cim/cimtest/ElementCapabilities/05_hostsystem_cap.py   Wed Jun 11 
> 20:56:07 2008 +0800
> > +++ b/suites/libvirt-
> cim/cimtest/ElementCapabilities/05_hostsystem_cap.py   Thu Jun 12 
> 17:13:23 2008 +0800
> 
> This failed for me:
> 
> Testing LXC hypervisor
> ElementCapabilities - 05_hostsystem_cap.py: FAIL
> ERROR   - LXC_ElementCapabilities returned 0 Capabilities objects
> ERROR   - ManagementCapabilities Verification failed
> 
  This fails because we can't get anything by querying below:

wbemcli ein 
http://root:password at localhost/root/virt:LXC_VirtualSystemManagementService
localhost:5988/root/virt:LXC_VirtualSystemManagementService.SystemCreationClassName="LXC_HostSystem",SystemName="nine",CreationClassName="LXC_VirtualSystemManagementService",Name="Management 
Service"
 
I think we have to fix it in provider. Below is part code of 
Virt_ElementCapabilities.c.
...
 static char* service[] = {
        "Xen_VirtualSystemManagementService",
        "KVM_VirtualSystemManagementService",
        "Xen_VirtualSystemMigrationService",
        "KVM_VirtualSystemMigrationService",
        "LXC_VirtualSystemMigrationService",
        NULL
};
...

We have to add LXC_VirtualSystemManagementService to the structure.



> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080612/f64e7b92/attachment.htm>

From yunguol at cn.ibm.com  Thu Jun 12 07:04:14 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Thu, 12 Jun 2008 00:04:14 -0700
Subject: [Libvirt-cim] [PATCH] Fix LXC_VirtualSystemManagementService
	missing in ElementCapabilities association service structure
Message-ID: <9a457c241c23cc32961f.1213254254@elm3b197.beaverton.ibm.com>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213254244 25200
# Node ID 9a457c241c23cc32961f3a4d8eb15652eea7c172
# Parent  4490ff0e39c77b64e9380151dd9b6f3b217836f4
Fix LXC_VirtualSystemManagementService missing in ElementCapabilities association service structure

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 4490ff0e39c7 -r 9a457c241c23 src/Virt_ElementCapabilities.c
--- a/src/Virt_ElementCapabilities.c	Wed Jun 11 09:05:22 2008 -0700
+++ b/src/Virt_ElementCapabilities.c	Thu Jun 12 00:04:04 2008 -0700
@@ -441,6 +441,7 @@ static char* service[] = {
 static char* service[] = {
         "Xen_VirtualSystemManagementService",
         "KVM_VirtualSystemManagementService",
+        "LXC_VirtualSystemManagementService"
         "Xen_VirtualSystemMigrationService",
         "KVM_VirtualSystemMigrationService",
         "LXC_VirtualSystemMigrationService",



From deeptik at linux.vnet.ibm.com  Thu Jun 12 09:44:40 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 12 Jun 2008 02:44:40 -0700
Subject: [Libvirt-cim] [PATCH 4 of 4] [TEST] Updating the tc to use the
	rasd_init_list() fn of rasd.py
In-Reply-To: <patchbomb.1213263876@elm3b193.beaverton.ibm.com>
Message-ID: <bb5f359be87cb3883b45.1213263880@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213263349 25200
# Node ID bb5f359be87cb3883b45301c8c7a056278d453a0
# Parent  dfb6d5b51653712ed15387b76e3ddf89098d92d2
[TEST] Updating the tc to use the rasd_init_list() fn of rasd.py.


Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r dfb6d5b51653 -r bb5f359be87c suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Thu Jun 12 02:33:29 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Thu Jun 12 02:35:49 2008 -0700
@@ -57,6 +57,9 @@
 from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import rasd
+from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -64,44 +67,18 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-prev = 531
-mrev = 529
-
-def init_list(xml, disk, virt="Xen"):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    procrasd = {
-            "InstanceID" : '%s/%s' % (test_dom, "proc"),
-            "ResourceType" : 3,
-            "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
-    netrasd = {
-            "InstanceID" : '%s/%s' % (test_dom,test_mac),
-            "ResourceType" : 10 ,
-            "ntype1" : "bridge",
-            "ntype2" : "ethernet",
-            "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
-    address = xml.xml_get_disk_source()
-    diskrasd = {
-            "InstanceID" : '%s/%s' % (test_dom, disk),
-            "ResourceType" : 17,
-            "Address" : address,
-            "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
-    memrasd = {
-            "InstanceID" : '%s/%s' % (test_dom, "mem"),
-            "ResourceType" : 4,
-            "AllocationUnits" : "KiloBytes",
-            "VirtualQuantity" : (test_mem * 1024),
-            "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
-    if CIM_REV < prev:
-        procrasd['InstanceID'] = '%s/0' % test_dom
-    if CIM_REV < mrev:
-        memrasd['AllocationUnits'] = 'MegaBytes'
-
-    return procrasd, netrasd, diskrasd, memrasd
 
 def assoc_values(assoc_info, xml, disk, virt="Xen"):
-    procrasd, netrasd, diskrasd, memrasd = init_list(xml, disk, virt)
+    status, rasd_values = rasd_init_list(xml, virt, disk, test_dom,
+                                         test_mac, test_mem)
+    if status != PASS:
+        return status
+
+    procrasd =  rasd_values['%s' %rasd.proc_cn]
+    netrasd  =  rasd_values['%s'  %rasd.net_cn] 
+    diskrasd =  rasd_values['%s'  %rasd.disk_cn]
+    memrasd  =  rasd_values['%s'  %rasd.mem_cn]
+
     if virt == 'LXC':
         proc_status = 0
         disk_status = 0
diff -r dfb6d5b51653 -r bb5f359be87c suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py	Thu Jun 12 02:33:29 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py	Thu Jun 12 02:35:49 2008 -0700
@@ -37,6 +37,10 @@
 from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import rasd
+from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
+
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -44,41 +48,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-prev = 531
-mrev = 529
-
-def init_list(virt):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    proc = {
-            "InstanceID" : '%s/%s' % (test_dom, "proc"),
-            "ResourceType" : 3,
-            "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
-    net = {
-            "InstanceID" : '%s/%s' % (test_dom,test_mac),
-            "ResourceType" : 10 ,
-            "ntype1" : "bridge",
-            "ntype2" : "ethernet",
-            "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
-    address = vsxml.xml_get_disk_source()
-    disk = {
-            "InstanceID"  : '%s/%s' % (test_dom, test_disk),
-            "ResourceType" : 17,
-            "Address" : address,
-            "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
-    mem = {
-            "InstanceID" : '%s/%s' % (test_dom, "mem"),
-            "ResourceType" : 4,
-            "AllocationUnits" : "KiloBytes",
-            "VirtualQuantity" : (test_mem * 1024),
-            "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
-    if CIM_REV < prev:
-        proc['InstanceID'] = '%s/0' % test_dom
-    if CIM_REV < mrev:
-        mem['AllocationUnits'] = 'MegaBytes'
-
-    return proc, net, disk, mem
 
 def get_inst_from_list(server, classname, rasd_list, filter_name, exp_val):
     status = PASS
@@ -125,7 +94,7 @@
         for rasd_instance in rasd_values_info:
             CCName = rasd_instance.classname
             if rasd.pasd_cn in CCName :
-                status = rasd.verify_procrasd_values(rasd_instance, procrasd,)
+                status = rasd.verify_procrasd_values(rasd_instance, procrasd)
             elif rasd.nasd_cn in CCName :
                 status = rasd.verify_netrasd_values(rasd_instance, netrasd)
             elif rasd.dasd_cn in CCName:
@@ -176,8 +145,15 @@
         logger.error("Exception : %s", details)
         return FAIL
     
-    status = PASS 
-    procrasd, netrasd, diskrasd, memrasd = init_list(virt)
+    status, rasd_values_list = rasd_init_list(vsxml, virt, test_disk, test_dom,
+                                         test_mac, test_mem)
+    if status != PASS:
+        return status
+
+    procrasd =  rasd_values_list['%s'  %rasd.proc_cn]
+    netrasd  =  rasd_values_list['%s'  %rasd.net_cn]
+    diskrasd =  rasd_values_list['%s'  %rasd.disk_cn]
+    memrasd  =  rasd_values_list['%s'  %rasd.mem_cn]
     
     # For each loop
     # 1) Enumerate one RASD type
diff -r dfb6d5b51653 -r bb5f359be87c suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py
--- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Thu Jun 12 02:33:29 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Thu Jun 12 02:35:49 2008 -0700
@@ -51,8 +51,9 @@
 from XenKvmLib import assoc
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
+from XenKvmLib import rasd
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values 
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
@@ -87,44 +88,6 @@
         logger.error("Exception : %s", details)
         return FAIL, vsxml_info
     return PASS, vsxml_info
-
-def init_list(virt):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    procrasd = {
-                 "InstanceID" : '%s/%s' %(test_dom, "proc"),
-                 "ResourceType" : 3,
-                 "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
-                }
-    if CIM_REV < proc_rev:
-        procrasd['InstanceID'] = '%s/%s' %(test_dom, "0")
-
-    netrasd = {
-                "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
-                "ResourceType" : 10 , 
-                "ntype1": "bridge", 
-                "ntype2": "ethernet", 
-                "CreationClassName": get_typed_class(virt, 'NetResourceAllocationSettingData')
-               }
-
-    address = vsxml.xml_get_disk_source()
-    diskrasd = {
-                "InstanceID"  : '%s/%s' %(test_dom, test_disk), 
-                "ResourceType" : 17, 
-                "Address"      : address, 
-                "CreationClassName": get_typed_class(virt, 'DiskResourceAllocationSettingData')
-               }
-    memrasd = {
-               "InstanceID"  : '%s/%s' %(test_dom, "mem"), 
-               "ResourceType" : 4, 
-               "AllocationUnits" : "KiloBytes",
-               "VirtualQuantity" : (test_mem * 1024), 
-               "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
-              }
-    if CIM_REV < mem_rev:
-        memrasd['AllocationUnits'] = "MegaBytes"
-    return procrasd, netrasd, diskrasd, memrasd
 
 def get_inst_from_list(classname, vssd_list, filter_name, exp_val):
     status = PASS
@@ -199,7 +162,16 @@
     return status, vssdc_assoc_info
 
 def verify_rasd_values(rasd_values_info):
-    procrasd, netrasd, diskrasd, memrasd = init_list(virt)
+    status, rasd_values = rasd_init_list(vsxml, virt, test_disk, test_dom,
+                                         test_mac, test_mem)
+    if status != PASS:
+        return status
+
+    procrasd =  rasd_values['%s' %rasd.proc_cn]
+    netrasd  =  rasd_values['%s'  %rasd.net_cn]
+    diskrasd =  rasd_values['%s'  %rasd.disk_cn]
+    memrasd  =  rasd_values['%s'  %rasd.mem_cn]
+
     try:
         for rasd_instance in rasd_values_info:
             CCName = rasd_instance.classname



From deeptik at linux.vnet.ibm.com  Thu Jun 12 09:44:36 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 12 Jun 2008 02:44:36 -0700
Subject: [Libvirt-cim] [PATCH 0 of 4] [TEST] Moving the init_list() to
	rasd.py
Message-ID: <patchbomb.1213263876@elm3b193.beaverton.ibm.com>

Moving the init_list() fn for RASD related tc to lib.
Modifying the affected tc to use the new rasd_init_list().



From deeptik at linux.vnet.ibm.com  Thu Jun 12 09:44:39 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 12 Jun 2008 02:44:39 -0700
Subject: [Libvirt-cim] [PATCH 3 of 4] [TEST] Updating the
	41_cs_to_settingdefinestate.py tc of ComputerSystem
In-Reply-To: <patchbomb.1213263876@elm3b193.beaverton.ibm.com>
Message-ID: <dfb6d5b51653712ed153.1213263879@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213263209 25200
# Node ID dfb6d5b51653712ed15387b76e3ddf89098d92d2
# Parent  facf3365deb1a39cc11c6d252674407eb4b93f88
[TEST] Updating the 41_cs_to_settingdefinestate.py tc of ComputerSystem.

1) Updated the tc to use vxml fn().
2) Updated the tc to use rasd_init_list() fn of rasd.py.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r facf3365deb1 -r dfb6d5b51653 suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py	Thu Jun 12 02:30:44 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py	Thu Jun 12 02:33:29 2008 -0700
@@ -59,15 +59,17 @@
 import sys
 from VirtLib import utils
 from XenKvmLib import computersystem
-from XenKvmLib.test_xml import testxml, disk_path
-from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
+from XenKvmLib.classes import get_typed_class
+from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.assoc import Associators, AssociatorNames
 from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \
 CIM_ERROR_ASSOCIATORS
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import rasd
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 
 sup_types = ['Xen']
 
@@ -75,43 +77,7 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-test_disk   = 'xvda'
 vstype      = 'Xen'
-
-
-def rasd_init_list():
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    proc_rasd = {
-                         "InstanceID" : '%s/%s' %(test_dom, "proc"),\
-                       "ResourceType" : 3,\
-                }
-
-    disk_rasd = {
-                       "InstanceID"  : '%s/%s' %(test_dom, test_disk), \
-                      "ResourceType" : 17, \
-                      "Address"      : disk_path, \
-                }
-    net_rasd =  {
-                       "InstanceID"  : '%s/%s' %(test_dom,test_mac), \
-                      "ResourceType" : 10 , \
-                             "ntype1": "bridge", \
-                             "ntype2": "ethernet", \
-                }
-    mem_rasd =  {
-                       "InstanceID"  : '%s/%s' %(test_dom, "mem"), \
-                      "ResourceType" : 4, \
-                   "AllocationUnits" : "KiloBytes",\
-                   "VirtualQuantity" : (test_mem * 1024), \
-                }
-    rasd_values = {  "Xen_Processor"   : proc_rasd, \
-                     "Xen_LogicalDisk" : disk_rasd, \
-                     "Xen_NetworkPort" : net_rasd, \
-                     "Xen_Memory"      : mem_rasd 
-                  }
-    return rasd_values
-
 
 def vssd_init_list():
     """
@@ -142,19 +108,27 @@
                  }
     return cs_values 
 
-def setup_env(server):
+def setup_env(server, virt):
+    vsxml_info = None
     status = PASS
     destroy_and_undefine_all(server)
-    test_xml = testxml(test_dom, mem = test_mem,    \
-                                 vcpus = test_vcpus, \
-                                     mac = test_mac,  \
-                                      disk = test_disk)
+    if virt == "Xen":
+        test_disk = "xvda"
+    else:
+        test_disk = "hda"
+    virt_xml =  get_class(virt)
+    vsxml_info = virt_xml(test_dom, mem = test_mem,
+                                  vcpus=test_vcpus,
+                                    mac = test_mac,
+                                  disk = test_disk)
 
-    ret = test_domain_function(test_xml, server, cmd = "create")
+    ret = vsxml_info.create(server)
     if not ret:
         logger.error("Failed to create the dom: %s", test_dom)
         status = FAIL
-    return status
+
+    return status, vsxml_info, test_disk
+
 
 def print_err(err, detail, cn):
     logger.error(err % cn)
@@ -168,7 +142,7 @@
     logger.error(err)
     logger.error(detail)
 
-def get_inst_from_list(server, cn, cs_list, exp_val):
+def get_inst_from_list(server, vsxml, cn, cs_list, exp_val):
     status = PASS
     ret = -1
     inst = None 
@@ -179,12 +153,12 @@
 
     if ret != PASS:
         logger.error("%s with %s was not returned" % (cn, exp_val))
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         status = FAIL
 
     return status, inst
 
-def get_associatornames_info(server, cn, an, qcn, name):
+def get_associatornames_info(server, vsxml, cn, an, qcn, name):
     status = PASS
     assoc_info = []
     try:
@@ -201,11 +175,11 @@
         status = FAIL
 
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
 
     return status, assoc_info
 
-def get_associators_info(server, cn, an, qcn, instid):
+def get_associators_info(server, vsxml, cn, an, qcn, instid):
     status = PASS
     assoc_info = []
     try:
@@ -223,17 +197,19 @@
         status = FAIL
 
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
 
     return status, assoc_info
 
 def check_len(an, assoc_list_info, qcn, exp_len):
     if len(assoc_list_info) != exp_len:
-        logger.error("%s returned %i %s objects" % (an, len(assoc_list_info), qcn))
+        logger.error("%s returned %i %s objects" % (an, 
+                                                    len(assoc_list_info), qcn))
         return FAIL 
     return PASS 
 
-def get_setdefstate_verify_RASD_build_vssdc_input(server, sd_assoc_info):
+def get_setdefstate_verify_RASD_build_vssdc_input(server, virt, vsxml, test_disk, 
+                                                                  sd_assoc_info):
     status = PASS
     in_setting_define_state = {} 
     in_vssdc = {}
@@ -254,7 +230,11 @@
             return FAIL, in_setting_define_state
 # Get the rasd values that will be used to compare with the Xen_SettingsDefineState
 # output.
-        rasd_values = rasd_init_list()
+        status, rasd_values = rasd_init_list(vsxml, virt, test_disk, test_dom,
+                                             test_mac, test_mem)
+        if status != PASS:
+            return status
+
         sccn = "Xen_ComputerSystem"
         an = "Xen_SettingsDefineState"
         for cn, devid in sorted(in_setting_define_state.items()):
@@ -350,21 +330,23 @@
 @do_main(sup_types)
 def main():
     server = main.options.ip
-    status = setup_env(server)
+    virt   = main.options.virt
+    status, vsxml, test_disk = setup_env(server, virt)
     if status != PASS:
         return status
 
     cs_enum = computersystem.enumerate(server)
     if len(cs_enum) == 0:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
     cn = cs_enum[0].CreationClassName
     status, cs_dom = get_inst_from_list(server,
+                                         vsxml,
                                             cn,
                                        cs_enum,
                                       test_dom)
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
 
 # Creating the cs info list which will be used later for comparison.
@@ -372,26 +354,30 @@
     if cs_values['EnabledState'] != 2 :
         logger.error("Improper EnabledState value set for domain %s", test_dom)
         logger.error("Should have been 2 instead of %s", cs_values['EnabledState'])
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return FAIL 
     
     cn        = cs_dom.CreationClassName
     an        = 'Xen_SystemDevice'
     qcn       = 'Logical Devices'
     name      = test_dom
-    status, sd_assoc_info = get_associatornames_info(server, cn, an, qcn, name)
+    status, sd_assoc_info = get_associatornames_info(server, vsxml, 
+                                                     cn, an, qcn, name)
     if status != PASS or len(sd_assoc_info) == 0:
         return status
-    status, in_vssdc_list = get_setdefstate_verify_RASD_build_vssdc_input(server, \
-                                                                     sd_assoc_info)
+    status, in_vssdc_list = get_setdefstate_verify_RASD_build_vssdc_input(server, 
+                                                                            virt,
+                                                                            vsxml,
+                                                                        test_disk,
+                                                                    sd_assoc_info)
     if status != PASS or len(in_vssdc_list) == 0 :
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
 # Verifying that the in_vssdc_list contains 4 entries one each for mem rasd,
 # network rasd, processor rasd and disk rasd.
     exp_len = 4
     if check_len(an, in_vssdc_list, qcn, exp_len) != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return FAIL 
 # Get the vssd values which will be used for verifying the Xen_VirtualSystemSettingData 
 # output from the Xen_VirtualSystemSettingDataComponent results.
@@ -399,14 +385,15 @@
     an  = 'Xen_VirtualSystemSettingDataComponent'
     qcn = 'Xen_VirtualSystemSettingData'
     for cn, instid in sorted((in_vssdc_list.items())):
-        status, vssd_assoc_info = get_associators_info(server, cn, an, qcn, instid)
+        status, vssd_assoc_info = get_associators_info(server, vsxml, cn, an, qcn,
+                                                       instid)
         if status != PASS or len(vssd_assoc_info) == 0:
             break 
         status = verify_VSSD_values(vssd_assoc_info, vssd_values, an, qcn)    
         if status != PASS:
             break
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
 # Since the Xen_VirtualSystemSettingDataComponent returns similar output when queried with 
 # every RASD, we are taking the output of the last associtaion query as inputs for 
@@ -415,13 +402,13 @@
     an     = 'Xen_SettingsDefineState'
     qcn    = 'Xen_ComputerSystem'
     instid = vssd_assoc_info[0]['InstanceID']
-    status, cs_assoc_info = get_associators_info(server, cn, an, qcn, instid)
+    status, cs_assoc_info = get_associators_info(server, vsxml, cn, an, qcn, instid)
     if status != PASS or len(cs_assoc_info) == 0:
         return status
 # verify the results of Xen_SettingsDefineState with the cs_values list that was 
 # built using the output of the enumeration on Xen_ComputerSystem.
     status = verify_CS_values(cs_assoc_info, cs_values, an, qcn)
-    test_domain_function(test_dom, server, "destroy")
+    vsxml.destroy(server)
     return status
 if __name__ == "__main__":
     sys.exit(main())



From deeptik at linux.vnet.ibm.com  Thu Jun 12 09:44:37 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 12 Jun 2008 02:44:37 -0700
Subject: [Libvirt-cim] [PATCH 1 of 4] [TEST] Moving the init_list() to
	rasd.py
In-Reply-To: <patchbomb.1213263876@elm3b193.beaverton.ibm.com>
Message-ID: <6b52040f1dd92532abca.1213263877@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213262959 25200
# Node ID 6b52040f1dd92532abca3a7698d406f1bc369c7a
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] Moving the init_list()  to rasd.py

1) Most of the tc use init_list() fn to verify the RASD values, hence moved it to rasd.py.
2) Added the logic to pick up the networktype used by the guest while creating to verify the RASD values.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r b9100cec9aed -r 6b52040f1dd9 suites/libvirt-cim/lib/XenKvmLib/rasd.py
--- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Thu Jun 12 02:29:19 2008 -0700
@@ -21,28 +21,96 @@
 #
 
 import sys
-from CimTest import Globals 
 from CimTest.Globals import log_param, logger
 from CimTest.ReturnCodes import FAIL, PASS
+from XenKvmLib.const import CIM_REV
+from XenKvmLib import vxml
+from XenKvmLib.classes import get_typed_class
+
 
 pasd_cn = 'ProcResourceAllocationSettingData'
 nasd_cn = 'NetResourceAllocationSettingData'
 dasd_cn = 'DiskResourceAllocationSettingData'
 masd_cn = 'MemResourceAllocationSettingData'
+global proc_cn, mem_cn, net_cn, disk_cn
+
+
+mem_units_rev = 529
+proc_instid_rev = 590
+
+def rasd_init_list(vsxml, virt, test_disk, test_dom, test_mac, test_mem):
+    """
+        Creating the lists that will be used for comparisons.
+    """
+    global proc_cn, mem_cn, net_cn, disk_cn
+    proc_cn = get_typed_class(virt, "Processor")
+    mem_cn = get_typed_class(virt, "Memory")
+    net_cn = get_typed_class(virt, "NetworkPort")
+    disk_cn = get_typed_class(virt, "LogicalDisk")
+    try:
+
+        disk_path = vsxml.xml_get_disk_source()
+
+        if CIM_REV < mem_units_rev:
+          alloc_units  = "MegaBytes"
+        else:
+          alloc_units  = "KiloBytes"
+
+        if CIM_REV < proc_instid_rev:
+           proc_id = '%s/%s' %(test_dom, 0)
+        else:
+           proc_id = '%s/%s' %(test_dom, "proc")
+       
+
+        rasd_values = { 
+                        proc_cn  : {
+                                     "InstanceID"   : proc_id,
+                                     "ResourceType" : 3,
+                                    }, 
+                        disk_cn  : {
+                                     "InstanceID"   : '%s/%s' %(test_dom, 
+                                                                test_disk), 
+                                     "ResourceType" : 17, 
+                                     "Address"      : disk_path, 
+                                    }, 
+                        net_cn   : {
+                                      "InstanceID"   : '%s/%s' %(test_dom, 
+                                                                 test_mac), 
+                                      "ResourceType" : 10 , 
+                                      "ntype"        : [ 'bridge', 'user',
+                                                         'network', 'ethernet'] 
+                                   }, 
+                        mem_cn   : {
+                                      "InstanceID"    : '%s/%s' %(test_dom, "mem"), 
+                                      "ResourceType"  : 4, 
+                                      "AllocationUnits" : alloc_units,
+                                      "VirtualQuantity" : (test_mem * 1024), 
+                                   }
+                      } 
+    except Exception, details:
+        logger.error("Exception: In fn rasd_init_list %s", details)
+        return FAIL, rasd_values
+
+    nettype   = vsxml.xml_get_net_type()
+    if not nettype in rasd_values[net_cn]['ntype']:
+        logger.info("Adding the %s net type", nettype)
+        rasd_values[net_cn]['ntype'].append(nettype)
+
+    return PASS, rasd_values
 
 def CCN_err(assoc_info, list):
-    Globals.logger.error("%s Mismatch", 'CreationClassName')
-    Globals.logger.error("Returned %s instead of %s", \
+    logger.error("%s Mismatch", 'CreationClassName')
+    logger.error("Returned %s instead of %s", \
          assoc_info['CreationClassName'], list['CreationClassName'])
     
 def RType_err(assoc_info, list):
-    Globals.logger.error("%s Mismatch", 'ResourceType')
-    Globals.logger.error("Returned %s instead of %s", \
+    logger.error("%s Mismatch", 'ResourceType')
+    logger.error("Returned %s instead of %s", \
          assoc_info['ResourceType'], list['ResourceType'])
 
 def InstId_err(assoc_info, list):
-    Globals.logger.error("%s Mismatch", 'InstanceID')
-    Globals.logger.error("Returned %s instead of %s", \
+    logger.error("%s Mismatch", 'InstanceID')
+    logger.error("Returned %s instead of %s", \
          assoc_info['InstanceID'], list['InstanceID'])
 
 def verify_procrasd_values(assoc_info, procrasd_list):
@@ -63,12 +131,10 @@
     if assoc_info['ResourceType'] != netrasd_list['ResourceType']:
         RType_err(assoc_info, netrasd_list)
         status = FAIL
-    if assoc_info['NetworkType'] != netrasd_list['ntype1'] and \
-       assoc_info['NetworkType'] != netrasd_list['ntype2']:
-        Globals.logger.error("%s Mismatch", 'NetworkType')
-        Globals.logger.error("Returned %s instead of %s or %s", \
-                             assoc_info['NetworkType'], netrasd_list['ntype1'],
-                             netrasd_list['ntype2'])
+    if not assoc_info['NetworkType'] in netrasd_list['ntype']:
+        logger.error("%s Mismatch", 'NetworkType')
+        logger.error("Returned '%s' instead of returning one of %s types",
+                         assoc_info['NetworkType'], netrasd_list['ntype'])
         status = FAIL
     return status
 
@@ -81,8 +147,8 @@
         RType_err(assoc_info, diskrasd_list)
         status = FAIL
     if assoc_info['Address'] != diskrasd_list['Address']:
-        Globals.logger.error("%s Mismatch", 'Address')
-        Globals.logger.error("Returned %s instead of %s ", \
+        logger.error("%s Mismatch", 'Address')
+        logger.error("Returned %s instead of %s ", \
               assoc_info['Address'], diskrasd_list['Address'])
         status = FAIL
     return status
@@ -96,13 +162,13 @@
         RType_err(assoc_info, memrasd_list)
         status = FAIL
     if assoc_info['AllocationUnits'] != memrasd_list['AllocationUnits']:
-        Globals.logger.error("%s Mismatch", 'AllocationUnits')
-        Globals.logger.error("Returned %s instead of %s ", \
+        logger.error("%s Mismatch", 'AllocationUnits')
+        logger.error("Returned %s instead of %s ", \
               assoc_info['AllocationUnits'],  memrasd_list['AllocationUnits'])
         status = FAIL 
     if assoc_info['VirtualQuantity'] != memrasd_list['VirtualQuantity']:
-        Globals.logger.error("%s mismatch", 'VirtualQuantity')
-        Globals.logger.error("Returned %s instead of %s ", \
+        logger.error("%s mismatch", 'VirtualQuantity')
+        logger.error("Returned %s instead of %s ", \
               assoc_info['VirtualQuantity'], memrasd_list['VirtualQuantity'])
         status = FAIL 
     return status



From deeptik at linux.vnet.ibm.com  Thu Jun 12 09:44:38 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 12 Jun 2008 02:44:38 -0700
Subject: [Libvirt-cim] [PATCH 2 of 4] [TEST] Fixing the
	02_hostsystem_to_rasd.py tc of HostSystem
In-Reply-To: <patchbomb.1213263876@elm3b193.beaverton.ibm.com>
Message-ID: <facf3365deb1a39cc11c.1213263878@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213263044 25200
# Node ID facf3365deb1a39cc11c6d252674407eb4b93f88
# Parent  6b52040f1dd92532abca3a7698d406f1bc369c7a
[TEST] Fixing the 02_hostsystem_to_rasd.py tc of HostSystem.

1) Fixing the tc failure bcs of the modifications that was done to default network type.
2) Using the rasd_init_list() fn of the rasd.py .

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 6b52040f1dd9 -r facf3365deb1 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Thu Jun 12 02:29:19 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Thu Jun 12 02:30:44 2008 -0700
@@ -57,7 +57,7 @@
 CIM_ERROR_ASSOCIATORS
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV']
@@ -69,47 +69,6 @@
 test_mac    = "00:11:22:33:44:aa"
 rev = 529
 proc_instid_rev = 590
-
-def init_list(vsxml, virt="Xen"):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    disk_path = vsxml.xml_get_disk_source()
-    proc_cn = get_typed_class(virt, "Processor")
-    mem_cn = get_typed_class(virt, "Memory")
-    net_cn = get_typed_class(virt, "NetworkPort")
-    disk_cn = get_typed_class(virt, "LogicalDisk")
-
-    rasd_values = { 
-                    proc_cn              : {
-                                             "InstanceID" : '%s/%s' %(test_dom, "proc"),
-                                             "ResourceType" : 3,
-                                            }, 
-                    disk_cn              : {
-                                             "InstanceID"  : '%s/%s' %(test_dom, test_disk), 
-                                             "ResourceType" : 17, 
-                                             "Address"      : disk_path, 
-                                            }, 
-                    net_cn               : {
-                                              "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
-                                              "ResourceType" : 10 , 
-                                              "ntype1": "bridge", 
-                                              "ntype2": "ethernet", 
-                                           }, 
-                    mem_cn               : {
-                                              "InstanceID"  : '%s/%s' %(test_dom, "mem"), 
-                                              "ResourceType" : 4, 
-                                              "AllocationUnits" : "KiloBytes",
-                                              "VirtualQuantity" : (test_mem * 1024), 
-                                           }
-                  } 
-    if CIM_REV < rev:
-       rasd_values[mem_cn]['AllocationUnits'] = "MegaBytes"
-
-    if CIM_REV < proc_instid_rev:
-       rasd_values[proc_cn]['InstanceID'] = '%s/%s' %(test_dom, 0)
-
-    return rasd_values
 
 def setup_env(server, virt="Xen"):
     vsxml_info = None
@@ -185,7 +144,12 @@
                 classname_keyvalue = sd_assoc_info[i]['CreationClassName']
                 deviceid =  sd_assoc_info[i]['DeviceID']
                 in_setting_define_state[classname_keyvalue] = deviceid
-        rasd_values = init_list(vsxml, virt)
+
+        status, rasd_values = rasd_init_list(vsxml, virt, test_disk, test_dom, 
+                                            test_mac, test_mem)
+        if status != PASS:
+            return status
+
         an = get_typed_class(virt, 'SettingsDefineState')
         sccn = get_typed_class(virt, 'ComputerSystem')
         for cn, devid in sorted(in_setting_define_state.items()):



From kaitlin at linux.vnet.ibm.com  Thu Jun 12 13:40:32 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 12 Jun 2008 06:40:32 -0700
Subject: [Libvirt-cim] [PATCH] Fix LXC_VirtualSystemManagementService
	missing in ElementCapabilities association service structure
In-Reply-To: <9a457c241c23cc32961f.1213254254@elm3b197.beaverton.ibm.com>
References: <9a457c241c23cc32961f.1213254254@elm3b197.beaverton.ibm.com>
Message-ID: <48512750.7040002@linux.vnet.ibm.com>

Guo Lian Yun wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213254244 25200
> # Node ID 9a457c241c23cc32961f3a4d8eb15652eea7c172
> # Parent  4490ff0e39c77b64e9380151dd9b6f3b217836f4
> Fix LXC_VirtualSystemManagementService missing in ElementCapabilities association service structure
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r 4490ff0e39c7 -r 9a457c241c23 src/Virt_ElementCapabilities.c

Nice catch! +1

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Fri Jun 13 00:52:51 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 12 Jun 2008 17:52:51 -0700
Subject: [Libvirt-cim] [PATCH] [TEST]
	Update	VirtualSystemSettingDataComponent.04 for LXC support
In-Reply-To: <OF5D092DE3.77AA8048-ON48257466.000E2374-48257466.000F450B@cn.ibm.com>
References: <OF5D092DE3.77AA8048-ON48257466.000E2374-48257466.000F450B@cn.ibm.com>
Message-ID: <4851C4E3.70504@linux.vnet.ibm.com>

>  > Why the change here?  I see the following errors:
>  >
>  >   wbemcli ain -ac LXC_VirtualSystemSettingDataComponent
>  > 
> 'http://localhost/root/virt:LXC_VirtualSystemSettingData.Invalid="LXC:meep"'
>  > *
>  > * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID)
>  >
>  > wbemcli ain -ac LXC_VirtualSystemSettingDataComponent
>  > 
> 'http://localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="Invalid"'
>  >
>  > *
>  > * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID)
>  > *
>  >
>  > Are you seeing a different error?
>  >
>   Yes, here is the error on my system.
> 
> wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
> http://localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="LXC:Invalid" 
> 
> *
> * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (Invalid)
> *

Oh, I see.  The query call you're using is different than the queries 
the test is calling. It's calling the following:

wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
http://localhost/root/virt:LXC_VirtualSystemSettingData.INVALID_InstID_Keyname="KVM:domu1" 


wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
http://localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="INVALID_InstID_Keyval"

You're welcome to add your scenario (attempting to query the association 
using a guest name that does not exist) since it's not covered by the test.


Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Fri Jun 13 05:16:19 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Fri, 13 Jun 2008 13:16:19 +0800
Subject: [Libvirt-cim] [TEST] CimTest Report for LXC with Pegasus on F9
	(2008/06/13)
Message-ID: <OF39DC37FF.DB100D77-ON48257467.001D21F2-48257467.001D4133@cn.ibm.com>

stro: Fedora 9 Beta
kernel-2.6.25-0.218.rc8.git7.fc9.x86_64
CIMOM: tog-pegasus-2.7.0-6.fc9.x86_64
cimtest: changeset-194

==================================================================
PASS        :  70
FAIL        :  0
XFAIL       :  1
SKIP        :  58
-----------------
Total       : 129

===================== CIMTEST REPORT===============================
AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: PASS
ComputerSystem - 03_defineVS.py: PASS
ComputerSystem - 04_defineStartVS.py: SKIP
ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
ComputerSystem - 06_paused_active_suspend.py: SKIP
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: SKIP
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: SKIP
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: SKIP
ComputerSystemIndication - 01_created_indication.py: SKIP
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: SKIP
ElementAllocatedFromPool - 04_forward_errs.py: SKIP
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: SKIP
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: SKIP
HostSystem - 03_hs_to_settdefcap.py: SKIP
HostSystem - 04_hs_to_EAPF.py: SKIP
HostSystem - 05_hs_gi_errs.py: PASS
HostSystem - 06_hs_to_vsms.py: SKIP
HostedDependency - 01_forward.py: PASS
HostedDependency - 02_reverse.py: PASS
HostedDependency - 03_enabledstate.py: SKIP
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: SKIP
LogicalDisk - 02_nodevs.py: SKIP
LogicalDisk - 03_ld_gi_errs.py: SKIP
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: SKIP
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: SKIP
NetworkPort - 02_np_gi_errors.py: SKIP
NetworkPort - 03_user_netport.py: SKIP
Processor - 01_processor.py: SKIP
Processor - 02_definesys_get_procs.py: SKIP
Processor - 03_proc_gi_errs.py: SKIP
Profile - 01_enum.py: PASS
Profile - 02_profile_to_elec.py: SKIP
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
ReferencedProfile - 01_verify_refprof.py: PASS
ReferencedProfile - 02_refprofile_errs.py: PASS
ResourceAllocationFromPool - 01_forward.py: SKIP
ResourceAllocationFromPool - 02_reverse.py: SKIP
ResourceAllocationFromPool - 03_forward_errs.py: SKIP
ResourceAllocationFromPool - 04_reverse_errs.py: SKIP
ResourceAllocationFromPool - 05_RAPF_err.py: SKIP
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: SKIP
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: 
SKIP
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP
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: SKIP
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: SKIP
VirtualSystemManagementService - 03_definesystem_ess.py: SKIP
VirtualSystemManagementService - 04_definesystem_ers.py: SKIP
VirtualSystemManagementService - 05_destroysystem_neg.py: SKIP
VirtualSystemManagementService - 06_addresource.py: SKIP
VirtualSystemManagementService - 07_addresource_neg.py: SKIP
VirtualSystemManagementService - 08_modifyresource.py: SKIP
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: SKIP
VirtualSystemSettingDataComponent - 02_reverse.py: SKIP
VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: SKIP
VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: SKIP
VirtualSystemSnapshotService - 01_enum.py: PASS
VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS
VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS
VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: 
PASS


Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080613/b94ec953/attachment.htm>

From yunguol at cn.ibm.com  Fri Jun 13 05:42:50 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Fri, 13 Jun 2008 13:42:50 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ComputerSystem.04&42 for LXC
	support
Message-ID: <9e16645bd46a6824788d.1213335770@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213335760 -28800
# Node ID 9e16645bd46a6824788d90df6935bfca57545be1
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] Update ComputerSystem.04&42 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r 9e16645bd46a suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py	Fri Jun 13 13:42:40 2008 +0800
@@ -38,7 +38,7 @@
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 test_dom = "domguest"
 
 @do_main(sup_types)
diff -r b9100cec9aed -r 9e16645bd46a suites/libvirt-cim/cimtest/ComputerSystem/42_cs_gi_errs.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/42_cs_gi_errs.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/42_cs_gi_errs.py	Fri Jun 13 13:42:40 2008 +0800
@@ -83,7 +83,7 @@
 from CimTest.Globals import do_main
 
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 expr_values = {
     "invalid_name_keyvalue"   : {'rc'   : pywbem.CIM_ERR_NOT_FOUND, \



From yunguol at cn.ibm.com  Fri Jun 13 06:29:53 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Fri, 13 Jun 2008 14:29:53 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ResourceAllocationFromPool.01
	for LXC support, create a guest and verification
Message-ID: <0dc2a5c7b39e1f1ac7bc.1213338593@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213338588 -28800
# Node ID 0dc2a5c7b39e1f1ac7bc4bca9fe33523c8631ced
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] Update ResourceAllocationFromPool.01 for LXC support, create a guest and verification

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r 0dc2a5c7b39e suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Fri Jun 13 14:29:48 2008 +0800
@@ -26,17 +26,26 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
+from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+test_dom = 'dom'
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
+
+    virt_xml = vxml.get_class(options.virt)
+    cxml = virt_xml(test_dom)
+    ret = cxml.define(options.ip)
+    if not ret:
+        logger.error('Unable to define domain %s' % test_dom)
+        return FAIL
 
     try:
         key_list = { 'InstanceID' : "MemoryPool/0" }
@@ -71,6 +80,9 @@
         if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"):
             logger.error("ERROR: Association result error")
             status = FAIL
+    if memdata[0]['InstanceID'] != '%s/mem' % test_dom:
+        logger.error("Return InstanceID error, not %s" % memdata[0]['InstanceID'])
+        status = FAIL
                 
     try:
         procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
@@ -85,6 +97,10 @@
         if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"):
 	    logger.error("ERROR: Association result error")
             status = FAIL
+    if options.virt != 'LXC' and procdata[0]['InstanceID'] != '%s/proc' % test_dom:
+        logger.error("Return InstanceID error, not %s" % procdata[0]['InstanceID'])
+        status = FAIL
+
 
     return status 
         



From yunguol at cn.ibm.com  Fri Jun 13 06:41:56 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Fri, 13 Jun 2008 14:41:56 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ResourceAllocationFromPool.02
	for LXC support
Message-ID: <bad1f84147e979809c1d.1213339316@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213339312 -28800
# Node ID bad1f84147e979809c1da8f165b3181f354e9d53
# Parent  b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] Update ResourceAllocationFromPool.02 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r b9100cec9aed -r bad1f84147e9 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Wed Jun 11 03:38:49 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Fri Jun 13 14:41:52 2008 +0800
@@ -38,7 +38,7 @@
 create_netpool_conf
 
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 test_dom    = "RAFP_dom"
 test_vcpus  = 1
 test_mem    = 128
@@ -54,8 +54,11 @@
         test_disk = "hda"
 
     virtxml = get_class(virt)
-    vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
-                    mac = test_mac, disk = test_disk)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
     try:
         ret = vsxml.define(server)
         if not ret:
@@ -68,7 +71,7 @@
 
     return PASS, vsxml, test_disk
 
-def init_list(test_disk, diskid, test_network):
+def init_list(test_disk, diskid, test_network, virt='Xen'):
 
     if CIM_REV < proc_instid_rev:
         procid = '%s/%s' % (test_dom, 0)
@@ -92,12 +95,17 @@
              'pool_id' : diskid
            }
 
-    cn_id_list = {
-                   'MemResourceAllocationSettingData'  : mem,
-                   'ProcResourceAllocationSettingData' : proc,
-                   'NetResourceAllocationSettingData'  : net,
-                   'DiskResourceAllocationSettingData' : disk
-                }
+    if virt == 'LXC':
+        cn_id_list = {
+                       'MemResourceAllocationSettingData'  : mem,
+                     }
+    else:
+        cn_id_list = {
+                       'MemResourceAllocationSettingData'  : mem,
+                       'ProcResourceAllocationSettingData' : proc,
+                       'NetResourceAllocationSettingData'  : net,
+                       'DiskResourceAllocationSettingData' : disk
+                     }
 
     return cn_id_list
 
@@ -174,7 +182,7 @@
     if status != PASS:
         return status
 
-    cn_id_list = init_list(test_disk, diskid, test_network)
+    cn_id_list = init_list(test_disk, diskid, test_network, options.virt)
 
     for rasd_cn, id_info in cn_id_list.iteritems():
         status = get_rasdinst_verify_pool_from_RAFP(server, virt, vsxml, 



From yunguol at cn.ibm.com  Fri Jun 13 06:40:07 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Fri, 13 Jun 2008 14:40:07 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	ResourceAllocationFromPool.01	for
	LXC support, create a guest and verification
In-Reply-To: <0dc2a5c7b39e1f1ac7bc.1213338593@localhost.localdomain>
Message-ID: <OFCE8253D9.5ED5B3CB-ON48257467.0024E5AE-48257467.0024ED0B@cn.ibm.com>

Please ignore this patch.
Thanks!

Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203


libvirt-cim-bounces at redhat.com wrote on 2008-06-13 14:29:53:

> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213338588 -28800
> # Node ID 0dc2a5c7b39e1f1ac7bc4bca9fe33523c8631ced
> # Parent  b9100cec9aedb9f9243d753111a9a856e9480335
> [TEST] Update ResourceAllocationFromPool.01 for LXC support, create 
> a guest and verification
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r b9100cec9aed -r 0dc2a5c7b39e suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/01_forward.py
> --- a/suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/01_forward.py   Wed Jun 11 
> 03:38:49 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/01_forward.py   Fri Jun 13 
> 14:29:48 2008 +0800
> @@ -26,17 +26,26 @@
>  from VirtLib import utils
>  from XenKvmLib import assoc
>  from XenKvmLib import enumclass
> +from XenKvmLib import vxml
>  from XenKvmLib.classes import get_typed_class 
>  from CimTest import Globals
>  from CimTest.Globals import logger, do_main
>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL
> 
> -sup_types = ['Xen', 'XenFV', 'KVM']
> +test_dom = 'dom'
> +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
> 
>  @do_main(sup_types)
>  def main():
>      options = main.options
>      status = PASS
> +
> +    virt_xml = vxml.get_class(options.virt)
> +    cxml = virt_xml(test_dom)
> +    ret = cxml.define(options.ip)
> +    if not ret:
> +        logger.error('Unable to define domain %s' % test_dom)
> +        return FAIL
> 
>      try:
>          key_list = { 'InstanceID' : "MemoryPool/0" }
> @@ -71,6 +80,9 @@
>          if memdata[i].classname != get_typed_class(options.virt, 
> "MemResourceAllocationSettingData"):
>              logger.error("ERROR: Association result error")
>              status = FAIL
> +    if memdata[0]['InstanceID'] != '%s/mem' % test_dom:
> +        logger.error("Return InstanceID error, not %s" % memdata[0]
> ['InstanceID'])
> +        status = FAIL
> 
>      try:
>          procdata = assoc.AssociatorNames(options.ip, 
> "ResourceAllocationFromPool",
> @@ -85,6 +97,10 @@
>          if procdata[j].classname != get_typed_class(options.virt, 
> "ProcResourceAllocationSettingData"):
>         logger.error("ERROR: Association result error")
>              status = FAIL
> +    if options.virt != 'LXC' and procdata[0]['InstanceID'] != '%
> s/proc' % test_dom:
> +        logger.error("Return InstanceID error, not %s" % 
> procdata[0]['InstanceID'])
> +        status = FAIL
> +
> 
>      return status 
> 
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080613/01c363b9/attachment.htm>

From kaitlin at linux.vnet.ibm.com  Sat Jun 14 01:10:33 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Fri, 13 Jun 2008 18:10:33 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update SettingsDefineCapabilities.03
	for LXC support
In-Reply-To: <OF83D371AA.BC2D453C-ON48257466.002292A0-48257466.00240681@cn.ibm.com>
References: <OF83D371AA.BC2D453C-ON48257466.002292A0-48257466.00240681@cn.ibm.com>
Message-ID: <48531A89.2090309@linux.vnet.ibm.com>

>  >
>  > I saw the following failure:
>  >
>  > Testing LXC hypervisor
>  > SettingsDefineCapabilities - 03_forward_errs.py: FAIL
>  > ERROR   - Unexpected rc code 4 and description
>  > CIM_ERR_INVALID_PARAMETER: WrongClassName.InstanceID="MemoryPool/0"
>  >
>  > ERROR   - ------ FAILED: Invalid CCName Key Name.------
>  >
>  > I also saw the same issue on Xen, XenFV, and KVM.
>  >
>   Do you test it with Pegasus or SFCB? 

I tested on Pegasus.  However, it's passing for me now. Very strange. 
Can you resend the patch with just the LXC portion (since you sent a 
different patch to fix the description issue).

Thanks!

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Sat Jun 14 01:42:01 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Fri, 13 Jun 2008 18:42:01 -0700
Subject: [Libvirt-cim] [PATCH] Add missing comma to EC
Message-ID: <e3b5268c1b4e18a7b0bf.1213407721@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213407552 25200
# Node ID e3b5268c1b4e18a7b0bfe48d98d1f1017a4498c6
# Parent  959831f603a0ef93c468ac0cea0b1413ca102222
Add missing comma to EC.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 959831f603a0 -r e3b5268c1b4e src/Virt_ElementCapabilities.c
--- a/src/Virt_ElementCapabilities.c	Fri Jun 13 09:28:24 2008 -0700
+++ b/src/Virt_ElementCapabilities.c	Fri Jun 13 18:39:12 2008 -0700
@@ -441,7 +441,7 @@
 static char* service[] = {
         "Xen_VirtualSystemManagementService",
         "KVM_VirtualSystemManagementService",
-        "LXC_VirtualSystemManagementService"
+        "LXC_VirtualSystemManagementService",
         "Xen_VirtualSystemMigrationService",
         "KVM_VirtualSystemMigrationService",
         "LXC_VirtualSystemMigrationService",



From kaitlin at linux.vnet.ibm.com  Mon Jun 16 01:44:49 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Sun, 15 Jun 2008 18:44:49 -0700
Subject: [Libvirt-cim] [PATCH 1 of 4] [TEST] Moving the init_list() to
	rasd.py
In-Reply-To: <6b52040f1dd92532abca.1213263877@elm3b193.beaverton.ibm.com>
References: <6b52040f1dd92532abca.1213263877@elm3b193.beaverton.ibm.com>
Message-ID: <4855C591.2090300@linux.vnet.ibm.com>

Deepti B. Kalakeri wrote:
> # HG changeset patch
> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> # Date 1213262959 25200
> # Node ID 6b52040f1dd92532abca3a7698d406f1bc369c7a
> # Parent  b9100cec9aedb9f9243d753111a9a856e9480335
> [TEST] Moving the init_list()  to rasd.py
> 
> 1) Most of the tc use init_list() fn to verify the RASD values, hence moved it to rasd.py.
> 2) Added the logic to pick up the networktype used by the guest while creating to verify the RASD values.
> 
> Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> 
> diff -r b9100cec9aed -r 6b52040f1dd9 suites/libvirt-cim/lib/XenKvmLib/rasd.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Wed Jun 11 03:38:49 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Thu Jun 12 02:29:19 2008 -0700
> @@ -21,28 +21,96 @@
>  #
> 
>  import sys
> -from CimTest import Globals 
>  from CimTest.Globals import log_param, logger
>  from CimTest.ReturnCodes import FAIL, PASS
> +from XenKvmLib.const import CIM_REV
> +from XenKvmLib import vxml
> +from XenKvmLib.classes import get_typed_class
> +
> 
>  pasd_cn = 'ProcResourceAllocationSettingData'
>  nasd_cn = 'NetResourceAllocationSettingData'
>  dasd_cn = 'DiskResourceAllocationSettingData'
>  masd_cn = 'MemResourceAllocationSettingData'
> +global proc_cn, mem_cn, net_cn, disk_cn

No need to define these as global.

> +
> +
> +mem_units_rev = 529
> +proc_instid_rev = 590
> +
> +def rasd_init_list(vsxml, virt, test_disk, test_dom, test_mac, test_mem):
> +    """
> +        Creating the lists that will be used for comparisons.
> +    """
> +    global proc_cn, mem_cn, net_cn, disk_cn

Same here.
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun 16 01:47:59 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Sun, 15 Jun 2008 18:47:59 -0700
Subject: [Libvirt-cim] [PATCH 3 of 4] [TEST] Updating the
	41_cs_to_settingdefinestate.py tc of ComputerSystem
In-Reply-To: <dfb6d5b51653712ed153.1213263879@elm3b193.beaverton.ibm.com>
References: <dfb6d5b51653712ed153.1213263879@elm3b193.beaverton.ibm.com>
Message-ID: <4855C64F.4090100@linux.vnet.ibm.com>

>  sup_types = ['Xen']
> 
> @@ -75,43 +77,7 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -test_disk   = 'xvda'
>  vstype      = 'Xen'

Instead of vstype, you can use options.virt

> +    if virt == "Xen":
> +        test_disk = "xvda"
> +    else:
> +        test_disk = "hda"

Test currently only supports Xen - no need to modify this, just curious 
if you plan to modify this to support XenFV or KVM in the future.

> +    virt_xml =  get_class(virt)
> +    vsxml_info = virt_xml(test_dom, mem = test_mem,
> +                                  vcpus=test_vcpus,
> +                                    mac = test_mac,
> +                                  disk = test_disk)

Strange indentation here.

> 
> -def get_setdefstate_verify_RASD_build_vssdc_input(server, sd_assoc_info):
> +def get_setdefstate_verify_RASD_build_vssdc_input(server, virt, vsxml, test_disk, 
> +                                                                  sd_assoc_info):

Strange indentation here as well.

> -    status, in_vssdc_list = get_setdefstate_verify_RASD_build_vssdc_input(server, \
> -                                                                     sd_assoc_info)
> +    status, in_vssdc_list = get_setdefstate_verify_RASD_build_vssdc_input(server, 
> +                                                                            virt,
> +                                                                            vsxml,
> +                                                                        test_disk,
> +                                                                    sd_assoc_info)

And here too.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun 16 01:52:18 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Sun, 15 Jun 2008 18:52:18 -0700
Subject: [Libvirt-cim] [PATCH 4 of 4] [TEST] Updating the tc to use the
	rasd_init_list() fn of rasd.py
In-Reply-To: <bb5f359be87cb3883b45.1213263880@elm3b193.beaverton.ibm.com>
References: <bb5f359be87cb3883b45.1213263880@elm3b193.beaverton.ibm.com>
Message-ID: <4855C752.9070109@linux.vnet.ibm.com>

Deepti B. Kalakeri wrote:
> # HG changeset patch
> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> # Date 1213263349 25200
> # Node ID bb5f359be87cb3883b45301c8c7a056278d453a0
> # Parent  dfb6d5b51653712ed15387b76e3ddf89098d92d2
> [TEST] Updating the tc to use the rasd_init_list() fn of rasd.py.
> 
> 
> Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> 
> diff -r dfb6d5b51653 -r bb5f359be87c suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py

Will need to modify this so it doesn't depend on global proc_cn (etc) 
values.

> diff -r dfb6d5b51653 -r bb5f359be87c suites/libvirt-cim/cimtest/RASD/02_enum.py

Will also need to modify this so it doesn't depend on global proc_cn 
(etc) values.


>      
> -    status = PASS 
> -    procrasd, netrasd, diskrasd, memrasd = init_list(virt)
> +    status, rasd_values_list = rasd_init_list(vsxml, virt, test_disk, test_dom,
> +                                         test_mac, test_mem)

Unusually indentation here.

> diff -r dfb6d5b51653 -r bb5f359be87c suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py

Will also need to modify this so it doesn't depend on global proc_cn 
(etc) values.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Mon Jun 16 02:10:15 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Mon, 16 Jun 2008 10:10:15 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update SettingsDefineCapabilities.03
	for LXC support
Message-ID: <6988bb7f7803927f7c53.1213582215@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213582207 -28800
# Node ID 6988bb7f7803927f7c5330cc858c891430199f2f
# Parent  6900d7da2228de4e48cb9919b61dcdda7af500c9
[TEST] Update SettingsDefineCapabilities.03 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 6900d7da2228 -r 6988bb7f7803 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py	Fri Jun 13 14:41:52 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py	Mon Jun 16 10:10:07 2008 +0800
@@ -34,6 +34,8 @@
 from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
+
+platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 expr_values = {
    "invalid_instid_keyname"  : { 'rc'   : pywbem.CIM_ERR_FAILED, 



From yunguol at cn.ibm.com  Mon Jun 16 06:19:00 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 16 Jun 2008 14:19:00 +0800
Subject: [Libvirt-cim] Cimtest Report for LXC on F9 (2008/06/16)
Message-ID: <OF3AC68BC6.6348FCC0-ON4825746A.0022F6B2-4825746A.0023136F@cn.ibm.com>

stro: Fedora 9 Beta
kernel-2.6.25-0.218.rc8.git7.fc9.x86_64
CIMOM: tog-pegasus-2.7.0-6.fc9.x86_64
cimtest: changeset-203

==================================================================
PASS        :  80
FAIL        :  0
XFAIL       :  1
SKIP        :  48
-----------------
Total       : 129

===================== CIMTEST REPORT===============================

AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: PASS
ComputerSystem - 03_defineVS.py: PASS
ComputerSystem - 04_defineStartVS.py: SKIP
ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
ERROR   - ERROR: VS DomST1 transition from Defined State to Activate state 
was not Successful
Bug:<00002>
ComputerSystem - 06_paused_active_suspend.py: SKIP
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: SKIP
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: SKIP
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: SKIP
ComputerSystemIndication - 01_created_indication.py: SKIP
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: SKIP
ElementAllocatedFromPool - 04_forward_errs.py: SKIP
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: SKIP
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: SKIP
HostSystem - 03_hs_to_settdefcap.py: SKIP
HostSystem - 04_hs_to_EAPF.py: SKIP
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: SKIP
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: SKIP
LogicalDisk - 02_nodevs.py: SKIP
LogicalDisk - 03_ld_gi_errs.py: SKIP
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: PASS
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: SKIP
NetworkPort - 02_np_gi_errors.py: SKIP
NetworkPort - 03_user_netport.py: SKIP
Processor - 01_processor.py: SKIP
Processor - 02_definesys_get_procs.py: SKIP
Processor - 03_proc_gi_errs.py: SKIP
Profile - 01_enum.py: PASS
Profile - 02_profile_to_elec.py: SKIP
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
ReferencedProfile - 01_verify_refprof.py: PASS
ReferencedProfile - 02_refprofile_errs.py: PASS
ResourceAllocationFromPool - 01_forward.py: SKIP
ResourceAllocationFromPool - 02_reverse.py: SKIP
ResourceAllocationFromPool - 03_forward_errs.py: SKIP
ResourceAllocationFromPool - 04_reverse_errs.py: SKIP
ResourceAllocationFromPool - 05_RAPF_err.py: SKIP
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: SKIP
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: 
SKIP
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP
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: SKIP
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: SKIP
VirtualSystemManagementService - 07_addresource_neg.py: PASS
VirtualSystemManagementService - 08_modifyresource.py: SKIP
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: SKIP
VirtualSystemSettingDataComponent - 02_reverse.py: 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


Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080616/e8ee7e90/attachment.htm>

From yunguol at cn.ibm.com  Mon Jun 16 06:26:44 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 16 Jun 2008 14:26:44 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Fix proc InstanceID in vsms.py
In-Reply-To: <00ed91b75fd62cdcdcfb.1213154812@elm3b41.beaverton.ibm.com>
Message-ID: <OF84E743B7.54E01841-ON4825746A.0023C1AF-4825746A.0023C8BE@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-11 11:26:52:

> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1213153446 25200
> # Node ID 00ed91b75fd62cdcdcfb51c403646118edb91c54
> # Parent  58f7c9cf54677356b88b30e2b5a5db9685a15604
> [TEST] Fix proc InstanceID in vsms.py
> 
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
> 
> diff -r 58f7c9cf5467 -r 00ed91b75fd6 
suites/libvirt-cim/lib/XenKvmLib/vsms.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py   Tue Jun 10 11:04:312008 
-0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py   Tue Jun 10 20:04:062008 
-0700
> @@ -183,7 +183,7 @@
>              self.VirtualQuantity = vcpu
> 
>          if name != None:
> -            self.InstanceID = '%s/0' % name
> +            self.InstanceID = '%s/proc' % name

  +1 from me =)
> 
>  class 
> 
Xen_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData):
>      pass
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080616/96456708/attachment.htm>

From yunguol at cn.ibm.com  Mon Jun 16 07:50:26 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 16 Jun 2008 15:50:26 +0800
Subject: [Libvirt-cim] [PATCH] Remove revision branches
In-Reply-To: <58f7c9cf54677356b88b.1213133583@elm3b41.beaverton.ibm.com>
Message-ID: <OFA23F6DF9.F5A48CE6-ON4825746A.002AF828-4825746A.002B724D@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-11 05:33:03:

> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1213121071 25200
> # Node ID 58f7c9cf54677356b88b30e2b5a5db9685a15604
> # Parent  fdc71e98f2d1417fcd50bb8b2b6a91300a8296c4
> Remove revision branches.
> 
> These brances were needed to distinguish the behavior between the 0.
> 3.0 release and the current head of the mercurial tree.  Now that 
> the cimtest tree has been tagged, cimtest release_0_1 should 
> correspond with the functionality in libvirt-cim 0.4.0.
> 
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
> 
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py
> --- a/suites/libvirt-
> cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py   Fri May 
> 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py   Tue Jun 
> 10 11:04:31 2008 -0700
> @@ -62,14 +62,12 @@
>  from XenKvmLib.test_doms import create_vnet
>  from CimTest.Globals import do_main, platform_sup
>  from XenKvmLib.classes import get_typed_class
> -from XenKvmLib.const import CIM_REV
>  from XenKvmLib.common_util import cleanup_restore, test_dpath, \
>  create_diskpool_file
> 
>  diskid = "%s/%s" % ("DiskPool", test_dpath)
>  memid = "%s/%s" % ("MemoryPool", 0)
>  procid = "%s/%s" % ("ProcessorPool", 0)
> -rev = 463
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
>  @do_main(sup_types) 
> @@ -112,8 +110,6 @@
>                                    'desc' : 'No InstanceID specified' },
>              "invalid_keyvalue" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND,
>                                     'desc' : 'Instance not found' }}
> -    if CIM_REV < rev:
> -        exp['invalid_keyvalue']['desc'] = 'Object could not be found'
> 
>      ret_value = try_getinstance(conn, classname, keys, 
field_name=field,
> 
> expr_values=exp['invalid_keyvalue'], bug_no="")
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py
> --- a/suites/libvirt-
> cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py   Fri May 23
> 10:39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py   Tue Jun 10
> 11:04:31 2008 -0700
> @@ -34,7 +34,6 @@
>  from CimTest import Globals
>  from XenKvmLib.test_doms import destroy_and_undefine_all
>  from XenKvmLib.common_util import try_assoc
> -from XenKvmLib.const import CIM_REV
>  from CimTest.ReturnCodes import PASS, FAIL 
>  from CimTest.Globals import do_main, platform_sup, logger
>  from XenKvmLib.vxml import get_class
> @@ -60,7 +59,6 @@
>                                          'desc'  : 'No such instance'
>                                      } 
>                }
> -libvirt_rev = 393
> 
>  def err_invalid_ccname():
>  # This is used to verify the that the 
> @@ -157,10 +155,6 @@
>                get_typed_class(virt, "ProcessorPool")
>               ]
> 
> -    if CIM_REV < libvirt_rev:
> -        expr_values['invalid_keyvalue']['desc'] = 'Invalid 
> InstanceID or unsupported pool type'
> -        expr_values['invalid_keyvalue']['rc'] = pywbem.CIM_ERR_FAILED
> -
>      for classname in sorted(lelist):
>          keys = { "InstanceID" : "InvalidKeyValue" }
>          field = "InstanceID_KeyValue" 
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/ElementCapabilities/01_forward.py
> --- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py 
> Fri May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py 
> Tue Jun 10 11:04:31 2008 -0700
> @@ -30,11 +30,9 @@
>  from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORNAMES, 
\
>  CIM_ERROR_ENUMERATE
>  from CimTest.ReturnCodes import PASS, FAIL, SKIP
> -from XenKvmLib.const import CIM_REV
>  from XenKvmLib.enumclass import enumerate
> 
>  sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
> -ac_to_pool_version = 561
> 
>  def append_to_list(server, virt, poolname, valid_elc_id):
>      keys_list = ['InstanceID']
> @@ -87,11 +85,10 @@
>      valid_elc_id = ["ManagementCapabilities", 
>                      "MigrationCapabilities"]
> 
> -    if CIM_REV >= ac_to_pool_version:
> -        valid_elc_name.append(get_typed_class(virt, 
> "AllocationCapabilities"))
> -        status, valid_elc_id = set_pool_info(server, virt, 
valid_elc_id)
> -        if status != PASS:
> -            return status
> +    valid_elc_name.append(get_typed_class(virt, 
"AllocationCapabilities"))
> +    status, valid_elc_id = set_pool_info(server, virt, valid_elc_id)
> +    if status != PASS:
> +        return status
> 
>      if len(elc) == 0:
>          logger.error("ElementCapabilities association failed, 
> excepted at least one instance")
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
> --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
> Fri May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
> Tue Jun 10 11:04:31 2008 -0700
> @@ -58,7 +58,6 @@
>  from CimTest.ReturnCodes import PASS, FAIL
>  from XenKvmLib.rasd import verify_procrasd_values, 
verify_netrasd_values, \
>  verify_diskrasd_values, verify_memrasd_values
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV']
> 
> @@ -67,8 +66,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -rev = 529
> -proc_instid_rev = 590
> 
>  def init_list(vsxml, virt="Xen"):
>      """
> @@ -103,11 +100,6 @@
>                                                "VirtualQuantity" : 
> (test_mem * 1024), 
>                                             }
>                    } 
> -    if CIM_REV < rev:
> -       rasd_values[mem_cn]['AllocationUnits'] = "MegaBytes"
> -
> -    if CIM_REV < proc_instid_rev:
> -       rasd_values[proc_cn]['InstanceID'] = '%s/%s' %(test_dom, 0)
> 
>      return rasd_values
> 
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/HostSystem/03_hs_to_settdefcap.py
> --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py 
> Fri May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py 
> Tue Jun 10 11:04:31 2008 -0700
> @@ -49,12 +49,10 @@
>  from CimTest.ReturnCodes import PASS, FAIL
>  from XenKvmLib.test_xml import testxml
>  from XenKvmLib.test_doms import destroy_and_undefine_all
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV']
>  test_dom = "domgst"
>  test_vcpus = 1
> -libvirtcim_sdc_rasd_rev = 571
> 
>  def setup_env(server, virt="Xen"):
>      status = PASS
> @@ -243,26 +241,6 @@
>              logger.error("In ResourceType for %s " % rt)
>              return FAIL
> 
> -        # The following properties have been removed in the patchset 
571
> -        # but is present in the rpm libvirt-cim and hence retained it.
> -
> -        if CIM_REV < libvirtcim_sdc_rasd_rev:
> -            ppolicy = inst['PropertyPolicy']
> -            if ppolicy != 0 and ppolicy != 1:
> -                logger.error("In PropertyPolicy for %s " % ppolicy)
> -                return FAIL
> -
> -            vrole  = inst['ValueRole']
> -            if vrole < 0 or vrole > 4:
> -                logger.error("In ValueRole %s " % vrole)
> -                return FAIL
> -
> -            insid  = inst['InstanceID']
> -            vrange = rangelist[insid]
> -            if vrange != inst['ValueRange']:
> -                logger.error("In ValueRange for %s " % vrange)
> -                return FAIL
> -
>      except Exception, detail:
>          logger.error("Error checking RASD attribute values %s" % 
detail)
>          return FAIL
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/Memory/01_memory.py
> --- a/suites/libvirt-cim/cimtest/Memory/01_memory.py   Fri May 23 
> 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py   Tue Jun 10 
> 11:04:31 2008 -0700
> @@ -31,13 +31,11 @@
>  from XenKvmLib.vxml import XenXML, KVMXML, get_class
>  from CimTest.Globals import logger
>  from CimTest.Globals import do_main
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
>  test_dom = "test_domain"
>  mem = 256 #MB
> -mem_change_version=585
> 
>  @do_main(sup_types)
>  def main():
> @@ -45,10 +43,7 @@
> 
>      vsxml = get_class(options.virt)(test_dom, mem)
>      vsxml.define(options.ip)
> -    if CIM_REV >= mem_change_version: 
> -        alloc_mem = int(vsxml.xml_get_mem())
> -    else:
> -        alloc_mem = int(vsxml.xml_get_mem())/1024
> +    alloc_mem = int(vsxml.xml_get_mem())
> 
>      devid = "%s/mem" % test_dom
>      key_list = { 'DeviceID' : devid,
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/RASD/01_verify_rasd_fields.py
> --- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py   Fri
> May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py   Tue
> Jun 10 11:04:31 2008 -0700
> @@ -54,7 +54,6 @@
>  from XenKvmLib import vxml 
>  from XenKvmLib.classes import get_typed_class
>  from XenKvmLib import rasd 
> -from XenKvmLib.const import CIM_REV
>  from CimTest.Globals import logger
>  from CimTest.ReturnCodes import PASS, FAIL
> 
> @@ -64,8 +63,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -prev = 531
> -mrev = 529
> 
>  def init_list(xml, disk, virt="Xen"):
>      """
> @@ -93,10 +90,6 @@
>              "AllocationUnits" : "KiloBytes",
>              "VirtualQuantity" : (test_mem * 1024),
>              "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
> -    if CIM_REV < prev:
> -        procrasd['InstanceID'] = '%s/0' % test_dom
> -    if CIM_REV < mrev:
> -        memrasd['AllocationUnits'] = 'MegaBytes'
> 
>      return procrasd, netrasd, diskrasd, memrasd
> 
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/RASD/02_enum.py
> --- a/suites/libvirt-cim/cimtest/RASD/02_enum.py   Fri May 23 10:39:
> 01 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py   Tue Jun 10 11:04:
> 31 2008 -0700
> @@ -34,7 +34,6 @@
>  from XenKvmLib.vxml import get_class
>  from XenKvmLib.classes import get_typed_class
>  from XenKvmLib import rasd 
> -from XenKvmLib.const import CIM_REV
>  from CimTest.Globals import logger
>  from CimTest.ReturnCodes import PASS, FAIL
> 
> @@ -44,8 +43,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -prev = 531
> -mrev = 529
> 
>  def init_list(virt):
>      """
> @@ -73,10 +70,6 @@
>              "AllocationUnits" : "KiloBytes",
>              "VirtualQuantity" : (test_mem * 1024),
>              "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
> -    if CIM_REV < prev:
> -        proc['InstanceID'] = '%s/0' % test_dom
> -    if CIM_REV < mrev:
> -        mem['AllocationUnits'] = 'MegaBytes'
> 
>      return proc, net, disk, mem
> 
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/ReferencedProfile/01_verify_refprof.py
> --- a/suites/libvirt-
> cim/cimtest/ReferencedProfile/01_verify_refprof.py   Fri May 23 10:
> 39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/ReferencedProfile/01_verify_refprof.py   Tue Jun 10 11:
> 04:31 2008 -0700
> @@ -79,12 +79,9 @@
>  from CimTest.Globals import do_main
>  from XenKvmLib.classes import get_typed_class
>  from CimTest.ReturnCodes import FAIL, PASS, SKIP
> -from XenKvmLib.const import CIM_REV
>  from XenKvmLib.common_util import print_field_error
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> -
> -libvirtcim_rev = 501
> 
>  def get_proflist():
>      proflist = []
> @@ -167,12 +164,6 @@
>      server = options.ip
>      status = PASS
> 
> -    # Referenced Profile was introduced as part of changeset 501 
> -    # and is not available in the libvirt-cim rpm, hence skipping tc
> -    # if CIM_REV  501
> -    if CIM_REV < libvirtcim_rev:
> -        return SKIP
> -
>      prev_namespace = Globals.CIM_NS
>      Globals.CIM_NS = 'root/interop'
>      reg_classname = get_typed_class(virt, 'RegisteredProfile')
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/ReferencedProfile/02_refprofile_errs.py
> --- a/suites/libvirt-
> cim/cimtest/ReferencedProfile/02_refprofile_errs.py   Fri May 23 10:
> 39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/ReferencedProfile/02_refprofile_errs.py   Tue Jun 10 11:
> 04:31 2008 -0700
> @@ -60,10 +60,8 @@
>  from XenKvmLib.classes import get_typed_class
>  from CimTest.ReturnCodes import FAIL, PASS, SKIP
>  from XenKvmLib.common_util import try_assoc
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> -libvirtcim_rev = 501
> 
>  expr_values = {
>                  'INVALID_Instid_KeyName'  :  {
> @@ -124,11 +122,6 @@
>      virt = options.virt
>      server = options.ip
>      status = PASS
> -    # Referenced Profile was introduced as part of changeset 501 
> -    # and is not available in the libvirt-cim rpm, hence skipping tc
> -    # if CIM_REV  501
> -    if CIM_REV < libvirtcim_rev:
> -        return SKIP
> 
>      prev_namespace = Globals.CIM_NS
>      Globals.CIM_NS = 'root/interop'
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
> --- a/suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py   Fri May 
> 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py   Tue Jun 
> 10 11:04:31 2008 -0700
> @@ -28,11 +28,9 @@
>  from CimTest import Globals
>  from CimTest.Globals import logger, do_main
>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'XenFV', 'KVM']
> 
> -rev = 466
> 
>  @do_main(sup_types)
>  def main():
> @@ -49,9 +47,6 @@
> 
>      exp_rc = 6 #CIM_ERR_NOT_FOUND
>      exp_desc = "No such instance (wrong) - resource pool type mismatch"
> -    if CIM_REV < rev:
> -        exp_rc = 1 # CIM_ERR_FAILED
> -        exp_desc = "Invalid InstanceID or unsupported pool type"
> 
>      for k, v in poollist.items():
>          instanceref = CIMInstanceName(k, 
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/SettingsDefine/01_forward.py
> --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py   Fri 
> May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py   Tue 
> Jun 10 11:04:31 2008 -0700
> @@ -32,7 +32,6 @@
>  from XenKvmLib import assoc
>  from XenKvmLib import devices
>  from XenKvmLib.classes import get_typed_class
> -from XenKvmLib.const import CIM_REV
>  from CimTest import Globals
>  from CimTest.Globals import do_main
>  from CimTest.ReturnCodes import PASS, FAIL 
> @@ -42,8 +41,6 @@
>  test_dom = "domu1"
>  test_mac = "00:11:22:33:44:aa"
>  test_vcpus = 1
> -proc_instid_rev = 590
> -
> 
>  def print_error(cn, detail):
>      Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
> @@ -96,7 +93,7 @@
>      for cn in cn_id.keys():
>          key_list = get_keys(cn, cn_id[cn], 'ComputerSystem', 
options.virt)
> 
> -        if CIM_REV >= proc_instid_rev and cn == 'Processor':
> +        if cn == 'Processor':
>              exp_inst_id_val[cn] = "%s/%s" % (test_dom, "proc") 
>          else:
>              exp_inst_id_val[cn] = key_list['DeviceID']
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/SettingsDefine/02_reverse.py
> --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py   Fri 
> May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py   Tue 
> Jun 10 11:04:31 2008 -0700
> @@ -59,8 +59,6 @@
>  from XenKvmLib import vxml
>  from XenKvmLib.classes import get_typed_class, get_class_basename
>  from XenKvmLib.rasd import InstId_err
> -from XenKvmLib.const import CIM_REV
> -
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
> @@ -68,9 +66,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -proc_instid_rev = 590
> -
> -
> 
>  def call_assoc(ip, inst, exp_id, ccn, virt):
>      if inst['InstanceID'] != exp_id:
> @@ -196,9 +191,6 @@
>              'DiskResourceAllocationSettingData' : '%s/%s' % 
> (test_dom, test_disk),
>              'MemResourceAllocationSettingData'  : '%s/%s' % 
> (test_dom, 'mem')}
> 
> -    if CIM_REV < proc_instid_rev :
> -        rasd_devid['ProcResourceAllocationSettingData'] = "%s/%s" %
> (test_dom, "0")
> -
>      global dev_devid
>      dev_devid = {
>              'Processor'   : '%s/%s' % (test_dom, test_vcpus-1),
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/SettingsDefineCapabilities/01_forward.py
> --- a/suites/libvirt-
> cim/cimtest/SettingsDefineCapabilities/01_forward.py   Fri May 23 
> 10:39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/SettingsDefineCapabilities/01_forward.py   Tue Jun 10 
> 11:04:31 2008 -0700
> @@ -65,14 +65,11 @@
>  from XenKvmLib.common_util import cleanup_restore, 
create_diskpool_conf, \
>  create_netpool_conf
>  from XenKvmLib.common_util import print_field_error
> -from XenKvmLib.const import CIM_REV
> 
>  platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
>  memid = "%s/%s" % ("MemoryPool", 0)
>  procid = "%s/%s" % ("ProcessorPool", 0)
> -libvirtcim_sdc_rasd_rev = 571
> -
> 
>  def get_or_bail(virt, ip, id, pool_class):
>      """
> @@ -165,27 +162,6 @@
>                                rtype[cllist[loop]])
>              return FAIL 
> 
> -        # The following properties have been removed in the patchset 
571
> -        # but is present in the rpm libvirt-cim and hence retained it.
> -
> -        if CIM_REV < libvirtcim_sdc_rasd_rev:
> -            ppolicy = inst['PropertyPolicy']
> -            if ppolicy != 0 and ppolicy != 1:
> -                print_field_error("PropertyPolicy", 
inst['PropertyPolicy'], 
> -                                   ppolicy)
> -                return FAIL 
> -
> -            vrole  = inst['ValueRole']
> -            if vrole < 0 or vrole > 4:
> -                print_field_error("ValueRole", inst['ValueRole'], 
vrole)
> -                return FAIL 
> -
> -            insid  = inst['InstanceID']
> -            vrange = rangelist[insid]
> -            if vrange != inst['ValueRange']:
> -                print_field_error("ValueRange", inst['ValueRange'], 
vrange)
> -                return FAIL 
> -
>      return PASS
> 
>  def verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool):
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/VSSD/04_vssd_to_rasd.py
> --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py   Fri May 
> 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py   Tue Jun 
> 10 11:04:31 2008 -0700
> @@ -53,7 +53,6 @@
>  from XenKvmLib.classes import get_typed_class
>  from XenKvmLib.rasd import verify_procrasd_values, 
verify_netrasd_values, \
>  verify_diskrasd_values, verify_memrasd_values 
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
> @@ -61,8 +60,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -proc_rev = 531
> -mem_rev = 529
> 
>  def setup_env(virt): 
>      vsxml_info = None
> @@ -97,8 +94,6 @@
>                   "ResourceType" : 3,
>                   "CreationClassName": get_typed_class(virt, 
> 'ProcResourceAllocationSettingData')
>                  }
> -    if CIM_REV < proc_rev:
> -        procrasd['InstanceID'] = '%s/%s' %(test_dom, "0")
> 
>      netrasd = {
>                  "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
> @@ -122,8 +117,7 @@
>                 "VirtualQuantity" : (test_mem * 1024), 
>                 "CreationClassName": get_typed_class(virt, 
> 'MemResourceAllocationSettingData')
>                }
> -    if CIM_REV < mem_rev:
> -        memrasd['AllocationUnits'] = "MegaBytes"
> +
>      return procrasd, netrasd, diskrasd, memrasd
> 
>  def get_inst_from_list(classname, vssd_list, filter_name, exp_val):
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
> --- a/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/02_destroysystem.py   Fri
> May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/02_destroysystem.py   Tue
> Jun 10 11:04:31 2008 -0700
> @@ -28,14 +28,12 @@
>  from VirtLib.live import domain_list, active_domain_list
>  from XenKvmLib import vsms, vxml
>  from XenKvmLib.classes import get_typed_class
> -from XenKvmLib.const import CIM_REV
>  from CimTest.Globals import do_main
>  from CimTest.Globals import logger
>  from CimTest.ReturnCodes import PASS, FAIL
> 
>  sup_types = ['Xen', 'KVM', 'XenFV']
>  default_dom = 'test_domain'
> -rev = 528
> 
>  @do_main(sup_types)
>  def main():
> @@ -50,11 +48,7 @@
>      cs_ref = CIMInstanceName(classname, keybindings = {
>                                          'Name':default_dom,
>                                          'CreationClassName':classname})
> -    if CIM_REV < rev:
> -        dl_func = active_domain_list
> -    else:
> -        dl_func = domain_list
> -    list_before = dl_func(options.ip, options.virt)
> +    list_before = domain_list(options.ip, options.virt)
>      status = PASS
>      rc = -1
> 
> @@ -66,7 +60,7 @@
>          logger.error(details)
>          status = FAIL
> 
> -    list_after = dl_func(options.ip, options.virt)
> +    list_after = domain_list(options.ip, options.virt)
> 
>      status = PASS
>      if default_dom not in list_before:
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py
> --- a/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py 
> Fri May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py 
> Tue Jun 10 11:04:31 2008 -0700
> @@ -27,14 +27,12 @@
>  from VirtLib import utils
>  from XenKvmLib import vsms
>  from XenKvmLib.classes import get_typed_class
> -from XenKvmLib.const import CIM_REV
>  from XenKvmLib.test_doms import undefine_test_domain
>  from CimTest.Globals import logger
>  from CimTest.Globals import do_main
>  from CimTest.ReturnCodes import FAIL, PASS, SKIP
> 
>  sup_types = ['Xen', 'KVM', 'XenFV']
> -vsms_status_version = 534
> 
>  def destroysystem_fail(tc, options):
>      service = vsms.get_vsms_class(options.virt)(options.ip)
> @@ -45,25 +43,19 @@
>          cs_ref = CIMInstanceName(classname, 
>                                keybindings = 
{'CreationClassName':classname})
> 
> -        if CIM_REV < vsms_status_version:
> -            exp_rc = 2 #IM_RC_FAILED
> -        else:
> -            exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
> -                          'desc'  : 'CIM_ERR_FAILED: Unable to 
> retrieve domain\
> +        exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
> +                      'desc'  : 'CIM_ERR_FAILED: Unable to retrieve 
domain\
>   name.'
> -                        }
> +                    }
> 
>      elif tc == 'nonexistent':
>          cs_ref = CIMInstanceName(classname,keybindings = {
>                                  'Name':'##@@!!cimtest_domain',
>                                  'CreationClassName':classname})
> 
> -        if CIM_REV < vsms_status_version:
> -            exp_rc = 4 #IM_RC_SYS_NOT_FOUND
> -        else:
> -            exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
> -                          'desc' : 'CIM_ERR_FAILED: Failed to find 
domain' 
> -                        }
> +        exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
> +                      'desc' : 'CIM_ERR_FAILED: Failed to find domain' 
> +                    }
> 
>      else:
>          return SKIP
> @@ -71,25 +63,15 @@
>      status = FAIL
>      try:
>          ret = service.DestroySystem(AffectedSystem=cs_ref)
> -        if CIM_REV < vsms_status_version:
> -            if ret[0] == exp_rc:
> -                logger.info('destroy_fail>>%s: Got expected return code 
%s', 
> -                            tc, exp_rc)
> -                return PASS 
> -            else:
> -                logger.error('destroy_fail>>%s: Got rc: %s, but we 
> expect %s',
> -                            tc, ret[0], exp_rc)
> -                return FAIL 
> 
>      except Exception, details:
> -        if CIM_REV >= vsms_status_version:
> -            err_no   = details[0]
> -            err_desc = details[1]
> -            if err_no == exp_value['rc'] and err_desc == 
exp_value['desc']:
> -                logger.error("For Invalid Scenario '%s'", tc)
> -                logger.info('Got expected error no: %s', err_no)
> -                logger.info('Got expected error desc: %s',err_desc)
> -                return PASS
> +        err_no   = details[0]
> +        err_desc = details[1]
> +        if err_no == exp_value['rc'] and err_desc == exp_value['desc']:
> +            logger.error("For Invalid Scenario '%s'", tc)
> +            logger.info('Got expected error no: %s', err_no)
> +            logger.info('Got expected error desc: %s',err_desc)
> +            return PASS
> 
>          logger.error('destroy_fail>> %s: Error executing DestroySystem' 
% tc)
>          logger.error(details)
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
> --- a/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py   Fri 
> May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py   Tue 
> Jun 10 11:04:31 2008 -0700
> @@ -55,7 +55,6 @@
>  from XenKvmLib.rasd import InstId_err
>  from CimTest.Globals import logger, do_main
>  from CimTest.ReturnCodes import PASS, FAIL
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'XenFV', 'KVM']
> 
> @@ -63,7 +62,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -rev = 531
> 
>  def check_rasd_values(id, exp_id):
>      try:
> @@ -90,8 +88,6 @@
>                   "disk_rasd" : '%s/%s' %(test_dom, test_disk),
>                   "mem_rasd"  : '%s/%s' %(test_dom, "mem")
>                  }
> -    if CIM_REV < rev:
> -        rasd_list['proc_rasd'] = '%s/%s' %(test_dom, "0")
> 
>      try: 
>          if len(assoc_info) <= 0: 
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py
> --- a/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py 
> Fri May 23 10:39:01 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py 
> Tue Jun 10 11:04:31 2008 -0700
> @@ -62,14 +62,12 @@
>  from CimTest.ReturnCodes import PASS, FAIL
>  from CimTest.Globals import do_main, logger
>  from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'XenFV', 'KVM']
> 
>  test_dom     = "domu1"
>  test_mac     = "00:11:22:33:44:aa"
>  test_vcpus   = 1
> -rev = 417
> 
>  expr_values = {
>      "INVALID_InstID_Keyname"   : { 'rc'   : pywbem.CIM_ERR_FAILED, \
> @@ -77,10 +75,6 @@
>      "INVALID_InstID_Keyval"    : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
>                       'desc' : 'No such instance 
(INVALID_InstID_Keyval)'}
>  }
> -
> -if CIM_REV < rev:
> -    expr_values['INVALID_InstID_Keyval'] = {'rc' : 
pywbem.CIM_ERR_FAILED, \
> -                                            'desc' : 'Invalid 
InstanceID'}
> 
>  def try_invalid_assoc(classname, name_val, i, field, virt="Xen"):
>      ac_classname = get_typed_class(virt, 
"VirtualSystemSettingDataComponent")
> diff -r fdc71e98f2d1 -r 58f7c9cf5467 suites/libvirt-
> cim/lib/XenKvmLib/common_util.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py   Fri May 23 
> 10:39:01 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py   Tue Jun 10 
> 11:04:31 2008 -0700
> @@ -33,17 +33,11 @@
>  from XenKvmLib.classes import get_typed_class
>  from CimTest.Globals import logger, log_param, CIM_ERROR_ENUMERATE
>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
> -from XenKvmLib.const import CIM_REV
>  from VirtLib.live import diskpool_list, virsh_version, net_list
>  from XenKvmLib.vxml import PoolXML, NetXML
> 
>  test_dpath = "foo"
> -diskpoolconf_rev = 558
> -
> -if CIM_REV < diskpoolconf_rev:
> -    disk_file = '/tmp/diskpool.conf'
> -else:
> -    disk_file = '/etc/libvirt/diskpool.conf'
> +disk_file = '/etc/libvirt/diskpool.conf'
> 
>  back_disk_file = disk_file + "." + "backup"
> 
> @@ -276,11 +270,10 @@
>      status = PASS
>      libvirt_version = virsh_version(server, virt)
>      # The conf file is not present on  the machine if 
> -    # libvirt_version >= 0.4.1 and CIM_REV > 558
> +    # libvirt_version >= 0.4.1
>      # Hence Skipping the logic to delete the new conf file
>      # and just returning PASS
> -    if libvirt_version >= '0.4.1' and \
> -       CIM_REV > diskpoolconf_rev:
> +    if libvirt_version >= '0.4.1':
>          return status
>      try:
>          if os.path.exists(back_disk_file):
> @@ -328,8 +321,7 @@
> 
>  def create_diskpool_conf(server, virt):
>      libvirt_version = virsh_version(server, virt)
> -    if libvirt_version >= '0.4.1' and \
> -       CIM_REV > diskpoolconf_rev:
> +    if libvirt_version >= '0.4.1':
>          status, dpoolname = create_diskpool(server, virt=virt)
>          diskid = "%s/%s" % ("DiskPool", dpoolname)
>      else:
> 
  +1 from me. 
  Would you please update ResourceAllocationFromPool.02 that remove
  revision branch? Also, do we need the global CIM_REV variable on the 
next? If
  not, would you please update related functions such as const.py and 
main.py?

  Thanks!
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080616/66fdd010/attachment.htm>

From deeptik at linux.vnet.ibm.com  Mon Jun 16 12:01:47 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Mon, 16 Jun 2008 05:01:47 -0700
Subject: [Libvirt-cim] [PATCH 2 of 4] [TEST] #2 Fixing the
	02_hostsystem_to_rasd.py tc of HostSystem
In-Reply-To: <patchbomb.1213617705@elm3b193.beaverton.ibm.com>
Message-ID: <15b3d305bec5e26313bf.1213617707@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213615884 25200
# Node ID 15b3d305bec5e26313bf96824a670afe91aae357
# Parent  36a1ac9fce4185f796f0a07b7f31c107b94f3ed7
[TEST] #2 Fixing the 02_hostsystem_to_rasd.py tc of HostSystem.

Changes from Patch 1 to 2:
--------------------------
1) Updated the return value of the rasd_init_list().

Patch 1:
--------
1) Fixing the tc failure bcs of the modifications that was done to default network type.
2) Using the rasd_init_list() fn of the rasd.py .

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 36a1ac9fce41 -r 15b3d305bec5 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Mon Jun 16 04:30:23 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Mon Jun 16 04:31:24 2008 -0700
@@ -57,7 +57,7 @@
 CIM_ERROR_ASSOCIATORS
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV']
@@ -69,47 +69,6 @@
 test_mac    = "00:11:22:33:44:aa"
 rev = 529
 proc_instid_rev = 590
-
-def init_list(vsxml, virt="Xen"):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    disk_path = vsxml.xml_get_disk_source()
-    proc_cn = get_typed_class(virt, "Processor")
-    mem_cn = get_typed_class(virt, "Memory")
-    net_cn = get_typed_class(virt, "NetworkPort")
-    disk_cn = get_typed_class(virt, "LogicalDisk")
-
-    rasd_values = { 
-                    proc_cn              : {
-                                             "InstanceID" : '%s/%s' %(test_dom, "proc"),
-                                             "ResourceType" : 3,
-                                            }, 
-                    disk_cn              : {
-                                             "InstanceID"  : '%s/%s' %(test_dom, test_disk), 
-                                             "ResourceType" : 17, 
-                                             "Address"      : disk_path, 
-                                            }, 
-                    net_cn               : {
-                                              "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
-                                              "ResourceType" : 10 , 
-                                              "ntype1": "bridge", 
-                                              "ntype2": "ethernet", 
-                                           }, 
-                    mem_cn               : {
-                                              "InstanceID"  : '%s/%s' %(test_dom, "mem"), 
-                                              "ResourceType" : 4, 
-                                              "AllocationUnits" : "KiloBytes",
-                                              "VirtualQuantity" : (test_mem * 1024), 
-                                           }
-                  } 
-    if CIM_REV < rev:
-       rasd_values[mem_cn]['AllocationUnits'] = "MegaBytes"
-
-    if CIM_REV < proc_instid_rev:
-       rasd_values[proc_cn]['InstanceID'] = '%s/%s' %(test_dom, 0)
-
-    return rasd_values
 
 def setup_env(server, virt="Xen"):
     vsxml_info = None
@@ -185,7 +144,13 @@
                 classname_keyvalue = sd_assoc_info[i]['CreationClassName']
                 deviceid =  sd_assoc_info[i]['DeviceID']
                 in_setting_define_state[classname_keyvalue] = deviceid
-        rasd_values = init_list(vsxml, virt)
+
+        status, rasd_values, in_list = rasd_init_list(vsxml, virt, 
+                                                      test_disk, test_dom, 
+                                                      test_mac, test_mem)
+        if status != PASS:
+            return status
+
         an = get_typed_class(virt, 'SettingsDefineState')
         sccn = get_typed_class(virt, 'ComputerSystem')
         for cn, devid in sorted(in_setting_define_state.items()):



From deeptik at linux.vnet.ibm.com  Mon Jun 16 12:01:48 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Mon, 16 Jun 2008 05:01:48 -0700
Subject: [Libvirt-cim] [PATCH 3 of 4] [TEST] #2 Updating the
	41_cs_to_settingdefinestate.py tc of ComputerSystem
In-Reply-To: <patchbomb.1213617705@elm3b193.beaverton.ibm.com>
Message-ID: <943322cb9721cdd9b3dc.1213617708@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213616987 25200
# Node ID 943322cb9721cdd9b3dc0e247f7119cda05dcb28
# Parent  15b3d305bec5e26313bf96824a670afe91aae357
[TEST] #2 Updating the 41_cs_to_settingdefinestate.py tc of ComputerSystem.

Changes:
-------
Patch 2 to 1:
------------
1) Addressed the indentation comments.
2) updated the rasd_init_list() for return values.

Will update the tc for XenFV,KVM later.

Patch1
-------
1) Updated the tc to use vxml fn().
2) Updated the tc to use rasd_init_list() fn of rasd.py.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 15b3d305bec5 -r 943322cb9721 suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py	Mon Jun 16 04:31:24 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py	Mon Jun 16 04:49:47 2008 -0700
@@ -59,15 +59,17 @@
 import sys
 from VirtLib import utils
 from XenKvmLib import computersystem
-from XenKvmLib.test_xml import testxml, disk_path
-from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
+from XenKvmLib.classes import get_typed_class
+from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.assoc import Associators, AssociatorNames
 from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \
 CIM_ERROR_ASSOCIATORS
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import rasd
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 
 sup_types = ['Xen']
 
@@ -75,55 +77,18 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-test_disk   = 'xvda'
-vstype      = 'Xen'
+test_disk = "xvda"
 
-
-def rasd_init_list():
+def vssd_init_list(virt):
     """
         Creating the lists that will be used for comparisons.
     """
-    proc_rasd = {
-                         "InstanceID" : '%s/%s' %(test_dom, "proc"),\
-                       "ResourceType" : 3,\
-                }
-
-    disk_rasd = {
-                       "InstanceID"  : '%s/%s' %(test_dom, test_disk), \
-                      "ResourceType" : 17, \
-                      "Address"      : disk_path, \
-                }
-    net_rasd =  {
-                       "InstanceID"  : '%s/%s' %(test_dom,test_mac), \
-                      "ResourceType" : 10 , \
-                             "ntype1": "bridge", \
-                             "ntype2": "ethernet", \
-                }
-    mem_rasd =  {
-                       "InstanceID"  : '%s/%s' %(test_dom, "mem"), \
-                      "ResourceType" : 4, \
-                   "AllocationUnits" : "KiloBytes",\
-                   "VirtualQuantity" : (test_mem * 1024), \
-                }
-    rasd_values = {  "Xen_Processor"   : proc_rasd, \
-                     "Xen_LogicalDisk" : disk_rasd, \
-                     "Xen_NetworkPort" : net_rasd, \
-                     "Xen_Memory"      : mem_rasd 
-                  }
-    return rasd_values
-
-
-def vssd_init_list():
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    
     vssd_values = { 
                       'Caption'                 : "Virtual System", \
-                      'InstanceID'              : '%s:%s' % (vstype, test_dom), \
+                      'InstanceID'              : '%s:%s' % (virt, test_dom), \
                       'ElementName'             : test_dom, \
                       'VirtualSystemIdentifier' : test_dom, \
-                      'VirtualSystemType'       : vstype, \
+                      'VirtualSystemType'       : virt, \
                       'Classname'               : "Xen_VirtualSystemSettingData"
                   } 
 
@@ -142,19 +107,23 @@
                  }
     return cs_values 
 
-def setup_env(server):
+def setup_env(server, virt):
+    vsxml_info = None
     status = PASS
     destroy_and_undefine_all(server)
-    test_xml = testxml(test_dom, mem = test_mem,    \
-                                 vcpus = test_vcpus, \
-                                     mac = test_mac,  \
-                                      disk = test_disk)
+    virt_xml =  get_class(virt)
+    vsxml_info = virt_xml(test_dom, mem = test_mem,
+                          vcpus=test_vcpus,
+                          mac = test_mac,
+                          disk = test_disk)
 
-    ret = test_domain_function(test_xml, server, cmd = "create")
+    ret = vsxml_info.create(server)
     if not ret:
         logger.error("Failed to create the dom: %s", test_dom)
         status = FAIL
-    return status
+
+    return status, vsxml_info
+
 
 def print_err(err, detail, cn):
     logger.error(err % cn)
@@ -168,7 +137,7 @@
     logger.error(err)
     logger.error(detail)
 
-def get_inst_from_list(server, cn, cs_list, exp_val):
+def get_inst_from_list(server, vsxml, cn, cs_list, exp_val):
     status = PASS
     ret = -1
     inst = None 
@@ -179,12 +148,12 @@
 
     if ret != PASS:
         logger.error("%s with %s was not returned" % (cn, exp_val))
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         status = FAIL
 
     return status, inst
 
-def get_associatornames_info(server, cn, an, qcn, name):
+def get_associatornames_info(server, vsxml, cn, an, qcn, name):
     status = PASS
     assoc_info = []
     try:
@@ -201,11 +170,11 @@
         status = FAIL
 
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
 
     return status, assoc_info
 
-def get_associators_info(server, cn, an, qcn, instid):
+def get_associators_info(server, vsxml, cn, an, qcn, instid):
     status = PASS
     assoc_info = []
     try:
@@ -223,17 +192,19 @@
         status = FAIL
 
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
 
     return status, assoc_info
 
 def check_len(an, assoc_list_info, qcn, exp_len):
     if len(assoc_list_info) != exp_len:
-        logger.error("%s returned %i %s objects" % (an, len(assoc_list_info), qcn))
+        logger.error("%s returned %i %s objects", an, 
+                                                  len(assoc_list_info), qcn)
         return FAIL 
     return PASS 
 
-def get_setdefstate_verify_RASD_build_vssdc_input(server, sd_assoc_info):
+def get_SDS_verify_RASD_build_vssdc_input(server, virt, vsxml, 
+                                          test_disk, sd_assoc_info):
     status = PASS
     in_setting_define_state = {} 
     in_vssdc = {}
@@ -254,7 +225,12 @@
             return FAIL, in_setting_define_state
 # Get the rasd values that will be used to compare with the Xen_SettingsDefineState
 # output.
-        rasd_values = rasd_init_list()
+        status, rasd_values, in_list = rasd_init_list(vsxml, virt, test_disk, 
+                                                      test_dom, test_mac, 
+                                                      test_mem)
+        if status != PASS:
+            return status
+
         sccn = "Xen_ComputerSystem"
         an = "Xen_SettingsDefineState"
         for cn, devid in sorted(in_setting_define_state.items()):
@@ -350,21 +326,23 @@
 @do_main(sup_types)
 def main():
     server = main.options.ip
-    status = setup_env(server)
+    virt   = main.options.virt
+    status, vsxml = setup_env(server, virt)
     if status != PASS:
         return status
 
     cs_enum = computersystem.enumerate(server)
     if len(cs_enum) == 0:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
     cn = cs_enum[0].CreationClassName
     status, cs_dom = get_inst_from_list(server,
+                                         vsxml,
                                             cn,
                                        cs_enum,
                                       test_dom)
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
 
 # Creating the cs info list which will be used later for comparison.
@@ -372,41 +350,44 @@
     if cs_values['EnabledState'] != 2 :
         logger.error("Improper EnabledState value set for domain %s", test_dom)
         logger.error("Should have been 2 instead of %s", cs_values['EnabledState'])
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return FAIL 
     
     cn        = cs_dom.CreationClassName
     an        = 'Xen_SystemDevice'
     qcn       = 'Logical Devices'
     name      = test_dom
-    status, sd_assoc_info = get_associatornames_info(server, cn, an, qcn, name)
+    status, sd_assoc_info = get_associatornames_info(server, vsxml, 
+                                                     cn, an, qcn, name)
     if status != PASS or len(sd_assoc_info) == 0:
         return status
-    status, in_vssdc_list = get_setdefstate_verify_RASD_build_vssdc_input(server, \
-                                                                     sd_assoc_info)
+    status, in_vssdc_list = get_SDS_verify_RASD_build_vssdc_input(server, virt,
+                                                                  vsxml, test_disk,
+                                                                  sd_assoc_info)
     if status != PASS or len(in_vssdc_list) == 0 :
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
 # Verifying that the in_vssdc_list contains 4 entries one each for mem rasd,
 # network rasd, processor rasd and disk rasd.
     exp_len = 4
     if check_len(an, in_vssdc_list, qcn, exp_len) != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return FAIL 
 # Get the vssd values which will be used for verifying the Xen_VirtualSystemSettingData 
 # output from the Xen_VirtualSystemSettingDataComponent results.
-    vssd_values = vssd_init_list()
+    vssd_values = vssd_init_list(virt)
     an  = 'Xen_VirtualSystemSettingDataComponent'
     qcn = 'Xen_VirtualSystemSettingData'
     for cn, instid in sorted((in_vssdc_list.items())):
-        status, vssd_assoc_info = get_associators_info(server, cn, an, qcn, instid)
+        status, vssd_assoc_info = get_associators_info(server, vsxml, cn, an, qcn,
+                                                       instid)
         if status != PASS or len(vssd_assoc_info) == 0:
             break 
         status = verify_VSSD_values(vssd_assoc_info, vssd_values, an, qcn)    
         if status != PASS:
             break
     if status != PASS:
-        test_domain_function(test_dom, server, "destroy")
+        vsxml.destroy(server)
         return status
 # Since the Xen_VirtualSystemSettingDataComponent returns similar output when queried with 
 # every RASD, we are taking the output of the last associtaion query as inputs for 
@@ -415,13 +396,13 @@
     an     = 'Xen_SettingsDefineState'
     qcn    = 'Xen_ComputerSystem'
     instid = vssd_assoc_info[0]['InstanceID']
-    status, cs_assoc_info = get_associators_info(server, cn, an, qcn, instid)
+    status, cs_assoc_info = get_associators_info(server, vsxml, cn, an, qcn, instid)
     if status != PASS or len(cs_assoc_info) == 0:
         return status
 # verify the results of Xen_SettingsDefineState with the cs_values list that was 
 # built using the output of the enumeration on Xen_ComputerSystem.
     status = verify_CS_values(cs_assoc_info, cs_values, an, qcn)
-    test_domain_function(test_dom, server, "destroy")
+    vsxml.destroy(server)
     return status
 if __name__ == "__main__":
     sys.exit(main())



From deeptik at linux.vnet.ibm.com  Mon Jun 16 12:01:49 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Mon, 16 Jun 2008 05:01:49 -0700
Subject: [Libvirt-cim] [PATCH 4 of 4] [TEST] #2 Updating the tc to use the
	rasd_init_list() fn of rasd.py
In-Reply-To: <patchbomb.1213617705@elm3b193.beaverton.ibm.com>
Message-ID: <5cf86e67c88b493c8cbe.1213617709@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213617321 25200
# Node ID 5cf86e67c88b493c8cbe5e8de9ed03884128ed3a
# Parent  943322cb9721cdd9b3dc0e247f7119cda05dcb28
[TEST] #2 Updating the tc to use the rasd_init_list() fn of rasd.py.

Changes:

>From Patch 1 to 2;
-----------------
1) updated the rasd_init_list() return values.

Patch 1:
-------
Updating the tc to use the rasd_init_list() fn of rasd.py.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 943322cb9721 -r 5cf86e67c88b suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Mon Jun 16 04:49:47 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Mon Jun 16 04:55:21 2008 -0700
@@ -57,6 +57,9 @@
 from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import rasd
+from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -64,44 +67,18 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-prev = 531
-mrev = 529
-
-def init_list(xml, disk, virt="Xen"):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    procrasd = {
-            "InstanceID" : '%s/%s' % (test_dom, "proc"),
-            "ResourceType" : 3,
-            "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
-    netrasd = {
-            "InstanceID" : '%s/%s' % (test_dom,test_mac),
-            "ResourceType" : 10 ,
-            "ntype1" : "bridge",
-            "ntype2" : "ethernet",
-            "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
-    address = xml.xml_get_disk_source()
-    diskrasd = {
-            "InstanceID" : '%s/%s' % (test_dom, disk),
-            "ResourceType" : 17,
-            "Address" : address,
-            "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
-    memrasd = {
-            "InstanceID" : '%s/%s' % (test_dom, "mem"),
-            "ResourceType" : 4,
-            "AllocationUnits" : "KiloBytes",
-            "VirtualQuantity" : (test_mem * 1024),
-            "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
-    if CIM_REV < prev:
-        procrasd['InstanceID'] = '%s/0' % test_dom
-    if CIM_REV < mrev:
-        memrasd['AllocationUnits'] = 'MegaBytes'
-
-    return procrasd, netrasd, diskrasd, memrasd
 
 def assoc_values(assoc_info, xml, disk, virt="Xen"):
-    procrasd, netrasd, diskrasd, memrasd = init_list(xml, disk, virt)
+    status, rasd_values, in_list = rasd_init_list(xml, virt, disk, test_dom,
+                                                 test_mac, test_mem)
+    if status != PASS:
+        return status
+    
+    procrasd =  rasd_values['%s'  %in_list['proc']]
+    netrasd  =  rasd_values['%s'  %in_list['net']] 
+    diskrasd =  rasd_values['%s'  %in_list['disk']]
+    memrasd  =  rasd_values['%s'  %in_list['mem']]
+
     if virt == 'LXC':
         proc_status = 0
         disk_status = 0
diff -r 943322cb9721 -r 5cf86e67c88b suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py	Mon Jun 16 04:49:47 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py	Mon Jun 16 04:55:21 2008 -0700
@@ -37,6 +37,10 @@
 from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib import rasd
+from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
+
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -44,41 +48,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-prev = 531
-mrev = 529
-
-def init_list(virt):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    proc = {
-            "InstanceID" : '%s/%s' % (test_dom, "proc"),
-            "ResourceType" : 3,
-            "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
-    net = {
-            "InstanceID" : '%s/%s' % (test_dom,test_mac),
-            "ResourceType" : 10 ,
-            "ntype1" : "bridge",
-            "ntype2" : "ethernet",
-            "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
-    address = vsxml.xml_get_disk_source()
-    disk = {
-            "InstanceID"  : '%s/%s' % (test_dom, test_disk),
-            "ResourceType" : 17,
-            "Address" : address,
-            "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
-    mem = {
-            "InstanceID" : '%s/%s' % (test_dom, "mem"),
-            "ResourceType" : 4,
-            "AllocationUnits" : "KiloBytes",
-            "VirtualQuantity" : (test_mem * 1024),
-            "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
-    if CIM_REV < prev:
-        proc['InstanceID'] = '%s/0' % test_dom
-    if CIM_REV < mrev:
-        mem['AllocationUnits'] = 'MegaBytes'
-
-    return proc, net, disk, mem
 
 def get_inst_from_list(server, classname, rasd_list, filter_name, exp_val):
     status = PASS
@@ -125,7 +94,7 @@
         for rasd_instance in rasd_values_info:
             CCName = rasd_instance.classname
             if rasd.pasd_cn in CCName :
-                status = rasd.verify_procrasd_values(rasd_instance, procrasd,)
+                status = rasd.verify_procrasd_values(rasd_instance, procrasd)
             elif rasd.nasd_cn in CCName :
                 status = rasd.verify_netrasd_values(rasd_instance, netrasd)
             elif rasd.dasd_cn in CCName:
@@ -159,7 +128,7 @@
         class_list = [get_typed_class(virt, rasd.masd_cn)]
     else:
         vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
-                    mac = test_mac, disk = test_disk)
+                        mac = test_mac, disk = test_disk)
         vsxml.set_vbridge(server)
         class_list = [ get_typed_class(virt, rasd.dasd_cn),
                        get_typed_class(virt, rasd.masd_cn),
@@ -176,8 +145,17 @@
         logger.error("Exception : %s", details)
         return FAIL
     
-    status = PASS 
-    procrasd, netrasd, diskrasd, memrasd = init_list(virt)
+    status, rasd_values_list, in_list = rasd_init_list(vsxml, virt, test_disk, 
+                                                       test_dom, test_mac, 
+                                                       test_mem)
+    if status != PASS:
+        return status
+
+    procrasd =  rasd_values_list['%s'  %in_list['proc']]
+    netrasd  =  rasd_values_list['%s'  %in_list['net']]
+    diskrasd =  rasd_values_list['%s'  %in_list['disk']]
+    memrasd  =  rasd_values_list['%s'  %in_list['mem']]
+
     
     # For each loop
     # 1) Enumerate one RASD type



From deeptik at linux.vnet.ibm.com  Mon Jun 16 12:01:45 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Mon, 16 Jun 2008 05:01:45 -0700
Subject: [Libvirt-cim] [PATCH 0 of 4] [TEST] Moving the init_list() to
	rasd.py
Message-ID: <patchbomb.1213617705@elm3b193.beaverton.ibm.com>

Moving the init_list() fn for RASD related tc to lib.
Modifying the affected tc to use the new rasd_init_list().



From deeptik at linux.vnet.ibm.com  Mon Jun 16 12:01:46 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Mon, 16 Jun 2008 05:01:46 -0700
Subject: [Libvirt-cim] [PATCH 1 of 4] [TEST] #2 Moving the init_list() to
	rasd.py
In-Reply-To: <patchbomb.1213617705@elm3b193.beaverton.ibm.com>
Message-ID: <36a1ac9fce4185f796f0.1213617706@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213615823 25200
# Node ID 36a1ac9fce4185f796f0a07b7f31c107b94f3ed7
# Parent  6900d7da2228de4e48cb9919b61dcdda7af500c9
[TEST] #2 Moving the init_list()  to rasd.py

Changes from patch 1 to 2:
-------------------------
1) Removed the globals used.
2) Modified rasd_init_list() to also return the list of rasd_values indices.

Patch 1
--------
1) Most of the tc use init_list() fn to verify the RASD values, hence moved it to rasd.py.
2) Added the logic to pick up the networktype used by the guest while creating to verify the RASD values.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 6900d7da2228 -r 36a1ac9fce41 suites/libvirt-cim/lib/XenKvmLib/rasd.py
--- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Fri Jun 13 14:41:52 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Mon Jun 16 04:30:23 2008 -0700
@@ -21,29 +21,104 @@
 #
 
 import sys
-from CimTest import Globals 
 from CimTest.Globals import log_param, logger
 from CimTest.ReturnCodes import FAIL, PASS
+from XenKvmLib.const import CIM_REV
+from XenKvmLib import vxml
+from XenKvmLib.classes import get_typed_class
+
 
 pasd_cn = 'ProcResourceAllocationSettingData'
 nasd_cn = 'NetResourceAllocationSettingData'
 dasd_cn = 'DiskResourceAllocationSettingData'
 masd_cn = 'MemResourceAllocationSettingData'
+proccn =  'Processor'
+memcn  =  'Memory'
+netcn  =  'NetworkPort'
+diskcn =  'LogicalDisk'
+
+
+mem_units_rev = 529
+proc_instid_rev = 590
+
+def rasd_init_list(vsxml, virt, t_disk, t_dom, t_mac, t_mem):
+    """
+        Creating the lists that will be used for comparisons.
+    """
+    rasd_values =  { }
+    proc_cn = get_typed_class(virt, proccn)
+    mem_cn = get_typed_class(virt, memcn)
+    net_cn = get_typed_class(virt, netcn)
+    disk_cn = get_typed_class(virt, diskcn)
+
+    in_list = { 'proc'  :      proc_cn,
+                 'mem'  :      mem_cn,
+                 'net'  :      net_cn,
+                 'disk' :      disk_cn
+               }
+    try:
+
+        disk_path = vsxml.xml_get_disk_source()
+
+        if CIM_REV < mem_units_rev:
+          alloc_units  = "MegaBytes"
+        else:
+          alloc_units  = "KiloBytes"
+
+        if CIM_REV < proc_instid_rev:
+           proc_id = '%s/%s' %(t_dom, 0)
+        else:
+           proc_id = '%s/%s' %(t_dom, "proc")
+       
+
+        rasd_values = { 
+                        proc_cn  : {
+                                     "InstanceID"   : proc_id,
+                                     "ResourceType" : 3,
+                                    }, 
+                        disk_cn  : {
+                                     "InstanceID"   : '%s/%s' %(t_dom, t_disk), 
+                                     "ResourceType" : 17, 
+                                     "Address"      : disk_path, 
+                                    }, 
+                        net_cn   : {
+                                    "InstanceID"   : '%s/%s' %(t_dom, t_mac), 
+                                    "ResourceType" : 10 , 
+                                    "ntype"        : [ 'bridge', 'user',
+                                                         'network', 'ethernet'] 
+                                      }, 
+                        mem_cn   : {
+                                    "InstanceID" : '%s/%s' %(t_dom, "mem"), 
+                                    "ResourceType"    : 4, 
+                                    "AllocationUnits" : alloc_units,
+                                    "VirtualQuantity" : (t_mem * 1024),
+                                  }
+                      } 
+    except Exception, details:
+        logger.error("Exception: In fn rasd_init_list %s", details)
+        return FAIL, rasd_values, in_list
+
+    nettype   = vsxml.xml_get_net_type()
+    if not nettype in rasd_values[net_cn]['ntype']:
+        logger.info("Adding the %s net type", nettype)
+        rasd_values[net_cn]['ntype'].append(nettype)
+
+    return PASS, rasd_values, in_list
 
 def CCN_err(assoc_info, list):
-    Globals.logger.error("%s Mismatch", 'CreationClassName')
-    Globals.logger.error("Returned %s instead of %s", \
-         assoc_info['CreationClassName'], list['CreationClassName'])
+    logger.error("%s Mismatch", 'CreationClassName')
+    logger.error("Returned %s instead of %s", 
+                  assoc_info['CreationClassName'], list['CreationClassName'])
     
 def RType_err(assoc_info, list):
-    Globals.logger.error("%s Mismatch", 'ResourceType')
-    Globals.logger.error("Returned %s instead of %s", \
-         assoc_info['ResourceType'], list['ResourceType'])
+    logger.error("%s Mismatch", 'ResourceType')
+    logger.error("Returned %s instead of %s", 
+                  assoc_info['ResourceType'], list['ResourceType'])
 
 def InstId_err(assoc_info, list):
-    Globals.logger.error("%s Mismatch", 'InstanceID')
-    Globals.logger.error("Returned %s instead of %s", \
-         assoc_info['InstanceID'], list['InstanceID'])
+    logger.error("%s Mismatch", 'InstanceID')
+    logger.error("Returned %s instead of %s", 
+                  assoc_info['InstanceID'], list['InstanceID'])
 
 def verify_procrasd_values(assoc_info, procrasd_list):
     status = PASS
@@ -63,12 +138,10 @@
     if assoc_info['ResourceType'] != netrasd_list['ResourceType']:
         RType_err(assoc_info, netrasd_list)
         status = FAIL
-    if assoc_info['NetworkType'] != netrasd_list['ntype1'] and \
-       assoc_info['NetworkType'] != netrasd_list['ntype2']:
-        Globals.logger.error("%s Mismatch", 'NetworkType')
-        Globals.logger.error("Returned %s instead of %s or %s", \
-                             assoc_info['NetworkType'], netrasd_list['ntype1'],
-                             netrasd_list['ntype2'])
+    if not assoc_info['NetworkType'] in netrasd_list['ntype']:
+        logger.error("%s Mismatch", 'NetworkType')
+        logger.error("Returned '%s' instead of returning one of %s types",
+                      assoc_info['NetworkType'], netrasd_list['ntype'])
         status = FAIL
     return status
 
@@ -81,9 +154,9 @@
         RType_err(assoc_info, diskrasd_list)
         status = FAIL
     if assoc_info['Address'] != diskrasd_list['Address']:
-        Globals.logger.error("%s Mismatch", 'Address')
-        Globals.logger.error("Returned %s instead of %s ", \
-              assoc_info['Address'], diskrasd_list['Address'])
+        logger.error("%s Mismatch", 'Address')
+        logger.error("Returned %s instead of %s ", 
+                      assoc_info['Address'], diskrasd_list['Address'])
         status = FAIL
     return status
 
@@ -96,13 +169,15 @@
         RType_err(assoc_info, memrasd_list)
         status = FAIL
     if assoc_info['AllocationUnits'] != memrasd_list['AllocationUnits']:
-        Globals.logger.error("%s Mismatch", 'AllocationUnits')
-        Globals.logger.error("Returned %s instead of %s ", \
-              assoc_info['AllocationUnits'],  memrasd_list['AllocationUnits'])
+        logger.error("%s Mismatch", 'AllocationUnits')
+        logger.error("Returned %s instead of %s ", 
+                     assoc_info['AllocationUnits'], 
+                     memrasd_list['AllocationUnits'])
         status = FAIL 
     if assoc_info['VirtualQuantity'] != memrasd_list['VirtualQuantity']:
-        Globals.logger.error("%s mismatch", 'VirtualQuantity')
-        Globals.logger.error("Returned %s instead of %s ", \
-              assoc_info['VirtualQuantity'], memrasd_list['VirtualQuantity'])
+        logger.error("%s mismatch", 'VirtualQuantity')
+        logger.error("Returned %s instead of %s ", 
+                      assoc_info['VirtualQuantity'], 
+                      memrasd_list['VirtualQuantity'])
         status = FAIL 
     return status



From deeptik at linux.vnet.ibm.com  Mon Jun 16 15:14:58 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Mon, 16 Jun 2008 20:44:58 +0530
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] Add vsms_util.py
In-Reply-To: <c6fdcb5088bbe5040976.1213154834@elm3b41.beaverton.ibm.com>
References: <c6fdcb5088bbe5040976.1213154834@elm3b41.beaverton.ibm.com>
Message-ID: <48568372.4080304@linux.vnet.ibm.com>



Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1213147576 25200
> # Node ID c6fdcb5088bbe504097625265a0d8fc0c4ed73c9
> # Parent  1a4f0bc12b84af40d1ebef71ea3d6d30b300af05
> [TEST] Add vsms_util.py
>
> This module is for vsms related utility functions (for AddResource, ModifyResource, etc).
>
> Add the mod_<> functions.  These are identical the code paths in VSMS 08_modifyresource.py except for mod_net_res().
>
> mod_net_res() - In the case of Xen, the bridge name needs to be verified.  This is because the network interface type is converted to a bridge interface by libvirt.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r 1a4f0bc12b84 -r c6fdcb5088bb suites/libvirt-cim/lib/XenKvmLib/vsms_util.py
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Tue Jun 10 18:26:16 2008 -0700
> @@ -0,0 +1,102 @@
> +#!/usr/bin/python
> +#
> +# Copyright 2008 IBM Corp.
> +#
> +# Authors:
> +#    Kaitlin Rupert <karupert at us.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 CimTest import Globals
> +from CimTest.ReturnCodes import FAIL, PASS
> +from CimTest.Globals import logger
> +from VirtLib.live import network_by_bridge
> +
> +def mod_disk_res(server, service, cxml, dasd, ndpath):
> +    try:
> +        service.ModifyResourceSettings(ResourceSettings = [str(dasd)])
> +        cxml.dumpxml(server)
> +        dpath = cxml.xml_get_disk_source()
> +        if dpath != ndpath:
> +            logger.error("Got %s, exp %s." % (dpath, ndpath))
> +            raise Exception('Error changing rs for disk path')
> +        logger.info('good status for disk path')
> +    except Exception, details:
> +        logger.error('Error invoking ModifyRS')
> +        logger.error(details)
> +        return FAIL
> +
> +    return PASS
> +
> +def mod_net_res(server, service, virt, cxml, nasd, ntype, net_name):
> +    try:
> +        service.ModifyResourceSettings(ResourceSettings = [str(nasd)])
> +        cxml.dumpxml(server)
> +        type = cxml.xml_get_net_type()
> +
> +        if virt == "KVM":
> +            name = cxml.xml_get_net_network()
> +        else:
> +            if type == "bridge":
> +                type = "network"
> +            br_name = cxml.xml_get_net_bridge()
> +            name = network_by_bridge(br_name, server, virt)
> +
> +        if type != ntype or name != net_name:
> +            logger.error('Got %s, exp %s. Got %s, exp %s' %
> +                         (type, ntype, name, net_name))
> +            raise Exception('Error changing rs for net mac')
> +        logger.info('good status for net mac')
> +    except Exception, details:
> +        logger.error('Error invoking ModifyRS')
> +        logger.error(details)
> +        return FAIL
> +
> +    return PASS
> +
> +def mod_mem_res(server, service, cxml, masd, nmem):
> +    try:
> +        service.ModifyResourceSettings(ResourceSettings=[str(masd)])
> +        cxml.dumpxml(server)
> +        mem = cxml.xml_get_mem()
> +        if int(mem) != int(nmem) * 1024:
> +            logger.error("Got %d, exp %d." % (int(mem), (int(nmem) * 1024)))
> +            raise Exception('Error changing rs for mem')
> +        logger.info('good status for mem')
> +    except Exception, details:
> +        logger.error('Error invoking ModifyRS')
> +        logger.error(details)
> +        return FAIL
> +
> +    return PASS
> +
> +def mod_vcpu_res(server, service, cxml, pasd, ncpu):
> +    try:
> +        service.ModifyResourceSettings(ResourceSettings = [str(pasd)])
> +        cxml.dumpxml(server)
> +        cpu = cxml.xml_get_vcpu()
> +        if int(cpu) != int(ncpu):
> +            logger.error("Got %d, exp %d." % (int(cpu), int(ncpu)))
> +            raise Exception('Error changing rs for vcpu')
> +        logger.info('good status for vcpu')
> +    except Exception, details:
> +        logger.error('Error invoking ModifyRS')
> +        logger.error(details)
> +        return FAIL
> +
> +    return PASS
>   
1) Since the Exception handling is same in all of the above, We can move 
it to a function.
2) Also, We can make it more meaningful if we print the fn in which the 
exception is occurs.
> +
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From deeptik at linux.vnet.ibm.com  Mon Jun 16 15:15:06 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Mon, 16 Jun 2008 20:45:06 +0530
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] Fix VSMS 08_modifyresource.py
	on Xen and KVM
In-Reply-To: <9f168dca6251330adcb1.1213154835@elm3b41.beaverton.ibm.com>
References: <9f168dca6251330adcb1.1213154835@elm3b41.beaverton.ibm.com>
Message-ID: <4856837A.7060705@linux.vnet.ibm.com>



Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1213154736 25200
> # Node ID 9f168dca6251330adcb158f6b64fea51ee72d45e
> # Parent  c6fdcb5088bbe504097625265a0d8fc0c4ed73c9
> [TEST] Fix VSMS 08_modifyresource.py on Xen and KVM.
>
> This still fails on XenFV because of a provider bug.  It looks like the ModifyResource call strips the <emulator> tag from a XenFV guest.  So the test is unable to start the guest.
>   
The tc failed on KVM and Xen machine with latest sources [ REV: 611 ] 
with the following error:
VirtualSystemManagementService - 08_modifyresource.py: FAIL
ERROR   - Error invoking ModifyRS
ERROR   - (1, u"CIM_ERR_FAILED: Device `0' not found")
ERROR   - Failed to destroy Virtual Network 'default-net17'
InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Device `0' not found

The debug o/p shows that the tc is failing with :

device_parsing.c(257): Disk node: disk
Virt_VirtualSystemManagementService.c(1192): Resource transform function 
failed

> Updates to this test:
>   -Call create_netpool_conf() to create a new network pool to use in modify calls.
>   -Create network RASD instead of bridge
>   -Replaced modify calls with functions from vsms_util
>   -Added support for modifying a running guest (mem and vcpu only)
>   -Remove XFAIL
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r c6fdcb5088bb -r 9f168dca6251 suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py
> --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py	Tue Jun 10 18:26:16 2008 -0700
> +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py	Tue Jun 10 20:25:36 2008 -0700
> @@ -26,19 +26,25 @@
>  import pywbem
>  from pywbem.cim_obj import CIMInstanceName
>  from VirtLib import utils
> +from VirtLib.live import network_by_bridge
>  from XenKvmLib import vsms
>  from XenKvmLib import vxml
>  from CimTest.Globals import logger
>  from CimTest.Globals import do_main
>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
>   
XFAIL_RC can also be removed.
> +from XenKvmLib.common_util import create_netpool_conf, destroy_netpool
> +from XenKvmLib import vsms_util
>
>  sup_types = ['Xen', 'KVM', 'XenFV']
>  default_dom = 'rstest_domain'
> -ntype = 'bridge'
> +ntype = 'network'
>  ncpu = 3
>  nmem = 78
>
> -bug_cpu = '90079'
> +def cleanup_env(ip, virt, cxml, net_name):
> +    destroy_netpool(ip, virt, net_name)
> +    cxml.destroy(ip)
> +    cxml.undefine(ip)
>
>  @do_main(sup_types)
>  def main():
> @@ -50,54 +56,65 @@
>      dasd = vsms.get_dasd_class(options.virt)(dev=cxml.xml_get_disk_dev(),
>                                               source=ndpath, 
>                                               name=default_dom)
> +    
> +    status, net_name = create_netpool_conf(options.ip, options.virt, 
> +                                           use_existing=False)
> +    if status != PASS:
> +        logger.error('Unable to create network pool')
>   
logger.error('Unable to find a network pool') would be more appropriate ?
> +        return FAIL 
> +
>      nasd = vsms.get_nasd_class(options.virt)(type=ntype, 
>                                               mac=cxml.xml_get_net_mac(),
> -                                             name=default_dom)
> +                                             name=default_dom,
> +                                             virt_net=net_name)
>      masd = vsms.get_masd_class(options.virt)(megabytes=nmem, name=default_dom)
>      pasd = vsms.get_pasd_class(options.virt)(vcpu=ncpu, name=default_dom)
>
>      status = FAIL
>      rc = 0
>   
We can remove rc since it is never used.     
> -    try:
> -        cxml.define(options.ip)
> -        # Modify disk setting
> -        service.ModifyResourceSettings(ResourceSettings = [str(dasd)])
> -        cxml.dumpxml(options.ip)
> -        dpath = cxml.xml_get_disk_source()
> -        if dpath != ndpath:
> -            raise Exception('Error changing rs for disk path')
> -        logger.info('good status for disk path')
> -        # Modify net setting
> -        service.ModifyResourceSettings(ResourceSettings = [str(nasd)])
> -        cxml.dumpxml(options.ip)
> -        type = cxml.xml_get_net_type()
> -        if type != ntype:
> -            raise Exception('Error changing rs for net mac')
> -        logger.info('good status for net mac')
> -        # Modify memory resource setting
> -        service.ModifyResourceSettings(ResourceSettings=[str(masd)])
> -        cxml.dumpxml(options.ip)
> -        mem = cxml.xml_get_mem()
> -        if mem != '%i' % (nmem * 1024):
> -            raise Exception('Error changing rs for mem')
> -        logger.info('good status for mem')
> -        # Modify cpu setting
> -        service.ModifyResourceSettings(ResourceSettings = [str(pasd)])
> -        cxml.dumpxml(options.ip)
> -        cpu = cxml.xml_get_vcpu()
> -        if cpu != '%i' % ncpu:
> -            rc = -1
> -            raise Exception('Error changing rs for vcpu')
> -        logger.info('good status for vcpu')
> -        status = PASS
> -    except Exception, details:
> -        logger.error('Error invoking ModifyRS')
> -        logger.error(details)
> -        return FAIL
> +  
> +    if options.virt == "KVM":
> +        test_cases = ["define"]
> +    else:
> +        test_cases = ["define", "start"]
>
> -    cxml.undefine(options.ip)
> -    if rc == -1:
> -        return XFAIL_RC(bug_cpu)
> +    for case in test_cases:
> +        cxml.undefine(options.ip)
> +        ret = cxml.define(options.ip)
> +        if not ret:
> +            logger.error("Failed to define the dom: %s", default_dom)
> +            cleanup_env(options.ip, options.virt, cxml, net_name)
> +            return FAIL
> +        if case == "start":
> +            ret = cxml.start(options.ip)
> +            if not ret:
> +                logger.error("Failed to start the dom: %s", default_dom)
> +                cleanup_env(options.ip, options.virt, cxml, net_name)
> +                return FAIL
>   
Can we do like this ?
if case == "start":
    ret = cxml.start(options.ip)
else:
    ret = cxml.define(options.ip)   
if not ret:
 logger.error("Failed to '%s' the dom: %s", case, default_dom)
 cleanup_env(options.ip, options.virt, cxml, net_name)
 return FAIL

> +
> +        status = vsms_util.mod_vcpu_res(options.ip, service, cxml, pasd, ncpu)
> +        if status != PASS:
> +            break
> +
> +        status = vsms_util.mod_mem_res(options.ip, service, cxml, masd, nmem)
> +        if status != PASS:
> +            break
> +
> +        #Unable to modify net and disk devices while guest is running
> +        if case == "start":
> +            break
> +
> +        status = vsms_util.mod_disk_res(options.ip, service, cxml, dasd, ndpath)
> +        if status != PASS:
> +            break
> +
> +        status = vsms_util.mod_net_res(options.ip, service, options.virt, cxml,
> +                                       nasd, ntype, net_name)
> +        if status != PASS:
> +            break
> +
> +    cleanup_env(options.ip, options.virt, cxml, net_name)
> +    destroy_netpool(options.ip, options.virt, net_name)
>
>      return status
>
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From deeptik at linux.vnet.ibm.com  Mon Jun 16 15:14:27 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Mon, 16 Jun 2008 20:44:27 +0530
Subject: [Libvirt-cim] [PATCH 1 of 3] [TEST] Update create_netpool_conf()
	to support new pool creation
In-Reply-To: <1a4f0bc12b84af40d1eb.1213154833@elm3b41.beaverton.ibm.com>
References: <1a4f0bc12b84af40d1eb.1213154833@elm3b41.beaverton.ibm.com>
Message-ID: <48568353.9030802@linux.vnet.ibm.com>



Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1211403918 25200
> # Node ID 1a4f0bc12b84af40d1ebef71ea3d6d30b300af05
> # Parent  00ed91b75fd62cdcdcfb51c403646118edb91c54
> [TEST] Update create_netpool_conf() to support new pool creation.
>
> This includes the following changes:
>  -Updated create_netpool_conf() so that caller can specify whether to use an existing pool or create a new pool.
>  -Added destroy_netpool() / destroy_vnet()
>  -Updated CIM_NetResourceAllocationSettingData to set the PoolID
>  -Added xml_get_net_network().
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r 00ed91b75fd6 -r 1a4f0bc12b84 suites/libvirt-cim/lib/XenKvmLib/common_util.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Tue Jun 10 20:04:06 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Wed May 21 14:05:18 2008 -0700
> @@ -22,6 +22,7 @@
>  #
>  import os
>  import pywbem
> +import random
>  from distutils.file_util import move_file
>  from XenKvmLib.test_xml import * 
>  from XenKvmLib.test_doms import * 
> @@ -331,19 +332,22 @@
>      return status, diskid
>
>
> -def create_netpool_conf(server, virt):
> +def create_netpool_conf(server, virt, use_existing=True):
>      status = PASS
>      test_network = None
>      try:
> -        vir_network = net_list(server, virt)
> -        if len(vir_network) > 0:
> -            test_network = vir_network[0]
> -        else:
> -            netxml = NetXML(server, virt=virt)
> +        if use_existing == True:
> +            vir_network = net_list(server, virt)
> +            if len(vir_network) > 0:
> +                test_network = vir_network[0]
> +
> +        if test_network == None:
> +            net_name = "default-net" + str(random.randint(1, 100))
> +            netxml = NetXML(server, virt=virt, networkname=net_name)
>              ret = netxml.create_vnet()
>              if not ret:
>                  logger.error("Failed to create Virtual Network '%s'",
> -                              test_network)
> +                              net_name)
>                  status = FAIL
>              else:
>                  test_network = netxml.xml_get_netpool_name()
> @@ -351,3 +355,17 @@
>          logger.error("Exception: In fn create_netpool_conf(): %s", detail)
>          status=FAIL
>      return status, test_network
>   
This is a good addition.
> +
> +def destroy_netpool(server, virt, net_name):
> +    if net_name == None:
> +        return FAIL
> +  
> +    netxml = NetXML(server, virt=virt, networkname=net_name)
> +    ret = netxml.destroy_vnet()
> +    if not ret:
> +        logger.error("Failed to destroy Virtual Network '%s'",
> +                     net_name)
> +        return FAIL
> +
> +    return PASS 
> +
> diff -r 00ed91b75fd6 -r 1a4f0bc12b84 suites/libvirt-cim/lib/XenKvmLib/vsms.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Tue Jun 10 20:04:06 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Wed May 21 14:05:18 2008 -0700
> @@ -151,13 +151,16 @@
>      pass
>
>  class CIM_NetResourceAllocationSettingData(CIMClassMOF):
> -    def __init__(self, type, mac, name):
> +    def __init__(self, type, mac, name, virt_net=None): 
>          self.Address = mac
>          self.NetworkType = type
>          if type == 'ethernet' or type == 'bridge' :
>              self.ResourceType = RASD_TYPE_NET_ETHER
>          else:
>              self.ResourceType = RASD_TYPE_NET_OTHER
>   
I think the "network" type interface should also be considered as 
RASD_TYPE_NET_EHTER ?

> +
> +        if virt_net != None :
> +            self.PoolID = "NetworkPool/%s" % virt_net
>          
>          if mac != None:
>              self.InstanceID = '%s/%s' % (name, mac)
> diff -r 00ed91b75fd6 -r 1a4f0bc12b84 suites/libvirt-cim/lib/XenKvmLib/vxml.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Tue Jun 10 20:04:06 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Wed May 21 14:05:18 2008 -0700
> @@ -215,6 +215,9 @@
>      def create_vnet(self):
>          return self.run(self.server, 'net-create', self.xml_string)
>
> +    def destroy_vnet(self):
> +        return self.run(self.server, 'net-destroy', self.net_name)
> +
>      def xml_get_netpool_name(self):
>          npoolname = self.get_value_xpath('/network/name')
>          return npoolname
> @@ -403,7 +406,12 @@
>          bridgeStr = self.get_value_xpath(
>                  '/domain/devices/interface/source/@bridge')
>          return bridgeStr
> - 
> +
> +    def xml_get_net_network(self):
> +        networkStr = self.get_value_xpath(
> +                '/domain/devices/interface/source/@network')
> +        return networkStr
> +
>      def dumpxml(self, ip):
>          cmd = 'virsh -c %s dumpxml %s' % (self.vuri, self.dname)
>          s, o = utils.run_remote(ip, cmd)
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From deeptik at linux.vnet.ibm.com  Mon Jun 16 16:25:01 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Mon, 16 Jun 2008 21:55:01 +0530
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] Fix VSMS 08_modifyresource.py
	on Xen and KVM
In-Reply-To: <4856837A.7060705@linux.vnet.ibm.com>
References: <9f168dca6251330adcb1.1213154835@elm3b41.beaverton.ibm.com>
	<4856837A.7060705@linux.vnet.ibm.com>
Message-ID: <485693DD.9050505@linux.vnet.ibm.com>



Deepti B Kalakeri wrote:
>
>
> Kaitlin Rupert wrote:
>> # HG changeset patch
>> # User Kaitlin Rupert <karupert at us.ibm.com>
>> # Date 1213154736 25200
>> # Node ID 9f168dca6251330adcb158f6b64fea51ee72d45e
>> # Parent  c6fdcb5088bbe504097625265a0d8fc0c4ed73c9
>> [TEST] Fix VSMS 08_modifyresource.py on Xen and KVM.
>>
>> This still fails on XenFV because of a provider bug.  It looks like 
>> the ModifyResource call strips the <emulator> tag from a XenFV 
>> guest.  So the test is unable to start the guest.
>>   
> The tc failed on KVM and Xen machine with latest sources [ REV: 611 ] 
> with the following error:
> VirtualSystemManagementService - 08_modifyresource.py: FAIL
> ERROR   - Error invoking ModifyRS
> ERROR   - (1, u"CIM_ERR_FAILED: Device `0' not found")
> ERROR   - Failed to destroy Virtual Network 'default-net17'
> InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Device `0' not 
> found
>
> The debug o/p shows that the tc is failing with :
>
> device_parsing.c(257): Disk node: disk
> Virt_VirtualSystemManagementService.c(1192): Resource transform 
> function failed
Sorry, This error does not occur when the Patch " Fix proc InstanceID in 
vsms.py" is applied.
>
>> Updates to this test:
>>   -Call create_netpool_conf() to create a new network pool to use in 
>> modify calls.
>>   -Create network RASD instead of bridge
>>   -Replaced modify calls with functions from vsms_util
>>   -Added support for modifying a running guest (mem and vcpu only)
>>   -Remove XFAIL
>>
>> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>>
>> diff -r c6fdcb5088bb -r 9f168dca6251 
>> suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py 
>>
>> --- 
>> a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py    
>> Tue Jun 10 18:26:16 2008 -0700
>> +++ 
>> b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py    
>> Tue Jun 10 20:25:36 2008 -0700
>> @@ -26,19 +26,25 @@
>>  import pywbem
>>  from pywbem.cim_obj import CIMInstanceName
>>  from VirtLib import utils
>> +from VirtLib.live import network_by_bridge
>>  from XenKvmLib import vsms
>>  from XenKvmLib import vxml
>>  from CimTest.Globals import logger
>>  from CimTest.Globals import do_main
>>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
>>   
> XFAIL_RC can also be removed.
>> +from XenKvmLib.common_util import create_netpool_conf, destroy_netpool
>> +from XenKvmLib import vsms_util
>>
>>  sup_types = ['Xen', 'KVM', 'XenFV']
>>  default_dom = 'rstest_domain'
>> -ntype = 'bridge'
>> +ntype = 'network'
>>  ncpu = 3
>>  nmem = 78
>>
>> -bug_cpu = '90079'
>> +def cleanup_env(ip, virt, cxml, net_name):
>> +    destroy_netpool(ip, virt, net_name)
>> +    cxml.destroy(ip)
>> +    cxml.undefine(ip)
>>
>>  @do_main(sup_types)
>>  def main():
>> @@ -50,54 +56,65 @@
>>      dasd = 
>> vsms.get_dasd_class(options.virt)(dev=cxml.xml_get_disk_dev(),
>>                                               source=ndpath, 
>>                                               name=default_dom)
>> +    +    status, net_name = create_netpool_conf(options.ip, 
>> options.virt, +                                           
>> use_existing=False)
>> +    if status != PASS:
>> +        logger.error('Unable to create network pool')
>>   
> logger.error('Unable to find a network pool') would be more appropriate ?
>> +        return FAIL +
>>      nasd = vsms.get_nasd_class(options.virt)(type=ntype, 
>>                                               
>> mac=cxml.xml_get_net_mac(),
>> -                                             name=default_dom)
>> +                                             name=default_dom,
>> +                                             virt_net=net_name)
>>      masd = vsms.get_masd_class(options.virt)(megabytes=nmem, 
>> name=default_dom)
>>      pasd = vsms.get_pasd_class(options.virt)(vcpu=ncpu, 
>> name=default_dom)
>>
>>      status = FAIL
>>      rc = 0
>>   
> We can remove rc since it is never used.    
>> -    try:
>> -        cxml.define(options.ip)
>> -        # Modify disk setting
>> -        service.ModifyResourceSettings(ResourceSettings = [str(dasd)])
>> -        cxml.dumpxml(options.ip)
>> -        dpath = cxml.xml_get_disk_source()
>> -        if dpath != ndpath:
>> -            raise Exception('Error changing rs for disk path')
>> -        logger.info('good status for disk path')
>> -        # Modify net setting
>> -        service.ModifyResourceSettings(ResourceSettings = [str(nasd)])
>> -        cxml.dumpxml(options.ip)
>> -        type = cxml.xml_get_net_type()
>> -        if type != ntype:
>> -            raise Exception('Error changing rs for net mac')
>> -        logger.info('good status for net mac')
>> -        # Modify memory resource setting
>> -        service.ModifyResourceSettings(ResourceSettings=[str(masd)])
>> -        cxml.dumpxml(options.ip)
>> -        mem = cxml.xml_get_mem()
>> -        if mem != '%i' % (nmem * 1024):
>> -            raise Exception('Error changing rs for mem')
>> -        logger.info('good status for mem')
>> -        # Modify cpu setting
>> -        service.ModifyResourceSettings(ResourceSettings = [str(pasd)])
>> -        cxml.dumpxml(options.ip)
>> -        cpu = cxml.xml_get_vcpu()
>> -        if cpu != '%i' % ncpu:
>> -            rc = -1
>> -            raise Exception('Error changing rs for vcpu')
>> -        logger.info('good status for vcpu')
>> -        status = PASS
>> -    except Exception, details:
>> -        logger.error('Error invoking ModifyRS')
>> -        logger.error(details)
>> -        return FAIL
>> +  +    if options.virt == "KVM":
>> +        test_cases = ["define"]
>> +    else:
>> +        test_cases = ["define", "start"]
>>
>> -    cxml.undefine(options.ip)
>> -    if rc == -1:
>> -        return XFAIL_RC(bug_cpu)
>> +    for case in test_cases:
>> +        cxml.undefine(options.ip)
>> +        ret = cxml.define(options.ip)
>> +        if not ret:
>> +            logger.error("Failed to define the dom: %s", default_dom)
>> +            cleanup_env(options.ip, options.virt, cxml, net_name)
>> +            return FAIL
>> +        if case == "start":
>> +            ret = cxml.start(options.ip)
>> +            if not ret:
>> +                logger.error("Failed to start the dom: %s", 
>> default_dom)
>> +                cleanup_env(options.ip, options.virt, cxml, net_name)
>> +                return FAIL
>>   
> Can we do like this ?
> if case == "start":
>    ret = cxml.start(options.ip)
> else:
>    ret = cxml.define(options.ip)   if not ret:
> logger.error("Failed to '%s' the dom: %s", case, default_dom)
> cleanup_env(options.ip, options.virt, cxml, net_name)
> return FAIL
>
>> +
>> +        status = vsms_util.mod_vcpu_res(options.ip, service, cxml, 
>> pasd, ncpu)
>> +        if status != PASS:
>> +            break
>> +
>> +        status = vsms_util.mod_mem_res(options.ip, service, cxml, 
>> masd, nmem)
>> +        if status != PASS:
>> +            break
>> +
>> +        #Unable to modify net and disk devices while guest is running
>> +        if case == "start":
>> +            break
>> +
>> +        status = vsms_util.mod_disk_res(options.ip, service, cxml, 
>> dasd, ndpath)
>> +        if status != PASS:
>> +            break
>> +
>> +        status = vsms_util.mod_net_res(options.ip, service, 
>> options.virt, cxml,
>> +                                       nasd, ntype, net_name)
>> +        if status != PASS:
>> +            break
>> +
>> +    cleanup_env(options.ip, options.virt, cxml, net_name)
>> +    destroy_netpool(options.ip, options.virt, net_name)
>>
>>      return status
>>
>>
>> _______________________________________________
>> Libvirt-cim mailing list
>> Libvirt-cim at redhat.com
>> https://www.redhat.com/mailman/listinfo/libvirt-cim
>>   



From kaitlin at linux.vnet.ibm.com  Mon Jun 16 21:42:32 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 16 Jun 2008 14:42:32 -0700
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] Fix VSMS 08_modifyresource.py
	on Xen and KVM
In-Reply-To: <485693DD.9050505@linux.vnet.ibm.com>
References: <9f168dca6251330adcb1.1213154835@elm3b41.beaverton.ibm.com>
	<4856837A.7060705@linux.vnet.ibm.com>
	<485693DD.9050505@linux.vnet.ibm.com>
Message-ID: <4856DE48.3070208@linux.vnet.ibm.com>

>> The tc failed on KVM and Xen machine with latest sources [ REV: 611 ] 
>> with the following error:
>> VirtualSystemManagementService - 08_modifyresource.py: FAIL
>> ERROR   - Error invoking ModifyRS
>> ERROR   - (1, u"CIM_ERR_FAILED: Device `0' not found")
>> ERROR   - Failed to destroy Virtual Network 'default-net17'
>> InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Device `0' not 
>> found
>>
>> The debug o/p shows that the tc is failing with :
>>
>> device_parsing.c(257): Disk node: disk
>> Virt_VirtualSystemManagementService.c(1192): Resource transform 
>> function failed
> Sorry, This error does not occur when the Patch " Fix proc InstanceID in 
> vsms.py" is applied.

Oops - yes, the proc patch should have been a part of this patchset.

Thanks for the excellent feedback! =)

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun 16 22:03:03 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 16 Jun 2008 15:03:03 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update ElementCapabilities.05 for
	LXC support
In-Reply-To: <OFA75154B4.17B5C0DA-ON48257466.00256455-48257466.0027CCB1@cn.ibm.com>
References: <OFA75154B4.17B5C0DA-ON48257466.00256455-48257466.0027CCB1@cn.ibm.com>
Message-ID: <4856E317.8050907@linux.vnet.ibm.com>

>   This fails because we can't get anything by querying below:
> 
> wbemcli ein 
> http://root:password at localhost/root/virt:LXC_VirtualSystemManagementService
> localhost:5988/root/virt:LXC_VirtualSystemManagementService.SystemCreationClassName="LXC_HostSystem",SystemName="nine",CreationClassName="LXC_VirtualSystemManagementService",Name="Management 
> Service"
>  
> I think we have to fix it in provider. Below is part code of 
> Virt_ElementCapabilities.c.
> ...
>  static char* service[] = {
>         "Xen_VirtualSystemManagementService",
>         "KVM_VirtualSystemManagementService",
>         "Xen_VirtualSystemMigrationService",
>         "KVM_VirtualSystemMigrationService",
>         "LXC_VirtualSystemMigrationService",
>         NULL
> };
> ...
> 
> We have to add LXC_VirtualSystemManagementService to the structure.

Thanks for tracking down this issue.  Now that the fix is in, I've 
applied your patch.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun 16 22:19:53 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 16 Jun 2008 15:19:53 -0700
Subject: [Libvirt-cim] [PATCH] Remove revision branches
In-Reply-To: <OFA23F6DF9.F5A48CE6-ON4825746A.002AF828-4825746A.002B724D@cn.ibm.com>
References: <OFA23F6DF9.F5A48CE6-ON4825746A.002AF828-4825746A.002B724D@cn.ibm.com>
Message-ID: <4856E709.1040000@linux.vnet.ibm.com>

>  >
>   +1 from me.
>   Would you please update ResourceAllocationFromPool.02 that remove

Good catch, thanks!

>   revision branch? Also, do we need the global CIM_REV variable on the 
> next? If
>   not, would you please update related functions such as const.py and 
> main.py?
> 

It's possible we'll need the revision for the the few tests that are 
still failing on on the current F9 rpm.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun 16 22:31:44 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 16 Jun 2008 15:31:44 -0700
Subject: [Libvirt-cim] [PATCH] 
Message-ID: <3f0cd0ab3daa2bf984c8.1213655504@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213121071 25200
# Node ID 3f0cd0ab3daa2bf984c8e0fa38edd98cf4aca671
# Parent  6652ca49942c0314ec1b2b1da504810325097250
#2 Remove revision branches.

These brances were needed to distinguish the behavior between the 0.3.0 release and the current head of the mercurial tree.  Now that the cimtest tree has been tagged, cimtest release_0_1 should correspond with the functionality in libvirt-cim 0.4.0.

Updates:
 -Rebased on current tree
 -Also update RAFP 02

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py
--- a/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -62,14 +62,12 @@
 from XenKvmLib.test_doms import create_vnet
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 
 diskid = "%s/%s" % ("DiskPool", test_dpath)
 memid = "%s/%s" % ("MemoryPool", 0)
 procid = "%s/%s" % ("ProcessorPool", 0)
-rev = 463
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 @do_main(sup_types)     
@@ -112,8 +110,6 @@
                                   'desc' : 'No InstanceID specified' },
             "invalid_keyvalue" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND,
                                    'desc' : 'Instance not found' }}
-    if CIM_REV < rev:
-        exp['invalid_keyvalue']['desc'] = 'Object could not be found'
 
     ret_value = try_getinstance(conn, classname, keys, field_name=field,
                                 expr_values=exp['invalid_keyvalue'], bug_no="")
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -34,7 +34,6 @@
 from CimTest import Globals
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.common_util import try_assoc
-from XenKvmLib.const import CIM_REV
 from CimTest.ReturnCodes import PASS, FAIL	
 from CimTest.Globals import do_main, platform_sup, logger
 from XenKvmLib.vxml import get_class
@@ -60,7 +59,6 @@
                                         'desc'  : 'No such instance'
                                     } 
               }
-libvirt_rev = 393
 
 def err_invalid_ccname():
 # This is used to verify the that the  
@@ -157,10 +155,6 @@
               get_typed_class(virt, "ProcessorPool")
              ]
 
-    if CIM_REV < libvirt_rev:
-        expr_values['invalid_keyvalue']['desc'] = 'Invalid InstanceID or unsupported pool type'
-        expr_values['invalid_keyvalue']['rc'] = pywbem.CIM_ERR_FAILED
-
     for classname in sorted(lelist):
         keys = { "InstanceID" : "InvalidKeyValue" }
         field = "InstanceID_KeyValue"    
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py	Tue Jun 10 11:04:31 2008 -0700
@@ -30,11 +30,9 @@
 from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORNAMES, \
 CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL, SKIP
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.enumclass import enumerate
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
-ac_to_pool_version = 561
 
 def append_to_list(server, virt, poolname, valid_elc_id):
     keys_list = ['InstanceID']
@@ -87,11 +85,10 @@
     valid_elc_id = ["ManagementCapabilities", 
                     "MigrationCapabilities"]
 
-    if CIM_REV >= ac_to_pool_version:
-        valid_elc_name.append(get_typed_class(virt, "AllocationCapabilities"))
-        status, valid_elc_id = set_pool_info(server, virt, valid_elc_id)
-        if status != PASS:
-            return status
+    valid_elc_name.append(get_typed_class(virt, "AllocationCapabilities"))
+    status, valid_elc_id = set_pool_info(server, virt, valid_elc_id)
+    if status != PASS:
+        return status
 
     if len(elc) == 0:
         logger.error("ElementCapabilities association failed, excepted at least one instance")
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Tue Jun 10 11:04:31 2008 -0700
@@ -58,7 +58,6 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
 verify_diskrasd_values, verify_memrasd_values, rasd_init_list
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 
@@ -67,8 +66,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-rev = 529
-proc_instid_rev = 590
 
 def setup_env(server, virt="Xen"):
     vsxml_info = None
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py
--- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Tue Jun 10 11:04:31 2008 -0700
@@ -49,12 +49,10 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.test_xml import testxml
 from XenKvmLib.test_doms import destroy_and_undefine_all
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 test_dom = "domgst"
 test_vcpus = 1
-libvirtcim_sdc_rasd_rev = 571
 
 def setup_env(server, virt="Xen"):
     status = PASS
@@ -243,26 +241,6 @@
             logger.error("In ResourceType for %s " % rt)
             return FAIL
  
-        # The following properties have been removed in the patchset 571
-        # but is present in the rpm libvirt-cim and hence retained it.
-
-        if CIM_REV < libvirtcim_sdc_rasd_rev:
-            ppolicy = inst['PropertyPolicy']
-            if ppolicy != 0 and ppolicy != 1:
-                logger.error("In PropertyPolicy for %s " % ppolicy)
-                return FAIL
-
-            vrole  = inst['ValueRole']
-            if vrole < 0 or vrole > 4:
-                logger.error("In ValueRole %s " % vrole)
-                return FAIL
-
-            insid  = inst['InstanceID']
-            vrange = rangelist[insid]
-            if vrange != inst['ValueRange']:
-                logger.error("In ValueRange for %s " % vrange)
-                return FAIL
-
     except Exception, detail:
         logger.error("Error checking RASD attribute values %s" % detail)
         return FAIL
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/Memory/01_memory.py
--- a/suites/libvirt-cim/cimtest/Memory/01_memory.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py	Tue Jun 10 11:04:31 2008 -0700
@@ -31,13 +31,11 @@
 from XenKvmLib.vxml import XenXML, KVMXML, get_class
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "test_domain"
 mem = 256 #MB
-mem_change_version=585
 
 @do_main(sup_types)
 def main():
@@ -45,10 +43,7 @@
     
     vsxml = get_class(options.virt)(test_dom, mem)
     vsxml.define(options.ip)
-    if CIM_REV >= mem_change_version: 
-        alloc_mem = int(vsxml.xml_get_mem())
-    else:
-        alloc_mem = int(vsxml.xml_get_mem())/1024
+    alloc_mem = int(vsxml.xml_get_mem())
     
     devid = "%s/mem" % test_dom
     key_list = { 'DeviceID' : devid,
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Tue Jun 10 11:04:31 2008 -0700
@@ -54,7 +54,6 @@
 from XenKvmLib import vxml 
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib import rasd 
-from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib import rasd
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py	Tue Jun 10 11:04:31 2008 -0700
@@ -34,7 +34,6 @@
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib import rasd 
-from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib import rasd
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py
--- a/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py	Tue Jun 10 11:04:31 2008 -0700
@@ -79,12 +79,9 @@
 from CimTest.Globals import do_main
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.common_util import print_field_error
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
-
-libvirtcim_rev = 501
 
 def get_proflist():
     proflist = []
@@ -167,12 +164,6 @@
     server = options.ip
     status = PASS
 
-    # Referenced Profile was introduced as part of changeset 501 
-    # and is not available in the libvirt-cim rpm, hence skipping tc
-    # if CIM_REV  501
-    if CIM_REV < libvirtcim_rev:
-        return SKIP
-
     prev_namespace = Globals.CIM_NS
     Globals.CIM_NS = 'root/interop'
     reg_classname = get_typed_class(virt, 'RegisteredProfile')
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py
--- a/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -60,10 +60,8 @@
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
 from XenKvmLib.common_util import try_assoc
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
-libvirtcim_rev = 501
 
 expr_values = {
                 'INVALID_Instid_KeyName'  :  {
@@ -124,11 +122,6 @@
     virt = options.virt
     server = options.ip
     status = PASS
-    # Referenced Profile was introduced as part of changeset 501 
-    # and is not available in the libvirt-cim rpm, hence skipping tc
-    # if CIM_REV  501
-    if CIM_REV < libvirtcim_rev:
-        return SKIP
 
     prev_namespace = Globals.CIM_NS
     Globals.CIM_NS = 'root/interop'
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Tue Jun 10 11:04:31 2008 -0700
@@ -29,7 +29,6 @@
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL
@@ -43,7 +42,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-proc_instid_rev = 590
 
 def setup_env(server, virt):
     destroy_and_undefine_all(server)
@@ -73,12 +71,7 @@
 
 def init_list(test_disk, diskid, test_network, virt='Xen'):
 
-    if CIM_REV < proc_instid_rev:
-        procid = '%s/%s' % (test_dom, 0)
-    else:
-        procid = '%s/%s' % (test_dom, 'proc')
-
-    proc = { 'rasd_id' : procid,
+    proc = { 'rasd_id' : '%s/%s' % (test_dom, 'proc'),
              'pool_id' : 'ProcessorPool/0'
            }
 
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -28,11 +28,9 @@
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'XenFV', 'KVM']
 
-rev = 466
 
 @do_main(sup_types)
 def main():
@@ -49,9 +47,6 @@
 
     exp_rc = 6 #CIM_ERR_NOT_FOUND
     exp_desc = "No such instance (wrong) - resource pool type mismatch"
-    if CIM_REV < rev:
-        exp_rc = 1 # CIM_ERR_FAILED
-        exp_desc = "Invalid InstanceID or unsupported pool type"
 
     for k, v in poollist.items():
         instanceref = CIMInstanceName(k, 
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py	Tue Jun 10 11:04:31 2008 -0700
@@ -32,7 +32,6 @@
 from XenKvmLib import assoc
 from XenKvmLib import devices
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from CimTest import Globals
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL 
@@ -42,8 +41,6 @@
 test_dom = "domu1"
 test_mac = "00:11:22:33:44:aa"
 test_vcpus = 1
-proc_instid_rev = 590
-
 
 def print_error(cn, detail):
     Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
@@ -96,7 +93,7 @@
     for cn in cn_id.keys():
         key_list = get_keys(cn, cn_id[cn], 'ComputerSystem', options.virt)
 
-        if CIM_REV >= proc_instid_rev and cn == 'Processor':
+        if cn == 'Processor':
             exp_inst_id_val[cn] = "%s/%s" % (test_dom, "proc") 
         else:
             exp_inst_id_val[cn] = key_list['DeviceID']
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py	Tue Jun 10 11:04:31 2008 -0700
@@ -59,8 +59,6 @@
 from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class, get_class_basename
 from XenKvmLib.rasd import InstId_err
-from XenKvmLib.const import CIM_REV
-
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -68,9 +66,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-proc_instid_rev = 590
-
-
 
 def call_assoc(ip, inst, exp_id, ccn, virt):
     if inst['InstanceID'] != exp_id:
@@ -196,9 +191,6 @@
             'DiskResourceAllocationSettingData' : '%s/%s' % (test_dom, test_disk),
             'MemResourceAllocationSettingData'  : '%s/%s' % (test_dom, 'mem')}
 
-    if CIM_REV < proc_instid_rev :
-        rasd_devid['ProcResourceAllocationSettingData'] = "%s/%s" % (test_dom, "0")
-
     global dev_devid
     dev_devid = {
             'Processor'   : '%s/%s' % (test_dom, test_vcpus-1),
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Tue Jun 10 11:04:31 2008 -0700
@@ -65,14 +65,11 @@
 from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
 create_netpool_conf
 from XenKvmLib.common_util import print_field_error
-from XenKvmLib.const import CIM_REV
 
 platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 memid = "%s/%s" % ("MemoryPool", 0)
 procid = "%s/%s" % ("ProcessorPool", 0)
-libvirtcim_sdc_rasd_rev = 571
-
 
 def get_or_bail(virt, ip, id, pool_class):
     """
@@ -165,27 +162,6 @@
                               rtype[cllist[loop]])
             return FAIL 
 
-        # The following properties have been removed in the patchset 571
-        # but is present in the rpm libvirt-cim and hence retained it.
-
-        if CIM_REV < libvirtcim_sdc_rasd_rev:
-            ppolicy = inst['PropertyPolicy']
-            if ppolicy != 0 and ppolicy != 1:
-                print_field_error("PropertyPolicy", inst['PropertyPolicy'], 
-                                   ppolicy)
-                return FAIL 
-
-            vrole  = inst['ValueRole']
-            if vrole < 0 or vrole > 4:
-                print_field_error("ValueRole", inst['ValueRole'], vrole)
-                return FAIL 
-
-            insid  = inst['InstanceID']
-            vrange = rangelist[insid]
-            if vrange != inst['ValueRange']:
-                print_field_error("ValueRange", inst['ValueRange'], vrange)
-                return FAIL 
-
     return PASS
 
 def verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool):
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py
--- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Tue Jun 10 11:04:31 2008 -0700
@@ -53,7 +53,6 @@
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
 verify_diskrasd_values, verify_memrasd_values 
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -61,8 +60,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-proc_rev = 531
-mem_rev = 529
 
 def setup_env(virt):  
     vsxml_info = None
@@ -97,8 +94,6 @@
                  "ResourceType" : 3,
                  "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
                 }
-    if CIM_REV < proc_rev:
-        procrasd['InstanceID'] = '%s/%s' %(test_dom, "0")
 
     netrasd = {
                 "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
@@ -122,8 +117,7 @@
                "VirtualQuantity" : (test_mem * 1024), 
                "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
               }
-    if CIM_REV < mem_rev:
-        memrasd['AllocationUnits'] = "MegaBytes"
+
     return procrasd, netrasd, diskrasd, memrasd
 
 def get_inst_from_list(classname, vssd_list, filter_name, exp_val):
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Tue Jun 10 11:04:31 2008 -0700
@@ -28,14 +28,12 @@
 from VirtLib.live import domain_list, active_domain_list
 from XenKvmLib import vsms, vxml
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from CimTest.Globals import do_main
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 default_dom = 'test_domain'
-rev = 528
 
 @do_main(sup_types)
 def main():
@@ -50,11 +48,7 @@
     cs_ref = CIMInstanceName(classname, keybindings = {
                                         'Name':default_dom,
                                         'CreationClassName':classname})
-    if CIM_REV < rev:
-        dl_func = active_domain_list
-    else:
-        dl_func = domain_list
-    list_before = dl_func(options.ip, options.virt)
+    list_before = domain_list(options.ip, options.virt)
     status = PASS
     rc = -1
     
@@ -66,7 +60,7 @@
         logger.error(details)
         status = FAIL
 
-    list_after = dl_func(options.ip, options.virt)
+    list_after = domain_list(options.ip, options.virt)
 
     status = PASS
     if default_dom not in list_before:
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Tue Jun 10 11:04:31 2008 -0700
@@ -27,7 +27,6 @@
 from VirtLib import utils
 from XenKvmLib import vsms
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.test_doms import undefine_test_domain
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
@@ -45,25 +44,19 @@
         cs_ref = CIMInstanceName(classname, 
                               keybindings = {'CreationClassName':classname})
 
-        if CIM_REV < vsms_status_version:
-            exp_rc = 2 #IM_RC_FAILED
-        else:
-            exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
-                          'desc'  : 'CIM_ERR_FAILED: Unable to retrieve domain\
+        exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
+                      'desc'  : 'CIM_ERR_FAILED: Unable to retrieve domain\
  name.'
-                        }
+                    }
 
     elif tc == 'nonexistent':
         cs_ref = CIMInstanceName(classname,keybindings = {
                                 'Name':'##@@!!cimtest_domain',
                                 'CreationClassName':classname})
 
-        if CIM_REV < vsms_status_version:
-            exp_rc = 4 #IM_RC_SYS_NOT_FOUND
-        else:
-            exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
-                          'desc' : 'CIM_ERR_FAILED: Failed to find domain' 
-                        }
+        exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
+                      'desc' : 'CIM_ERR_FAILED: Failed to find domain' 
+                    }
 
     else:
         return SKIP
@@ -71,25 +64,15 @@
     status = FAIL
     try:
         ret = service.DestroySystem(AffectedSystem=cs_ref)
-        if CIM_REV < vsms_status_version:
-            if ret[0] == exp_rc:
-                logger.info('destroy_fail>>%s: Got expected return code %s', 
-                            tc, exp_rc)
-                return PASS 
-            else:
-                logger.error('destroy_fail>>%s: Got rc: %s, but we expect %s',
-                            tc, ret[0], exp_rc)
-                return FAIL 
 
     except Exception, details:
-        if CIM_REV >= vsms_status_version:
-            err_no   = details[0]
-            err_desc = details[1]
-            if err_no == exp_value['rc'] and err_desc == exp_value['desc']:
-                logger.error("For Invalid Scenario '%s'", tc)
-                logger.info('Got expected error no: %s', err_no)
-                logger.info('Got expected error desc: %s',err_desc)
-                return PASS
+        err_no   = details[0]
+        err_desc = details[1]
+        if err_no == exp_value['rc'] and err_desc == exp_value['desc']:
+            logger.error("For Invalid Scenario '%s'", tc)
+            logger.info('Got expected error no: %s', err_no)
+            logger.info('Got expected error desc: %s',err_desc)
+            return PASS
 
         logger.error('destroy_fail>> %s: Error executing DestroySystem' % tc)
         logger.error(details)
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Tue Jun 10 11:04:31 2008 -0700
@@ -55,7 +55,6 @@
 from XenKvmLib.rasd import InstId_err
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
@@ -63,7 +62,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-rev = 531
 
 def check_rasd_values(id, exp_id):
     try:
@@ -90,8 +88,6 @@
                  "disk_rasd" : '%s/%s' %(test_dom, test_disk),
                  "mem_rasd"  : '%s/%s' %(test_dom, "mem")
                 }
-    if CIM_REV < rev:
-        rasd_list['proc_rasd'] = '%s/%s' %(test_dom, "0")
 
     try: 
         if len(assoc_info) <= 0: 
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -62,14 +62,12 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest.Globals import do_main, logger
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 test_dom     = "domu1"
 test_mac     = "00:11:22:33:44:aa"
 test_vcpus   = 1
-rev = 417
 
 expr_values = {
     "INVALID_InstID_Keyname"   : { 'rc'   : pywbem.CIM_ERR_FAILED, \
@@ -77,10 +75,6 @@
     "INVALID_InstID_Keyval"    : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
                      'desc' : 'No such instance (INVALID_InstID_Keyval)'}
 }
-
-if CIM_REV < rev:
-    expr_values['INVALID_InstID_Keyval'] = {'rc' : pywbem.CIM_ERR_FAILED, \
-                                            'desc' : 'Invalid InstanceID'}
 
 def try_invalid_assoc(classname, name_val, i, field, virt="Xen"):
     ac_classname = get_typed_class(virt, "VirtualSystemSettingDataComponent")
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/lib/XenKvmLib/common_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Tue Jun 10 11:04:31 2008 -0700
@@ -33,17 +33,11 @@
 from XenKvmLib.classes import get_typed_class
 from CimTest.Globals import logger, log_param, CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
-from XenKvmLib.const import CIM_REV
 from VirtLib.live import diskpool_list, virsh_version, net_list
 from XenKvmLib.vxml import PoolXML, NetXML
 
 test_dpath = "foo"
-diskpoolconf_rev = 558
-
-if CIM_REV < diskpoolconf_rev:
-    disk_file = '/tmp/diskpool.conf'
-else:
-    disk_file = '/etc/libvirt/diskpool.conf'
+disk_file = '/etc/libvirt/diskpool.conf'
 
 back_disk_file = disk_file + "." + "backup"
 
@@ -276,11 +270,10 @@
     status = PASS
     libvirt_version = virsh_version(server, virt)
     # The conf file is not present on  the machine if 
-    # libvirt_version >= 0.4.1 and CIM_REV > 558
+    # libvirt_version >= 0.4.1
     # Hence Skipping the logic to delete the new conf file
     # and just returning PASS
-    if libvirt_version >= '0.4.1' and \
-       CIM_REV > diskpoolconf_rev:
+    if libvirt_version >= '0.4.1':
         return status
     try:
         if os.path.exists(back_disk_file):
@@ -328,8 +321,7 @@
 
 def create_diskpool_conf(server, virt):
     libvirt_version = virsh_version(server, virt)
-    if libvirt_version >= '0.4.1' and \
-       CIM_REV > diskpoolconf_rev:
+    if libvirt_version >= '0.4.1':
         status, dpoolname = create_diskpool(server, virt=virt)
         diskid = "%s/%s" % ("DiskPool", dpoolname)
     else:
diff -r 6652ca49942c -r 3f0cd0ab3daa suites/libvirt-cim/lib/XenKvmLib/rasd.py
--- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Tue Jun 10 11:04:31 2008 -0700
@@ -23,7 +23,6 @@
 import sys
 from CimTest.Globals import log_param, logger
 from CimTest.ReturnCodes import FAIL, PASS
-from XenKvmLib.const import CIM_REV
 from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class
 
@@ -36,10 +35,6 @@
 memcn  =  'Memory'
 netcn  =  'NetworkPort'
 diskcn =  'LogicalDisk'
-
-
-mem_units_rev = 529
-proc_instid_rev = 590
 
 def rasd_init_list(vsxml, virt, t_disk, t_dom, t_mac, t_mem):
     """
@@ -60,20 +55,9 @@
 
         disk_path = vsxml.xml_get_disk_source()
 
-        if CIM_REV < mem_units_rev:
-          alloc_units  = "MegaBytes"
-        else:
-          alloc_units  = "KiloBytes"
-
-        if CIM_REV < proc_instid_rev:
-           proc_id = '%s/%s' %(t_dom, 0)
-        else:
-           proc_id = '%s/%s' %(t_dom, "proc")
-       
-
         rasd_values = { 
                         proc_cn  : {
-                                     "InstanceID"   : proc_id,
+                                     "InstanceID"   : '%s/%s' %(t_dom, "proc"),
                                      "ResourceType" : 3,
                                     }, 
                         disk_cn  : {
@@ -90,7 +74,7 @@
                         mem_cn   : {
                                     "InstanceID" : '%s/%s' %(t_dom, "mem"), 
                                     "ResourceType"    : 4, 
-                                    "AllocationUnits" : alloc_units,
+                                    "AllocationUnits" : "KiloBytes",
                                     "VirtualQuantity" : (t_mem * 1024),
                                   }
                       } 



From kaitlin at linux.vnet.ibm.com  Tue Jun 17 00:08:04 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 16 Jun 2008 17:08:04 -0700
Subject: [Libvirt-cim] [PATCH 1 of 3] [TEST] Update create_netpool_conf()
	to support new pool creation
In-Reply-To: <48568353.9030802@linux.vnet.ibm.com>
References: <1a4f0bc12b84af40d1eb.1213154833@elm3b41.beaverton.ibm.com>
	<48568353.9030802@linux.vnet.ibm.com>
Message-ID: <48570064.9010602@linux.vnet.ibm.com>

>>
>>  class CIM_NetResourceAllocationSettingData(CIMClassMOF):
>> -    def __init__(self, type, mac, name):
>> +    def __init__(self, type, mac, name, virt_net=None):          
>> self.Address = mac
>>          self.NetworkType = type
>>          if type == 'ethernet' or type == 'bridge' :
>>              self.ResourceType = RASD_TYPE_NET_ETHER
>>          else:
>>              self.ResourceType = RASD_TYPE_NET_OTHER
>>   
> I think the "network" type interface should also be considered as 
> RASD_TYPE_NET_EHTER ?

Yep, RASD_TYPE_NET_ETHER is device type 10, which corresponds to the 
save value in the CIM provider. Good call =)

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun 17 00:09:35 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 16 Jun 2008 17:09:35 -0700
Subject: [Libvirt-cim] [PATCH]
In-Reply-To: <3f0cd0ab3daa2bf984c8.1213655504@elm3b41.beaverton.ibm.com>
References: <3f0cd0ab3daa2bf984c8.1213655504@elm3b41.beaverton.ibm.com>
Message-ID: <485700BF.9040507@linux.vnet.ibm.com>

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1213121071 25200
> # Node ID 3f0cd0ab3daa2bf984c8e0fa38edd98cf4aca671
> # Parent  6652ca49942c0314ec1b2b1da504810325097250
> #2 Remove revision branches.
> 
> These brances were needed to distinguish the behavior between the 0.3.0 release and the current head of the mercurial tree.  Now that the cimtest tree has been tagged, cimtest release_0_1 should correspond with the functionality in libvirt-cim 0.4.0.
> 
> Updates:
>  -Rebased on current tree
>  -Also update RAFP 02

Please ignore this - will resend with fixed subject.
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun 17 03:24:52 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 16 Jun 2008 20:24:52 -0700
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] Fix VSMS 08_modifyresource.py
	on Xen and KVM
In-Reply-To: <4856837A.7060705@linux.vnet.ibm.com>
References: <9f168dca6251330adcb1.1213154835@elm3b41.beaverton.ibm.com>
	<4856837A.7060705@linux.vnet.ibm.com>
Message-ID: <48572E84.3050103@linux.vnet.ibm.com>

>> -    cxml.undefine(options.ip)
>> -    if rc == -1:
>> -        return XFAIL_RC(bug_cpu)
>> +    for case in test_cases:
>> +        cxml.undefine(options.ip)
>> +        ret = cxml.define(options.ip)
>> +        if not ret:
>> +            logger.error("Failed to define the dom: %s", default_dom)
>> +            cleanup_env(options.ip, options.virt, cxml, net_name)
>> +            return FAIL
>> +        if case == "start":
>> +            ret = cxml.start(options.ip)
>> +            if not ret:
>> +                logger.error("Failed to start the dom: %s", default_dom)
>> +                cleanup_env(options.ip, options.virt, cxml, net_name)
>> +                return FAIL
>>   
> Can we do like this ?
> if case == "start":
>    ret = cxml.start(options.ip)
> else:
>    ret = cxml.define(options.ip)   if not ret:
> logger.error("Failed to '%s' the dom: %s", case, default_dom)
> cleanup_env(options.ip, options.virt, cxml, net_name)
> return FAIL
> 

I don't think that'll work for what we want.  What we want to do is:

1) Define a guest using the a default XML
2) Modify that guest with ModifyResource() calls
3) Undefine the guest
4) Define using a default XML
5) Start the guest
6) Modify the running guest with ModifyResource() calls

After you're done modifying the defined guest, you need to undefine the 
guest and then start with a default XML.  If we don't do this step, we 
start a guest that already has a modified XML.

So that said, I realized there's a bug in the code here.  The cxml XML 
object will retain the changes made during the modify call, so we need 
to overwrite it with the defaults.


-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun 17 03:33:35 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 16 Jun 2008 20:33:35 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Remove revision branches
Message-ID: <e1f221334033e17120e3.1213673615@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213121071 25200
# Node ID e1f221334033e17120e32dc5ffa00c951b8ada78
# Parent  6652ca49942c0314ec1b2b1da504810325097250
[TEST] #2 Remove revision branches.

These brances were needed to distinguish the behavior between the 0.3.0 release and the current head of the mercurial tree.  Now that the cimtest tree has been tagged, cimtest release_0_1 should correspond with the functionality in libvirt-cim 0.4.0.

Updates:
 -Rebased on current tree
 -Also update RAFP 02

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py
--- a/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -62,14 +62,12 @@
 from XenKvmLib.test_doms import create_vnet
 from CimTest.Globals import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 
 diskid = "%s/%s" % ("DiskPool", test_dpath)
 memid = "%s/%s" % ("MemoryPool", 0)
 procid = "%s/%s" % ("ProcessorPool", 0)
-rev = 463
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 @do_main(sup_types)     
@@ -112,8 +110,6 @@
                                   'desc' : 'No InstanceID specified' },
             "invalid_keyvalue" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND,
                                    'desc' : 'Instance not found' }}
-    if CIM_REV < rev:
-        exp['invalid_keyvalue']['desc'] = 'Object could not be found'
 
     ret_value = try_getinstance(conn, classname, keys, field_name=field,
                                 expr_values=exp['invalid_keyvalue'], bug_no="")
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -34,7 +34,6 @@
 from CimTest import Globals
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.common_util import try_assoc
-from XenKvmLib.const import CIM_REV
 from CimTest.ReturnCodes import PASS, FAIL	
 from CimTest.Globals import do_main, platform_sup, logger
 from XenKvmLib.vxml import get_class
@@ -60,7 +59,6 @@
                                         'desc'  : 'No such instance'
                                     } 
               }
-libvirt_rev = 393
 
 def err_invalid_ccname():
 # This is used to verify the that the  
@@ -157,10 +155,6 @@
               get_typed_class(virt, "ProcessorPool")
              ]
 
-    if CIM_REV < libvirt_rev:
-        expr_values['invalid_keyvalue']['desc'] = 'Invalid InstanceID or unsupported pool type'
-        expr_values['invalid_keyvalue']['rc'] = pywbem.CIM_ERR_FAILED
-
     for classname in sorted(lelist):
         keys = { "InstanceID" : "InvalidKeyValue" }
         field = "InstanceID_KeyValue"    
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py	Tue Jun 10 11:04:31 2008 -0700
@@ -30,11 +30,9 @@
 from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORNAMES, \
 CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL, SKIP
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.enumclass import enumerate
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
-ac_to_pool_version = 561
 
 def append_to_list(server, virt, poolname, valid_elc_id):
     keys_list = ['InstanceID']
@@ -87,11 +85,10 @@
     valid_elc_id = ["ManagementCapabilities", 
                     "MigrationCapabilities"]
 
-    if CIM_REV >= ac_to_pool_version:
-        valid_elc_name.append(get_typed_class(virt, "AllocationCapabilities"))
-        status, valid_elc_id = set_pool_info(server, virt, valid_elc_id)
-        if status != PASS:
-            return status
+    valid_elc_name.append(get_typed_class(virt, "AllocationCapabilities"))
+    status, valid_elc_id = set_pool_info(server, virt, valid_elc_id)
+    if status != PASS:
+        return status
 
     if len(elc) == 0:
         logger.error("ElementCapabilities association failed, excepted at least one instance")
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Tue Jun 10 11:04:31 2008 -0700
@@ -58,7 +58,6 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
 verify_diskrasd_values, verify_memrasd_values, rasd_init_list
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 
@@ -67,8 +66,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-rev = 529
-proc_instid_rev = 590
 
 def setup_env(server, virt="Xen"):
     vsxml_info = None
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py
--- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Tue Jun 10 11:04:31 2008 -0700
@@ -49,12 +49,10 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.test_xml import testxml
 from XenKvmLib.test_doms import destroy_and_undefine_all
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 test_dom = "domgst"
 test_vcpus = 1
-libvirtcim_sdc_rasd_rev = 571
 
 def setup_env(server, virt="Xen"):
     status = PASS
@@ -243,26 +241,6 @@
             logger.error("In ResourceType for %s " % rt)
             return FAIL
  
-        # The following properties have been removed in the patchset 571
-        # but is present in the rpm libvirt-cim and hence retained it.
-
-        if CIM_REV < libvirtcim_sdc_rasd_rev:
-            ppolicy = inst['PropertyPolicy']
-            if ppolicy != 0 and ppolicy != 1:
-                logger.error("In PropertyPolicy for %s " % ppolicy)
-                return FAIL
-
-            vrole  = inst['ValueRole']
-            if vrole < 0 or vrole > 4:
-                logger.error("In ValueRole %s " % vrole)
-                return FAIL
-
-            insid  = inst['InstanceID']
-            vrange = rangelist[insid]
-            if vrange != inst['ValueRange']:
-                logger.error("In ValueRange for %s " % vrange)
-                return FAIL
-
     except Exception, detail:
         logger.error("Error checking RASD attribute values %s" % detail)
         return FAIL
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/Memory/01_memory.py
--- a/suites/libvirt-cim/cimtest/Memory/01_memory.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py	Tue Jun 10 11:04:31 2008 -0700
@@ -31,13 +31,11 @@
 from XenKvmLib.vxml import XenXML, KVMXML, get_class
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 test_dom = "test_domain"
 mem = 256 #MB
-mem_change_version=585
 
 @do_main(sup_types)
 def main():
@@ -45,10 +43,7 @@
     
     vsxml = get_class(options.virt)(test_dom, mem)
     vsxml.define(options.ip)
-    if CIM_REV >= mem_change_version: 
-        alloc_mem = int(vsxml.xml_get_mem())
-    else:
-        alloc_mem = int(vsxml.xml_get_mem())/1024
+    alloc_mem = int(vsxml.xml_get_mem())
     
     devid = "%s/mem" % test_dom
     key_list = { 'DeviceID' : devid,
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Tue Jun 10 11:04:31 2008 -0700
@@ -54,7 +54,6 @@
 from XenKvmLib import vxml 
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib import rasd 
-from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib import rasd
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py	Tue Jun 10 11:04:31 2008 -0700
@@ -34,7 +34,6 @@
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib import rasd 
-from XenKvmLib.const import CIM_REV
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib import rasd
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py
--- a/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py	Tue Jun 10 11:04:31 2008 -0700
@@ -79,12 +79,9 @@
 from CimTest.Globals import do_main
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.common_util import print_field_error
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
-
-libvirtcim_rev = 501
 
 def get_proflist():
     proflist = []
@@ -167,12 +164,6 @@
     server = options.ip
     status = PASS
 
-    # Referenced Profile was introduced as part of changeset 501 
-    # and is not available in the libvirt-cim rpm, hence skipping tc
-    # if CIM_REV  501
-    if CIM_REV < libvirtcim_rev:
-        return SKIP
-
     prev_namespace = Globals.CIM_NS
     Globals.CIM_NS = 'root/interop'
     reg_classname = get_typed_class(virt, 'RegisteredProfile')
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py
--- a/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -60,10 +60,8 @@
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
 from XenKvmLib.common_util import try_assoc
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
-libvirtcim_rev = 501
 
 expr_values = {
                 'INVALID_Instid_KeyName'  :  {
@@ -124,11 +122,6 @@
     virt = options.virt
     server = options.ip
     status = PASS
-    # Referenced Profile was introduced as part of changeset 501 
-    # and is not available in the libvirt-cim rpm, hence skipping tc
-    # if CIM_REV  501
-    if CIM_REV < libvirtcim_rev:
-        return SKIP
 
     prev_namespace = Globals.CIM_NS
     Globals.CIM_NS = 'root/interop'
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Tue Jun 10 11:04:31 2008 -0700
@@ -29,7 +29,6 @@
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL
@@ -43,7 +42,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-proc_instid_rev = 590
 
 def setup_env(server, virt):
     destroy_and_undefine_all(server)
@@ -73,12 +71,7 @@
 
 def init_list(test_disk, diskid, test_network, virt='Xen'):
 
-    if CIM_REV < proc_instid_rev:
-        procid = '%s/%s' % (test_dom, 0)
-    else:
-        procid = '%s/%s' % (test_dom, 'proc')
-
-    proc = { 'rasd_id' : procid,
+    proc = { 'rasd_id' : '%s/%s' % (test_dom, 'proc'),
              'pool_id' : 'ProcessorPool/0'
            }
 
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -28,11 +28,9 @@
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'XenFV', 'KVM']
 
-rev = 466
 
 @do_main(sup_types)
 def main():
@@ -49,9 +47,6 @@
 
     exp_rc = 6 #CIM_ERR_NOT_FOUND
     exp_desc = "No such instance (wrong) - resource pool type mismatch"
-    if CIM_REV < rev:
-        exp_rc = 1 # CIM_ERR_FAILED
-        exp_desc = "Invalid InstanceID or unsupported pool type"
 
     for k, v in poollist.items():
         instanceref = CIMInstanceName(k, 
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py	Tue Jun 10 11:04:31 2008 -0700
@@ -32,7 +32,6 @@
 from XenKvmLib import assoc
 from XenKvmLib import devices
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from CimTest import Globals
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import PASS, FAIL 
@@ -42,8 +41,6 @@
 test_dom = "domu1"
 test_mac = "00:11:22:33:44:aa"
 test_vcpus = 1
-proc_instid_rev = 590
-
 
 def print_error(cn, detail):
     Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
@@ -96,7 +93,7 @@
     for cn in cn_id.keys():
         key_list = get_keys(cn, cn_id[cn], 'ComputerSystem', options.virt)
 
-        if CIM_REV >= proc_instid_rev and cn == 'Processor':
+        if cn == 'Processor':
             exp_inst_id_val[cn] = "%s/%s" % (test_dom, "proc") 
         else:
             exp_inst_id_val[cn] = key_list['DeviceID']
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py
--- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py	Tue Jun 10 11:04:31 2008 -0700
@@ -59,8 +59,6 @@
 from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class, get_class_basename
 from XenKvmLib.rasd import InstId_err
-from XenKvmLib.const import CIM_REV
-
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -68,9 +66,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-proc_instid_rev = 590
-
-
 
 def call_assoc(ip, inst, exp_id, ccn, virt):
     if inst['InstanceID'] != exp_id:
@@ -196,9 +191,6 @@
             'DiskResourceAllocationSettingData' : '%s/%s' % (test_dom, test_disk),
             'MemResourceAllocationSettingData'  : '%s/%s' % (test_dom, 'mem')}
 
-    if CIM_REV < proc_instid_rev :
-        rasd_devid['ProcResourceAllocationSettingData'] = "%s/%s" % (test_dom, "0")
-
     global dev_devid
     dev_devid = {
             'Processor'   : '%s/%s' % (test_dom, test_vcpus-1),
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py	Tue Jun 10 11:04:31 2008 -0700
@@ -65,14 +65,11 @@
 from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
 create_netpool_conf
 from XenKvmLib.common_util import print_field_error
-from XenKvmLib.const import CIM_REV
 
 platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 memid = "%s/%s" % ("MemoryPool", 0)
 procid = "%s/%s" % ("ProcessorPool", 0)
-libvirtcim_sdc_rasd_rev = 571
-
 
 def get_or_bail(virt, ip, id, pool_class):
     """
@@ -165,27 +162,6 @@
                               rtype[cllist[loop]])
             return FAIL 
 
-        # The following properties have been removed in the patchset 571
-        # but is present in the rpm libvirt-cim and hence retained it.
-
-        if CIM_REV < libvirtcim_sdc_rasd_rev:
-            ppolicy = inst['PropertyPolicy']
-            if ppolicy != 0 and ppolicy != 1:
-                print_field_error("PropertyPolicy", inst['PropertyPolicy'], 
-                                   ppolicy)
-                return FAIL 
-
-            vrole  = inst['ValueRole']
-            if vrole < 0 or vrole > 4:
-                print_field_error("ValueRole", inst['ValueRole'], vrole)
-                return FAIL 
-
-            insid  = inst['InstanceID']
-            vrange = rangelist[insid]
-            if vrange != inst['ValueRange']:
-                print_field_error("ValueRange", inst['ValueRange'], vrange)
-                return FAIL 
-
     return PASS
 
 def verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool):
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py
--- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Tue Jun 10 11:04:31 2008 -0700
@@ -53,7 +53,6 @@
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
 verify_diskrasd_values, verify_memrasd_values 
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -61,8 +60,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-proc_rev = 531
-mem_rev = 529
 
 def setup_env(virt):  
     vsxml_info = None
@@ -97,8 +94,6 @@
                  "ResourceType" : 3,
                  "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
                 }
-    if CIM_REV < proc_rev:
-        procrasd['InstanceID'] = '%s/%s' %(test_dom, "0")
 
     netrasd = {
                 "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
@@ -122,8 +117,7 @@
                "VirtualQuantity" : (test_mem * 1024), 
                "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
               }
-    if CIM_REV < mem_rev:
-        memrasd['AllocationUnits'] = "MegaBytes"
+
     return procrasd, netrasd, diskrasd, memrasd
 
 def get_inst_from_list(classname, vssd_list, filter_name, exp_val):
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Tue Jun 10 11:04:31 2008 -0700
@@ -28,14 +28,12 @@
 from VirtLib.live import domain_list, active_domain_list
 from XenKvmLib import vsms, vxml
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from CimTest.Globals import do_main
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 default_dom = 'test_domain'
-rev = 528
 
 @do_main(sup_types)
 def main():
@@ -50,11 +48,7 @@
     cs_ref = CIMInstanceName(classname, keybindings = {
                                         'Name':default_dom,
                                         'CreationClassName':classname})
-    if CIM_REV < rev:
-        dl_func = active_domain_list
-    else:
-        dl_func = domain_list
-    list_before = dl_func(options.ip, options.virt)
+    list_before = domain_list(options.ip, options.virt)
     status = PASS
     rc = -1
     
@@ -66,7 +60,7 @@
         logger.error(details)
         status = FAIL
 
-    list_after = dl_func(options.ip, options.virt)
+    list_after = domain_list(options.ip, options.virt)
 
     status = PASS
     if default_dom not in list_before:
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Tue Jun 10 11:04:31 2008 -0700
@@ -27,7 +27,6 @@
 from VirtLib import utils
 from XenKvmLib import vsms
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.const import CIM_REV
 from XenKvmLib.test_doms import undefine_test_domain
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
@@ -45,25 +44,19 @@
         cs_ref = CIMInstanceName(classname, 
                               keybindings = {'CreationClassName':classname})
 
-        if CIM_REV < vsms_status_version:
-            exp_rc = 2 #IM_RC_FAILED
-        else:
-            exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
-                          'desc'  : 'CIM_ERR_FAILED: Unable to retrieve domain\
+        exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
+                      'desc'  : 'CIM_ERR_FAILED: Unable to retrieve domain\
  name.'
-                        }
+                    }
 
     elif tc == 'nonexistent':
         cs_ref = CIMInstanceName(classname,keybindings = {
                                 'Name':'##@@!!cimtest_domain',
                                 'CreationClassName':classname})
 
-        if CIM_REV < vsms_status_version:
-            exp_rc = 4 #IM_RC_SYS_NOT_FOUND
-        else:
-            exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
-                          'desc' : 'CIM_ERR_FAILED: Failed to find domain' 
-                        }
+        exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
+                      'desc' : 'CIM_ERR_FAILED: Failed to find domain' 
+                    }
 
     else:
         return SKIP
@@ -71,25 +64,15 @@
     status = FAIL
     try:
         ret = service.DestroySystem(AffectedSystem=cs_ref)
-        if CIM_REV < vsms_status_version:
-            if ret[0] == exp_rc:
-                logger.info('destroy_fail>>%s: Got expected return code %s', 
-                            tc, exp_rc)
-                return PASS 
-            else:
-                logger.error('destroy_fail>>%s: Got rc: %s, but we expect %s',
-                            tc, ret[0], exp_rc)
-                return FAIL 
 
     except Exception, details:
-        if CIM_REV >= vsms_status_version:
-            err_no   = details[0]
-            err_desc = details[1]
-            if err_no == exp_value['rc'] and err_desc == exp_value['desc']:
-                logger.error("For Invalid Scenario '%s'", tc)
-                logger.info('Got expected error no: %s', err_no)
-                logger.info('Got expected error desc: %s',err_desc)
-                return PASS
+        err_no   = details[0]
+        err_desc = details[1]
+        if err_no == exp_value['rc'] and err_desc == exp_value['desc']:
+            logger.error("For Invalid Scenario '%s'", tc)
+            logger.info('Got expected error no: %s', err_no)
+            logger.info('Got expected error desc: %s',err_desc)
+            return PASS
 
         logger.error('destroy_fail>> %s: Error executing DestroySystem' % tc)
         logger.error(details)
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Tue Jun 10 11:04:31 2008 -0700
@@ -55,7 +55,6 @@
 from XenKvmLib.rasd import InstId_err
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
@@ -63,7 +62,6 @@
 test_vcpus  = 1
 test_mem    = 128
 test_mac    = "00:11:22:33:44:aa"
-rev = 531
 
 def check_rasd_values(id, exp_id):
     try:
@@ -90,8 +88,6 @@
                  "disk_rasd" : '%s/%s' %(test_dom, test_disk),
                  "mem_rasd"  : '%s/%s' %(test_dom, "mem")
                 }
-    if CIM_REV < rev:
-        rasd_list['proc_rasd'] = '%s/%s' %(test_dom, "0")
 
     try: 
         if len(assoc_info) <= 0: 
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Tue Jun 10 11:04:31 2008 -0700
@@ -62,14 +62,12 @@
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest.Globals import do_main, logger
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
-from XenKvmLib.const import CIM_REV
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 test_dom     = "domu1"
 test_mac     = "00:11:22:33:44:aa"
 test_vcpus   = 1
-rev = 417
 
 expr_values = {
     "INVALID_InstID_Keyname"   : { 'rc'   : pywbem.CIM_ERR_FAILED, \
@@ -77,10 +75,6 @@
     "INVALID_InstID_Keyval"    : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
                      'desc' : 'No such instance (INVALID_InstID_Keyval)'}
 }
-
-if CIM_REV < rev:
-    expr_values['INVALID_InstID_Keyval'] = {'rc' : pywbem.CIM_ERR_FAILED, \
-                                            'desc' : 'Invalid InstanceID'}
 
 def try_invalid_assoc(classname, name_val, i, field, virt="Xen"):
     ac_classname = get_typed_class(virt, "VirtualSystemSettingDataComponent")
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/lib/XenKvmLib/common_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Tue Jun 10 11:04:31 2008 -0700
@@ -33,17 +33,11 @@
 from XenKvmLib.classes import get_typed_class
 from CimTest.Globals import logger, log_param, CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
-from XenKvmLib.const import CIM_REV
 from VirtLib.live import diskpool_list, virsh_version, net_list
 from XenKvmLib.vxml import PoolXML, NetXML
 
 test_dpath = "foo"
-diskpoolconf_rev = 558
-
-if CIM_REV < diskpoolconf_rev:
-    disk_file = '/tmp/diskpool.conf'
-else:
-    disk_file = '/etc/libvirt/diskpool.conf'
+disk_file = '/etc/libvirt/diskpool.conf'
 
 back_disk_file = disk_file + "." + "backup"
 
@@ -276,11 +270,10 @@
     status = PASS
     libvirt_version = virsh_version(server, virt)
     # The conf file is not present on  the machine if 
-    # libvirt_version >= 0.4.1 and CIM_REV > 558
+    # libvirt_version >= 0.4.1
     # Hence Skipping the logic to delete the new conf file
     # and just returning PASS
-    if libvirt_version >= '0.4.1' and \
-       CIM_REV > diskpoolconf_rev:
+    if libvirt_version >= '0.4.1':
         return status
     try:
         if os.path.exists(back_disk_file):
@@ -328,8 +321,7 @@
 
 def create_diskpool_conf(server, virt):
     libvirt_version = virsh_version(server, virt)
-    if libvirt_version >= '0.4.1' and \
-       CIM_REV > diskpoolconf_rev:
+    if libvirt_version >= '0.4.1':
         status, dpoolname = create_diskpool(server, virt=virt)
         diskid = "%s/%s" % ("DiskPool", dpoolname)
     else:
diff -r 6652ca49942c -r e1f221334033 suites/libvirt-cim/lib/XenKvmLib/rasd.py
--- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py	Tue Jun 10 11:04:31 2008 -0700
@@ -23,7 +23,6 @@
 import sys
 from CimTest.Globals import log_param, logger
 from CimTest.ReturnCodes import FAIL, PASS
-from XenKvmLib.const import CIM_REV
 from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class
 
@@ -36,10 +35,6 @@
 memcn  =  'Memory'
 netcn  =  'NetworkPort'
 diskcn =  'LogicalDisk'
-
-
-mem_units_rev = 529
-proc_instid_rev = 590
 
 def rasd_init_list(vsxml, virt, t_disk, t_dom, t_mac, t_mem):
     """
@@ -60,20 +55,9 @@
 
         disk_path = vsxml.xml_get_disk_source()
 
-        if CIM_REV < mem_units_rev:
-          alloc_units  = "MegaBytes"
-        else:
-          alloc_units  = "KiloBytes"
-
-        if CIM_REV < proc_instid_rev:
-           proc_id = '%s/%s' %(t_dom, 0)
-        else:
-           proc_id = '%s/%s' %(t_dom, "proc")
-       
-
         rasd_values = { 
                         proc_cn  : {
-                                     "InstanceID"   : proc_id,
+                                     "InstanceID"   : '%s/%s' %(t_dom, "proc"),
                                      "ResourceType" : 3,
                                     }, 
                         disk_cn  : {
@@ -90,7 +74,7 @@
                         mem_cn   : {
                                     "InstanceID" : '%s/%s' %(t_dom, "mem"), 
                                     "ResourceType"    : 4, 
-                                    "AllocationUnits" : alloc_units,
+                                    "AllocationUnits" : "KiloBytes",
                                     "VirtualQuantity" : (t_mem * 1024),
                                   }
                       } 



From yunguol at cn.ibm.com  Tue Jun 17 05:20:56 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Tue, 17 Jun 2008 13:20:56 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update
	ResourceAllocationFromPool.03&04 for LXC support
Message-ID: <4cadaeddee3aa439638f.1213680056@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213680047 -28800
# Node ID 4cadaeddee3aa439638ff212861a2cfc37fdfe69
# Parent  6652ca49942c0314ec1b2b1da504810325097250
[TEST] Update ResourceAllocationFromPool.03&04 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 6652ca49942c -r 4cadaeddee3a suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Tue Jun 17 13:20:47 2008 +0800
@@ -30,7 +30,7 @@
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 from XenKvmLib.const import CIM_REV
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 rev = 466
 
@@ -42,7 +42,9 @@
 
 
     poollist = {get_typed_class(options.virt, "MemoryPool") : "wrong", 
-                get_typed_class(options.virt, "ProcessorPool") : "wrong"}
+                get_typed_class(options.virt, "ProcessorPool") : "wrong",
+                get_typed_class(options.virt, "DiskPool") : "wrong",
+                get_typed_class(options.virt, "NetworkPool") : "wrong"}
     conn = assoc.myWBEMConnection('http://%s' % options.ip,                                        
                                   (Globals.CIM_USER, Globals.CIM_PASS),
                                   Globals.CIM_NS)
diff -r 6652ca49942c -r 4cadaeddee3a suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py	Tue Jun 17 13:20:47 2008 +0800
@@ -29,7 +29,7 @@
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
 exp_rc = 6 #CIM_ERR_NOT_FOUND
 exp_desc = "No such instance"
@@ -42,7 +42,9 @@
 
 
     dataset = {get_typed_class(options.virt, "MemResourceAllocationSettingData") : "wrong", 
-               get_typed_class(options.virt, "ProcResourceAllocationSettingData") : "wrong"}
+               get_typed_class(options.virt, "ProcResourceAllocationSettingData") : "wrong",
+               get_typed_class(options.virt, "DiskResourceAllocationSettingData") : "wrong",
+               get_typed_class(options.virt, "NetResourceAllocationSettingData") : "wrong"}
     conn = assoc.myWBEMConnection('http://%s' % options.ip,                                        
                                   (Globals.CIM_USER, Globals.CIM_PASS),
                                   Globals.CIM_NS)



From yunguol at cn.ibm.com  Tue Jun 17 06:56:41 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Tue, 17 Jun 2008 14:56:41 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update RAFP.01 for LXC support,
	also fix Diskpool and NetworkPool missing
Message-ID: <72d19c4c969b8b4239a5.1213685801@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213685796 -28800
# Node ID 72d19c4c969b8b4239a5cdf2107fa279782f9d96
# Parent  6652ca49942c0314ec1b2b1da504810325097250
[TEST] Update RAFP.01 for LXC support, also fix Diskpool and NetworkPool missing

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 6652ca49942c -r 72d19c4c969b suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Tue Jun 17 14:56:36 2008 +0800
@@ -24,70 +24,164 @@
 
 import sys
 from VirtLib import utils
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
 from XenKvmLib.classes import get_typed_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
+
+test_dom = 'RAFP_domain'
+test_mac = '00:11:22:33:44:55'
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    else:
+        test_disk = "hda"
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def init_list(test_disk, diskid, test_network, virt='Xen'):
+
+    proc = { 'rasd_id' : '%s/%s' % (test_dom, 'proc'),
+             'pool_id' : 'ProcessorPool/0'
+           }
+
+    mem = { 'rasd_id' : '%s/%s' % (test_dom,'mem'),
+            'pool_id' : 'MemoryPool/0'
+          }
+
+    net  = {
+             'rasd_id' : '%s/%s' % (test_dom, test_mac),
+             'pool_id' : 'NetworkPool/%s' %test_network
+           }
+
+    disk = { 'rasd_id' : '%s/%s' % (test_dom, test_disk),
+             'pool_id' : diskid
+           }
+
+    if virt == 'LXC':
+        cn_id_list = {
+                       'MemResourceAllocationSettingData'  : mem,
+                     }
+    else:
+        cn_id_list = {
+                       'MemResourceAllocationSettingData'  : mem,
+                       'ProcResourceAllocationSettingData' : proc,
+                       'NetResourceAllocationSettingData'  : net,
+                       'DiskResourceAllocationSettingData' : disk
+                     }
+
+    return cn_id_list
+
+def get_rasd_instance(server, virt, key_list, cn):
+    inst = None
+    try:
+        inst = enumclass.getInstance(server, cn, key_list, virt)
+    except Exception, details:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
+        logger.error("Exception details: %s", details)
+        return inst, FAIL
+
+    return inst, PASS
+
+def verify_rasd_from_RAFP(server, virt, inst, rasd_id, cn):
+    rasd = []
+    try:
+        rasd = assoc.AssociatorNames(server, "ResourceAllocationFromPool",
+                                     cn, virt, InstanceID = inst.InstanceID)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES, inst.InstanceID)
+        return FAIL
+
+    if len(rasd) != 1:
+        logger.error("No associated rasd for %s", inst.InstanceID)
+        return FAIL
+
+    if rasd[0]['InstanceID'] != rasd_id:
+        logger.error("InstanceID Mismatch")
+        logger.error("Returned %s instead of %s", rasd[0]['InstanceID'] ,
+                      pool_id)
+        return FAIL
+
+    return PASS
+
+def get_rasdinst_verify_rasd_from_RAFP(server, virt, vsxml, cn, id_info):
+    try:
+        key_list = {  'InstanceID' : id_info['rasd_id'] }
+        rasd_cn =  get_typed_class(virt, cn)
+        rasdinst, status = get_rasd_instance(server, virt, key_list, rasd_cn)
+        if status != PASS or rasdinst.InstanceID == None:
+            vsxml.undefine(server)
+            return status
+
+        status = verify_rasd_from_RAFP(server, virt, rasdinst,
+                                       id_info['pool_id'], cn)
+    except Exception, details:
+        logger.error("Exception in get_rasdinst_verify_pool_from_RAFP() fn")
+        logger.error("Exception Details %s", details)
+        status = FAIL
+
+    if status != PASS:
+        vsxml.undefine(server)
+
+    return status
 
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
 
-    try:
-        key_list = { 'InstanceID' : "MemoryPool/0" }
-        mempool = enumclass.getInstance(options.ip,
-                                        "MemoryPool",
-                                        key_list,
-                                        options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
-        return FAIL
+    server = options.ip
+    virt = options.virt
 
-    try:
-        key_list = { 'InstanceID' : "ProcessorPool/0" }
-        procpool = enumclass.getInstance(options.ip,
-                                         "ProcessorPool",
-                                         key_list,
-                                         options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
-        return FAIL
-     
-    try:
-        memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                        "MemoryPool",
-                                        options.virt,
-                                        InstanceID = mempool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mempool.InstanceID)
-        status = FAIL
-     
-    for i in range(len(memdata)):
-        if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"):
-            logger.error("ERROR: Association result error")
-            status = FAIL
-                
-    try:
-        procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                         "ProcessorPool",
-                                         options.virt,
-                                         InstanceID = procpool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % procpool.InstanceID)
-        status = FAIL
-      
-    for j in range(len(procdata)):
-        if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"):
-	    logger.error("ERROR: Association result error")
-            status = FAIL
+    status, vsxml, test_disk = setup_env(server, virt)
+    if status != PASS:
+        return status
 
-    return status 
-        
-        
+    status, diskid = create_diskpool_conf(server, virt)
+    if status != PASS:
+        return status
+
+    status, test_network = create_netpool_conf(server, virt)
+    if status != PASS:
+        return status
+
+    cn_id_list = init_list(test_disk, diskid, test_network, options.virt)
+
+    for rasd_cn, id_info in cn_id_list.iteritems():
+        status = get_rasdinst_verify_rasd_from_RAFP(server, virt, vsxml,
+                                                    rasd_cn, id_info)
+        if status != PASS:
+            return status
+
+    cleanup_restore(server, virt)
+    vsxml.undefine(server)
+    return status
+
 if __name__ == "__main__":
     sys.exit(main())



From yunguol at cn.ibm.com  Tue Jun 17 07:07:10 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Tue, 17 Jun 2008 15:07:10 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Remove revision branches
In-Reply-To: <e1f221334033e17120e3.1213673615@elm3b41.beaverton.ibm.com>
Message-ID: <OFEB387B07.4398568F-ON4825746B.00271D08-4825746B.002764B0@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-17 11:33:35:

> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1213121071 25200
> # Node ID e1f221334033e17120e32dc5ffa00c951b8ada78
> # Parent  6652ca49942c0314ec1b2b1da504810325097250
> [TEST] #2 Remove revision branches.
> 
> These brances were needed to distinguish the behavior between the 0.
> 3.0 release and the current head of the mercurial tree.  Now that 
> the cimtest tree has been tagged, cimtest release_0_1 should 
> correspond with the functionality in libvirt-cim 0.4.0.
> 
> Updates:
>  -Rebased on current tree
>  -Also update RAFP 02
> 
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
> 
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py
> --- a/suites/libvirt-
> cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py   Thu Jun 
> 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py   Tue Jun 
> 10 11:04:31 2008 -0700
> @@ -62,14 +62,12 @@
>  from XenKvmLib.test_doms import create_vnet
>  from CimTest.Globals import do_main, platform_sup
>  from XenKvmLib.classes import get_typed_class
> -from XenKvmLib.const import CIM_REV
>  from XenKvmLib.common_util import cleanup_restore, test_dpath, \
>  create_diskpool_file
> 
>  diskid = "%s/%s" % ("DiskPool", test_dpath)
>  memid = "%s/%s" % ("MemoryPool", 0)
>  procid = "%s/%s" % ("ProcessorPool", 0)
> -rev = 463
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
>  @do_main(sup_types) 
> @@ -112,8 +110,6 @@
>                                    'desc' : 'No InstanceID specified' },
>              "invalid_keyvalue" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND,
>                                     'desc' : 'Instance not found' }}
> -    if CIM_REV < rev:
> -        exp['invalid_keyvalue']['desc'] = 'Object could not be found'
> 
>      ret_value = try_getinstance(conn, classname, keys, 
field_name=field,
> 
> expr_values=exp['invalid_keyvalue'], bug_no="")
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py
> --- a/suites/libvirt-
> cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py   Thu Jun 12
> 17:13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py   Tue Jun 10
> 11:04:31 2008 -0700
> @@ -34,7 +34,6 @@
>  from CimTest import Globals
>  from XenKvmLib.test_doms import destroy_and_undefine_all
>  from XenKvmLib.common_util import try_assoc
> -from XenKvmLib.const import CIM_REV
>  from CimTest.ReturnCodes import PASS, FAIL 
>  from CimTest.Globals import do_main, platform_sup, logger
>  from XenKvmLib.vxml import get_class
> @@ -60,7 +59,6 @@
>                                          'desc'  : 'No such instance'
>                                      } 
>                }
> -libvirt_rev = 393
> 
>  def err_invalid_ccname():
>  # This is used to verify the that the 
> @@ -157,10 +155,6 @@
>                get_typed_class(virt, "ProcessorPool")
>               ]
> 
> -    if CIM_REV < libvirt_rev:
> -        expr_values['invalid_keyvalue']['desc'] = 'Invalid 
> InstanceID or unsupported pool type'
> -        expr_values['invalid_keyvalue']['rc'] = pywbem.CIM_ERR_FAILED
> -
>      for classname in sorted(lelist):
>          keys = { "InstanceID" : "InvalidKeyValue" }
>          field = "InstanceID_KeyValue" 
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/ElementCapabilities/01_forward.py
> --- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py 
> Thu Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py 
> Tue Jun 10 11:04:31 2008 -0700
> @@ -30,11 +30,9 @@
>  from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORNAMES, 
\
>  CIM_ERROR_ENUMERATE
>  from CimTest.ReturnCodes import PASS, FAIL, SKIP
> -from XenKvmLib.const import CIM_REV
>  from XenKvmLib.enumclass import enumerate
> 
>  sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
> -ac_to_pool_version = 561
> 
>  def append_to_list(server, virt, poolname, valid_elc_id):
>      keys_list = ['InstanceID']
> @@ -87,11 +85,10 @@
>      valid_elc_id = ["ManagementCapabilities", 
>                      "MigrationCapabilities"]
> 
> -    if CIM_REV >= ac_to_pool_version:
> -        valid_elc_name.append(get_typed_class(virt, 
> "AllocationCapabilities"))
> -        status, valid_elc_id = set_pool_info(server, virt, 
valid_elc_id)
> -        if status != PASS:
> -            return status
> +    valid_elc_name.append(get_typed_class(virt, 
"AllocationCapabilities"))
> +    status, valid_elc_id = set_pool_info(server, virt, valid_elc_id)
> +    if status != PASS:
> +        return status
> 
>      if len(elc) == 0:
>          logger.error("ElementCapabilities association failed, 
> excepted at least one instance")
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
> --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
> Thu Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
> Tue Jun 10 11:04:31 2008 -0700
> @@ -58,7 +58,6 @@
>  from CimTest.ReturnCodes import PASS, FAIL
>  from XenKvmLib.rasd import verify_procrasd_values, 
verify_netrasd_values, \
>  verify_diskrasd_values, verify_memrasd_values, rasd_init_list
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV']
> 
> @@ -67,8 +66,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -rev = 529
> -proc_instid_rev = 590
> 
>  def setup_env(server, virt="Xen"):
>      vsxml_info = None
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/HostSystem/03_hs_to_settdefcap.py
> --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py 
> Thu Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py 
> Tue Jun 10 11:04:31 2008 -0700
> @@ -49,12 +49,10 @@
>  from CimTest.ReturnCodes import PASS, FAIL
>  from XenKvmLib.test_xml import testxml
>  from XenKvmLib.test_doms import destroy_and_undefine_all
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV']
>  test_dom = "domgst"
>  test_vcpus = 1
> -libvirtcim_sdc_rasd_rev = 571
> 
>  def setup_env(server, virt="Xen"):
>      status = PASS
> @@ -243,26 +241,6 @@
>              logger.error("In ResourceType for %s " % rt)
>              return FAIL
> 
> -        # The following properties have been removed in the patchset 
571
> -        # but is present in the rpm libvirt-cim and hence retained it.
> -
> -        if CIM_REV < libvirtcim_sdc_rasd_rev:
> -            ppolicy = inst['PropertyPolicy']
> -            if ppolicy != 0 and ppolicy != 1:
> -                logger.error("In PropertyPolicy for %s " % ppolicy)
> -                return FAIL
> -
> -            vrole  = inst['ValueRole']
> -            if vrole < 0 or vrole > 4:
> -                logger.error("In ValueRole %s " % vrole)
> -                return FAIL
> -
> -            insid  = inst['InstanceID']
> -            vrange = rangelist[insid]
> -            if vrange != inst['ValueRange']:
> -                logger.error("In ValueRange for %s " % vrange)
> -                return FAIL
> -
>      except Exception, detail:
>          logger.error("Error checking RASD attribute values %s" % 
detail)
>          return FAIL
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/Memory/01_memory.py
> --- a/suites/libvirt-cim/cimtest/Memory/01_memory.py   Thu Jun 12 
> 17:13:23 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py   Tue Jun 10 
> 11:04:31 2008 -0700
> @@ -31,13 +31,11 @@
>  from XenKvmLib.vxml import XenXML, KVMXML, get_class
>  from CimTest.Globals import logger
>  from CimTest.Globals import do_main
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
>  test_dom = "test_domain"
>  mem = 256 #MB
> -mem_change_version=585
> 
>  @do_main(sup_types)
>  def main():
> @@ -45,10 +43,7 @@
> 
>      vsxml = get_class(options.virt)(test_dom, mem)
>      vsxml.define(options.ip)
> -    if CIM_REV >= mem_change_version: 
> -        alloc_mem = int(vsxml.xml_get_mem())
> -    else:
> -        alloc_mem = int(vsxml.xml_get_mem())/1024
> +    alloc_mem = int(vsxml.xml_get_mem())
> 
>      devid = "%s/mem" % test_dom
>      key_list = { 'DeviceID' : devid,
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/RASD/01_verify_rasd_fields.py
> --- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py   Thu
> Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py   Tue
> Jun 10 11:04:31 2008 -0700
> @@ -54,7 +54,6 @@
>  from XenKvmLib import vxml 
>  from XenKvmLib.classes import get_typed_class
>  from XenKvmLib import rasd 
> -from XenKvmLib.const import CIM_REV
>  from CimTest.Globals import logger
>  from CimTest.ReturnCodes import PASS, FAIL
>  from XenKvmLib import rasd
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/RASD/02_enum.py
> --- a/suites/libvirt-cim/cimtest/RASD/02_enum.py   Thu Jun 12 17:13:
> 23 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py   Tue Jun 10 11:04:
> 31 2008 -0700
> @@ -34,7 +34,6 @@
>  from XenKvmLib.vxml import get_class
>  from XenKvmLib.classes import get_typed_class
>  from XenKvmLib import rasd 
> -from XenKvmLib.const import CIM_REV
>  from CimTest.Globals import logger
>  from CimTest.ReturnCodes import PASS, FAIL
>  from XenKvmLib import rasd
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/ReferencedProfile/01_verify_refprof.py
> --- a/suites/libvirt-
> cim/cimtest/ReferencedProfile/01_verify_refprof.py   Thu Jun 12 17:
> 13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/ReferencedProfile/01_verify_refprof.py   Tue Jun 10 11:
> 04:31 2008 -0700
> @@ -79,12 +79,9 @@
>  from CimTest.Globals import do_main
>  from XenKvmLib.classes import get_typed_class
>  from CimTest.ReturnCodes import FAIL, PASS, SKIP
> -from XenKvmLib.const import CIM_REV
>  from XenKvmLib.common_util import print_field_error
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> -
> -libvirtcim_rev = 501
> 
>  def get_proflist():
>      proflist = []
> @@ -167,12 +164,6 @@
>      server = options.ip
>      status = PASS
> 
> -    # Referenced Profile was introduced as part of changeset 501 
> -    # and is not available in the libvirt-cim rpm, hence skipping tc
> -    # if CIM_REV  501
> -    if CIM_REV < libvirtcim_rev:
> -        return SKIP
> -
>      prev_namespace = Globals.CIM_NS
>      Globals.CIM_NS = 'root/interop'
>      reg_classname = get_typed_class(virt, 'RegisteredProfile')
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/ReferencedProfile/02_refprofile_errs.py
> --- a/suites/libvirt-
> cim/cimtest/ReferencedProfile/02_refprofile_errs.py   Thu Jun 12 17:
> 13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/ReferencedProfile/02_refprofile_errs.py   Tue Jun 10 11:
> 04:31 2008 -0700
> @@ -60,10 +60,8 @@
>  from XenKvmLib.classes import get_typed_class
>  from CimTest.ReturnCodes import FAIL, PASS, SKIP
>  from XenKvmLib.common_util import try_assoc
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> -libvirtcim_rev = 501
> 
>  expr_values = {
>                  'INVALID_Instid_KeyName'  :  {
> @@ -124,11 +122,6 @@
>      virt = options.virt
>      server = options.ip
>      status = PASS
> -    # Referenced Profile was introduced as part of changeset 501 
> -    # and is not available in the libvirt-cim rpm, hence skipping tc
> -    # if CIM_REV  501
> -    if CIM_REV < libvirtcim_rev:
> -        return SKIP
> 
>      prev_namespace = Globals.CIM_NS
>      Globals.CIM_NS = 'root/interop'
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/02_reverse.py
> --- a/suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/02_reverse.py   Thu Jun 12 
> 17:13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/02_reverse.py   Tue Jun 10 
> 11:04:31 2008 -0700
> @@ -29,7 +29,6 @@
>  from XenKvmLib.test_doms import destroy_and_undefine_all
>  from XenKvmLib.vxml import get_class
>  from XenKvmLib.classes import get_typed_class
> -from XenKvmLib.const import CIM_REV
>  from CimTest import Globals
>  from CimTest.Globals import logger, do_main
>  from CimTest.ReturnCodes import PASS, FAIL
> @@ -43,7 +42,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -proc_instid_rev = 590
> 
>  def setup_env(server, virt):
>      destroy_and_undefine_all(server)
> @@ -73,12 +71,7 @@
> 
>  def init_list(test_disk, diskid, test_network, virt='Xen'):
> 
> -    if CIM_REV < proc_instid_rev:
> -        procid = '%s/%s' % (test_dom, 0)
> -    else:
> -        procid = '%s/%s' % (test_dom, 'proc')
> -
> -    proc = { 'rasd_id' : procid,
> +    proc = { 'rasd_id' : '%s/%s' % (test_dom, 'proc'),
>               'pool_id' : 'ProcessorPool/0'
>             }
> 
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
> --- a/suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py   Thu Jun 
> 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py   Tue Jun 
> 10 11:04:31 2008 -0700
> @@ -28,11 +28,9 @@
>  from CimTest import Globals
>  from CimTest.Globals import logger, do_main
>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'XenFV', 'KVM']
> 
> -rev = 466
> 
>  @do_main(sup_types)
>  def main():
> @@ -49,9 +47,6 @@
> 
>      exp_rc = 6 #CIM_ERR_NOT_FOUND
>      exp_desc = "No such instance (wrong) - resource pool type mismatch"
> -    if CIM_REV < rev:
> -        exp_rc = 1 # CIM_ERR_FAILED
> -        exp_desc = "Invalid InstanceID or unsupported pool type"
> 
>      for k, v in poollist.items():
>          instanceref = CIMInstanceName(k, 
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/SettingsDefine/01_forward.py
> --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py   Thu 
> Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py   Tue 
> Jun 10 11:04:31 2008 -0700
> @@ -32,7 +32,6 @@
>  from XenKvmLib import assoc
>  from XenKvmLib import devices
>  from XenKvmLib.classes import get_typed_class
> -from XenKvmLib.const import CIM_REV
>  from CimTest import Globals
>  from CimTest.Globals import do_main
>  from CimTest.ReturnCodes import PASS, FAIL 
> @@ -42,8 +41,6 @@
>  test_dom = "domu1"
>  test_mac = "00:11:22:33:44:aa"
>  test_vcpus = 1
> -proc_instid_rev = 590
> -
> 
>  def print_error(cn, detail):
>      Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, cn)
> @@ -96,7 +93,7 @@
>      for cn in cn_id.keys():
>          key_list = get_keys(cn, cn_id[cn], 'ComputerSystem', 
options.virt)
> 
> -        if CIM_REV >= proc_instid_rev and cn == 'Processor':
> +        if cn == 'Processor':
>              exp_inst_id_val[cn] = "%s/%s" % (test_dom, "proc") 
>          else:
>              exp_inst_id_val[cn] = key_list['DeviceID']
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/SettingsDefine/02_reverse.py
> --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py   Thu 
> Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py   Tue 
> Jun 10 11:04:31 2008 -0700
> @@ -59,8 +59,6 @@
>  from XenKvmLib import vxml
>  from XenKvmLib.classes import get_typed_class, get_class_basename
>  from XenKvmLib.rasd import InstId_err
> -from XenKvmLib.const import CIM_REV
> -
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
> @@ -68,9 +66,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -proc_instid_rev = 590
> -
> -
> 
>  def call_assoc(ip, inst, exp_id, ccn, virt):
>      if inst['InstanceID'] != exp_id:
> @@ -196,9 +191,6 @@
>              'DiskResourceAllocationSettingData' : '%s/%s' % 
> (test_dom, test_disk),
>              'MemResourceAllocationSettingData'  : '%s/%s' % 
> (test_dom, 'mem')}
> 
> -    if CIM_REV < proc_instid_rev :
> -        rasd_devid['ProcResourceAllocationSettingData'] = "%s/%s" %
> (test_dom, "0")
> -
>      global dev_devid
>      dev_devid = {
>              'Processor'   : '%s/%s' % (test_dom, test_vcpus-1),
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/SettingsDefineCapabilities/01_forward.py
> --- a/suites/libvirt-
> cim/cimtest/SettingsDefineCapabilities/01_forward.py   Thu Jun 12 
> 17:13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/SettingsDefineCapabilities/01_forward.py   Tue Jun 10 
> 11:04:31 2008 -0700
> @@ -65,14 +65,11 @@
>  from XenKvmLib.common_util import cleanup_restore, 
create_diskpool_conf, \
>  create_netpool_conf
>  from XenKvmLib.common_util import print_field_error
> -from XenKvmLib.const import CIM_REV
> 
>  platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
>  memid = "%s/%s" % ("MemoryPool", 0)
>  procid = "%s/%s" % ("ProcessorPool", 0)
> -libvirtcim_sdc_rasd_rev = 571
> -
> 
>  def get_or_bail(virt, ip, id, pool_class):
>      """
> @@ -165,27 +162,6 @@
>                                rtype[cllist[loop]])
>              return FAIL 
> 
> -        # The following properties have been removed in the patchset 
571
> -        # but is present in the rpm libvirt-cim and hence retained it.
> -
> -        if CIM_REV < libvirtcim_sdc_rasd_rev:
> -            ppolicy = inst['PropertyPolicy']
> -            if ppolicy != 0 and ppolicy != 1:
> -                print_field_error("PropertyPolicy", 
inst['PropertyPolicy'], 
> -                                   ppolicy)
> -                return FAIL 
> -
> -            vrole  = inst['ValueRole']
> -            if vrole < 0 or vrole > 4:
> -                print_field_error("ValueRole", inst['ValueRole'], 
vrole)
> -                return FAIL 
> -
> -            insid  = inst['InstanceID']
> -            vrange = rangelist[insid]
> -            if vrange != inst['ValueRange']:
> -                print_field_error("ValueRange", inst['ValueRange'], 
vrange)
> -                return FAIL 
> -
>      return PASS
> 
>  def verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool):
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/VSSD/04_vssd_to_rasd.py
> --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py   Thu Jun 
> 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py   Tue Jun 
> 10 11:04:31 2008 -0700
> @@ -53,7 +53,6 @@
>  from XenKvmLib.classes import get_typed_class
>  from XenKvmLib.rasd import verify_procrasd_values, 
verify_netrasd_values, \
>  verify_diskrasd_values, verify_memrasd_values 
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
> 
> @@ -61,8 +60,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -proc_rev = 531
> -mem_rev = 529
> 
>  def setup_env(virt): 
>      vsxml_info = None
> @@ -97,8 +94,6 @@
>                   "ResourceType" : 3,
>                   "CreationClassName": get_typed_class(virt, 
> 'ProcResourceAllocationSettingData')
>                  }
> -    if CIM_REV < proc_rev:
> -        procrasd['InstanceID'] = '%s/%s' %(test_dom, "0")
> 
>      netrasd = {
>                  "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
> @@ -122,8 +117,7 @@
>                 "VirtualQuantity" : (test_mem * 1024), 
>                 "CreationClassName": get_typed_class(virt, 
> 'MemResourceAllocationSettingData')
>                }
> -    if CIM_REV < mem_rev:
> -        memrasd['AllocationUnits'] = "MegaBytes"
> +
>      return procrasd, netrasd, diskrasd, memrasd
> 
>  def get_inst_from_list(classname, vssd_list, filter_name, exp_val):
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
> --- a/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/02_destroysystem.py   Thu
> Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/02_destroysystem.py   Tue
> Jun 10 11:04:31 2008 -0700
> @@ -28,14 +28,12 @@
>  from VirtLib.live import domain_list, active_domain_list
>  from XenKvmLib import vsms, vxml
>  from XenKvmLib.classes import get_typed_class
> -from XenKvmLib.const import CIM_REV
>  from CimTest.Globals import do_main
>  from CimTest.Globals import logger
>  from CimTest.ReturnCodes import PASS, FAIL
> 
>  sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
>  default_dom = 'test_domain'
> -rev = 528
> 
>  @do_main(sup_types)
>  def main():
> @@ -50,11 +48,7 @@
>      cs_ref = CIMInstanceName(classname, keybindings = {
>                                          'Name':default_dom,
>                                          'CreationClassName':classname})
> -    if CIM_REV < rev:
> -        dl_func = active_domain_list
> -    else:
> -        dl_func = domain_list
> -    list_before = dl_func(options.ip, options.virt)
> +    list_before = domain_list(options.ip, options.virt)
>      status = PASS
>      rc = -1
> 
> @@ -66,7 +60,7 @@
>          logger.error(details)
>          status = FAIL
> 
> -    list_after = dl_func(options.ip, options.virt)
> +    list_after = domain_list(options.ip, options.virt)
> 
>      status = PASS
>      if default_dom not in list_before:
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py
> --- a/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py 
> Thu Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py 
> Tue Jun 10 11:04:31 2008 -0700
> @@ -27,7 +27,6 @@
>  from VirtLib import utils
>  from XenKvmLib import vsms
>  from XenKvmLib.classes import get_typed_class
> -from XenKvmLib.const import CIM_REV
>  from XenKvmLib.test_doms import undefine_test_domain
>  from CimTest.Globals import logger
>  from CimTest.Globals import do_main
> @@ -45,25 +44,19 @@
>          cs_ref = CIMInstanceName(classname, 
>                                keybindings = 
{'CreationClassName':classname})
> 
> -        if CIM_REV < vsms_status_version:
> -            exp_rc = 2 #IM_RC_FAILED
> -        else:
> -            exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
> -                          'desc'  : 'CIM_ERR_FAILED: Unable to 
> retrieve domain\
> +        exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
> +                      'desc'  : 'CIM_ERR_FAILED: Unable to retrieve 
domain\
>   name.'
> -                        }
> +                    }
> 
>      elif tc == 'nonexistent':
>          cs_ref = CIMInstanceName(classname,keybindings = {
>                                  'Name':'##@@!!cimtest_domain',
>                                  'CreationClassName':classname})
> 
> -        if CIM_REV < vsms_status_version:
> -            exp_rc = 4 #IM_RC_SYS_NOT_FOUND
> -        else:
> -            exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
> -                          'desc' : 'CIM_ERR_FAILED: Failed to find 
domain' 
> -                        }
> +        exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
> +                      'desc' : 'CIM_ERR_FAILED: Failed to find domain' 
> +                    }
> 
>      else:
>          return SKIP
> @@ -71,25 +64,15 @@
>      status = FAIL
>      try:
>          ret = service.DestroySystem(AffectedSystem=cs_ref)
> -        if CIM_REV < vsms_status_version:
> -            if ret[0] == exp_rc:
> -                logger.info('destroy_fail>>%s: Got expected return code 
%s', 
> -                            tc, exp_rc)
> -                return PASS 
> -            else:
> -                logger.error('destroy_fail>>%s: Got rc: %s, but we 
> expect %s',
> -                            tc, ret[0], exp_rc)
> -                return FAIL 
> 
>      except Exception, details:
> -        if CIM_REV >= vsms_status_version:
> -            err_no   = details[0]
> -            err_desc = details[1]
> -            if err_no == exp_value['rc'] and err_desc == 
exp_value['desc']:
> -                logger.error("For Invalid Scenario '%s'", tc)
> -                logger.info('Got expected error no: %s', err_no)
> -                logger.info('Got expected error desc: %s',err_desc)
> -                return PASS
> +        err_no   = details[0]
> +        err_desc = details[1]
> +        if err_no == exp_value['rc'] and err_desc == exp_value['desc']:
> +            logger.error("For Invalid Scenario '%s'", tc)
> +            logger.info('Got expected error no: %s', err_no)
> +            logger.info('Got expected error desc: %s',err_desc)
> +            return PASS
> 
>          logger.error('destroy_fail>> %s: Error executing DestroySystem' 
% tc)
>          logger.error(details)
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
> --- a/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py   Thu 
> Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py   Tue 
> Jun 10 11:04:31 2008 -0700
> @@ -55,7 +55,6 @@
>  from XenKvmLib.rasd import InstId_err
>  from CimTest.Globals import logger, do_main
>  from CimTest.ReturnCodes import PASS, FAIL
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
> 
> @@ -63,7 +62,6 @@
>  test_vcpus  = 1
>  test_mem    = 128
>  test_mac    = "00:11:22:33:44:aa"
> -rev = 531
> 
>  def check_rasd_values(id, exp_id):
>      try:
> @@ -90,8 +88,6 @@
>                   "disk_rasd" : '%s/%s' %(test_dom, test_disk),
>                   "mem_rasd"  : '%s/%s' %(test_dom, "mem")
>                  }
> -    if CIM_REV < rev:
> -        rasd_list['proc_rasd'] = '%s/%s' %(test_dom, "0")
> 
>      try: 
>          if len(assoc_info) <= 0: 
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py
> --- a/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py 
> Thu Jun 12 17:13:23 2008 +0800
> +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py 
> Tue Jun 10 11:04:31 2008 -0700
> @@ -62,14 +62,12 @@
>  from CimTest.ReturnCodes import PASS, FAIL
>  from CimTest.Globals import do_main, logger
>  from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
> -from XenKvmLib.const import CIM_REV
> 
>  sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
> 
>  test_dom     = "domu1"
>  test_mac     = "00:11:22:33:44:aa"
>  test_vcpus   = 1
> -rev = 417
> 
>  expr_values = {
>      "INVALID_InstID_Keyname"   : { 'rc'   : pywbem.CIM_ERR_FAILED, \
> @@ -77,10 +75,6 @@
>      "INVALID_InstID_Keyval"    : { 'rc'   : pywbem.CIM_ERR_NOT_FOUND, \
>                       'desc' : 'No such instance 
(INVALID_InstID_Keyval)'}
>  }
> -
> -if CIM_REV < rev:
> -    expr_values['INVALID_InstID_Keyval'] = {'rc' : 
pywbem.CIM_ERR_FAILED, \
> -                                            'desc' : 'Invalid 
InstanceID'}
> 
>  def try_invalid_assoc(classname, name_val, i, field, virt="Xen"):
>      ac_classname = get_typed_class(virt, 
"VirtualSystemSettingDataComponent")
> diff -r 6652ca49942c -r e1f221334033 suites/libvirt-
> cim/lib/XenKvmLib/common_util.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py   Thu Jun 12 
> 17:13:23 2008 +0800
> +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py   Tue Jun 10 
> 11:04:31 2008 -0700
> @@ -33,17 +33,11 @@
>  from XenKvmLib.classes import get_typed_class
>  from CimTest.Globals import logger, log_param, CIM_ERROR_ENUMERATE
>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
> -from XenKvmLib.const import CIM_REV
>  from VirtLib.live import diskpool_list, virsh_version, net_list
>  from XenKvmLib.vxml import PoolXML, NetXML
> 
>  test_dpath = "foo"
> -diskpoolconf_rev = 558
> -
> -if CIM_REV < diskpoolconf_rev:
> -    disk_file = '/tmp/diskpool.conf'
> -else:
> -    disk_file = '/etc/libvirt/diskpool.conf'
> +disk_file = '/etc/libvirt/diskpool.conf'
> 
>  back_disk_file = disk_file + "." + "backup"
> 
> @@ -276,11 +270,10 @@
>      status = PASS
>      libvirt_version = virsh_version(server, virt)
>      # The conf file is not present on  the machine if 
> -    # libvirt_version >= 0.4.1 and CIM_REV > 558
> +    # libvirt_version >= 0.4.1
>      # Hence Skipping the logic to delete the new conf file
>      # and just returning PASS
> -    if libvirt_version >= '0.4.1' and \
> -       CIM_REV > diskpoolconf_rev:
> +    if libvirt_version >= '0.4.1':
>          return status
>      try:
>          if os.path.exists(back_disk_file):
> @@ -328,8 +321,7 @@
> 
>  def create_diskpool_conf(server, virt):
>      libvirt_version = virsh_version(server, virt)
> -    if libvirt_version >= '0.4.1' and \
> -       CIM_REV > diskpoolconf_rev:
> +    if libvirt_version >= '0.4.1':
>          status, dpoolname = create_diskpool(server, virt=virt)
>          diskid = "%s/%s" % ("DiskPool", dpoolname)
>      else:
> diff -r 6652ca49942c -r e1f221334033 
suites/libvirt-cim/lib/XenKvmLib/rasd.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py   Thu Jun 12 17:13:232008 
+0800
> +++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py   Tue Jun 10 11:04:312008 
-0700
> @@ -23,7 +23,6 @@
>  import sys
>  from CimTest.Globals import log_param, logger
>  from CimTest.ReturnCodes import FAIL, PASS
> -from XenKvmLib.const import CIM_REV
>  from XenKvmLib import vxml
>  from XenKvmLib.classes import get_typed_class
> 
> @@ -36,10 +35,6 @@
>  memcn  =  'Memory'
>  netcn  =  'NetworkPort'
>  diskcn =  'LogicalDisk'
> -
> -
> -mem_units_rev = 529
> -proc_instid_rev = 590
> 
>  def rasd_init_list(vsxml, virt, t_disk, t_dom, t_mac, t_mem):
>      """
> @@ -60,20 +55,9 @@
> 
>          disk_path = vsxml.xml_get_disk_source()
> 
> -        if CIM_REV < mem_units_rev:
> -          alloc_units  = "MegaBytes"
> -        else:
> -          alloc_units  = "KiloBytes"
> -
> -        if CIM_REV < proc_instid_rev:
> -           proc_id = '%s/%s' %(t_dom, 0)
> -        else:
> -           proc_id = '%s/%s' %(t_dom, "proc")
> - 
> -
>          rasd_values = { 
>                          proc_cn  : {
> -                                     "InstanceID"   : proc_id,
> +                                     "InstanceID"   : '%s/%s' %
> (t_dom, "proc"),
>                                       "ResourceType" : 3,
>                                      }, 
>                          disk_cn  : {
> @@ -90,7 +74,7 @@
>                          mem_cn   : {
>                                      "InstanceID" : '%s/%s' %(t_dom, 
"mem"), 
>                                      "ResourceType"    : 4, 
> -                                    "AllocationUnits" : alloc_units,
> +                                    "AllocationUnits" : "KiloBytes",
>                                      "VirtualQuantity" : (t_mem * 1024),
>                                    }
>                        } 
> 
 Thanks!
 +1 from me.
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080617/6d1dd6b1/attachment.htm>

From yunguol at cn.ibm.com  Tue Jun 17 07:57:50 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Tue, 17 Jun 2008 15:57:50 +0800
Subject: [Libvirt-cim] discussion on class list for LXC support
Message-ID: <OF2BBEA0CC.37C597AE-ON4825746B.002989E1-4825746B.002C0B7F@cn.ibm.com>

Kaitlin,

I'm not sure whether below test case have to update for LXC support.

1) Domain state change  -- Container guest doesn't make state change, 
right? 

ComputerSystem - 06_paused_active_suspend.py: SKIP
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: SKIP
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: SKIP
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
HostedDependency - 03_enabledstate.py: SKIP

2) Device support now  -- Container guest can only support memory now? 

LogicalDisk - 01_disk.py: SKIP
LogicalDisk - 02_nodevs.py: SKIP
LogicalDisk - 03_ld_gi_errs.py: SKIP

NetworkPort - 01_netport.py: SKIP
NetworkPort - 02_np_gi_errors.py: SKIP
NetworkPort - 03_user_netport.py: SKIP

Processor - 01_processor.py: SKIP
Processor - 02_definesys_get_procs.py: SKIP
Processor - 03_proc_gi_errs.py: SKIP

3) ResourcePool operation 

ResourcePoolConfigurationService - 03_CreateResourcePool.py: SKIP
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: 
SKIP
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP

4) VirtualSystemMigrationService

VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP


If all of the list tc can be skip, we can say that nearly all of test case 
support LXC now. On the next,
I will focus on cimtest running on F9 and try to fix bugs. Kaitlin - any 
suggestion on the next work besides 
cimtest running? And what's your plan on the next month?

Thanks!

Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080617/8267e08c/attachment.htm>

From danms at us.ibm.com  Tue Jun 17 14:08:58 2008
From: danms at us.ibm.com (Dan Smith)
Date: Tue, 17 Jun 2008 07:08:58 -0700
Subject: [Libvirt-cim] discussion on class list for LXC support
In-Reply-To: <OF2BBEA0CC.37C597AE-ON4825746B.002989E1-4825746B.002C0B7F@cn.ibm.com>
	(Guo Lian Yun's message of "Tue, 17 Jun 2008 15:57:50 +0800")
References: <OF2BBEA0CC.37C597AE-ON4825746B.002989E1-4825746B.002C0B7F@cn.ibm.com>
Message-ID: <87fxrci26d.fsf@caffeine.beaverton.ibm.com>

GY> 1) Domain state change -- Container guest doesn't make state
GY> change, right?

Do you mean you're not able to call RequestStateChange() on an LXC
domain?  You should be able to, but if it's not working, I'll take a
look at it.

GY> 2) Device support now -- Container guest can only support memory
GY> now?

Correct.

GY> 3) ResourcePool operation

GY>  ? ResourcePoolConfigurationService - 03_CreateResourcePool.py: SKIP
GY>  ? ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
GY>  ? ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
GY>  ? ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py:
GY>     SKIP
GY>  ? ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP

These should SKIP on all domain types, right?

GY> 4) VirtualSystemMigrationService

GY>  ? VirtualSystemMigrationService - 01_migratable_host.py: SKIP
GY>  ? VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
GY>  ? VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP

This is correct, yes.

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080617/93141fb4/attachment.sig>

From deeptik at linux.vnet.ibm.com  Tue Jun 17 14:20:51 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Tue, 17 Jun 2008 07:20:51 -0700
Subject: [Libvirt-cim] [PATCH 2 of 2] [TEST] Fixed the tc 05_RAPF_err.py
In-Reply-To: <patchbomb.1213712449@elm3b193.beaverton.ibm.com>
Message-ID: <73d199833bce1a21f374.1213712451@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213711825 25200
# Node ID 73d199833bce1a21f374a1c8c95885a749e955cc
# Parent  9700e5130a511e8a5457ba3033eb57d7b0b6a656
[TEST] Fixed the tc 05_RAPF_err.py.

1) Added support for verifying the exception when an invalid network name is passed.
2) Modified get_unique_bridge() to now return non-existing bridgename/networkpoolnmae.
3) Modified the code to occupy 80 columns only.
4) Removed the global declaration of the virt and server and passed them as parameters to fn instead.

This tc passed on KVM with latest sources and libvirt-cim rpm on F9.
This tc fails for Xen/XenFV when an invalid networkpoolname.
The libvirt does not support definining the Xen/XenFV guest with invalid network name.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 9700e5130a51 -r 73d199833bce suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Tue Jun 17 06:59:09 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Tue Jun 17 07:10:25 2008 -0700
@@ -53,48 +53,65 @@
 from CimTest.Globals import logger, CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest.Globals import do_main, platform_sup
-from XenKvmLib.vxml import get_class
+from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class
 
 test_dom   = "RAPF_domain"
 test_mac   = "00:11:22:33:44:aa"
 test_vcpus = 1
 
-def get_unique_bridge():
-    bridge = "invalid-bridge"
-    bridge_list = live.available_bridges(server) 
-    while bridge in bridge_list:
-        bridge = bridge + str(random.randint(1, 100))
+def get_unique_interface(server, virt, nettype='network'):
+    interface = "wrong-int"
+    if nettype == 'bridge':
+        int_list = live.available_bridges(server) 
+    else:
+        int_list = live.net_list(server, virt)
+
+    while interface in int_list:
+        interface = interface + str(random.randint(1, 100))
   
-    return bridge
+    return interface
 
-def setup_env():
+def setup_env(server, virt, nettype='network'):
     vsxml_info = None
     if virt == "Xen":
         test_disk = "xvda"
     else:    
         test_disk = "hda"
 
-    virt_xml =  get_class(virt)
-    vsxml_info = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+    virt_xml =  vxml.get_class(virt)
+    vsxml_info = virt_xml(test_dom, vcpus = test_vcpus, 
+                          mac = test_mac, disk = test_disk)
 
-    bridge = vsxml_info.xml_get_net_bridge()
-    if bridge == None:
-        bridge = vsxml_info.set_vbridge(server)
+    int_name = vsxml_info.xml_get_net_network()
+    if int_name == None:
+        devices = vsxml_info.get_node('/domain/devices')
+        vsxml_info.set_interface_details(devices, test_mac, nettype, virt)
 
-# Get a bridge name that is not used by any of the virtual network pool on the machine. 
-    bridge_name = get_unique_bridge()
+    int_name = get_unique_interface(server, virt, nettype)
+    vsxml_net_type = vsxml_info.xml_get_net_type()
+    if vsxml_net_type == 'bridge':
+        vsxml_info.set_bridge_name(int_name)
+    else:
+        vsxml_info.set_net_name(int_name)
 
-# Assigning the bridge that does not belong to any networkpool.
-    vsxml_info.set_bridge_name(bridge_name)
+    if vsxml_net_type != 'bridge' and nettype == 'bridge':
+        vsxml_info.set_nettype(nettype)
+        in_string  = 'network="%s"' %int_name
+        out_string = 'bridge="%s"' %int_name
+        vsxml_replace = (vsxml_info.xml_string.replace(in_string, out_string))
+        vsxml_info.xml_string = vsxml_replace
+
     ret = vsxml_info.define(server)
     if not ret:
-        Globals.logger.error("Failed to define the dom: %s", test_dom)
+        Globals.logger.error("Failed to define the dom '%s' for '%s' type"
+                             " interface", test_dom, nettype)
         return FAIL, vsxml_info
 
     return PASS, vsxml_info
 
-def get_inst_from_list(vsxml, classname, rasd_list, filter_name, exp_val):
+def get_inst_from_list(server, vsxml, classname, rasd_list, filter_name, 
+                       exp_val):
     status = PASS
     ret = FAIL
     inst = []
@@ -112,14 +129,14 @@
 
     return status, inst
 
-def get_netrasd_instid(vsxml, classname):
+def get_netrasd_instid(server, virt, vsxml, classname):
     rasd_list = []
     status = PASS
     try:
         rasd_list = enumclass.enumerate_inst(server, classname, virt)
         if len(rasd_list) < 1:
-            logger.error("%s returned %i instances, excepted atleast 1 instance", classname,
-                                                                              len(rasd_list))
+            logger.error("%s returned %i instances, excepted atleast 1 "
+                         "instance", classname, len(rasd_list))
             status = FAIL
     except Exception, detail:
         logger.error(CIM_ERROR_ENUMERATE, classname)
@@ -132,21 +149,22 @@
     # Get the RASD info related to the domain "ONLY". 
     # We should get ONLY one record.
     rasd_info = []
-    status, rasd_info = get_inst_from_list(vsxml, classname, rasd_list, "InstanceID", test_dom)
+    status, rasd_info = get_inst_from_list(server, vsxml, classname, 
+                                           rasd_list, "InstanceID", test_dom)
 
     return status, rasd_info
 
-def verify_rapf_err(vsxml):
+def verify_rapf_err(server, virt, vsxml):
     status = PASS
     try:
 
         classname  = get_typed_class(virt, 'NetResourceAllocationSettingData')
-        status, net_rasd_list = get_netrasd_instid(vsxml, classname)
+        status, net_rasd_list = get_netrasd_instid(server, virt, vsxml, classname)
         if status != PASS or len(net_rasd_list) == 0:
             return status 
         if len(net_rasd_list) != 1:
-            logger.error("%s returned %i instances, excepted atleast 1 instance", classname,
-                                                                          len(net_rasd_list))
+            logger.error("%s returned %i instances, excepted atleast 1 "
+                         "instance", classname, len(net_rasd_list))
             return FAIL
 
     
@@ -160,12 +178,14 @@
         keys = { "InstanceID" : instid }
         expr_values = { 
                         'rapf_err' : {
-                                       'desc' : "Unable to determine pool of `%s'" %instid, 
+                                       'desc' : "Unable to determine pool of " \
+                                                 "`%s'" %instid, 
                                          'rc' : pywbem.CIM_ERR_FAILED
                                      }
                       } 
-        status = try_assoc(conn, classname, assoc_classname, keys, field_name="InstanceID", 
-                                            expr_values=expr_values['rapf_err'], bug_no="")
+        status = try_assoc(conn, classname, assoc_classname, keys,
+                           field_name="InstanceID", 
+                           expr_values=expr_values['rapf_err'], bug_no="")
 
     except Exception, detail:
         logger.error("Exception: %s", detail)
@@ -175,21 +195,23 @@
 
 @do_main(platform_sup)
 def main():
-    global virt, server 
     options = main.options
     server = options.ip
     virt = options.virt
     destroy_and_undefine_all(server)
+    in_list = [ 'bridge', 'network' ]
 
-    status, vsxml = setup_env()
-    if status != PASS:
-        logger.error("Failed to setup the domain")
-        return status
+    for interface in in_list:
+        status, vsxml = setup_env(server, virt, interface)
+        if status != PASS:
+            logger.error("Failed to setup the domain")
+            return status
 
-    ret = verify_rapf_err(vsxml)
-    if ret: 
-        logger.error("------FAILED: to verify the RAFP.------")
-        status = ret
+        ret = verify_rapf_err(server, virt, vsxml)
+        if ret: 
+            logger.error("------FAILED: to verify the RAFP.------")
+            vsxml.undefine(server)
+            return ret
 
     vsxml.undefine(server)
     return status



From deeptik at linux.vnet.ibm.com  Tue Jun 17 14:20:49 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Tue, 17 Jun 2008 07:20:49 -0700
Subject: [Libvirt-cim] [PATCH 0 of 2] Fixing 05_RAPF_err.py tc to support
	verification of exception when an invalid network name is passed. 
Message-ID: <patchbomb.1213712449@elm3b193.beaverton.ibm.com>

Fixing 05_RAPF_err.py tc to support verification of exception when an invalid network name is passed.



From deeptik at linux.vnet.ibm.com  Tue Jun 17 14:20:51 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Tue, 17 Jun 2008 07:20:51 -0700
Subject: [Libvirt-cim] [PATCH 2 of 2] [TEST] Fixed the tc 05_RAPF_err.py
In-Reply-To: <patchbomb.1213712449@elm3b193.beaverton.ibm.com>
Message-ID: <73d199833bce1a21f374.1213712451@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213711825 25200
# Node ID 73d199833bce1a21f374a1c8c95885a749e955cc
# Parent  9700e5130a511e8a5457ba3033eb57d7b0b6a656
[TEST] Fixed the tc 05_RAPF_err.py.

1) Added support for verifying the exception when an invalid network name is passed.
2) Modified get_unique_bridge() to now return non-existing bridgename/networkpoolnmae.
3) Modified the code to occupy 80 columns only.
4) Removed the global declaration of the virt and server and passed them as parameters to fn instead.

This tc passed on KVM with latest sources and libvirt-cim rpm on F9.
This tc fails for Xen/XenFV when an invalid networkpoolname.
The libvirt does not support definining the Xen/XenFV guest with invalid network name.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 9700e5130a51 -r 73d199833bce suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Tue Jun 17 06:59:09 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Tue Jun 17 07:10:25 2008 -0700
@@ -53,48 +53,65 @@
 from CimTest.Globals import logger, CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest.Globals import do_main, platform_sup
-from XenKvmLib.vxml import get_class
+from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class
 
 test_dom   = "RAPF_domain"
 test_mac   = "00:11:22:33:44:aa"
 test_vcpus = 1
 
-def get_unique_bridge():
-    bridge = "invalid-bridge"
-    bridge_list = live.available_bridges(server) 
-    while bridge in bridge_list:
-        bridge = bridge + str(random.randint(1, 100))
+def get_unique_interface(server, virt, nettype='network'):
+    interface = "wrong-int"
+    if nettype == 'bridge':
+        int_list = live.available_bridges(server) 
+    else:
+        int_list = live.net_list(server, virt)
+
+    while interface in int_list:
+        interface = interface + str(random.randint(1, 100))
   
-    return bridge
+    return interface
 
-def setup_env():
+def setup_env(server, virt, nettype='network'):
     vsxml_info = None
     if virt == "Xen":
         test_disk = "xvda"
     else:    
         test_disk = "hda"
 
-    virt_xml =  get_class(virt)
-    vsxml_info = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+    virt_xml =  vxml.get_class(virt)
+    vsxml_info = virt_xml(test_dom, vcpus = test_vcpus, 
+                          mac = test_mac, disk = test_disk)
 
-    bridge = vsxml_info.xml_get_net_bridge()
-    if bridge == None:
-        bridge = vsxml_info.set_vbridge(server)
+    int_name = vsxml_info.xml_get_net_network()
+    if int_name == None:
+        devices = vsxml_info.get_node('/domain/devices')
+        vsxml_info.set_interface_details(devices, test_mac, nettype, virt)
 
-# Get a bridge name that is not used by any of the virtual network pool on the machine. 
-    bridge_name = get_unique_bridge()
+    int_name = get_unique_interface(server, virt, nettype)
+    vsxml_net_type = vsxml_info.xml_get_net_type()
+    if vsxml_net_type == 'bridge':
+        vsxml_info.set_bridge_name(int_name)
+    else:
+        vsxml_info.set_net_name(int_name)
 
-# Assigning the bridge that does not belong to any networkpool.
-    vsxml_info.set_bridge_name(bridge_name)
+    if vsxml_net_type != 'bridge' and nettype == 'bridge':
+        vsxml_info.set_nettype(nettype)
+        in_string  = 'network="%s"' %int_name
+        out_string = 'bridge="%s"' %int_name
+        vsxml_replace = (vsxml_info.xml_string.replace(in_string, out_string))
+        vsxml_info.xml_string = vsxml_replace
+
     ret = vsxml_info.define(server)
     if not ret:
-        Globals.logger.error("Failed to define the dom: %s", test_dom)
+        Globals.logger.error("Failed to define the dom '%s' for '%s' type"
+                             " interface", test_dom, nettype)
         return FAIL, vsxml_info
 
     return PASS, vsxml_info
 
-def get_inst_from_list(vsxml, classname, rasd_list, filter_name, exp_val):
+def get_inst_from_list(server, vsxml, classname, rasd_list, filter_name, 
+                       exp_val):
     status = PASS
     ret = FAIL
     inst = []
@@ -112,14 +129,14 @@
 
     return status, inst
 
-def get_netrasd_instid(vsxml, classname):
+def get_netrasd_instid(server, virt, vsxml, classname):
     rasd_list = []
     status = PASS
     try:
         rasd_list = enumclass.enumerate_inst(server, classname, virt)
         if len(rasd_list) < 1:
-            logger.error("%s returned %i instances, excepted atleast 1 instance", classname,
-                                                                              len(rasd_list))
+            logger.error("%s returned %i instances, excepted atleast 1 "
+                         "instance", classname, len(rasd_list))
             status = FAIL
     except Exception, detail:
         logger.error(CIM_ERROR_ENUMERATE, classname)
@@ -132,21 +149,22 @@
     # Get the RASD info related to the domain "ONLY". 
     # We should get ONLY one record.
     rasd_info = []
-    status, rasd_info = get_inst_from_list(vsxml, classname, rasd_list, "InstanceID", test_dom)
+    status, rasd_info = get_inst_from_list(server, vsxml, classname, 
+                                           rasd_list, "InstanceID", test_dom)
 
     return status, rasd_info
 
-def verify_rapf_err(vsxml):
+def verify_rapf_err(server, virt, vsxml):
     status = PASS
     try:
 
         classname  = get_typed_class(virt, 'NetResourceAllocationSettingData')
-        status, net_rasd_list = get_netrasd_instid(vsxml, classname)
+        status, net_rasd_list = get_netrasd_instid(server, virt, vsxml, classname)
         if status != PASS or len(net_rasd_list) == 0:
             return status 
         if len(net_rasd_list) != 1:
-            logger.error("%s returned %i instances, excepted atleast 1 instance", classname,
-                                                                          len(net_rasd_list))
+            logger.error("%s returned %i instances, excepted atleast 1 "
+                         "instance", classname, len(net_rasd_list))
             return FAIL
 
     
@@ -160,12 +178,14 @@
         keys = { "InstanceID" : instid }
         expr_values = { 
                         'rapf_err' : {
-                                       'desc' : "Unable to determine pool of `%s'" %instid, 
+                                       'desc' : "Unable to determine pool of " \
+                                                 "`%s'" %instid, 
                                          'rc' : pywbem.CIM_ERR_FAILED
                                      }
                       } 
-        status = try_assoc(conn, classname, assoc_classname, keys, field_name="InstanceID", 
-                                            expr_values=expr_values['rapf_err'], bug_no="")
+        status = try_assoc(conn, classname, assoc_classname, keys,
+                           field_name="InstanceID", 
+                           expr_values=expr_values['rapf_err'], bug_no="")
 
     except Exception, detail:
         logger.error("Exception: %s", detail)
@@ -175,21 +195,23 @@
 
 @do_main(platform_sup)
 def main():
-    global virt, server 
     options = main.options
     server = options.ip
     virt = options.virt
     destroy_and_undefine_all(server)
+    in_list = [ 'bridge', 'network' ]
 
-    status, vsxml = setup_env()
-    if status != PASS:
-        logger.error("Failed to setup the domain")
-        return status
+    for interface in in_list:
+        status, vsxml = setup_env(server, virt, interface)
+        if status != PASS:
+            logger.error("Failed to setup the domain")
+            return status
 
-    ret = verify_rapf_err(vsxml)
-    if ret: 
-        logger.error("------FAILED: to verify the RAFP.------")
-        status = ret
+        ret = verify_rapf_err(server, virt, vsxml)
+        if ret: 
+            logger.error("------FAILED: to verify the RAFP.------")
+            vsxml.undefine(server)
+            return ret
 
     vsxml.undefine(server)
     return status



From deeptik at linux.vnet.ibm.com  Tue Jun 17 14:20:50 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Tue, 17 Jun 2008 07:20:50 -0700
Subject: [Libvirt-cim] [PATCH 1 of 2] [TEST] Modifying the vxml.py
In-Reply-To: <patchbomb.1213712449@elm3b193.beaverton.ibm.com>
Message-ID: <9700e5130a511e8a5457.1213712450@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213711149 25200
# Node ID 9700e5130a511e8a5457ba3033eb57d7b0b6a656
# Parent  6652ca49942c0314ec1b2b1da504810325097250
[TEST] Modifying the vxml.py

1) Added xml_get_net_network() to get the network name.
2) Fixed the set_nettype().

These changes are needed to support the 05_RAPF_err.py tc.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 6652ca49942c -r 9700e5130a51 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Thu Jun 12 17:13:23 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Tue Jun 17 06:59:09 2008 -0700
@@ -310,8 +310,12 @@
                             bridge=bridgename)
 
     def set_nettype(self, nettype):
-        self.set_attributes('/domain/devices/interface/type', 
+        self.set_attributes('/domain/devices/interface', 
                             type=nettype)
+
+    def set_net_name(self, netname):
+        self.set_attributes('/domain/devices/interface/source',
+                            network=netname)
 
     def set_diskimg(self, diskimg):
         self.set_attributes('/domain/devices/disk/source', file=diskimg)
@@ -403,6 +407,12 @@
         bridgeStr = self.get_value_xpath(
                 '/domain/devices/interface/source/@bridge')
         return bridgeStr
+
+    def xml_get_net_network(self):
+        networkStr = self.get_value_xpath(
+                '/domain/devices/interface/source/@network')
+        return networkStr
+
  
     def dumpxml(self, ip):
         cmd = 'virsh -c %s dumpxml %s' % (self.vuri, self.dname)



From kaitlin at linux.vnet.ibm.com  Tue Jun 17 16:52:49 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 17 Jun 2008 09:52:49 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update RAFP.01 for LXC support,
	also fix Diskpool and NetworkPool missing
In-Reply-To: <72d19c4c969b8b4239a5.1213685801@localhost.localdomain>
References: <72d19c4c969b8b4239a5.1213685801@localhost.localdomain>
Message-ID: <4857EBE1.8000706@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213685796 -28800
> # Node ID 72d19c4c969b8b4239a5cdf2107fa279782f9d96
> # Parent  6652ca49942c0314ec1b2b1da504810325097250
> [TEST] Update RAFP.01 for LXC support, also fix Diskpool and NetworkPool missing
> 
> Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> 
> diff -r 6652ca49942c -r 72d19c4c969b suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py

This fails for me on KVM, Xen, and XenFV:

ResourceAllocationFromPool - 01_forward.py: FAIL
ERROR   - Exception in get_rasdinst_verify_pool_from_RAFP() fn
ERROR   - Exception Details 'list' object has no attribute 'InstanceID'
CIM_ERR_NOT_FOUND: No such instance (RAFP_domain/00:11:22:33:44:55)

Does this also fail for you?

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun 17 17:51:18 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 17 Jun 2008 10:51:18 -0700
Subject: [Libvirt-cim] [PATCH 2 of 2] [TEST] Fixed the tc 05_RAPF_err.py
In-Reply-To: <73d199833bce1a21f374.1213712451@elm3b193.beaverton.ibm.com>
References: <73d199833bce1a21f374.1213712451@elm3b193.beaverton.ibm.com>
Message-ID: <4857F996.40103@linux.vnet.ibm.com>

Deepti B. Kalakeri wrote:
> # HG changeset patch
> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> # Date 1213711825 25200
> # Node ID 73d199833bce1a21f374a1c8c95885a749e955cc
> # Parent  9700e5130a511e8a5457ba3033eb57d7b0b6a656
> [TEST] Fixed the tc 05_RAPF_err.py.
> 
> 1) Added support for verifying the exception when an invalid network name is passed.
> 2) Modified get_unique_bridge() to now return non-existing bridgename/networkpoolnmae.
> 3) Modified the code to occupy 80 columns only.
> 4) Removed the global declaration of the virt and server and passed them as parameters to fn instead.
> 
> This tc passed on KVM with latest sources and libvirt-cim rpm on F9.
> This tc fails for Xen/XenFV when an invalid networkpoolname.
> The libvirt does not support definining the Xen/XenFV guest with invalid network name.

This test is creating invalid guests - you won't be able to start the 
KVM guest, even though the define succeeds.  It's good to have a test to 
make sure we handle broken guests properly.

Since this isn't supported for Xen/XenFV - this test should skip instead 
of failine.

It'd also be good to have a test where we create a valid guest with a 
network device that isn't part of a pool.  For Xen/XenFV guests, this 
can be done using an ethernet interface.  It should be possible to do 
something similar with KVM and the user interface type, but I've not 
tried this.  I'll add this test case idea to the wiki to keep track of it.

> 
> Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> 
> diff -r 9700e5130a51 -r 73d199833bce suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py

       vsxml_info.set_net_name(int_name)
> 
> -# Assigning the bridge that does not belong to any networkpool.
> -    vsxml_info.set_bridge_name(bridge_name)
> +    if vsxml_net_type != 'bridge' and nettype == 'bridge':
> +        vsxml_info.set_nettype(nettype)
> +        in_string  = 'network="%s"' %int_name
> +        out_string = 'bridge="%s"' %int_name
> +        vsxml_replace = (vsxml_info.xml_string.replace(in_string, out_string))
> +        vsxml_info.xml_string = vsxml_replace

Instead of hacking the xml_string directly, could something like 
set_interface_details() be modified to change the existing interface?

Or maybe a new function for this?

Another option would be to allow the KVMXML (etc) init call to take a 
network type.  That way, you could create an XML of whatever interface 
type you'd like (instead of modifying it afterwards).

> 
>  @do_main(platform_sup)
>  def main():
> -    global virt, server 
>      options = main.options
>      server = options.ip
>      virt = options.virt
>      destroy_and_undefine_all(server)
> +    in_list = [ 'bridge', 'network' ]
> 
> -    status, vsxml = setup_env()
> -    if status != PASS:
> -        logger.error("Failed to setup the domain")
> -        return status
> +    for interface in in_list:
> +        status, vsxml = setup_env(server, virt, interface)
> +        if status != PASS:

You'll need to undefine the guest here.  Even though virsh is returning 
an error, the guest is being defined.

> +            logger.error("Failed to setup the domain")
> +            return status

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Tue Jun 17 18:23:29 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 17 Jun 2008 11:23:29 -0700
Subject: [Libvirt-cim] discussion on class list for LXC support
In-Reply-To: <87fxrci26d.fsf@caffeine.beaverton.ibm.com>
References: <OF2BBEA0CC.37C597AE-ON4825746B.002989E1-4825746B.002C0B7F@cn.ibm.com>
	<87fxrci26d.fsf@caffeine.beaverton.ibm.com>
Message-ID: <48580121.2080308@linux.vnet.ibm.com>

> 
> GY> 3) ResourcePool operation
> 
> GY>  ? ResourcePoolConfigurationService - 03_CreateResourcePool.py: SKIP
> GY>  ? ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
> GY>  ? ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
> GY>  ? ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py:
> GY>     SKIP
> GY>  ? ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP
> 
> These should SKIP on all domain types, right?

All these tests do at the moment is make sure the method call returns 
CIM_ERR_NOT_SUPPORTED.  So it should be possible to have these support 
LXC.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Wed Jun 18 05:45:50 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 18 Jun 2008 13:45:50 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update ComputerSystem.27 for LXC
	support
Message-ID: <c1e319d82a734102c88c.1213767950@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213767944 -28800
# Node ID c1e319d82a734102c88c75fd25b2640760b3f795
# Parent  f4a167c62403c8aaaac5127d0c984c74ea863344
[TEST] Update ComputerSystem.27 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r f4a167c62403 -r c1e319d82a73 suites/libvirt-cim/cimtest/ComputerSystem/27_define_suspend_errs.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/27_define_suspend_errs.py	Tue Jun 17 13:20:47 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/27_define_suspend_errs.py	Wed Jun 18 13:45:44 2008 +0800
@@ -45,7 +45,7 @@
 from XenKvmLib.common_util import get_cs_instance
 from XenKvmLib.common_util import create_using_definesystem
 
-sup_types = ['Xen', 'XenFV']
+sup_types = ['Xen', 'XenFV', 'LXC']
 
 SUSPEND_STATE = 9 
 default_dom   = 'test_domain'



From yunguol at cn.ibm.com  Wed Jun 18 05:59:44 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Wed, 18 Jun 2008 13:59:44 +0800
Subject: [Libvirt-cim] discussion on class list for LXC support
In-Reply-To: <87fxrci26d.fsf@caffeine.beaverton.ibm.com>
Message-ID: <OF8884D660.8E84CF62-ON4825746C.00204931-4825746C.0020F129@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-17 22:08:58:

> GY> 1) Domain state change -- Container guest doesn't make state
> GY> change, right?
> 
> Do you mean you're not able to call RequestStateChange() on an LXC
> domain?  You should be able to, but if it's not working, I'll take a
> look at it.
> 
  The RequestStateChange() doesn't work for me on LXC domain now,
  for an example, if I update ComputerSystem.06_paused_active_suspend.py
  for LXC support, the tc will report error below:

  Test with SFCB:
  InvokeMethod(RequestStateChange): Domain Operation Failed 

  Test with Pegasus:
  ERROR   - Exception: (1, u'CIM_ERR_FAILED: Domain not running')
  ERROR   - Unable to suspend dom DomST1 using RequestedStateChange()
  InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain not running

  On the other test case, the domain's state can't be changed to expected, 
yet.
 
  Would you please take a look at this?

  Thanks! 

> GY> 2) Device support now -- Container guest can only support memory
> GY> now?
> 
> Correct.
> 
> GY> 3) ResourcePool operation
> 
> GY>  ? ResourcePoolConfigurationService - 03_CreateResourcePool.py: 
SKIP
> GY>  ? ResourcePoolConfigurationService - 
04_CreateChildResourcePool.py: SKIP
> GY>  ? ResourcePoolConfigurationService - 
> 05_AddResourcesToResourcePool.py: SKIP
> GY>  ? ResourcePoolConfigurationService - 
> 06_RemoveResourcesFromResourcePool.py:
> GY>     SKIP
> GY>  ? ResourcePoolConfigurationService - 07_DeleteResourcePool.py: 
SKIP
> 
> These should SKIP on all domain types, right?
> 
> GY> 4) VirtualSystemMigrationService
> 
> GY>  ? VirtualSystemMigrationService - 01_migratable_host.py: SKIP
> GY>  ? VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
> GY>  ? VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
> 
> This is correct, yes.
> 
> -- 
> Dan Smith
> IBM Linux Technology Center
> Open Hypervisor Team
> email: danms at us.ibm.com
> [attachment "att5igos.dat" deleted by Guo Lian Yun/China/IBM] 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080618/84321961/attachment.htm>

From deeptik at linux.vnet.ibm.com  Wed Jun 18 06:15:03 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Wed, 18 Jun 2008 11:45:03 +0530
Subject: [Libvirt-cim] CimTest Report for KVM on F9 18-06-2008
Message-ID: <4858A7E7.1050608@linux.vnet.ibm.com>

========================================================================
CIM Test Report for KVM  on F9 with latest libvirt-cim  and libcmpiutil
========================================================================
Distro      : Fedora 9 Beta
Kernel      : 2.6.25-0.121.rc5.git4.fc9
Libvirt     : libvirt-0.4.2-1.fc9.x86_64
CIMOM       : pegasus
PyWBEM      : pywbem-0.6
CIM Schema  : cimv216Experimental
LibCMPIutil :  79
LibVirtCIM  : 611
CIMTEST     : 214
=======================================================
PASS        : 101
FAIL        :   8
XFAIL       :   2
SKIP        :  18
-----------------
Total       : 129
=======================================================

List of tc that are failing:

ComputerSystem - 40_RSC_start.py: FAIL
NetworkPort - 03_user_netport.py: FAIL
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL
VSSD - 04_vssd_to_rasd.py: FAIL
VSSD - 03_vssd_gi_errs.py: FAIL
VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL
VirtualSystemManagementService - 06_addresource.py: FAIL
VirtualSystemManagementService - 08_modifyresource.py: FAIL


Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Jun18-KVM-report
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080618/58b58bd8/attachment.ksh>

From deeptik at linux.vnet.ibm.com  Wed Jun 18 06:24:32 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Wed, 18 Jun 2008 11:54:32 +0530
Subject: [Libvirt-cim] Cimtest Report on KVM with the latest rpm 18-06-2008
Message-ID: <4858AA20.3030405@linux.vnet.ibm.com>

==============================================================================
CIM Test Report for KVM  on F9 with latest libvirt-cim  and libcmpiutil 
rpms.
==============================================================================
Distro      : Fedora 9 Beta
Kernel      : 2.6.25-0.121.rc5.git4.fc9
Libvirt     : libvirt-0.4.2-1.fc9.x86_64
CIMOM       : pegasus
PyWBEM      : pywbem-0.6
CIM Schema  : cimv216Experimental
LibCMPIutil : libcmpiutil-0.4-1.fc9.x86_64
LibVirtCIM  : libvirt-cim-0.4-2.fc9.x86_64
CIMTEST     : 212
=======================================================
PASS        : 104
FAIL        :   7
XFAIL       :   2
SKIP        :  16
-----------------
Total       : 129
=======================================================

List of tc that are failing

ComputerSystem - 40_RSC_start.py: FAIL
NetworkPort - 01_netport.py: FAIL
NetworkPort - 03_user_netport.py: FAIL
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL
VSSD - 04_vssd_to_rasd.py: FAIL
VirtualSystemManagementService - 06_addresource.py: FAIL
VirtualSystemManagementService - 08_modifyresource.py: FAIL

Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: kvm-rpm-jun17-report
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080618/af405608/attachment.ksh>

From yunguol at cn.ibm.com  Wed Jun 18 06:25:00 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Wed, 18 Jun 2008 14:25:00 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update RAFP.01 for LXC support,
	also fix Diskpool and NetworkPool missing
In-Reply-To: <4857EBE1.8000706@linux.vnet.ibm.com>
Message-ID: <OFF8B58E93.A6C046D0-ON4825746C.002326FD-4825746C.0023418B@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-18 00:52:49:

> yunguol at cn.ibm.com wrote:
> > # HG changeset patch
> > # User Guolian Yun <yunguol at cn.ibm.com>
> > # Date 1213685796 -28800
> > # Node ID 72d19c4c969b8b4239a5cdf2107fa279782f9d96
> > # Parent  6652ca49942c0314ec1b2b1da504810325097250
> > [TEST] Update RAFP.01 for LXC support, also fix Diskpool and 
> NetworkPool missing
> > 
> > Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>
> > 
> > diff -r 6652ca49942c -r 72d19c4c969b suites/libvirt-
> cim/cimtest/ResourceAllocationFromPool/01_forward.py
> 
> This fails for me on KVM, Xen, and XenFV:
> 
> ResourceAllocationFromPool - 01_forward.py: FAIL
> ERROR   - Exception in get_rasdinst_verify_pool_from_RAFP() fn
> ERROR   - Exception Details 'list' object has no attribute 'InstanceID'
> CIM_ERR_NOT_FOUND: No such instance (RAFP_domain/00:11:22:33:44:55)
> 
> Does this also fail for you?
> 
  It fails for me also, thanks for your catch. I will look into this.

> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080618/c78c58de/attachment.htm>

From yunguol at cn.ibm.com  Wed Jun 18 08:18:45 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 18 Jun 2008 16:18:45 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] 2# Update RAFP.01 for LXC support,
	also add DiskPool and NetworkPool verification
Message-ID: <09f95362435b3fcfc1e3.1213777125@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213777121 -28800
# Node ID 09f95362435b3fcfc1e37445bb3b394a1ec59885
# Parent  f4a167c62403c8aaaac5127d0c984c74ea863344
[TEST] 2# Update RAFP.01 for LXC support, also add DiskPool and NetworkPool verification

2# Test and pass for Xen, KVM and LXC

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r f4a167c62403 -r 09f95362435b suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Tue Jun 17 13:20:47 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Wed Jun 18 16:18:41 2008 +0800
@@ -26,17 +26,64 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
+
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    else:
+        test_disk = "hda"
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
 
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
+
+    status, vsxml, test_disk = setup_env(options.ip, options.virt)
+    if status != PASS:
+        return status
+    
+    status, diskid = create_diskpool_conf(options.ip, options.virt)
+    if status != PASS:
+        return status
+
+    status, test_network = create_netpool_conf(options.ip, options.virt)
+    if status != PASS:
+        return status
 
     try:
         key_list = { 'InstanceID' : "MemoryPool/0" }
@@ -57,6 +104,27 @@
     except Exception:
         logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
         return FAIL
+
+    try:
+        key_list = { 'InstanceID' : diskid}
+        diskpool = enumclass.getInstance(options.ip,
+                                         "DiskPool",
+                                         key_list,
+                                         options.virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE % "DiskPool")
+        return FAIL
+
+    try:
+        key_list = { 'InstanceID' : "NetworkPool/%s" % test_network }
+        netpool = enumclass.getInstance(options.ip,
+                                        "NetworkPool",
+                                        key_list,
+                                        options.virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE % "NetworkPool")
+        return FAIL
+
      
     try:
         memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
@@ -86,6 +154,35 @@
 	    logger.error("ERROR: Association result error")
             status = FAIL
 
+    try:
+        diskdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
+                                         "DiskPool",
+                                         options.virt,
+                                         InstanceID = diskpool.InstanceID)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % diskpool.InstanceID)
+        status = FAIL
+
+    for i in range(len(diskdata)):
+        if diskdata[i].classname != get_typed_class(options.virt, "DiskResourceAllocationSettingData"):
+            logger.error("ERROR: Association result error")
+            status = FAIL
+
+    try:
+        netdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
+                                        "NetworkPool",
+                                        options.virt,
+                                        InstanceID = netpool.InstanceID)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % netpool.InstanceID)
+        status = FAIL
+
+    for i in range(len(netdata)):
+        if netdata[i].classname != get_typed_class(options.virt, "NetResourceAllocationSettingData"):
+            logger.error("ERROR: Association result error")
+            status = FAIL
+
+
     return status 
         
         



From deeptik at linux.vnet.ibm.com  Wed Jun 18 09:45:05 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 18 Jun 2008 02:45:05 -0700
Subject: [Libvirt-cim] [PATCH 2 of 2] [TEST] #2 Fixed the tc 05_RAPF_err.py
In-Reply-To: <patchbomb.1213782303@elm3b193.beaverton.ibm.com>
Message-ID: <bc724a2306e727f9bcab.1213782305@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213781722 25200
# Node ID bc724a2306e727f9bcabb1ee94d70d2ef551889b
# Parent  a4c2aedfe2c9d6a18e069542c17df1b0576ba933
[TEST] #2 Fixed the tc 05_RAPF_err.py.

Changes:
-------
>From patch 1 to 2:
------------------
1) Removed the use of xml_string.replace used to modify the network info.
2) Modified the tc to use the XML support to pass the nettype info.
3) Moved the code used for newtork information to the modify_net_name() function.
4) Included the missing undefine statement.
5) Removed the support for Xen/XenFV for verification of exception when the network type interface
   is passed. This is bcs virsh does not support the creation of a guest with invalid networkpool.

Patch:
------
1) Added support for verifying the exception when an invalid network name is passed.
2) Modified get_unique_bridge() to now return non-existing bridgename/networkpoolnmae.
3) Modified the code to occupy 80 columns only.
4) Removed the global declaration of the virt and server and passed them as parameters to fn instead.

This tc passed on KVM with latest sources and libvirt-cim rpm on F9.
This tc fails for Xen/XenFV when an invalid networkpoolname.
The libvirt does not support definining the Xen/XenFV guest with invalid network name.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r a4c2aedfe2c9 -r bc724a2306e7 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Wed Jun 18 02:10:13 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Wed Jun 18 02:35:22 2008 -0700
@@ -53,48 +53,68 @@
 from CimTest.Globals import logger, CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest.Globals import do_main, platform_sup
-from XenKvmLib.vxml import get_class
+from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class
 
 test_dom   = "RAPF_domain"
 test_mac   = "00:11:22:33:44:aa"
 test_vcpus = 1
 
-def get_unique_bridge():
-    bridge = "invalid-bridge"
-    bridge_list = live.available_bridges(server) 
-    while bridge in bridge_list:
-        bridge = bridge + str(random.randint(1, 100))
+def get_unique_interface(server, virt, nettype='network'):
+    interface = "wrong-int"
+    if nettype == 'bridge':
+        int_list = live.available_bridges(server) 
+    else:
+        int_list = live.net_list(server, virt)
+
+    while interface in int_list:
+        interface = interface + str(random.randint(1, 100))
   
-    return bridge
+    return interface
 
-def setup_env():
+def modify_net_name(server, virt, nettype, vsxml):
+    if nettype == 'bridge':
+        int_name = vsxml.xml_get_net_bridge()
+    else:
+        int_name = vsxml.xml_get_net_network()
+
+    if int_name == None:
+        devices = vsxml.get_node('/domain/devices')
+        vsxml.set_interface_details(devices, test_mac, nettype, virt)
+
+    int_name = get_unique_interface(server, virt, nettype)
+
+    if nettype == 'bridge':
+        vsxml.set_bridge_name(int_name)
+    else:
+        vsxml.set_net_name(int_name)
+
+    return vsxml
+
+def setup_env(server, virt, nettype='network'):
     vsxml_info = None
     if virt == "Xen":
         test_disk = "xvda"
     else:    
         test_disk = "hda"
 
-    virt_xml =  get_class(virt)
-    vsxml_info = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+    virt_xml =  vxml.get_class(virt)
+    vsxml_info = virt_xml(test_dom, vcpus = test_vcpus, 
+                          mac = test_mac, disk = test_disk, 
+                          ntype = nettype)
 
-    bridge = vsxml_info.xml_get_net_bridge()
-    if bridge == None:
-        bridge = vsxml_info.set_vbridge(server)
+    vsxml_info = modify_net_name(server, virt, nettype, vsxml_info)
 
-# Get a bridge name that is not used by any of the virtual network pool on the machine. 
-    bridge_name = get_unique_bridge()
-
-# Assigning the bridge that does not belong to any networkpool.
-    vsxml_info.set_bridge_name(bridge_name)
     ret = vsxml_info.define(server)
     if not ret:
-        Globals.logger.error("Failed to define the dom: %s", test_dom)
+        Globals.logger.error("Failed to define the dom '%s' for '%s' type"
+                             " interface", test_dom, nettype)
         return FAIL, vsxml_info
 
     return PASS, vsxml_info
 
-def get_inst_from_list(vsxml, classname, rasd_list, filter_name, exp_val):
+def get_inst_from_list(server, vsxml, classname, rasd_list, filter_name, 
+                       exp_val):
     status = PASS
     ret = FAIL
     inst = []
@@ -112,14 +132,14 @@
 
     return status, inst
 
-def get_netrasd_instid(vsxml, classname):
+def get_netrasd_instid(server, virt, vsxml, classname):
     rasd_list = []
     status = PASS
     try:
         rasd_list = enumclass.enumerate_inst(server, classname, virt)
         if len(rasd_list) < 1:
-            logger.error("%s returned %i instances, excepted atleast 1 instance", classname,
-                                                                              len(rasd_list))
+            logger.error("%s returned %i instances, excepted atleast 1 "
+                         "instance", classname, len(rasd_list))
             status = FAIL
     except Exception, detail:
         logger.error(CIM_ERROR_ENUMERATE, classname)
@@ -132,21 +152,22 @@
     # Get the RASD info related to the domain "ONLY". 
     # We should get ONLY one record.
     rasd_info = []
-    status, rasd_info = get_inst_from_list(vsxml, classname, rasd_list, "InstanceID", test_dom)
+    status, rasd_info = get_inst_from_list(server, vsxml, classname, 
+                                           rasd_list, "InstanceID", test_dom)
 
     return status, rasd_info
 
-def verify_rapf_err(vsxml):
+def verify_rapf_err(server, virt, vsxml):
     status = PASS
     try:
 
         classname  = get_typed_class(virt, 'NetResourceAllocationSettingData')
-        status, net_rasd_list = get_netrasd_instid(vsxml, classname)
+        status, net_rasd_list = get_netrasd_instid(server, virt, vsxml, classname)
         if status != PASS or len(net_rasd_list) == 0:
             return status 
         if len(net_rasd_list) != 1:
-            logger.error("%s returned %i instances, excepted atleast 1 instance", classname,
-                                                                          len(net_rasd_list))
+            logger.error("%s returned %i instances, excepted atleast 1 "
+                         "instance", classname, len(net_rasd_list))
             return FAIL
 
     
@@ -160,12 +181,14 @@
         keys = { "InstanceID" : instid }
         expr_values = { 
                         'rapf_err' : {
-                                       'desc' : "Unable to determine pool of `%s'" %instid, 
+                                       'desc' : "Unable to determine pool of " \
+                                                 "`%s'" %instid, 
                                          'rc' : pywbem.CIM_ERR_FAILED
                                      }
                       } 
-        status = try_assoc(conn, classname, assoc_classname, keys, field_name="InstanceID", 
-                                            expr_values=expr_values['rapf_err'], bug_no="")
+        status = try_assoc(conn, classname, assoc_classname, keys,
+                           field_name="InstanceID", 
+                           expr_values=expr_values['rapf_err'], bug_no="")
 
     except Exception, detail:
         logger.error("Exception: %s", detail)
@@ -175,21 +198,29 @@
 
 @do_main(platform_sup)
 def main():
-    global virt, server 
     options = main.options
     server = options.ip
     virt = options.virt
     destroy_and_undefine_all(server)
+    in_list = [ 'bridge', 'network' ]
 
-    status, vsxml = setup_env()
-    if status != PASS:
-        logger.error("Failed to setup the domain")
-        return status
+    for interface in in_list:
+        # This is req bcs virsh does not support the defining a guest 
+        # when an invalid network poolname is passed.
+        if interface == 'network' and virt != 'KVM':
+            continue
 
-    ret = verify_rapf_err(vsxml)
-    if ret: 
-        logger.error("------FAILED: to verify the RAFP.------")
-        status = ret
+        status, vsxml = setup_env(server, virt, interface)
+        if status != PASS:
+            logger.error("Failed to setup the domain")
+            vsxml.undefine(server)
+            return status
+
+        ret = verify_rapf_err(server, virt, vsxml)
+        if ret: 
+            logger.error("------FAILED: to verify the RAFP.------")
+            vsxml.undefine(server)
+            return ret
 
     vsxml.undefine(server)
     return status



From deeptik at linux.vnet.ibm.com  Wed Jun 18 09:45:03 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 18 Jun 2008 02:45:03 -0700
Subject: [Libvirt-cim] [PATCH 0 of 2] #2 Fixing 05_RAPF_err.py tc to support
	verification of exception when an invalid network name is passed.
Message-ID: <patchbomb.1213782303@elm3b193.beaverton.ibm.com>

Fixing 05_RAPF_err.py tc to support verification of exception when an invalid network name is passed.



From deeptik at linux.vnet.ibm.com  Wed Jun 18 09:45:04 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 18 Jun 2008 02:45:04 -0700
Subject: [Libvirt-cim] [PATCH 1 of 2] [TEST] #2 Modifying the vxml.py
In-Reply-To: <patchbomb.1213782303@elm3b193.beaverton.ibm.com>
Message-ID: <a4c2aedfe2c9d6a18e06.1213782304@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213780213 25200
# Node ID a4c2aedfe2c9d6a18e069542c17df1b0576ba933
# Parent  f4a167c62403c8aaaac5127d0c984c74ea863344
[TEST] #2 Modifying the vxml.py

Changes:
-------
>From patch 1 to 2:
------------------
1) Modified the XenXML, XenFVXML, KVMXML to support passing nettype info.

Patch 1:
--------
1) Added xml_get_net_network() to get the network name.
2) Fixed the set_nettype().

These changes are needed to support the 05_RAPF_err.py tc.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r f4a167c62403 -r a4c2aedfe2c9 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Tue Jun 17 13:20:47 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Wed Jun 18 02:10:13 2008 -0700
@@ -310,8 +310,12 @@
                             bridge=bridgename)
 
     def set_nettype(self, nettype):
-        self.set_attributes('/domain/devices/interface/type', 
+        self.set_attributes('/domain/devices/interface', 
                             type=nettype)
+
+    def set_net_name(self, netname):
+        self.set_attributes('/domain/devices/interface/source',
+                            network=netname)
 
     def set_diskimg(self, diskimg):
         self.set_attributes('/domain/devices/disk/source', file=diskimg)
@@ -403,6 +407,12 @@
         bridgeStr = self.get_value_xpath(
                 '/domain/devices/interface/source/@bridge')
         return bridgeStr
+
+    def xml_get_net_network(self):
+        networkStr = self.get_value_xpath(
+                '/domain/devices/interface/source/@network')
+        return networkStr
+
  
     def dumpxml(self, ip):
         cmd = 'virsh -c %s dumpxml %s' % (self.vuri, self.dname)
@@ -542,7 +552,8 @@
                        vcpus=const.default_vcpus,
                        mac=const.Xen_default_mac,
                        disk_file_path=const.Xen_disk_path,
-                       disk=const.Xen_default_disk_dev): 
+                       disk=const.Xen_default_disk_dev, 
+                       ntype=const.default_net_type): 
         if not (os.path.exists(const.Xen_kernel_path) \
                 and os.path.exists(const.Xen_init_path)):
             logger.error('ERROR: Either the kernel image '
@@ -550,10 +561,10 @@
             sys.exit(1)
         VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus)
         self._os(const.Xen_kernel_path, const.Xen_init_path)
-        self._devices(disk_file_path, disk, const.default_net_type, mac)
+        self._devices(disk_file_path, disk, ntype, mac)
 
         VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path, 
-                         const.default_net_type, mac, vcpus, mem)
+                         ntype, mac, vcpus, mem)
 
     def _os(self, os_kernel, os_initrd):
         os = self.get_node('/domain/os')
@@ -595,13 +606,14 @@
                        vcpus=const.default_vcpus,
                        mac=const.KVM_default_mac,
                        disk_file_path=const.KVM_disk_path,
-                       disk=const.KVM_default_disk_dev):
+                       disk=const.KVM_default_disk_dev, 
+                       ntype=const.default_net_type):
         if not os.path.exists(disk_file_path):
             logger.error('Error: Disk image does not exist')
             sys.exit(1)
         VirtXML.__init__(self, 'kvm', test_dom, set_uuid(), mem, vcpus)
         self._os()
-        self._devices(const.KVM_default_emulator, const.default_net_type,
+        self._devices(const.KVM_default_emulator, ntype,
                       disk_file_path, disk, mac)
 
     def _os(self):
@@ -636,7 +648,8 @@
                        vcpus=const.default_vcpus,
                        mac=const.XenFV_default_mac,
                        disk_file_path=const.XenFV_disk_path,
-                       disk=const.XenFV_default_disk_dev):
+                       disk=const.XenFV_default_disk_dev, 
+                       ntype=const.default_net_type):
         if not os.path.exists(disk_file_path):
             logger.error('Error: Disk image does not exist')
             sys.exit(1)
@@ -644,7 +657,7 @@
         self._features()
         self._os(const.XenFV_default_loader)
         self._devices(const.XenFV_default_emulator,
-                      const.default_net_type, mac, disk_file_path, disk) 
+                      ntype, mac, disk_file_path, disk) 
 
     def _features(self):
         features = self.get_node('/domain/features')



From deeptik at linux.vnet.ibm.com  Wed Jun 18 12:16:49 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 18 Jun 2008 05:16:49 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 03_user_netport.py tc
Message-ID: <f96b00310c76d5bb109f.1213791409@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213791390 25200
# Node ID f96b00310c76d5bb109f1f9842eb547eccc29372
# Parent  f4a167c62403c8aaaac5127d0c984c74ea863344
[TEST] Fixing 03_user_netport.py tc.

1) Changed the return value to XFAIL since the provider does not support guest with user interface type.
2) Fixed the KeyError.

This tc is dependent on the vxml.py changes submitted today.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r f4a167c62403 -r f96b00310c76 suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py	Tue Jun 17 13:20:47 2008 +0800
+++ b/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py	Wed Jun 18 05:16:30 2008 -0700
@@ -32,18 +32,18 @@
 from XenKvmLib.vxml import KVMXML
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
-from CimTest.ReturnCodes import PASS, FAIL
+from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
 sup_types = ['KVM']
 
 test_dom = "test_domain"
 test_mac = "00:11:22:33:44:55"
+bug = '00004'
 
 @do_main(sup_types)
 def main():
     options = main.options
-    const.KVM_default_net_type = 'user'
-    cxml = KVMXML(test_dom, mac = test_mac)
+    cxml = KVMXML(test_dom, mac = test_mac, ntype='user')
     ret = cxml.define(options.ip)
     if not ret:
         logger.error('Unable to define domain %s' % test_dom)
@@ -62,10 +62,10 @@
     except Exception, detail:
         logger.error("Exception: %s" % detail)
         cxml.undefine(options.ip)
-        return FAIL
+        return XFAIL_RC(bug)
 
-    if dev == None:
-        logger.error("Error retrieving instance for devid %s" % devid)
+    if dev.DeviceID == None:
+        logger.error("Error retrieving instance for devid %s" % dev.DeviceID)
         cxml.undefine(options.ip)
         return FAIL
 



From deeptik at linux.vnet.ibm.com  Wed Jun 18 13:00:53 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Wed, 18 Jun 2008 06:00:53 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing the tc 04_vssd_to_rasd.py which
	was failing bcs of rasd.py changes
Message-ID: <9a47268dea2f70cb290f.1213794053@elm3b193.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213794010 25200
# Node ID 9a47268dea2f70cb290f85e24c3bf0d2bada66e5
# Parent  f4a167c62403c8aaaac5127d0c984c74ea863344
[TEST] Fixing the tc 04_vssd_to_rasd.py which was failing bcs of rasd.py changes.


Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r f4a167c62403 -r 9a47268dea2f suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py
--- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Tue Jun 17 13:20:47 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Wed Jun 18 06:00:10 2008 -0700
@@ -51,8 +51,9 @@
 from XenKvmLib import assoc
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
+from XenKvmLib import rasd
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values 
+verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
@@ -84,41 +85,6 @@
         logger.error("Exception : %s", details)
         return FAIL, vsxml_info
     return PASS, vsxml_info
-
-def init_list(virt):
-    """
-        Creating the lists that will be used for comparisons.
-    """
-    procrasd = {
-                 "InstanceID" : '%s/%s' %(test_dom, "proc"),
-                 "ResourceType" : 3,
-                 "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
-                }
-
-    netrasd = {
-                "InstanceID"  : '%s/%s' %(test_dom,test_mac), 
-                "ResourceType" : 10 , 
-                "ntype1": "bridge", 
-                "ntype2": "ethernet", 
-                "CreationClassName": get_typed_class(virt, 'NetResourceAllocationSettingData')
-               }
-
-    address = vsxml.xml_get_disk_source()
-    diskrasd = {
-                "InstanceID"  : '%s/%s' %(test_dom, test_disk), 
-                "ResourceType" : 17, 
-                "Address"      : address, 
-                "CreationClassName": get_typed_class(virt, 'DiskResourceAllocationSettingData')
-               }
-    memrasd = {
-               "InstanceID"  : '%s/%s' %(test_dom, "mem"), 
-               "ResourceType" : 4, 
-               "AllocationUnits" : "KiloBytes",
-               "VirtualQuantity" : (test_mem * 1024), 
-               "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
-              }
-
-    return procrasd, netrasd, diskrasd, memrasd
 
 def get_inst_from_list(classname, vssd_list, filter_name, exp_val):
     status = PASS
@@ -193,7 +159,17 @@
     return status, vssdc_assoc_info
 
 def verify_rasd_values(rasd_values_info):
-    procrasd, netrasd, diskrasd, memrasd = init_list(virt)
+    status, rasd_values_list, in_list = rasd_init_list(vsxml, virt, test_disk,
+                                                       test_dom, test_mac,
+                                                       test_mem)
+    if status != PASS:
+        return status
+
+    procrasd =  rasd_values_list['%s'  %in_list['proc']]
+    netrasd  =  rasd_values_list['%s'  %in_list['net']]
+    diskrasd =  rasd_values_list['%s'  %in_list['disk']]
+    memrasd  =  rasd_values_list['%s'  %in_list['mem']]
+
     try:
         for rasd_instance in rasd_values_info:
             CCName = rasd_instance.classname



From danms at us.ibm.com  Wed Jun 18 13:41:59 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 18 Jun 2008 06:41:59 -0700
Subject: [Libvirt-cim] discussion on class list for LXC support
In-Reply-To: <OF8884D660.8E84CF62-ON4825746C.00204931-4825746C.0020F129@cn.ibm.com>
	(Guo Lian Yun's message of "Wed, 18 Jun 2008 13:59:44 +0800")
References: <OF8884D660.8E84CF62-ON4825746C.00204931-4825746C.0020F129@cn.ibm.com>
Message-ID: <87wskmhnbs.fsf@caffeine.beaverton.ibm.com>

GY>   The RequestStateChange() doesn't work for me on LXC domain now,
GY>   for an example, if I update
GY>   ComputerSystem.06_paused_active_suspend.py for LXC support, the
GY>   tc will report error below:

For which states?  All of them?

GY>   Test with Pegasus:
GY>   ERROR   - Exception: (1, u'CIM_ERR_FAILED: Domain not running')
GY>   ERROR   - Unable to suspend dom DomST1 using RequestedStateChange()
GY>   InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain not running

LXC certainly doesn't support the paused state.  All you should be
able to do is go from disabled to enabled and back to disabled.  Does
this not work for you?  The code path for Xen and LXC should be
identical here.

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080618/7f78f99d/attachment.sig>

From danms at us.ibm.com  Wed Jun 18 16:05:54 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 18 Jun 2008 09:05:54 -0700
Subject: [Libvirt-cim] [PATCH 1 of 6] Add persistent data location to
	configure.ac
In-Reply-To: <patchbomb.1213805153@guaranine.danplanet.com>
Message-ID: <74b34a49b99a5bef18be.1213805154@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1213647742 25200
# Node ID 74b34a49b99a5bef18be26c85e1f2c76c09822ca
# Parent  e3b5268c1b4e18a7b0bfe48d98d1f1017a4498c6
Add persistent data location to configure.ac

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r e3b5268c1b4e -r 74b34a49b99a acinclude.m4
--- a/acinclude.m4	Fri Jun 13 18:39:12 2008 -0700
+++ b/acinclude.m4	Mon Jun 16 13:22:22 2008 -0700
@@ -317,6 +317,17 @@
     ]
 )
 
+#
+# Define info store location.
+#
+AC_DEFUN([DEFINE_INFO_STORE],
+    [
+    AC_DEFINE_UNQUOTED([INFO_STORE], "$1", [Info store location])
+    INFO_STORE=$1
+    AC_SUBST(INFO_STORE)
+    ]
+)
+
 AC_DEFUN([SET_CSET],
 	[
 	if test -d .hg && test -x $(which hg); then
diff -r e3b5268c1b4e -r 74b34a49b99a configure.ac
--- a/configure.ac	Fri Jun 13 18:39:12 2008 -0700
+++ b/configure.ac	Mon Jun 16 13:22:22 2008 -0700
@@ -60,6 +60,13 @@
             [DEFINE_DISK_CONFIG($with_diskconfig)], 
             [DEFINE_DISK_CONFIG(/etc/libvirt/diskpool.conf)]
 )
+
+AC_ARG_WITH([info_store],
+	    [  --with-info-store=PATH  Set information store location (default=/etc/libvirt/cim)],
+	    [DEFINE_INFO_STORE($withval)],
+	    [DEFINE_INFO_STORE(/etc/libvirt/cim)]
+)
+
 AC_ARG_WITH([maxmem], 
             [  --with-maxmem=FOO	  Set max memory (KB) for a guest.], 
             [DEFINE_MAXMEM($with_maxmem)], 



From danms at us.ibm.com  Wed Jun 18 16:05:56 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 18 Jun 2008 09:05:56 -0700
Subject: [Libvirt-cim] [PATCH 3 of 6] Make ProcRASD expose stored scheduler
	parameters
In-Reply-To: <patchbomb.1213805153@guaranine.danplanet.com>
Message-ID: <05ee6d4b3049b86ab74d.1213805156@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1213804869 25200
# Node ID 05ee6d4b3049b86ab74d1b8121716e2440769316
# Parent  491abbe7867c50c66ce0cd3af41f169bf32dc8fb
Make ProcRASD expose stored scheduler parameters

When we're constructing a ProcRASD, open the infostore for the domain
and read out the weight and limit attributes so they can be set
in the RASD appropriately.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 491abbe7867c -r 05ee6d4b3049 src/Virt_RASD.c
--- a/src/Virt_RASD.c	Wed Jun 18 09:00:32 2008 -0700
+++ b/src/Virt_RASD.c	Wed Jun 18 09:01:09 2008 -0700
@@ -33,6 +33,7 @@
 
 #include "misc_util.h"
 #include "cs_util.h"
+#include "infostore.h"
 
 #include "Virt_RASD.h"
 #include "svpc_types.h"
@@ -91,6 +92,54 @@
 {
         /* FIXME: Remove this */
         return NULL;
+}
+
+static CMPIStatus set_proc_rasd_params(const CMPIBroker *broker,
+                                       const CMPIObjectPath *ref,
+                                       const char *domain,
+                                       CMPIInstance *inst)
+{
+        CMPIStatus s = {CMPI_RC_OK, NULL};
+        virConnectPtr conn = NULL;
+        virDomainPtr dom = NULL;
+        struct infostore_ctx *info;
+        uint32_t weight;
+        uint64_t limit;
+
+        conn = connect_by_classname(broker, CLASSNAME(ref), &s);
+        if (conn == NULL)
+                return s;
+
+        dom = virDomainLookupByName(conn, domain);
+        if (dom == NULL) {
+                cu_statusf(broker, &s,
+                           CMPI_RC_ERR_NOT_FOUND,
+                           "Domain `%s' not found while getting info", domain);
+                goto out;
+        }
+
+        info = infostore_open(dom);
+        if (info == NULL) {
+                cu_statusf(broker, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Unable to open domain information store");
+                goto out;
+        }
+
+        weight = (uint32_t)infostore_get_u64(info, "weight");
+        limit = infostore_get_u64(info, "limit");
+
+        CMSetProperty(inst, "Weight",
+                      (CMPIValue *)&weight, CMPI_uint32);
+        CMSetProperty(inst, "Limit",
+                      (CMPIValue *)&limit, CMPI_uint64);
+
+ out:
+        virDomainFree(dom);
+        virConnectClose(conn);
+        infostore_close(info);
+
+        return s;
 }
 
 static CMPIInstance *rasd_from_vdev(const CMPIBroker *broker,
@@ -174,6 +223,7 @@
         } else if (dev->type == CIM_RES_TYPE_PROC) {
                 CMSetProperty(inst, "VirtualQuantity",
                               (CMPIValue *)&dev->dev.vcpu.quantity, CMPI_uint64);
+                set_proc_rasd_params(broker, ref, host, inst);
         }
 
         /* FIXME: Put the HostResource in place */



From danms at us.ibm.com  Wed Jun 18 16:05:57 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 18 Jun 2008 09:05:57 -0700
Subject: [Libvirt-cim] [PATCH 4 of 6] Add scheduling information to
	device_parsing structures
In-Reply-To: <patchbomb.1213805153@guaranine.danplanet.com>
Message-ID: <5a98830e047c3b61be88.1213805157@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1213805059 25200
# Node ID 5a98830e047c3b61be88c763325ecb9c9bc70370
# Parent  05ee6d4b3049b86ab74d1b8121716e2440769316
Add scheduling information to device_parsing structures

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 05ee6d4b3049 -r 5a98830e047c libxkutil/device_parsing.h
--- a/libxkutil/device_parsing.h	Wed Jun 18 09:01:09 2008 -0700
+++ b/libxkutil/device_parsing.h	Wed Jun 18 09:04:19 2008 -0700
@@ -51,6 +51,8 @@
 
 struct vcpu_device {
         uint64_t quantity;
+        uint32_t weight;
+        uint64_t limit;
 };
 
 struct emu_device {



From danms at us.ibm.com  Wed Jun 18 16:05:53 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 18 Jun 2008 09:05:53 -0700
Subject: [Libvirt-cim] [PATCH 0 of 6] Add scheduling parameter persistence
Message-ID: <patchbomb.1213805153@guaranine.danplanet.com>

Since libvirt does not persist tuning parameters like those needed to control
the scheduler, this set introduces an additional persistence layer.  It also
makes DefineSystem() and ModifyResources() save that information and makes
ComputerSystem set the parameters on domain startup.

Comments welcome.



From danms at us.ibm.com  Wed Jun 18 16:05:55 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 18 Jun 2008 09:05:55 -0700
Subject: [Libvirt-cim] [PATCH 2 of 6] Add domain information store utilities
In-Reply-To: <patchbomb.1213805153@guaranine.danplanet.com>
Message-ID: <491abbe7867c50c66ce0.1213805155@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1213804832 25200
# Node ID 491abbe7867c50c66ce0cd3af41f169bf32dc8fb
# Parent  74b34a49b99a5bef18be26c85e1f2c76c09822ca
Add domain information store utilities

This sets up a very simple XML file in /etc/libvirt/cim that can store
some key=value attributes for a domain.

The included test is a very simple example and exercise of the code, and
should probably be improved a bit before moving on.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 74b34a49b99a -r 491abbe7867c libxkutil/Makefile.am
--- a/libxkutil/Makefile.am	Mon Jun 16 13:22:22 2008 -0700
+++ b/libxkutil/Makefile.am	Wed Jun 18 09:00:32 2008 -0700
@@ -4,14 +4,14 @@
 
 CFLAGS += $(CFLAGS_STRICT)
 
-noinst_HEADERS = cs_util.h misc_util.h device_parsing.h xmlgen.h
+noinst_HEADERS = cs_util.h misc_util.h device_parsing.h xmlgen.h infostore.h
 
 lib_LTLIBRARIES = libxkutil.la
 
 AM_LDFLAGS = -lvirt -luuid
 
 libxkutil_la_SOURCES = cs_util_instance.c misc_util.c device_parsing.c \
-                       xmlgen.c
+                       xmlgen.c infostore.c
 
 noinst_PROGRAMS = xml_parse_test
 
diff -r 74b34a49b99a -r 491abbe7867c libxkutil/infostore.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libxkutil/infostore.c	Wed Jun 18 09:00:32 2008 -0700
@@ -0,0 +1,372 @@
+/*
+ * Copyright IBM Corp. 2008
+ *
+ * Authors:
+ *  Dan Smith <danms at us.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <sys/file.h>
+
+#include <libvirt/libvirt.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+#include <libxml/xmlsave.h>
+#include <libxml/tree.h>
+
+#include <libcmpiutil/libcmpiutil.h>
+#include <config.h>
+
+#include "infostore.h"
+
+struct infostore_ctx {
+        xmlDocPtr doc;
+        xmlNodePtr root;
+        xmlXPathContextPtr xpathctx;
+        int fd;
+};
+
+static void infostore_cleanup_ctx(struct infostore_ctx *ctx)
+{
+        xmlXPathFreeContext(ctx->xpathctx);
+        xmlFreeDoc(ctx->doc);
+        close(ctx->fd);
+
+        free(ctx);
+}
+
+static char *_make_filename(const char *type, const char *name)
+{
+        int ret;
+        char *path;
+
+        ret = asprintf(&path, "%s/%s_%s",
+                       INFO_STORE,
+                       type,
+                       name);
+        if (ret == -1) {
+                CU_DEBUG("Failed to asprintf() path to info store");
+                path = NULL;
+        }
+
+        return path;
+}
+
+static char *make_filename(virDomainPtr dom)
+{
+        virConnectPtr conn;
+        char *path = NULL;
+
+        conn = virDomainGetConnect(dom);
+        if (conn == NULL) {
+                CU_DEBUG("Domain has no libvirt connection");
+                goto out;
+        }
+
+        path = _make_filename(virConnectGetType(conn),
+                              virDomainGetName(dom));
+
+        CU_DEBUG("Path is %s", path);
+
+ out:
+        return path;
+}
+
+static xmlDocPtr parse_xml(int fd)
+{
+        xmlParserCtxtPtr ctx = NULL;
+        xmlDocPtr doc = NULL;
+
+        ctx = xmlNewParserCtxt();
+        if (ctx == NULL)
+                goto err;
+
+        doc = xmlCtxtReadFd(ctx,
+                            fd,
+                            "foo",
+                            NULL,
+                            XML_PARSE_NOWARNING | XML_PARSE_NONET);
+        if (doc == NULL)
+                goto err;
+
+        return doc;
+ err:
+        xmlFreeDoc(doc);
+        xmlFreeParserCtxt(ctx);
+
+        return NULL;
+}
+
+static xmlDocPtr new_xml(void)
+{
+        xmlDocPtr doc = NULL;
+        xmlNodePtr root = NULL;
+
+        doc = xmlNewDoc(BAD_CAST "1.0");
+        if (doc == NULL) {
+                CU_DEBUG("Failed to create new XML document");
+                goto err;
+        }
+
+        root = xmlNewNode(NULL, BAD_CAST "dominfo");
+        if (root == NULL) {
+                CU_DEBUG("Failed top create new root node");
+                goto err;
+        }
+
+        xmlDocSetRootElement(doc, root);
+
+        return doc;
+ err:
+        xmlFreeDoc(doc);
+
+        return NULL;
+}
+
+static bool save_xml(struct infostore_ctx *ctx)
+{
+        xmlSaveCtxtPtr save = NULL;
+        long size = 0;
+
+        lseek(ctx->fd, 0, SEEK_SET);
+
+        save = xmlSaveToFd(ctx->fd, NULL, 0);
+        if (save == NULL) {
+                CU_DEBUG("Failed to allocate save context");
+                goto out;
+        }
+
+        size = xmlSaveDoc(save, ctx->doc);
+
+        xmlSaveClose(save);
+
+ out:
+        return size >= 0;
+}
+
+struct infostore_ctx *infostore_open(virDomainPtr dom)
+{
+        struct infostore_ctx *isc;
+        struct stat s;
+        char *filename = NULL;
+
+        isc = calloc(1, sizeof(*isc));
+        if (isc == NULL) {
+                CU_DEBUG("Unable to allocate domain_details struct");
+                return NULL;
+        }
+
+        filename = make_filename(dom);
+        if (filename == NULL)
+                goto err;
+
+        isc->fd = open(filename, O_RDWR|O_CREAT, 0600);
+        if (isc->fd < 0) {
+                CU_DEBUG("Unable to open `%s': %m", filename);
+                goto err;
+        }
+
+        if (flock(isc->fd, LOCK_EX) != 0) {
+                CU_DEBUG("Failed to lock infostore");
+                goto err;
+        }
+
+        fstat(isc->fd, &s);
+        if (s.st_size == 0)
+                isc->doc = new_xml();
+        else
+                isc->doc = parse_xml(isc->fd);
+
+        if (isc->doc == NULL) {
+                CU_DEBUG("Failed to parse XML");
+                goto err;
+        }
+
+        isc->root = xmlDocGetRootElement(isc->doc);
+        if (isc->root == NULL) {
+                CU_DEBUG("Failed to parse XML");
+                goto err;
+        }
+
+        if (!xmlStrEqual(isc->root->name, BAD_CAST "dominfo")) {
+                CU_DEBUG("XML does not start with <dominfo>");
+                goto err;
+        }
+
+        isc->xpathctx = xmlXPathNewContext(isc->doc);
+        if (isc->xpathctx == NULL) {
+                CU_DEBUG("Failed to allocate XPath context");
+                goto err;
+        }
+
+        free(filename);
+
+        return isc;
+
+ err:
+        infostore_cleanup_ctx(isc);
+        free(filename);
+
+        return NULL;
+}
+
+void infostore_close(struct infostore_ctx *ctx)
+{
+        if (ctx == NULL)
+                return;
+
+        save_xml(ctx);
+        infostore_cleanup_ctx(ctx);
+}
+
+void infostore_delete(const char *type, const char *name)
+{
+        char *path = NULL;
+
+        path = _make_filename(type, name);
+        if (path == NULL)
+                return;
+
+        unlink(path);
+
+        free(path);
+}
+
+static xmlXPathObjectPtr xpath_query(struct infostore_ctx *ctx, const char *key)
+{
+        char *path = NULL;
+        xmlXPathObjectPtr result = NULL;
+
+        if (asprintf(&path, "/dominfo/%s[1]", key) == -1) {
+                CU_DEBUG("Failed to alloc path string");
+                goto out;
+        }
+
+        result = xmlXPathEval(BAD_CAST path, ctx->xpathctx);
+        if ((result->type != XPATH_NODESET) ||
+            (xmlXPathNodeSetGetLength(result->nodesetval) < 1)) {
+                xmlXPathFreeObject(result);
+                result = NULL;
+        }
+ out:
+        free(path);
+
+        return result;
+}
+
+static char *xpath_query_string(struct infostore_ctx *ctx, const char *key)
+{
+        xmlXPathObjectPtr result;
+        char *val = NULL;
+
+        result = xpath_query(ctx, key);
+        if (result != NULL)
+                val = (char *)xmlXPathCastToString(result);
+
+        xmlXPathFreeObject(result);
+
+        return val;
+}
+
+static bool xpath_set_string(struct infostore_ctx *ctx,
+                             const char *key,
+                             const char *val)
+{
+        xmlXPathObjectPtr result = NULL;
+        xmlNodePtr node = NULL;
+
+        result = xpath_query(ctx, key);
+        if (result == NULL) {
+                CU_DEBUG("Creating new node %s=%s", key, val);
+                node = xmlNewDocNode(ctx->doc, NULL, BAD_CAST key, NULL);
+                xmlAddChild(ctx->root, node);
+        } else {
+                node = result->nodesetval->nodeTab[0];
+        }
+
+        if (node == NULL) {
+                CU_DEBUG("Failed to update node for `%s'", key);
+                goto out;
+        }
+
+        xmlNodeSetContent(node, BAD_CAST val);
+ out:
+        xmlXPathFreeObject(result);
+
+        return node != NULL;
+}
+
+uint64_t infostore_get_u64(struct infostore_ctx *ctx, const char *key)
+{
+        char *sval = NULL;
+        uint64_t val = 0;
+
+        sval = xpath_query_string(ctx, key);
+        if (sval == NULL)
+                goto out;
+
+        if (sscanf((const char *)sval, "%" SCNu64, &val) != 1) {
+                CU_DEBUG("Failed to parse u64 for %s (%s)", key, sval);
+                goto out;
+        }
+ out:
+        free(sval);
+
+        return val;
+}
+
+bool infostore_set_u64(struct infostore_ctx *ctx, const char *key, uint64_t val)
+{
+        char *sval = NULL;
+
+        if (asprintf(&sval, "%" PRIu64, val) == -1) {
+                CU_DEBUG("Failed to format u64 string");
+                sval = NULL;
+                goto out;
+        }
+
+        xpath_set_string(ctx, key, sval);
+ out:
+        free(sval);
+
+        return false;
+}
+
+char *infostore_get_str(struct infostore_ctx *ctx, const char *key)
+{
+        return xpath_query_string(ctx, key);
+}
+
+bool infostore_set_str(struct infostore_ctx *ctx,
+                       const char *key, const char * val)
+{
+        return xpath_set_string(ctx, key, val);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-set-style: "K&R"
+ * tab-width: 8
+ * c-basic-offset: 8
+ * indent-tabs-mode: nil
+ * End:
+ */
diff -r 74b34a49b99a -r 491abbe7867c libxkutil/infostore.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libxkutil/infostore.h	Wed Jun 18 09:00:32 2008 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright IBM Corp. 2008
+ *
+ * Authors:
+ *  Dan Smith <danms at us.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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
+ */
+
+#ifndef __INFOSTORE_H
+#define __INFOSTORE_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <libvirt/libvirt.h>
+
+struct infostore_ctx;
+
+struct infostore_ctx *infostore_open(virDomainPtr dom);
+void infostore_close(struct infostore_ctx *ctx);
+void infostore_delete(const char *type, const char *name);
+
+uint64_t infostore_get_u64(struct infostore_ctx *ctx, const char *key);
+bool infostore_set_u64(struct infostore_ctx *ctx,
+                       const char *key, uint64_t val);
+
+char *infostore_get_str(struct infostore_ctx *ctx, const char *key);
+bool infostore_set_str(struct infostore_ctx *ctx,
+                       const char *key, const char * val);
+
+
+#endif
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-set-style: "K&R"
+ * tab-width: 8
+ * c-basic-offset: 8
+ * indent-tabs-mode: nil
+ * End:
+ */
diff -r 74b34a49b99a -r 491abbe7867c libxkutil/tests/Makefile.am
--- a/libxkutil/tests/Makefile.am	Mon Jun 16 13:22:22 2008 -0700
+++ b/libxkutil/tests/Makefile.am	Wed Jun 18 09:00:32 2008 -0700
@@ -1,10 +1,10 @@
 # Copyright IBM Corp. 2007
-TESTS = xml_tag.test xml_devices.test xmlgen.test xml_dominfo.test
+TESTS = xml_tag.test xml_devices.test xmlgen.test xml_dominfo.test infostore.test
 
 CFLAGS += -g
 
 %.test: %.c
-	$(CC) -o $@ $^ $(CFLAGS) -lvirt `xml2-config --libs`
+	$(CC) -o $@ $^ $(CFLAGS) -lvirt `xml2-config --libs` -L../.libs -lxkutil
 
 clean-local:
 	rm -f *.test
diff -r 74b34a49b99a -r 491abbe7867c libxkutil/tests/infostore.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libxkutil/tests/infostore.c	Wed Jun 18 09:00:32 2008 -0700
@@ -0,0 +1,80 @@
+/*
+ * Copyright IBM Corp. 2008
+ *
+ * Authors:
+ *  Dan Smith <danms at us.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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
+ */
+
+#include <stdio.h>
+#include <inttypes.h>
+
+#include <libvirt/libvirt.h>
+
+#include "../infostore.h"
+
+int main(int argc, char **argv)
+{
+        struct infostore_ctx *ctx = NULL;
+        virConnectPtr conn = NULL;
+        virDomainPtr dom = NULL;
+
+        if (argc != 2) {
+                printf("Usage: %s <domain>\n", argv[0]);
+                return 1;
+        }
+
+        conn = virConnectOpen(NULL);
+        if (conn == NULL) {
+                printf("Unable to open connection\n");
+                goto out;
+        }
+
+        dom = virDomainLookupByName(conn, argv[1]);
+        if (dom == NULL) {
+                printf("Unable to lookup domain `%s'\n", argv[1]);
+                goto out;
+        }
+
+        ctx = infostore_open(dom);
+        if (ctx == NULL) {
+                printf("Unable to open infostore for `%s'\n", argv[1]);
+                goto out;
+        }
+
+        printf("Foo: %" PRIu64 "\n", infostore_get_u64(ctx, "foo"));
+
+        infostore_set_u64(ctx, "foo", 321);
+        infostore_set_u64(ctx, "bar", 987);
+        printf("Should be (null): %s\n", infostore_get_str(ctx, "baz"));
+
+ out:
+        infostore_close(ctx);
+        virDomainFree(dom);
+        virConnectClose(conn);
+
+        return 0;
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-set-style: "K&R"
+ * tab-width: 8
+ * c-basic-offset: 8
+ * indent-tabs-mode: nil
+ * End:
+ */



From danms at us.ibm.com  Wed Jun 18 16:05:58 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 18 Jun 2008 09:05:58 -0700
Subject: [Libvirt-cim] [PATCH 5 of 6] Make VSMS record scheduler parameters
	when changed
In-Reply-To: <patchbomb.1213805153@guaranine.danplanet.com>
Message-ID: <cbbf8d96967525ab4dcb.1213805158@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1213805105 25200
# Node ID cbbf8d96967525ab4dcb5bb67b2458a02c27e772
# Parent  5a98830e047c3b61be88c763325ecb9c9bc70370
Make VSMS record scheduler parameters when changed

This includes a new function to synchronize information to the infostore
for use during a ModifyResource() or DefineSystem() call.

Also, delete the infostore for a domain on DestroySystem()

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 5a98830e047c -r cbbf8d969675 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Wed Jun 18 09:04:19 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Wed Jun 18 09:05:05 2008 -0700
@@ -42,6 +42,7 @@
 #include <libcmpiutil/std_instance.h>
 
 #include "misc_util.h"
+#include "infostore.h"
 
 #include "Virt_VirtualSystemManagementService.h"
 #include "Virt_ComputerSystem.h"
@@ -471,6 +472,8 @@
                                      struct virt_device *dev)
 {
         cu_get_u64_prop(inst, "VirtualQuantity", &dev->dev.vcpu.quantity);
+        cu_get_u64_prop(inst, "Limit", &dev->dev.vcpu.limit);
+        cu_get_u32_prop(inst, "Weight", &dev->dev.vcpu.weight);
 
         return NULL;
 }
@@ -650,6 +653,54 @@
         return inst;
 }
 
+static CMPIStatus update_dominfo(const struct domain *dominfo,
+                                 const char *refcn)
+{
+        CMPIStatus s = {CMPI_RC_OK, NULL};
+        struct infostore_ctx *ctx = NULL;
+        struct virt_device *dev = dominfo->dev_vcpu;
+        virConnectPtr conn = NULL;
+        virDomainPtr dom = NULL;
+
+        if (dominfo->dev_vcpu_ct != 1) {
+                /* Right now, we only have extra info for processors */
+                CU_DEBUG("Domain has no vcpu devices!");
+                return s;
+        }
+
+        conn = connect_by_classname(_BROKER, refcn, &s);
+        if (conn == NULL) {
+                CU_DEBUG("Failed to connnect by %s", refcn);
+                return s;
+        }
+
+        dom = virDomainLookupByName(conn, dominfo->name);
+        if (dom == NULL) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_NOT_FOUND,
+                           "Unable to lookup domain `%s'", dominfo->name);
+                goto out;
+        }
+
+        ctx = infostore_open(dom);
+        if (ctx == NULL) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Unable to open infostore");
+                goto out;
+        }
+
+        infostore_set_u64(ctx, "weight", dev->dev.vcpu.weight);
+        infostore_set_u64(ctx, "limit", dev->dev.vcpu.limit);
+ out:
+        infostore_close(ctx);
+
+        virDomainFree(dom);
+        virConnectClose(conn);
+
+        return s;
+}
+
 static CMPIInstance *create_system(CMPIInstance *vssd,
                                    CMPIArray *resources,
                                    const CMPIObjectPath *ref,
@@ -690,6 +741,8 @@
         CU_DEBUG("System XML:\n%s", xml);
 
         inst = connect_and_create(xml, ref, s);
+        if (inst != NULL)
+                update_dominfo(domain, CLASSNAME(ref));
 
  out:
         cleanup_dominfo(&domain);
@@ -780,6 +833,8 @@
                 rc = IM_RC_SYS_NOT_FOUND;
                 goto error;
         }
+
+        infostore_delete(virConnectGetType(conn), dom_name);
 
         virDomainDestroy(dom); /* Okay for this to fail */
         if (virDomainUndefine(dom) == 0) {
@@ -961,6 +1016,8 @@
                            "Virtual System `%s' not found", dominfo->name);
                 goto out;
         }
+
+        update_dominfo(dominfo, refcn);
 
         if (!domain_online(dom)) {
                 CU_DEBUG("VS `%s' not online; skipping dynamic update",



From danms at us.ibm.com  Wed Jun 18 16:05:59 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 18 Jun 2008 09:05:59 -0700
Subject: [Libvirt-cim] [PATCH 6 of 6] Make
	ComputerSystem::RequestStateChange() set
	scheduling parameters at start
In-Reply-To: <patchbomb.1213805153@guaranine.danplanet.com>
Message-ID: <4535290b296e28a832be.1213805159@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1213805122 25200
# Node ID 4535290b296e28a832bea92b46b774af79e08ba4
# Parent  cbbf8d96967525ab4dcb5bb67b2458a02c27e772
Make ComputerSystem::RequestStateChange() set scheduling parameters at start

Currently, only do this for Xen domains.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r cbbf8d969675 -r 4535290b296e src/Virt_ComputerSystem.c
--- a/src/Virt_ComputerSystem.c	Wed Jun 18 09:05:05 2008 -0700
+++ b/src/Virt_ComputerSystem.c	Wed Jun 18 09:05:22 2008 -0700
@@ -35,6 +35,7 @@
 #include "cs_util.h"
 #include <libcmpiutil/libcmpiutil.h>
 #include "misc_util.h"
+#include "infostore.h"
 #include "device_parsing.h"
 #include <libcmpiutil/std_invokemethod.h>
 #include <libcmpiutil/std_instance.h>
@@ -620,6 +621,40 @@
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
+static void set_scheduler_params(virDomainPtr dom)
+{
+        struct infostore_ctx *ctx;
+        virConnectPtr conn = NULL;
+        virSchedParameter params[] =
+                {{ "weight", VIR_DOMAIN_SCHED_FIELD_UINT },
+                 { "cap", VIR_DOMAIN_SCHED_FIELD_UINT },
+                };
+
+        conn = virDomainGetConnect(dom);
+        if (conn == NULL) {
+                CU_DEBUG("Unable to get connection from domain");
+                return;
+        }
+
+        if (!STREQC(virConnectGetType(conn), "xen")) {
+                CU_DEBUG("Not setting sched params for this domain type");
+                return;
+        }
+
+        ctx = infostore_open(dom);
+        if (ctx == NULL) {
+                CU_DEBUG("Unable to open infostore for domain");
+                return;
+        }
+
+        params[0].value.ui = infostore_get_u64(ctx, "weight");
+        params[1].value.ui = infostore_get_u64(ctx, "limit");
+
+        virDomainSetSchedulerParameters(dom, params, 2);
+
+        infostore_close(ctx);
+}
+
 /* This composite operation may be supported as a flag to reboot */
 static int domain_reset(virDomainPtr dom)
 {
@@ -643,6 +678,7 @@
         case VIR_DOMAIN_SHUTOFF:
                 CU_DEBUG("Start domain");
                 ret = virDomainCreate(dom);
+                set_scheduler_params(dom);
                 break;
         case VIR_DOMAIN_PAUSED:
                 CU_DEBUG("Unpause domain");



From kaitlin at linux.vnet.ibm.com  Wed Jun 18 17:45:47 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 18 Jun 2008 10:45:47 -0700
Subject: [Libvirt-cim] [PATCH 2 of 6] Add domain information store
	utilities
In-Reply-To: <491abbe7867c50c66ce0.1213805155@guaranine.danplanet.com>
References: <491abbe7867c50c66ce0.1213805155@guaranine.danplanet.com>
Message-ID: <485949CB.2080002@linux.vnet.ibm.com>

> +static char *make_filename(virDomainPtr dom)
> +{
> +        virConnectPtr conn;
> +        char *path = NULL;
> +
> +        conn = virDomainGetConnect(dom);
> +        if (conn == NULL) {
> +                CU_DEBUG("Domain has no libvirt connection");
> +                goto out;
> +        }
> +
> +        path = _make_filename(virConnectGetType(conn),
> +                              virDomainGetName(dom));
> +
> +        CU_DEBUG("Path is %s", path);
> +
> + out:

Need to close the connection here.

> +        return path;
> +}
> +
> +static xmlDocPtr parse_xml(int fd)
> +{
> +        xmlParserCtxtPtr ctx = NULL;
> +        xmlDocPtr doc = NULL;
> +
> +        ctx = xmlNewParserCtxt();
> +        if (ctx == NULL)
> +                goto err;
> +
> +        doc = xmlCtxtReadFd(ctx,
> +                            fd,
> +                            "foo",
> +                            NULL,
> +                            XML_PARSE_NOWARNING | XML_PARSE_NONET);
> +        if (doc == NULL)
> +                goto err;

Before returning, the xmlParserCtxtPtr should be freed.

> +
> +        return doc;
> + err:
> +        xmlFreeDoc(doc);
> +        xmlFreeParserCtxt(ctx);
> +
> +        return NULL;
> +}
> +


> +bool infostore_set_u64(struct infostore_ctx *ctx, const char *key, uint64_t val)
> +{
> +        char *sval = NULL;
> +
> +        if (asprintf(&sval, "%" PRIu64, val) == -1) {
> +                CU_DEBUG("Failed to format u64 string");
> +                sval = NULL;
> +                goto out;
> +        }
> +
> +        xpath_set_string(ctx, key, sval);
> + out:
> +        free(sval);
> +
> +        return false;

Not sure why you only return false here.  In every place you've called 
it, you're not capturing the return, so the value doesn't really matter. 
  However, just curious why it's false.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From danms at us.ibm.com  Wed Jun 18 17:55:42 2008
From: danms at us.ibm.com (Dan Smith)
Date: Wed, 18 Jun 2008 10:55:42 -0700
Subject: [Libvirt-cim] [PATCH 2 of 6] Add domain information store
	utilities
In-Reply-To: <485949CB.2080002@linux.vnet.ibm.com> (Kaitlin Rupert's message
	of "Wed, 18 Jun 2008 10:45:47 -0700")
References: <491abbe7867c50c66ce0.1213805155@guaranine.danplanet.com>
	<485949CB.2080002@linux.vnet.ibm.com>
Message-ID: <871w2uhbkx.fsf@caffeine.beaverton.ibm.com>

KR> Need to close the connection here.

No, because I didn't open it, I just grabbed it from the
virDomainPtr.

KR> Before returning, the xmlParserCtxtPtr should be freed.

Yep, thanks.

KR> Not sure why you only return false here.  In every place you've
KR> called it, you're not capturing the return, so the value doesn't
KR> really matter. However, just curious why it's false.

Because I didn't change it once I implemented that function :P

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080618/e44de914/attachment.sig>

From kaitlin at linux.vnet.ibm.com  Wed Jun 18 19:10:57 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 18 Jun 2008 12:10:57 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] 2# Update RAFP.01 for LXC support,
	also add DiskPool and NetworkPool verification
In-Reply-To: <09f95362435b3fcfc1e3.1213777125@localhost.localdomain>
References: <09f95362435b3fcfc1e3.1213777125@localhost.localdomain>
Message-ID: <48595DC1.5040701@linux.vnet.ibm.com>

> +def setup_env(server, virt):
> +    destroy_and_undefine_all(server)
> +    vsxml = None
> +    if virt == "Xen":
> +        test_disk = "xvda"
> +    else:
> +        test_disk = "hda"

hda doesn't apply for LXC - maybe set the value to None in that case?

> 
>      try:
>          key_list = { 'InstanceID' : "MemoryPool/0" }
> @@ -57,6 +104,27 @@
>      except Exception:
>          logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
>          return FAIL

I know this is existing code, but you'll want to be sure you call 
cleanup_restore() and undefine your guest whenever you fail. The same 
applied for all the instances where you do a return FAIL below.

> +
> +    try:
> +        key_list = { 'InstanceID' : diskid}
> +        diskpool = enumclass.getInstance(options.ip,
> +                                         "DiskPool",
> +                                         key_list,
> +                                         options.virt)
> +    except Exception:
> +        logger.error(Globals.CIM_ERROR_GETINSTANCE % "DiskPool")
> +        return FAIL
> +
> +    try:
> +        key_list = { 'InstanceID' : "NetworkPool/%s" % test_network }
> +        netpool = enumclass.getInstance(options.ip,
> +                                        "NetworkPool",
> +                                        key_list,
> +                                        options.virt)
> +    except Exception:
> +        logger.error(Globals.CIM_ERROR_GETINSTANCE % "NetworkPool")
> +        return FAIL
> +

LXC doesn't support disk, network, and proc yet.  So we shouldn't check 
these because we don't have any resources we're allocated from a pool.

Also, this test is a bit difficult to read.  I'd suggest creating a 
function that handles everything in the try block.  You can then call 
this function to get each of the instances you need.

>       
>      try:
>          memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
> @@ -86,6 +154,35 @@
>  	    logger.error("ERROR: Association result error")
>              status = FAIL
> 
> +    try:
> +        diskdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
> +                                         "DiskPool",
> +                                         options.virt,
> +                                         InstanceID = diskpool.InstanceID)
> +    except Exception:
> +        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % diskpool.InstanceID)
> +        status = FAIL

Something similar could be said here - the association calls for each 
device will be similar, so you could make a function out of this.

> +
> +    for i in range(len(diskdata)):
> +        if diskdata[i].classname != get_typed_class(options.virt, "DiskResourceAllocationSettingData"):
> +            logger.error("ERROR: Association result error")
> +            status = FAIL

You'll also want to verify you got the expected number of instances back 
from the association.

If the association returns no instances, this for loop is skipped and 
the test returns a false positive.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 18 19:32:26 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 18 Jun 2008 12:32:26 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 03_user_netport.py tc
In-Reply-To: <f96b00310c76d5bb109f.1213791409@elm3b193.beaverton.ibm.com>
References: <f96b00310c76d5bb109f.1213791409@elm3b193.beaverton.ibm.com>
Message-ID: <485962CA.8090204@linux.vnet.ibm.com>

> -    if dev == None:
> -        logger.error("Error retrieving instance for devid %s" % devid)

This is verifying that we get an instance back.  It's not likely to 
happen, but the GetInstance() call could fail to find the instance but 
return a successful return code.

> +    if dev.DeviceID == None:

Instead of dev.DeviceID == None, should this be dev.DeviceID != devid?

> +        logger.error("Error retrieving instance for devid %s" % dev.DeviceID)

I think this error message would make more sense as something like:

"DeviceID reported incorrectly (%s instead of %s)" % (dev.DeviceID, devid)



>          cxml.undefine(options.ip)
>          return FAIL
> 
> 

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Thu Jun 19 05:31:32 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 19 Jun 2008 13:31:32 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] 3# Update RAFP.01 for LXC support
Message-ID: <fdbb6e915f260e05ac2a.1213853492@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213853486 -28800
# Node ID fdbb6e915f260e05ac2a46d2379a5a1316e10d39
# Parent  fc18447de1be94d839fdb1619811c1294bb279f9
[TEST] 3# Update RAFP.01 for LXC support


Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r fc18447de1be -r fdbb6e915f26 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Wed Jun 18 06:00:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Thu Jun 19 13:31:26 2008 +0800
@@ -26,68 +26,122 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    if virt == "XenFV" or virt == "KVM":
+        test_disk = "hda"
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml
+
+def get_instance(server, pool, list, virt='Xen'):
+    try:
+        inst = enumclass.getInstance(server,
+                                     pool,
+                                     list,
+                                     virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE  % pool)
+        return FAIL
+  
+    return inst
+
+def verify_rasd(server, assoc_cn, cn, virt, list, rasd_id):
+    try:
+        data = assoc.AssociatorNames(server,
+                                     assoc_cn,
+                                     cn,
+                                     virt,
+                                     InstanceID=list)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
+        status = FAIL
+
+    if len(data) != 1:
+        logger.error("No associated rasd for %s", cn)
+        return FAIL
+    
+    if data[0]['InstanceID'] not in rasd:
+        logger.error("InstanceID Mismatch")
+        logger.error("Returned %s error" % data[0]['InstanceID'])
+        return FAIL
+
+               
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
 
-    try:
-        key_list = { 'InstanceID' : "MemoryPool/0" }
-        mempool = enumclass.getInstance(options.ip,
-                                        "MemoryPool",
-                                        key_list,
-                                        options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
-        return FAIL
+    status, vsxml = setup_env(options.ip, options.virt)
+    if status != PASS:
+        return status
+    
+    status, diskid = create_diskpool_conf(options.ip, options.virt)
+    if status != PASS:
+        return status
 
-    try:
-        key_list = { 'InstanceID' : "ProcessorPool/0" }
-        procpool = enumclass.getInstance(options.ip,
-                                         "ProcessorPool",
-                                         key_list,
-                                         options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
-        return FAIL
-     
-    try:
-        memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                        "MemoryPool",
-                                        options.virt,
-                                        InstanceID = mempool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mempool.InstanceID)
-        status = FAIL
-     
-    for i in range(len(memdata)):
-        if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"):
-            logger.error("ERROR: Association result error")
-            status = FAIL
-                
-    try:
-        procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                         "ProcessorPool",
-                                         options.virt,
-                                         InstanceID = procpool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % procpool.InstanceID)
-        status = FAIL
-      
-    for j in range(len(procdata)):
-        if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"):
-	    logger.error("ERROR: Association result error")
-            status = FAIL
+    status, test_network = create_netpool_conf(options.ip, options.virt)
+    if status != PASS:
+        return status
 
+    global rasd 
+    if options.virt == 'LXC':
+        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
+        rasd = [ "%s/mem" % test_dom ]
+    else:
+        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
+                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
+                 "DiskPool"      : {'InstanceID' : diskid},
+                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" % test_network }}
+        rasd = [ "%s/mem" % test_dom, 
+                 "%s/proc" % test_dom, 
+                 "%s/%s" %(test_dom, diskid), 
+                 "%s/%s" % (test_dom, test_network) ]
+
+    for k, v in pool.iteritems():
+        inst = get_instance(options.ip, k, v, options.virt) 
+
+        verify_rasd(options.ip, "ResourceAllocationFromPool", 
+                    k, options.virt, inst.InstanceID,
+                    v['InstanceID'])
+
+    cleanup_restore(options.ip, options.virt)
+    vsxml.undefine(options.ip)
     return status 
-        
         
 if __name__ == "__main__":
     sys.exit(main())



From yunguol at cn.ibm.com  Thu Jun 19 05:43:41 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 19 Jun 2008 13:43:41 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update HostSystem.02 for LXC support
Message-ID: <05f9fe06593c989e3dab.1213854221@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213854217 -28800
# Node ID 05f9fe06593c989e3dab2574b5d59b74afc013b5
# Parent  fc18447de1be94d839fdb1619811c1294bb279f9
[TEST] Update HostSystem.02 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r fc18447de1be -r 05f9fe06593c suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Wed Jun 18 06:00:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py	Thu Jun 19 13:43:37 2008 +0800
@@ -59,7 +59,7 @@
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
 verify_diskrasd_values, verify_memrasd_values, rasd_init_list
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
 
 test_dom    = "CrossClass_GuestDom"
@@ -77,10 +77,13 @@
     else: 
         test_disk = "hda"
     virt_xml =  get_class(virt)
-    vsxml_info = virt_xml(test_dom, mem = test_mem,
-                            vcpus=test_vcpus,
-                            mac = test_mac,
-                            disk = test_disk)
+    if virt == 'LXC':
+        vsxml_info = virt_xml(test_dom)
+    else:
+        vsxml_info = virt_xml(test_dom, mem = test_mem,
+                              vcpus=test_vcpus,
+                              mac = test_mac,
+                              disk = test_disk)
     
     ret = vsxml_info.define(server)
     if not ret:



From yunguol at cn.ibm.com  Thu Jun 19 05:57:38 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 19 Jun 2008 13:57:38 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update HostSystem.03 for LXC support
Message-ID: <4443c9e338b481a5ac87.1213855058@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213855054 -28800
# Node ID 4443c9e338b481a5ac87cfc444fbb8ac1ef9167c
# Parent  fc18447de1be94d839fdb1619811c1294bb279f9
[TEST] Update HostSystem.03 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r fc18447de1be -r 4443c9e338b4 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py
--- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Wed Jun 18 06:00:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py	Thu Jun 19 13:57:34 2008 +0800
@@ -50,14 +50,17 @@
 from XenKvmLib.test_xml import testxml
 from XenKvmLib.test_doms import destroy_and_undefine_all
 
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 test_dom = "domgst"
 test_vcpus = 1
 
 def setup_env(server, virt="Xen"):
     status = PASS
     destroy_and_undefine_all(server)
-    vsxml = get_class(virt)(test_dom, vcpus=test_vcpus)
+    if virt == 'LXC':
+        vsxml = get_class(virt)(test_dom)
+    else:
+        vsxml = get_class(virt)(test_dom, vcpus=test_vcpus)
 
     ret = vsxml.define(server)
     if not ret:
@@ -113,10 +116,13 @@
     status = PASS
     devpool = []
     
-    ccnlist = { '%s_ProcessorPool' % virt : 'Processors',
-                '%s_MemoryPool' % virt : 'KiloBytes',
-                '%s_DiskPool' % virt : 'Megabytes' ,
-                '%s_NetworkPool' % virt : None }
+    if virt == 'LXC':
+        ccnlist = { '%s_MemoryPool' % virt : 'KiloBytes'}
+    else: 
+        ccnlist = { '%s_ProcessorPool' % virt : 'Processors',
+                    '%s_MemoryPool' % virt : 'KiloBytes',
+                    '%s_DiskPool' % virt : 'Megabytes' ,
+                    '%s_NetworkPool' % virt : None }
     try:
         assoc_info = Associators(server,
                                  an1,
@@ -149,11 +155,13 @@
     alloccap = []
     filter =  {"key" : "ResourceType"}
 
-
-    ccnlist = { '%s_ProcessorPool' % virt: 3,
-                '%s_MemoryPool' % virt : 4, 
-                '%s_DiskPool' % virt : 17 ,
-                '%s_NetworkPool' % virt : 10 }
+    if virt == 'LXC':
+        ccnlist = { '%s_MemoryPool' % virt : 4 }
+    else:
+        ccnlist = { '%s_ProcessorPool' % virt: 3,
+                    '%s_MemoryPool' % virt : 4, 
+                    '%s_DiskPool' % virt : 17 ,
+                    '%s_NetworkPool' % virt : 10 }
    
     for inst in devpool:
         try:
@@ -190,13 +198,16 @@
     status = PASS
     ccn = '%s_AllocationCapabilities' % virt
     an = '%s_SettingsDefineCapabilities' % virt
-
-    rtype = {
-              "%s_DiskResourceAllocationSettingData" % virt : 17, \
-              "%s_MemResourceAllocationSettingData" % virt :  4, \
-              "%s_NetResourceAllocationSettingData" % virt : 10, \
-              "%s_ProcResourceAllocationSettingData" % virt :  3
-             }
+   
+    if virt == 'LXC':
+        rtype = { "%s_MemResourceAllocationSettingData" % virt :  4 }
+    else:
+        rtype = {
+                  "%s_DiskResourceAllocationSettingData" % virt : 17, \
+                  "%s_MemResourceAllocationSettingData" % virt :  4, \
+                  "%s_NetResourceAllocationSettingData" % virt : 10, \
+                  "%s_ProcResourceAllocationSettingData" % virt :  3
+                 }
     rangelist = {
                   "Default"   : 0, \
                   "Minimum"   : 1, \



From yunguol at cn.ibm.com  Thu Jun 19 06:12:25 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Thu, 19 Jun 2008 14:12:25 +0800
Subject: [Libvirt-cim] Cimtest report for LXC on F9 (2008/06/19)
Message-ID: <OF6210F770.FFCA3489-ON4825746D.0021FE5A-4825746D.00221955@cn.ibm.com>

stro: Fedora 9 Beta
kernel-2.6.25-0.218.rc8.git7.fc9.x86_64
CIMOM: tog-pegasus-2.7.0-6.fc9.x86_64
cimtest: changeset-218

==================================================================
PASS        :  87
FAIL        :  1
XFAIL       :  1
SKIP        :  40
-----------------
Total       : 129

===================== CIMTEST REPORT===============================

AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: PASS
ComputerSystem - 03_defineVS.py: PASS
ComputerSystem - 04_defineStartVS.py: FAIL
ERROR   - Error: property values are not set for VS domguest
ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
ERROR   - ERROR: VS DomST1 transition from Defined State to Activate state 
was not Successful
Bug:<00002>
ComputerSystem - 06_paused_active_suspend.py: SKIP
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: PASS
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: SKIP
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: PASS
ComputerSystemIndication - 01_created_indication.py: SKIP
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: SKIP
ElementAllocatedFromPool - 04_forward_errs.py: SKIP
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: SKIP
HostSystem - 03_hs_to_settdefcap.py: SKIP
HostSystem - 04_hs_to_EAPF.py: SKIP
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: SKIP
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: SKIP
LogicalDisk - 02_nodevs.py: SKIP
LogicalDisk - 03_ld_gi_errs.py: SKIP
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: PASS
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: SKIP
NetworkPort - 02_np_gi_errors.py: SKIP
NetworkPort - 03_user_netport.py: SKIP
Processor - 01_processor.py: SKIP
Processor - 02_definesys_get_procs.py: SKIP
Processor - 03_proc_gi_errs.py: SKIP
Profile - 01_enum.py: PASS
Profile - 02_profile_to_elec.py: SKIP
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
ReferencedProfile - 01_verify_refprof.py: PASS
ReferencedProfile - 02_refprofile_errs.py: PASS
ResourceAllocationFromPool - 01_forward.py: SKIP
ResourceAllocationFromPool - 02_reverse.py: PASS
ResourceAllocationFromPool - 03_forward_errs.py: PASS
ResourceAllocationFromPool - 04_reverse_errs.py: PASS
ResourceAllocationFromPool - 05_RAPF_err.py: SKIP
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: SKIP
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: 
SKIP
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP
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: 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: SKIP
VirtualSystemManagementService - 07_addresource_neg.py: PASS
VirtualSystemManagementService - 08_modifyresource.py: SKIP
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: SKIP
VirtualSystemSettingDataComponent - 02_reverse.py: 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



Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080619/2761f81f/attachment.htm>

From deeptik at linux.vnet.ibm.com  Thu Jun 19 07:33:47 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Thu, 19 Jun 2008 13:03:47 +0530
Subject: [Libvirt-cim] CimTest Report  on XenFV 19-06-2008
Message-ID: <485A0BDB.5060603@linux.vnet.ibm.com>

======================================
CIM Test Report for XenFV
======================================
Distro        : RHEL 5.2 Beta
Kernel        : 2.6.18-88.el5xen
Xen version   : 3.1.2-88.el5
Libvirt       : libvirt-0.3.3-7.el5
CIMOM         : pegasus
PyWBEM        : pywbem-3.14
CIM Schema    : cimv216Experimental
LibCMPIutil   :  79
LibVirtCIM    : 612+
CIMTEST       : 217
======================================
PASS          : 89
TOTAL FAILED  : 17 [9 test cases passed when ran manually]
ACTUAL FAILED :  8
XFAIL         :  1
SKIP          : 22
-----------------
Total         : 129
======================================

List of tc that are failing:

ComputerSystem - 06_paused_active_suspend.py: FAIL
ComputerSystem - 23_suspend_suspend.py: FAIL
ComputerSystem - 32_start_reboot.py: FAIL
ComputerSystem - 33_suspend_reboot.py: FAIL
ComputerSystem - 35_start_reset.py: FAIL
ComputerSystem - 40_RSC_start.py: FAIL
ElementAllocatedFromPool - 04_forward_errs.py: FAIL                  
--Passed when run manually
ElementConforms - 02_reverse.py: FAIL                                
--Passed when run manually
HostSystem - 02_hostsystem_to_rasd.py: FAIL                          
--Passed when run manually
LogicalDisk - 03_ld_gi_errs.py: FAIL                                 
--Passed when run manually
Memory - 01_memory.py: FAIL                                          
--Passed when run manually
NetworkPort - 01_netport.py: FAIL                                    
--Passed when run manually
ResourceAllocationFromPool - 02_reverse.py: FAIL                     
--Passed when run manually
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL                    
--Passed when run manually
VSSD - 04_vssd_to_rasd.py: FAIL                                      
--Passed when run manually
VirtualSystemManagementService - 02_destroysystem.py: FAIL
VirtualSystemManagementService - 08_modifyresource.py: FAIL

Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.


------------------------------------------------------------------------

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Jun19-XenFV-results
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080619/a052c823/attachment.ksh>

From deeptik at linux.vnet.ibm.com  Thu Jun 19 08:42:27 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 19 Jun 2008 01:42:27 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Fixing 03_user_netport.py tc
Message-ID: <0986ab7af5023cac28da.1213864947@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213864932 25200
# Node ID 0986ab7af5023cac28da15c59fffcca60c78866c
# Parent  fc18447de1be94d839fdb1619811c1294bb279f9
[TEST] #2 Fixing 03_user_netport.py tc.

Changes:
-------
>From patch 1 to 2:
------------------
1) Modified the verification of the device.DeviceID from None to devid.
2) Modifed the log message to make it more meaningful.

Patch 1:
-------
1) Changed the return value to XFAIL since the provider does not support guest with user interface type.
2) Fixed the KeyError.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r fc18447de1be -r 0986ab7af502 suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py	Wed Jun 18 06:00:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py	Thu Jun 19 01:42:12 2008 -0700
@@ -32,18 +32,18 @@ from XenKvmLib.vxml import KVMXML
 from XenKvmLib.vxml import KVMXML
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
-from CimTest.ReturnCodes import PASS, FAIL
+from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
 sup_types = ['KVM']
 
 test_dom = "test_domain"
 test_mac = "00:11:22:33:44:55"
+bug = '00004'
 
 @do_main(sup_types)
 def main():
     options = main.options
-    const.KVM_default_net_type = 'user'
-    cxml = KVMXML(test_dom, mac = test_mac)
+    cxml = KVMXML(test_dom, mac = test_mac, ntype='user')
     ret = cxml.define(options.ip)
     if not ret:
         logger.error('Unable to define domain %s' % test_dom)
@@ -62,10 +62,11 @@ def main():
     except Exception, detail:
         logger.error("Exception: %s" % detail)
         cxml.undefine(options.ip)
-        return FAIL
+        return XFAIL_RC(bug)
 
-    if dev == None:
-        logger.error("Error retrieving instance for devid %s" % devid)
+    if dev.DeviceID != devid:
+        logger.error("DeviceID reported incorrectly (%s instead of %s)",
+                      dev.DeviceID, devid)
         cxml.undefine(options.ip)
         return FAIL
 



From deeptik at linux.vnet.ibm.com  Thu Jun 19 09:35:50 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 19 Jun 2008 02:35:50 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Modifying devices.py to fix tc
	01_netport.py which was failing on F9 libvirt-cim rpm
Message-ID: <f67381970add8e02ecd3.1213868150@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213868143 25200
# Node ID f67381970add8e02ecd3ebbdc600f397c7fa51fe
# Parent  0986ab7af5023cac28da15c59fffcca60c78866c
[TEST] Modifying devices.py to fix tc 01_netport.py which was failing on F9 libvirt-cim rpm.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 0986ab7af502 -r f67381970add suites/libvirt-cim/lib/XenKvmLib/devices.py
--- a/suites/libvirt-cim/lib/XenKvmLib/devices.py	Thu Jun 19 01:42:12 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py	Thu Jun 19 02:35:43 2008 -0700
@@ -26,9 +26,19 @@ from CimTest import CimExt
 from CimTest import CimExt
 from CimTest import Globals
 from XenKvmLib import assoc
+from XenKvmLib.const import CIM_REV
 from XenKvmLib.classes import get_typed_class
 
-LinkTechnology_Ethernet = 2
+net_rev = 598
+
+# The branch has to be removed once the new rpm
+# including the changes in revision 598 is available.
+# The value of LinkTechnology should be set to 2 for
+# network, bridge and ethernet type interfaces.
+if net_rev > CIM_REV:
+    LinkTechnology_Ethernet = 0
+else:
+    LinkTechnology_Ethernet = 2
 
 class CIM_Instance:
     def __init__(self, inst):



From deeptik at linux.vnet.ibm.com  Thu Jun 19 10:41:49 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 19 Jun 2008 03:41:49 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 40_RSC_start.py tc
Message-ID: <aca3e392c2b66f0a50af.1213872109@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213872100 25200
# Node ID aca3e392c2b66f0a50af5c417c819b8e669abd72
# Parent  f67381970add8e02ecd3ebbdc600f397c7fa51fe
[TEST] Fixing 40_RSC_start.py tc.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r f67381970add -r aca3e392c2b6 suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Thu Jun 19 02:35:43 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Thu Jun 19 03:41:40 2008 -0700
@@ -44,6 +44,7 @@ from CimTest.ReturnCodes import PASS, FA
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 bug = "00001"
+bug_req_state = "00002"
 
 default_dom = 'test_domain'
 REQUESTED_STATE = 2
@@ -52,7 +53,7 @@ def check_attributes(domain_name, ip, vi
 def check_attributes(domain_name, ip, virt):
     rc, cs = get_cs_instance(domain_name, ip, virt)
     if rc != 0:
-        return rc 
+        return rc
 
     if cs.RequestedState != REQUESTED_STATE:
         logger.error("RequestedState should be %d not %d",
@@ -69,30 +70,33 @@ def check_attributes(domain_name, ip, vi
 @do_main(sup_types)
 def main():
     options = main.options
-    status = PASS 
+    status = FAIL
 
     try:
         rc = create_using_definesystem(default_dom, options.ip, 
                                        virt=options.virt)
         if rc != 0:
-            raise Exception("Unable create domain %s using DefineSystem()", 
+            raise Exception("DefineSystem() failed to create domain:", 
                             default_dom)
 
         rc = call_request_state_change(default_dom, options.ip, 
                                        REQUESTED_STATE, TIME, options.virt)
         if rc != 0:
-            rc = XFAIL_RC(bug)
-            raise Exception("Unable start dom %s using RequestedStateChange()", 
-                            default_dom)
+            status = XFAIL_RC(bug)
+            raise Exception("RequestedStateChange() could not be used to start "
+                            "domain:", default_dom)
+
 
         rc = check_attributes(default_dom, options.ip, options.virt)
         if rc != 0:
-            raise Exception("Attributes for %s not set as expected.",
+            status = XFAIL_RC(bug_req_state)
+            raise Exception("Attributes were not set as expected for domain:",
                             default_dom)
+        else:
+            status = PASS
 
     except Exception, detail:
         logger.error("Exception: %s", detail)
-        status = FAIL
 
     undefine_test_domain(default_dom, options.ip, options.virt)
 



From kaitlin at linux.vnet.ibm.com  Thu Jun 19 15:33:41 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 19 Jun 2008 08:33:41 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] 3# Update RAFP.01 for LXC support
In-Reply-To: <fdbb6e915f260e05ac2a.1213853492@localhost.localdomain>
References: <fdbb6e915f260e05ac2a.1213853492@localhost.localdomain>
Message-ID: <485A7C55.4030203@linux.vnet.ibm.com>

> +def setup_env(server, virt):
> +    destroy_and_undefine_all(server)
> +    vsxml = None
> +    if virt == "Xen":
> +        test_disk = "xvda"
> +    if virt == "XenFV" or virt == "KVM":
> +        test_disk = "hda"
> +
> +    virtxml = get_class(virt)
> +    if virt == 'LXC':
> +        vsxml = virtxml(test_dom)
> +    else:
> +        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
> +                        mac = test_mac, disk = test_disk)
> +    try:
> +        ret = vsxml.define(server)
> +        if not ret:
> +            logger.error("Failed to Define the domain: %s", test_dom)
> +            return FAIL, vsxml, test_disk

No need to return test_disk here.

> +
> +    except Exception, details:
> +        logger.error("Exception : %s", details)
> +        return FAIL, vsxml, test_disk

Same here.

> +
> +    return PASS, vsxml
> +
> +def get_instance(server, pool, list, virt='Xen'):
> +    try:
> +        inst = enumclass.getInstance(server,
> +                                     pool,
> +                                     list,
> +                                     virt)
> +    except Exception:
> +        logger.error(Globals.CIM_ERROR_GETINSTANCE  % pool)
> +        return FAIL
> +  
> +    return inst

Mis-matching return types here.  I'd return both a status and an instance.

> +
> +def verify_rasd(server, assoc_cn, cn, virt, list, rasd_id):
> +    try:
> +        data = assoc.AssociatorNames(server,
> +                                     assoc_cn,
> +                                     cn,
> +                                     virt,
> +                                     InstanceID=list)
> +    except Exception:
> +        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
> +        status = FAIL
> +
> +    if len(data) != 1:

You can't guarantee one instance back because the system may have more 
than one guest defined (Xen systems always have a Domain-0 defined).

Instead, you'll want to make sure you get an instance or instances that 
correspond to the domain you're trying to verify.

> +        logger.error("No associated rasd for %s", cn)
> +        return FAIL
> +    
> +    if data[0]['InstanceID'] not in rasd:
> +        logger.error("InstanceID Mismatch")
> +        logger.error("Returned %s error" % data[0]['InstanceID'])
> +        return FAIL
> +

Should return PASS if all goes well here.

> +               
>  @do_main(sup_types)
>  def main():
>      options = main.options
>      status = PASS
> 
> -    try:
> -        key_list = { 'InstanceID' : "MemoryPool/0" }
> -        mempool = enumclass.getInstance(options.ip,
> -                                        "MemoryPool",
> -                                        key_list,
> -                                        options.virt)
> -    except Exception:
> -        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
> -        return FAIL
> +    status, vsxml = setup_env(options.ip, options.virt)
> +    if status != PASS:
> +        return status
> +    
> +    status, diskid = create_diskpool_conf(options.ip, options.virt)
> +    if status != PASS:
> +        return status

> +    status, test_network = create_netpool_conf(options.ip, options.virt)
> +    if status != PASS:
> +        return status

If create_diskpool_conf() or create_netpool_conf() fail, you'll need to 
make sure you undefine the guest and call cleanup_restore() .

> +    global rasd

Instead of using a global, pass rasd as an argument to the 
verify_rasd().  I'd like to move away from using globals like this.


> +    if options.virt == 'LXC':
> +        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
> +        rasd = [ "%s/mem" % test_dom ]
> +    else:
> +        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
> +                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
> +                 "DiskPool"      : {'InstanceID' : diskid},
> +                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" % test_network }}
> +        rasd = [ "%s/mem" % test_dom, 
> +                 "%s/proc" % test_dom, 
> +                 "%s/%s" %(test_dom, diskid), 
> +                 "%s/%s" % (test_dom, test_network) ]
> +
> +    for k, v in pool.iteritems():
> +        inst = get_instance(options.ip, k, v, options.virt) 

You'll want to verify this passes or fails.  If it fails, don't forget 
to clean up your environment before returning.

> +
> +        verify_rasd(options.ip, "ResourceAllocationFromPool", 
> +                    k, options.virt, inst.InstanceID,
> +                    v['InstanceID'])

You'll need to capture the return of verify_rasd().  As the code is now, 
you're returning the status of the create_netpool_conf() call.

> +
> +    cleanup_restore(options.ip, options.virt)
> +    vsxml.undefine(options.ip)
>      return status 
> -        
>          
>  if __name__ == "__main__":
>      sys.exit(main())

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From danms at us.ibm.com  Thu Jun 19 15:46:52 2008
From: danms at us.ibm.com (Dan Smith)
Date: Thu, 19 Jun 2008 08:46:52 -0700
Subject: [Libvirt-cim] Cimtest report for LXC on F9 (2008/06/19)
In-Reply-To: <OF6210F770.FFCA3489-ON4825746D.0021FE5A-4825746D.00221955@cn.ibm.com>
	(Guo Lian Yun's message of "Thu, 19 Jun 2008 14:12:25 +0800")
References: <OF6210F770.FFCA3489-ON4825746D.0021FE5A-4825746D.00221955@cn.ibm.com>
Message-ID: <87iqw577gz.fsf@caffeine.beaverton.ibm.com>

GY> ComputerSystem - 04_defineStartVS.py: FAIL
GY> ERROR   - Error: property values are not set for VS domguest

Do you know if your container is actually starting?  Grabbing the XML,
defining it manually, and then starting it would be good.  If it
transitions to the running state, then it should be okay, but check
the console to be sure.

GY> ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
GY> ERROR   - ERROR: VS DomST1 transition from Defined State to Activate state was
GY> not Successful
GY> Bug:<00002>

What is this test doing that is expected to fail?

Thanks!

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080619/ac90c835/attachment.sig>

From kaitlin at linux.vnet.ibm.com  Thu Jun 19 17:17:23 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 19 Jun 2008 10:17:23 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Modifying devices.py to fix tc
	01_netport.py which was failing on F9 libvirt-cim rpm
In-Reply-To: <f67381970add8e02ecd3.1213868150@elm3b217.beaverton.com>
References: <f67381970add8e02ecd3.1213868150@elm3b217.beaverton.com>
Message-ID: <485A94A3.9010304@linux.vnet.ibm.com>

>  from XenKvmLib.classes import get_typed_class
> 
> -LinkTechnology_Ethernet = 2
> +net_rev = 598
> +
> +# The branch has to be removed once the new rpm
> +# including the changes in revision 598 is available.
> +# The value of LinkTechnology should be set to 2 for
> +# network, bridge and ethernet type interfaces.
> +if net_rev > CIM_REV:
> +    LinkTechnology_Ethernet = 0

This change occurred due to changeset 599.  I know this is a minor 
change, but can you change this yo be net_rev >= CIM_REV and use 599 as 
the changeset number.

When I looked at rev 598, I was confused that it didn't have anything to 
do with network interfaces, so using 599 is a little clearer I think.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Thu Jun 19 17:31:23 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 19 Jun 2008 10:31:23 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 40_RSC_start.py tc
In-Reply-To: <aca3e392c2b66f0a50af.1213872109@elm3b217.beaverton.com>
References: <aca3e392c2b66f0a50af.1213872109@elm3b217.beaverton.com>
Message-ID: <485A97EB.1090604@linux.vnet.ibm.com>

>          if rc != 0:
> -            rc = XFAIL_RC(bug)
> -            raise Exception("Unable start dom %s using RequestedStateChange()", 
> -                            default_dom)
> +            status = XFAIL_RC(bug)
> +            raise Exception("RequestedStateChange() could not be used to start "
> +                            "domain:", default_dom)
> +

I know this was originally in the code (and my mistake too, I believe), 
but can you fix the strings the the raise call to use %s instead of a comma:

raise Exception("RequestedStateChange() could not be used to start " 

                 "domain: %s" % default_dom)

As the code is now, it prints like:

('RequestedStateChange() could not be used to start domain:', 'test_domain')

This isn't bad, but the following is cleaner:

('RequestedStateChange() could not be used to start domain: test_domain')

Thanks!
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Thu Jun 19 20:42:53 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 19 Jun 2008 13:42:53 -0700
Subject: [Libvirt-cim] [PATCH 1 of 3] [TEST] #2 Update create_netpool_conf()
	to support new pool creation
In-Reply-To: <patchbomb.1213908172@elm3b41.beaverton.ibm.com>
Message-ID: <94274683dee5aed5621d.1213908173@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1211403918 25200
# Node ID 94274683dee5aed5621dc555c8604dc56b378c85
# Parent  93dbca94a762bb2ba443025db96d43977484c40d
[TEST] #2 Update create_netpool_conf() to support new pool creation.

This includes the following changes:
 -Updated create_netpool_conf() so that caller can specify whether to use an existing pool or create a new pool.
 -Added destroy_netpool() / destroy_vnet()
 -Updated CIM_NetResourceAllocationSettingData to set the PoolID
 -Added xml_get_net_network().

Updates:
 -Removed if statement for setting the value of self.ResourceType.  This value should always be for network devices.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 93dbca94a762 -r 94274683dee5 suites/libvirt-cim/lib/XenKvmLib/common_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu Jun 19 01:42:12 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Wed May 21 14:05:18 2008 -0700
@@ -22,6 +22,7 @@
 #
 import os
 import pywbem
+import random
 from distutils.file_util import move_file
 from XenKvmLib.test_xml import * 
 from XenKvmLib.test_doms import * 
@@ -331,19 +332,22 @@
     return status, diskid
 
 
-def create_netpool_conf(server, virt):
+def create_netpool_conf(server, virt, use_existing=True):
     status = PASS
     test_network = None
     try:
-        vir_network = net_list(server, virt)
-        if len(vir_network) > 0:
-            test_network = vir_network[0]
-        else:
-            netxml = NetXML(server, virt=virt)
+        if use_existing == True:
+            vir_network = net_list(server, virt)
+            if len(vir_network) > 0:
+                test_network = vir_network[0]
+
+        if test_network == None:
+            net_name = "default-net" + str(random.randint(1, 100))
+            netxml = NetXML(server, virt=virt, networkname=net_name)
             ret = netxml.create_vnet()
             if not ret:
                 logger.error("Failed to create Virtual Network '%s'",
-                              test_network)
+                              net_name)
                 status = FAIL
             else:
                 test_network = netxml.xml_get_netpool_name()
@@ -351,3 +355,17 @@
         logger.error("Exception: In fn create_netpool_conf(): %s", detail)
         status=FAIL
     return status, test_network
+
+def destroy_netpool(server, virt, net_name):
+    if net_name == None:
+        return FAIL
+  
+    netxml = NetXML(server, virt=virt, networkname=net_name)
+    ret = netxml.destroy_vnet()
+    if not ret:
+        logger.error("Failed to destroy Virtual Network '%s'",
+                     net_name)
+        return FAIL
+
+    return PASS 
+
diff -r 93dbca94a762 -r 94274683dee5 suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Thu Jun 19 01:42:12 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Wed May 21 14:05:18 2008 -0700
@@ -151,13 +151,13 @@
     pass
 
 class CIM_NetResourceAllocationSettingData(CIMClassMOF):
-    def __init__(self, type, mac, name):
+    def __init__(self, type, mac, name, virt_net=None): 
         self.Address = mac
         self.NetworkType = type
-        if type == 'ethernet' or type == 'bridge' :
-            self.ResourceType = RASD_TYPE_NET_ETHER
-        else:
-            self.ResourceType = RASD_TYPE_NET_OTHER
+        self.ResourceType = RASD_TYPE_NET_ETHER
+
+        if virt_net != None :
+            self.PoolID = "NetworkPool/%s" % virt_net
         
         if mac != None:
             self.InstanceID = '%s/%s' % (name, mac)
diff -r 93dbca94a762 -r 94274683dee5 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Thu Jun 19 01:42:12 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Wed May 21 14:05:18 2008 -0700
@@ -214,6 +214,9 @@
 
     def create_vnet(self):
         return self.run(self.server, 'net-create', self.xml_string)
+
+    def destroy_vnet(self):
+        return self.run(self.server, 'net-destroy', self.net_name)
 
     def xml_get_netpool_name(self):
         npoolname = self.get_value_xpath('/network/name')



From kaitlin at linux.vnet.ibm.com  Thu Jun 19 20:42:52 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 19 Jun 2008 13:42:52 -0700
Subject: [Libvirt-cim] [PATCH 0 of 3] Patchset to fix VSMS
	08_modifyresource.py
Message-ID: <patchbomb.1213908172@elm3b41.beaverton.ibm.com>

This test is out of date.   The network portions needed to be updated to support the network interface type.

Also, test only attempted to modify a defined guest, not a running guest.



From kaitlin at linux.vnet.ibm.com  Thu Jun 19 20:42:54 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 19 Jun 2008 13:42:54 -0700
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] #2 Add vsms_util.py
In-Reply-To: <patchbomb.1213908172@elm3b41.beaverton.ibm.com>
Message-ID: <1ea2eaa7349fb3c16281.1213908174@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213147576 25200
# Node ID 1ea2eaa7349fb3c16281c4071b252104c7fde5c2
# Parent  94274683dee5aed5621dc555c8604dc56b378c85
[TEST] #2 Add vsms_util.py

This module is for vsms related utility functions (for AddResource, ModifyResource, etc).

Add the mod_<> functions.  These are identical the code paths in VSMS 08_modifyresource.py except for mod_net_res().

mod_net_res() - In the case of Xen, the bridge name needs to be verified.  This is because the network interface type is converted to a bridge interface by libvirt.

Updates:
 -Add generic print function

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 94274683dee5 -r 1ea2eaa7349f lib/VirtLib/live.py
--- a/lib/VirtLib/live.py	Wed May 21 14:05:18 2008 -0700
+++ b/lib/VirtLib/live.py	Tue Jun 10 18:26:16 2008 -0700
@@ -338,3 +338,12 @@
             names.append(disk_pool[0])
 
     return names
+
+def virsh_vcpuinfo(server, dom, virt="Xen"):
+    cmd = "virsh -c %s vcpuinfo %s | grep VCPU | wc -l" % (utils.virt2uri(virt),
+          dom)
+    ret, out = utils.run_remote(server, cmd)
+    if out.isdigit():
+        return out
+    return None
+
diff -r 94274683dee5 -r 1ea2eaa7349f suites/libvirt-cim/lib/XenKvmLib/vsms_util.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Tue Jun 10 18:26:16 2008 -0700
@@ -0,0 +1,106 @@
+#!/usr/bin/python
+#
+# Copyright 2008 IBM Corp.
+#
+# Authors:
+#    Kaitlin Rupert <karupert at us.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 CimTest import Globals
+from CimTest.ReturnCodes import FAIL, PASS
+from CimTest.Globals import logger
+from VirtLib.live import network_by_bridge, virsh_vcpuinfo
+
+def print_mod_err_msg(func_str, details):
+        logger.error('Error invoking ModifyRS: %s' % func_str)
+        logger.error(details)
+
+def mod_disk_res(server, service, cxml, dasd, ndpath):
+    try:
+        service.ModifyResourceSettings(ResourceSettings = [str(dasd)])
+        cxml.dumpxml(server)
+        dpath = cxml.xml_get_disk_source()
+        if dpath != ndpath:
+            logger.error("Got %s, exp %s." % (dpath, ndpath))
+            raise Exception('Error changing rs for disk path')
+        logger.info('good status for disk path')
+    except Exception, details:
+        print_mod_err_msg("mod_disk_res", details)
+        return FAIL
+
+    return PASS
+
+def mod_net_res(server, service, virt, cxml, nasd, ntype, net_name):
+    try:
+        service.ModifyResourceSettings(ResourceSettings = [str(nasd)])
+        cxml.dumpxml(server)
+        type = cxml.xml_get_net_type()
+
+        if virt == "KVM":
+            name = cxml.xml_get_net_network()
+        else:
+            if type == "bridge":
+                type = "network"
+            br_name = cxml.xml_get_net_bridge()
+            name = network_by_bridge(br_name, server, virt)
+
+        if type != ntype or name != net_name:
+            logger.error('Got %s, exp %s. Got %s, exp %s' %
+                         (type, ntype, name, net_name))
+            raise Exception('Error changing rs for net mac')
+        logger.info('good status for net mac')
+    except Exception, details:
+        print_mod_err_msg("mod_net_res", details)
+        return FAIL
+
+    return PASS
+
+def mod_mem_res(server, service, cxml, masd, nmem):
+    try:
+        service.ModifyResourceSettings(ResourceSettings=[str(masd)])
+        cxml.dumpxml(server)
+        mem = cxml.xml_get_mem()
+        if int(mem) != int(nmem) * 1024:
+            logger.error("Got %d, exp %d." % (int(mem), (int(nmem) * 1024)))
+            raise Exception('Error changing rs for mem')
+        logger.info('good status for mem')
+    except Exception, details:
+        print_mod_err_msg("mod_mem_res", details)
+        return FAIL
+
+    return PASS
+
+def mod_vcpu_res(server, service, cxml, pasd, ncpu, virt):
+    try:
+        service.ModifyResourceSettings(ResourceSettings = [str(pasd)])
+        cxml.dumpxml(server)
+        dom = cxml.xml_get_dom_name()
+        cpu = virsh_vcpuinfo(server, dom, virt)
+        if cpu is None:
+            logger.info("Unable to get vcpuinfo from virsh, using XML values")
+            cpu = cxml.xml_get_vcpu()
+        if int(cpu) != int(ncpu):
+            logger.error("Got %d, exp %d." % (int(cpu), int(ncpu)))
+            raise Exception('Error changing rs for vcpu')
+        logger.info('good status for vcpu')
+    except Exception, details:
+        print_mod_err_msg("mod_vcpu_res", details)
+        return FAIL
+
+    return PASS
+



From kaitlin at linux.vnet.ibm.com  Thu Jun 19 20:42:55 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 19 Jun 2008 13:42:55 -0700
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] #2 Fix VSMS
	08_modifyresource.py on Xen and KVM
In-Reply-To: <patchbomb.1213908172@elm3b41.beaverton.ibm.com>
Message-ID: <6bbf46ffb58f0de81ff2.1213908175@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213907999 25200
# Node ID 6bbf46ffb58f0de81ff2606c5c27284d3b997ed2
# Parent  1ea2eaa7349fb3c16281c4071b252104c7fde5c2
[TEST] #2 Fix VSMS 08_modifyresource.py on Xen and KVM.

This still fails on XenFV because of a provider bug.  It looks like the ModifyResource call strips the <emulator> tag from a XenFV guest.  So the test is unable to start the guest.

Updates to this test:
  -Call create_netpool_conf() to create a new network pool to use in modify calls.
  -Create network RASD instead of bridge
  -Replaced modify calls with functions from vsms_util
  -Added support for modifying a running guest (mem and vcpu only)
  -Remove XFAIL

Updates from patch 1 to patch 2:
 -After undefining the guests in the loop, get a new XML object so the guest is defined using a default XML (not a modified one).
 -Instead of changing vcpus from 1 to 3, start out with a 2 vcpu guest and change down to 1.  This ensures that the guest is a SMP guest starting out.
 -Instad of changing memory from 128 to 78, use 128 to 256 instead. 78 isn't much memory for a guest to run.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 1ea2eaa7349f -r 6bbf46ffb58f suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py	Tue Jun 10 18:26:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py	Thu Jun 19 13:39:59 2008 -0700
@@ -26,78 +26,97 @@
 import pywbem
 from pywbem.cim_obj import CIMInstanceName
 from VirtLib import utils
+from VirtLib.live import network_by_bridge
 from XenKvmLib import vsms
 from XenKvmLib import vxml
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
-from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
+from CimTest.ReturnCodes import PASS, FAIL
+from XenKvmLib.common_util import create_netpool_conf, destroy_netpool
+from XenKvmLib import vsms_util
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 default_dom = 'rstest_domain'
-ntype = 'bridge'
-ncpu = 3
-nmem = 78
+ntype = 'network'
+cpu = 2
+ncpu = 1
+nmem = 256 
 
-bug_cpu = '90079'
+def cleanup_env(ip, virt, cxml, net_name):
+    destroy_netpool(ip, virt, net_name)
+    cxml.destroy(ip)
+    cxml.undefine(ip)
 
 @do_main(sup_types)
 def main():
     options = main.options 
 
     service = vsms.get_vsms_class(options.virt)(options.ip)
-    cxml = vxml.get_class(options.virt)(default_dom)
+    cxml = vxml.get_class(options.virt)(default_dom, vcpus=cpu)
     ndpath = cxml.secondary_disk_path
     dasd = vsms.get_dasd_class(options.virt)(dev=cxml.xml_get_disk_dev(),
                                              source=ndpath, 
                                              name=default_dom)
+    
+    status, net_name = create_netpool_conf(options.ip, options.virt, 
+                                           use_existing=False)
+    if status != PASS:
+        logger.error('Unable to find a network pool')
+        return FAIL 
+
     nasd = vsms.get_nasd_class(options.virt)(type=ntype, 
                                              mac=cxml.xml_get_net_mac(),
-                                             name=default_dom)
+                                             name=default_dom,
+                                             virt_net=net_name)
     masd = vsms.get_masd_class(options.virt)(megabytes=nmem, name=default_dom)
     pasd = vsms.get_pasd_class(options.virt)(vcpu=ncpu, name=default_dom)
 
     status = FAIL
-    rc = 0
-    try:
-        cxml.define(options.ip)
-        # Modify disk setting
-        service.ModifyResourceSettings(ResourceSettings = [str(dasd)])
-        cxml.dumpxml(options.ip)
-        dpath = cxml.xml_get_disk_source()
-        if dpath != ndpath:
-            raise Exception('Error changing rs for disk path')
-        logger.info('good status for disk path')
-        # Modify net setting
-        service.ModifyResourceSettings(ResourceSettings = [str(nasd)])
-        cxml.dumpxml(options.ip)
-        type = cxml.xml_get_net_type()
-        if type != ntype:
-            raise Exception('Error changing rs for net mac')
-        logger.info('good status for net mac')
-        # Modify memory resource setting
-        service.ModifyResourceSettings(ResourceSettings=[str(masd)])
-        cxml.dumpxml(options.ip)
-        mem = cxml.xml_get_mem()
-        if mem != '%i' % (nmem * 1024):
-            raise Exception('Error changing rs for mem')
-        logger.info('good status for mem')
-        # Modify cpu setting
-        service.ModifyResourceSettings(ResourceSettings = [str(pasd)])
-        cxml.dumpxml(options.ip)
-        cpu = cxml.xml_get_vcpu()
-        if cpu != '%i' % ncpu:
-            rc = -1
-            raise Exception('Error changing rs for vcpu')
-        logger.info('good status for vcpu')
-        status = PASS
-    except Exception, details:
-        logger.error('Error invoking ModifyRS')
-        logger.error(details)
-        return FAIL
+  
+    if options.virt == "KVM":
+        test_cases = ["define"]
+    else:
+        test_cases = ["define", "start"]
 
-    cxml.undefine(options.ip)
-    if rc == -1:
-        return XFAIL_RC(bug_cpu)
+    for case in test_cases:
+        #Each time through, define guest using a default XML
+        cxml.undefine(options.ip)
+        cxml = vxml.get_class(options.virt)(default_dom, vcpus=cpu)
+        ret = cxml.define(options.ip)
+        if not ret:
+            logger.error("Failed to define the dom: %s", default_dom)
+            cleanup_env(options.ip, options.virt, cxml, net_name)
+            return FAIL
+        if case == "start":
+            ret = cxml.start(options.ip)
+            if not ret:
+                logger.error("Failed to start the dom: %s", default_dom)
+                cleanup_env(options.ip, options.virt, cxml, net_name)
+                return FAIL
+
+        status = vsms_util.mod_vcpu_res(options.ip, service, cxml, pasd, ncpu,
+                                        options.virt)
+        if status != PASS:
+            break
+
+        status = vsms_util.mod_mem_res(options.ip, service, cxml, masd, nmem)
+        if status != PASS:
+            break
+
+        #Unable to modify net and disk devices while guest is running
+        if case == "start":
+            break
+
+        status = vsms_util.mod_disk_res(options.ip, service, cxml, dasd, ndpath)
+        if status != PASS:
+            break
+
+        status = vsms_util.mod_net_res(options.ip, service, options.virt, cxml,
+                                       nasd, ntype, net_name)
+        if status != PASS:
+            break
+
+    cleanup_env(options.ip, options.virt, cxml, net_name)
 
     return status
 



From yunguol at cn.ibm.com  Fri Jun 20 02:34:20 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Fri, 20 Jun 2008 10:34:20 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #4 Update RAFP.01 for LXC support
Message-ID: <a77ba5eb00a6d9c175ee.1213929260@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1213929254 -28800
# Node ID a77ba5eb00a6d9c175eee319d8be4c6afe27c615
# Parent  93dbca94a762bb2ba443025db96d43977484c40d
[TEST] #4 Update RAFP.01 for LXC support

This includes the following changes:
 -Remove test_disk return
 -Update get_instance(), return both status and inst
 -Make sure undefine the guest and call cleanup_restore() if  create_diskpool_conf() or create_netpool_conf() fail

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 93dbca94a762 -r a77ba5eb00a6 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Thu Jun 19 01:42:12 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Fri Jun 20 10:34:14 2008 +0800
@@ -26,68 +26,123 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    if virt == "XenFV" or virt == "KVM":
+        test_disk = "hda"
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml
+
+    return PASS, vsxml
+
+def get_instance(server, pool, list, virt='Xen'):
+    try:
+        inst = enumclass.getInstance(server,
+                                     pool,
+                                     list,
+                                     virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE  % pool)
+        return FAIL, inst
+  
+    return PASS, inst
+
+def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
+    try:
+        data = assoc.AssociatorNames(server,
+                                     assoc_cn,
+                                     cn,
+                                     virt,
+                                     InstanceID=list)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
+        return FAIL
+
+    if data[0]['InstanceID'] not in rasd:
+        logger.error("InstanceID Mismatch")
+        logger.error("Returned %s error" % data[0]['InstanceID'])
+        return FAIL
+
+    return PASS
+
+               
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
 
-    try:
-        key_list = { 'InstanceID' : "MemoryPool/0" }
-        mempool = enumclass.getInstance(options.ip,
-                                        "MemoryPool",
-                                        key_list,
-                                        options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
-        return FAIL
+    status, vsxml = setup_env(options.ip, options.virt)
+    if status != PASS:
+        return status
+    
+    status, diskid = create_diskpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
 
-    try:
-        key_list = { 'InstanceID' : "ProcessorPool/0" }
-        procpool = enumclass.getInstance(options.ip,
-                                         "ProcessorPool",
-                                         key_list,
-                                         options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
-        return FAIL
-     
-    try:
-        memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                        "MemoryPool",
-                                        options.virt,
-                                        InstanceID = mempool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mempool.InstanceID)
-        status = FAIL
-     
-    for i in range(len(memdata)):
-        if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"):
-            logger.error("ERROR: Association result error")
-            status = FAIL
-                
-    try:
-        procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                         "ProcessorPool",
-                                         options.virt,
-                                         InstanceID = procpool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % procpool.InstanceID)
-        status = FAIL
-      
-    for j in range(len(procdata)):
-        if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"):
-	    logger.error("ERROR: Association result error")
-            status = FAIL
+    status, test_network = create_netpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
 
+    if options.virt == 'LXC':
+        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
+        rasd = [ "%s/mem" % test_dom ]
+    else:
+        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
+                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
+                 "DiskPool"      : {'InstanceID' : diskid},
+                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" % test_network }}
+        rasd = [ "%s/mem" % test_dom, 
+                 "%s/proc" % test_dom, 
+                 "%s/%s" %(test_dom, diskid), 
+                 "%s/%s" % (test_dom, test_network) ]
+
+    for k, v in pool.iteritems():
+        status, inst = get_instance(options.ip, k, v, options.virt) 
+
+        status = verify_rasd(options.ip, "ResourceAllocationFromPool", 
+                             k, options.virt, inst.InstanceID,
+                             rasd)
+
+    cleanup_restore(options.ip, options.virt)
+    vsxml.undefine(options.ip)
     return status 
-        
         
 if __name__ == "__main__":
     sys.exit(main())



From yunguol at cn.ibm.com  Fri Jun 20 02:52:51 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Fri, 20 Jun 2008 10:52:51 +0800
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] #2 Fix
	VSMS	08_modifyresource.py on Xen and KVM
In-Reply-To: <6bbf46ffb58f0de81ff2.1213908175@elm3b41.beaverton.ibm.com>
Message-ID: <OFB39FEDB1.FA1C2CA5-ON4825746E.00100D83-4825746E.00101B16@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-20 04:42:55:

> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1213907999 25200
> # Node ID 6bbf46ffb58f0de81ff2606c5c27284d3b997ed2
> # Parent  1ea2eaa7349fb3c16281c4071b252104c7fde5c2
> [TEST] #2 Fix VSMS 08_modifyresource.py on Xen and KVM.
> 
> This still fails on XenFV because of a provider bug.  It looks like 
> the ModifyResource call strips the <emulator> tag from a XenFV 
> guest.  So the test is unable to start the guest.
> 
> Updates to this test:
>   -Call create_netpool_conf() to create a new network pool to use in
> modify calls.
>   -Create network RASD instead of bridge
>   -Replaced modify calls with functions from vsms_util
>   -Added support for modifying a running guest (mem and vcpu only)
>   -Remove XFAIL
> 
> Updates from patch 1 to patch 2:
>  -After undefining the guests in the loop, get a new XML object so 
> the guest is defined using a default XML (not a modified one).
>  -Instead of changing vcpus from 1 to 3, start out with a 2 vcpu 
> guest and change down to 1.  This ensures that the guest is a SMP 
> guest starting out.
>  -Instad of changing memory from 128 to 78, use 128 to 256 instead. 
> 78 isn't much memory for a guest to run.
> 
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
> 
> diff -r 1ea2eaa7349f -r 6bbf46ffb58f suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/08_modifyresource.py
> --- a/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/08_modifyresource.py 
> Tue Jun 10 18:26:16 2008 -0700
> +++ b/suites/libvirt-
> cim/cimtest/VirtualSystemManagementService/08_modifyresource.py 
> Thu Jun 19 13:39:59 2008 -0700
> @@ -26,78 +26,97 @@
>  import pywbem
>  from pywbem.cim_obj import CIMInstanceName
>  from VirtLib import utils
> +from VirtLib.live import network_by_bridge
>  from XenKvmLib import vsms
>  from XenKvmLib import vxml
>  from CimTest.Globals import logger
>  from CimTest.Globals import do_main
> -from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
> +from CimTest.ReturnCodes import PASS, FAIL
> +from XenKvmLib.common_util import create_netpool_conf, destroy_netpool
> +from XenKvmLib import vsms_util
> 
>  sup_types = ['Xen', 'KVM', 'XenFV']
>  default_dom = 'rstest_domain'
> -ntype = 'bridge'
> -ncpu = 3
> -nmem = 78
> +ntype = 'network'
> +cpu = 2
> +ncpu = 1
> +nmem = 256 
> 
> -bug_cpu = '90079'
> +def cleanup_env(ip, virt, cxml, net_name):
> +    destroy_netpool(ip, virt, net_name)
> +    cxml.destroy(ip)
> +    cxml.undefine(ip)
> 
>  @do_main(sup_types)
>  def main():
>      options = main.options 
> 
>      service = vsms.get_vsms_class(options.virt)(options.ip)
> -    cxml = vxml.get_class(options.virt)(default_dom)
> +    cxml = vxml.get_class(options.virt)(default_dom, vcpus=cpu)
>      ndpath = cxml.secondary_disk_path
>      dasd = 
vsms.get_dasd_class(options.virt)(dev=cxml.xml_get_disk_dev(),
>                                               source=ndpath, 
>                                               name=default_dom)
> + 
> +    status, net_name = create_netpool_conf(options.ip, options.virt, 
> +                                           use_existing=False)
> +    if status != PASS:
> +        logger.error('Unable to find a network pool')
> +        return FAIL 
> +
>      nasd = vsms.get_nasd_class(options.virt)(type=ntype, 
> mac=cxml.xml_get_net_mac(),
> -                                             name=default_dom)
> +                                             name=default_dom,
> +                                             virt_net=net_name)
>      masd = vsms.get_masd_class(options.virt)(megabytes=nmem, 
> name=default_dom)
>      pasd = vsms.get_pasd_class(options.virt)(vcpu=ncpu, 
name=default_dom)
> 
>      status = FAIL
> -    rc = 0
> -    try:
> -        cxml.define(options.ip)
> -        # Modify disk setting
> -        service.ModifyResourceSettings(ResourceSettings = [str(dasd)])
> -        cxml.dumpxml(options.ip)
> -        dpath = cxml.xml_get_disk_source()
> -        if dpath != ndpath:
> -            raise Exception('Error changing rs for disk path')
> -        logger.info('good status for disk path')
> -        # Modify net setting
> -        service.ModifyResourceSettings(ResourceSettings = [str(nasd)])
> -        cxml.dumpxml(options.ip)
> -        type = cxml.xml_get_net_type()
> -        if type != ntype:
> -            raise Exception('Error changing rs for net mac')
> -        logger.info('good status for net mac')
> -        # Modify memory resource setting
> -        service.ModifyResourceSettings(ResourceSettings=[str(masd)])
> -        cxml.dumpxml(options.ip)
> -        mem = cxml.xml_get_mem()
> -        if mem != '%i' % (nmem * 1024):
> -            raise Exception('Error changing rs for mem')
> -        logger.info('good status for mem')
> -        # Modify cpu setting
> -        service.ModifyResourceSettings(ResourceSettings = [str(pasd)])
> -        cxml.dumpxml(options.ip)
> -        cpu = cxml.xml_get_vcpu()
> -        if cpu != '%i' % ncpu:
> -            rc = -1
> -            raise Exception('Error changing rs for vcpu')
> -        logger.info('good status for vcpu')
> -        status = PASS
> -    except Exception, details:
> -        logger.error('Error invoking ModifyRS')
> -        logger.error(details)
> -        return FAIL
> + 
> +    if options.virt == "KVM":
> +        test_cases = ["define"]
> +    else:
> +        test_cases = ["define", "start"]
> 
> -    cxml.undefine(options.ip)
> -    if rc == -1:
> -        return XFAIL_RC(bug_cpu)
> +    for case in test_cases:
> +        #Each time through, define guest using a default XML
> +        cxml.undefine(options.ip)
> +        cxml = vxml.get_class(options.virt)(default_dom, vcpus=cpu)
> +        ret = cxml.define(options.ip)
> +        if not ret:
> +            logger.error("Failed to define the dom: %s", default_dom)
> +            cleanup_env(options.ip, options.virt, cxml, net_name)
> +            return FAIL
> +        if case == "start":
> +            ret = cxml.start(options.ip)
> +            if not ret:
> +                logger.error("Failed to start the dom: %s", 
default_dom)
> +                cleanup_env(options.ip, options.virt, cxml, net_name)
> +                return FAIL
> +
> +        status = vsms_util.mod_vcpu_res(options.ip, service, cxml, 
> pasd, ncpu,
> +                                        options.virt)
> +        if status != PASS:
> +            break
> +
> +        status = vsms_util.mod_mem_res(options.ip, service, cxml, masd, 
nmem)
> +        if status != PASS:
> +            break
> +
> +        #Unable to modify net and disk devices while guest is running
> +        if case == "start":
> +            break
> +
> +        status = vsms_util.mod_disk_res(options.ip, service, cxml, 
> dasd, ndpath)
> +        if status != PASS:
> +            break
> +
> +        status = vsms_util.mod_net_res(options.ip, service, 
> options.virt, cxml,
> +                                       nasd, ntype, net_name)
> +        if status != PASS:
> +            break
> +
> +    cleanup_env(options.ip, options.virt, cxml, net_name)
> 
>      return status
> 
> 
  +1 from me.
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080620/59a8ec03/attachment.htm>

From yunguol at cn.ibm.com  Fri Jun 20 03:15:43 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Fri, 20 Jun 2008 11:15:43 +0800
Subject: [Libvirt-cim] Cimtest report for LXC on F9 (2008/06/19)
In-Reply-To: <87iqw577gz.fsf@caffeine.beaverton.ibm.com>
Message-ID: <OFDE31C72E.510BFD67-ON4825746E.00113969-4825746E.0011EB66@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-19 23:46:52:

> GY> ComputerSystem - 04_defineStartVS.py: FAIL
> GY> ERROR   - Error: property values are not set for VS domguest
> 
> Do you know if your container is actually starting?  Grabbing the XML,
> defining it manually, and then starting it would be good.  If it
> transitions to the running state, then it should be okay, but check
> the console to be sure.
> 
  Kaitlin - Would you please test ComputerSystem.04 on your machine? I
  can't run the cimtest on your machine although I can login today. 
  And if it still fails for you, would you please check it manually?

  This tc pass for me on sfcb.

> GY> ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
> GY> ERROR   - ERROR: VS DomST1 transition from Defined State to 
> Activate state was
> GY> not Successful
> GY> Bug:<00002>
> 
> What is this test doing that is expected to fail?
> 
> Thanks!
> 
> -- 
> Dan Smith
> IBM Linux Technology Center
> Open Hypervisor Team
> email: danms at us.ibm.com
> [attachment "attycree.dat" deleted by Guo Lian Yun/China/IBM] 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080620/81e13bbe/attachment.htm>

From yunguol at cn.ibm.com  Fri Jun 20 05:16:53 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Fri, 20 Jun 2008 13:16:53 +0800
Subject: [Libvirt-cim] Cimtest report for LXC on F9 (2008/06/19)
In-Reply-To: <OFDE31C72E.510BFD67-ON4825746E.00113969-4825746E.0011EB66@cn.ibm.com>
Message-ID: <OFC528D970.22716F73-ON4825746E.001BE562-4825746E.001D4A8E@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-20 11:15:43:

> 
> libvirt-cim-bounces at redhat.com wrote on 2008-06-19 23:46:52:
> 
> > GY> ComputerSystem - 04_defineStartVS.py: FAIL
> > GY> ERROR   - Error: property values are not set for VS domguest
> > 
> > Do you know if your container is actually starting?  Grabbing the XML,
> > defining it manually, and then starting it would be good.  If it
> > transitions to the running state, then it should be okay, but check
> > the console to be sure.
> > 
>   Kaitlin - Would you please test ComputerSystem.04 on your machine? I 
>   can't run the cimtest on your machine although I can login today. 
>   And if it still fails for you, would you please check it manually? 
> 

    Below is the domain dumpxml.

    <?xml version="1.0" ?>
    <domain 
type="lxc"><name>domguest</name><uuid>d03a0a52-3e85-11dd-b7d1-0011259da336</uuid><os><init>/tmp/cimtest_lxc_init</init></os><memory>131072</memory><vcpu>1</vcpu><on_poweroff>destroy</on_poweroff><on_reboot>restart</on_reboot><on_crash>destroy</on_crash><devices><console>/dev/ptmx</console></devices></domain>

    With it I can define and start the domain successfully on SFCB.

    virsh # list
    Id Name                 State
    ----------------------------------
    9134 domguest                  running
 
    However, on Pegasus with Kaitlin's system, I can only define the 
domain. Although
    it report 'Domain domguest started' by starting the domain, actually 
there is none 
    in virsh list.

>   This tc pass for me on sfcb. 
> 
> > GY> ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
> > GY> ERROR   - ERROR: VS DomST1 transition from Defined State to 
> > Activate state was
> > GY> not Successful
> > GY> Bug:<00002>
> > 
> > What is this test doing that is expected to fail?
> > 
    I think this is the same issue with 04_defineStartVS.py, a defined 
domain 
    can't transit to running state. Below is the bug:<00002> description 
in wiki.
 
00002 
RequestedState property in ComputerSystem is not getting populated 
Xem, KVM (?) 
No 




> > Thanks!
> > 
> > -- 
> > Dan Smith
> > IBM Linux Technology Center
> > Open Hypervisor Team
> > email: danms at us.ibm.com
> > [attachment "attycree.dat" deleted by Guo Lian Yun/China/IBM] 
> > _______________________________________________
> > Libvirt-cim mailing list
> > Libvirt-cim at redhat.com
> > https://www.redhat.com/mailman/listinfo/libvirt-cim
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080620/cc200034/attachment.htm>

From yunguol at cn.ibm.com  Fri Jun 20 05:36:48 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Fri, 20 Jun 2008 13:36:48 +0800
Subject: [Libvirt-cim] Cimtest report for LXC on F9 (2008/06/19)
In-Reply-To: <OFC528D970.22716F73-ON4825746E.001BE562-4825746E.001D4A8E@cn.ibm.com>
Message-ID: <OF07DFE801.31ED56B1-ON4825746E.001E7091-4825746E.001ED639@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-20 13:16:53:

> 
> libvirt-cim-bounces at redhat.com wrote on 2008-06-20 11:15:43:
> 
> > 
> > libvirt-cim-bounces at redhat.com wrote on 2008-06-19 23:46:52:
> > 
> > > GY> ComputerSystem - 04_defineStartVS.py: FAIL
> > > GY> ERROR   - Error: property values are not set for VS domguest
> > > 
> > > Do you know if your container is actually starting?  Grabbing the 
XML,
> > > defining it manually, and then starting it would be good.  If it
> > > transitions to the running state, then it should be okay, but check
> > > the console to be sure.
> > > 
> >   Kaitlin - Would you please test ComputerSystem.04 on your machine? I 

> >   can't run the cimtest on your machine although I can login today. 
> >   And if it still fails for you, would you please check it manually? 
> > 
> 
>     Below is the domain dumpxml. 
> 
>     <?xml version="1.0" ?> 
>     <domain 
> type="lxc"><name>domguest</name><uuid>d03a0a52-3e85-11dd-
> 
b7d1-0011259da336</uuid><os><init>/tmp/cimtest_lxc_init</init></os><memory>131072</memory><vcpu>1</vcpu><on_poweroff>destroy</on_poweroff><on_reboot>restart</on_reboot><on_crash>destroy</on_crash><devices><console>/dev/ptmx</console></devices></domain>
> 
>     With it I can define and start the domain successfully on SFCB. 
> 
>     virsh # list 
>     Id Name                 State 
>     ---------------------------------- 
>     9134 domguest                  running 
> 
>     However, on Pegasus with Kaitlin's system, I can only define the
> domain. Although 
>     it report 'Domain domguest started' by starting the domain, 
> actually there is none 
>     in virsh list. 
> 

      May I say the issue related with linux kernel?
      The domain can be start successfully with 
kernel-2.6.25-0.121.rc5.git4.fc9.i686,
      and the other test on Pegaus with kernel 
2.6.25-0.218.rc8.git7.fc9.x86_64.


> >   This tc pass for me on sfcb. 
> > 
> > > GY> ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 
00002
> > > GY> ERROR   - ERROR: VS DomST1 transition from Defined State to 
> > > Activate state was
> > > GY> not Successful
> > > GY> Bug:<00002>
> > > 
> > > What is this test doing that is expected to fail?
> > > 
>     I think this is the same issue with 04_defineStartVS.py, a defined 
domain 
>     can't transit to running state. Below is the bug:<00002> 
> description in wiki. 
> 
> 
> 00002 
> 
> RequestedState property in ComputerSystem is not getting populated 
> 
> Xem, KVM (?) 
> 
> No 
> 
> 
> 
> 
> 
> 
> > > Thanks!
> > > 
> > > -- 
> > > Dan Smith
> > > IBM Linux Technology Center
> > > Open Hypervisor Team
> > > email: danms at us.ibm.com
> > > [attachment "attycree.dat" deleted by Guo Lian Yun/China/IBM] 
> > > _______________________________________________
> > > Libvirt-cim mailing list
> > > Libvirt-cim at redhat.com
> > > https://www.redhat.com/mailman/listinfo/libvirt-cim
> > _______________________________________________
> > Libvirt-cim mailing list
> > Libvirt-cim at redhat.com
> > https://www.redhat.com/mailman/listinfo/libvirt-cim
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080620/1b5a2290/attachment.htm>

From deeptik at linux.vnet.ibm.com  Fri Jun 20 05:50:02 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 19 Jun 2008 22:50:02 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Modifying devices.py to fix tc
	01_netport.py which was failing on F9 libvirt-cim rpm
Message-ID: <2384eeff23be0643b12d.1213941002@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213940983 25200
# Node ID 2384eeff23be0643b12d908640bef054622c6a41
# Parent  93dbca94a762bb2ba443025db96d43977484c40d
[TEST] #2 Modifying devices.py to fix tc 01_netport.py which was failing on F9 libvirt-cim rpm.

Change in Patch 2
-----------------
Modified the changeset no from 598 to 599.


Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 93dbca94a762 -r 2384eeff23be suites/libvirt-cim/lib/XenKvmLib/devices.py
--- a/suites/libvirt-cim/lib/XenKvmLib/devices.py	Thu Jun 19 01:42:12 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py	Thu Jun 19 22:49:43 2008 -0700
@@ -26,9 +26,19 @@ from CimTest import CimExt
 from CimTest import CimExt
 from CimTest import Globals
 from XenKvmLib import assoc
+from XenKvmLib.const import CIM_REV
 from XenKvmLib.classes import get_typed_class
 
-LinkTechnology_Ethernet = 2
+net_rev = 599
+
+# The branch has to be removed once the new rpm
+# including the changes in revision 599 is available.
+# The value of LinkTechnology should be set to 2 for
+# network, bridge and ethernet type interfaces.
+if net_rev > CIM_REV:
+    LinkTechnology_Ethernet = 0
+else:
+    LinkTechnology_Ethernet = 2
 
 class CIM_Instance:
     def __init__(self, inst):



From deeptik at linux.vnet.ibm.com  Fri Jun 20 05:45:17 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Fri, 20 Jun 2008 11:15:17 +0530
Subject: [Libvirt-cim] [PATCH] [TEST] Modifying devices.py to fix tc
	01_netport.py which was failing on F9 libvirt-cim rpm
In-Reply-To: <485A94A3.9010304@linux.vnet.ibm.com>
References: <f67381970add8e02ecd3.1213868150@elm3b217.beaverton.com>
	<485A94A3.9010304@linux.vnet.ibm.com>
Message-ID: <485B43ED.7070403@linux.vnet.ibm.com>



Kaitlin Rupert wrote:
>> from XenKvmLib.classes import get_typed_class
>>
>> -LinkTechnology_Ethernet = 2
>> +net_rev = 598
>> +
>> +# The branch has to be removed once the new rpm
>> +# including the changes in revision 598 is available.
>> +# The value of LinkTechnology should be set to 2 for
>> +# network, bridge and ethernet type interfaces.
>> +if net_rev > CIM_REV:
>> + LinkTechnology_Ethernet = 0
>
> This change occurred due to changeset 599. I know this is a minor 
> change, but can you change this yo be net_rev >= CIM_REV and use 599 
> as the changeset number.
>
> When I looked at rev 598, I was confused that it didn't have anything 
> to do with network interfaces, so using 599 is a little clearer I think.
Sorry, I just used someother no other than the changeset present in the 
patch.
yeah it shld be 599 instead of 598 and the patch which I was referring 
is "Fix setting of the proper CIM network type for network devices".

Modified this and submitted the patch.

Thanks and Regards,
Deepti.



From deeptik at linux.vnet.ibm.com  Fri Jun 20 06:04:27 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Thu, 19 Jun 2008 23:04:27 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Fixing 40_RSC_start.py tc
Message-ID: <1231fad4c1a3b673747d.1213941867@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213941848 25200
# Node ID 1231fad4c1a3b673747df51a8508ff837f0b9686
# Parent  2384eeff23be0643b12d908640bef054622c6a41
[TEST] #2 Fixing 40_RSC_start.py tc.

Changes in the patch 2:
-----------------------
Modified the debug message.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 2384eeff23be -r 1231fad4c1a3 suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Thu Jun 19 22:49:43 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/40_RSC_start.py	Thu Jun 19 23:04:08 2008 -0700
@@ -44,6 +44,7 @@ from CimTest.ReturnCodes import PASS, FA
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 bug = "00001"
+bug_req_state = "00002"
 
 default_dom = 'test_domain'
 REQUESTED_STATE = 2
@@ -52,7 +53,7 @@ def check_attributes(domain_name, ip, vi
 def check_attributes(domain_name, ip, virt):
     rc, cs = get_cs_instance(domain_name, ip, virt)
     if rc != 0:
-        return rc 
+        return rc
 
     if cs.RequestedState != REQUESTED_STATE:
         logger.error("RequestedState should be %d not %d",
@@ -69,30 +70,33 @@ def check_attributes(domain_name, ip, vi
 @do_main(sup_types)
 def main():
     options = main.options
-    status = PASS 
+    status = FAIL
 
     try:
         rc = create_using_definesystem(default_dom, options.ip, 
                                        virt=options.virt)
         if rc != 0:
-            raise Exception("Unable create domain %s using DefineSystem()", 
+            raise Exception("DefineSystem() failed to create domain:", 
                             default_dom)
 
         rc = call_request_state_change(default_dom, options.ip, 
                                        REQUESTED_STATE, TIME, options.virt)
         if rc != 0:
-            rc = XFAIL_RC(bug)
-            raise Exception("Unable start dom %s using RequestedStateChange()", 
-                            default_dom)
+            status = XFAIL_RC(bug)
+            raise Exception("RequestedStateChange() could not be used to start"
+                            " domain: '%s'" %default_dom)
+
 
         rc = check_attributes(default_dom, options.ip, options.virt)
         if rc != 0:
-            raise Exception("Attributes for %s not set as expected.",
-                            default_dom)
+            status = XFAIL_RC(bug_req_state)
+            raise Exception("Attributes were not set as expected for "
+                            "domain: '%s'" %default_dom)
+        else:
+            status = PASS
 
     except Exception, detail:
         logger.error("Exception: %s", detail)
-        status = FAIL
 
     undefine_test_domain(default_dom, options.ip, options.virt)
 



From deeptik at linux.vnet.ibm.com  Fri Jun 20 12:58:28 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Fri, 20 Jun 2008 05:58:28 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing get_cs_instance() of
	common_util.py
Message-ID: <1837fcafef1281396deb.1213966708@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213966696 25200
# Node ID 1837fcafef1281396deb7d03f6754da320af8a36
# Parent  1231fad4c1a3b673747df51a8508ff837f0b9686
[TEST] Fixing get_cs_instance() of common_util.py.

1) Initalised cs to None.
2) Modified the return statements in the fn get_cs_instance().

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 1231fad4c1a3 -r 1837fcafef12 suites/libvirt-cim/lib/XenKvmLib/common_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu Jun 19 23:04:08 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Fri Jun 20 05:58:16 2008 -0700
@@ -46,18 +46,19 @@ def print_field_error(fieldname, ret_val
     logger.error("Returned %s instead of %s", ret_value, exp_value)
 
 def get_cs_instance(domain_name, ip, virt='Xen'):
+    cs = None
     try:
         cs = computersystem.get_cs_class(virt)(ip, domain_name)
 
         if cs.Name != domain_name:
             logger.error("VS %s is not found" % domain_name)
-            return 1 
+            return (1, cs)
 
     except Exception, detail:
         logger.error(Globals.CIM_ERROR_GETINSTANCE, 
                      get_typed_class(virt, 'ComputerSystem'))
         logger.error("Exception: %s", detail)
-        return 1 
+        return (1, cs) 
 
     return (0, cs) 
 



From deeptik at linux.vnet.ibm.com  Fri Jun 20 13:30:33 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Fri, 20 Jun 2008 06:30:33 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 06_paused_active_suspend.py tc
	of ComputerSystem
Message-ID: <92675efb0941a2550082.1213968633@elm3b217.beaverton.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1213968570 25200
# Node ID 92675efb0941a25500820ccfde0a7d73d6058acc
# Parent  1837fcafef1281396deb7d03f6754da320af8a36
[TEST] Fixing 06_paused_active_suspend.py tc of ComputerSystem.

1) Included the poll method since the enabledState was not getting set for XenFV appropriately.
2) Included the bugno["0001"], since RequestStateChange() method was not able to suspend a XenFV domain even when it
   was in a expected running state.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 1837fcafef12 -r 92675efb0941 suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py	Fri Jun 20 05:58:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py	Fri Jun 20 06:29:30 2008 -0700
@@ -48,7 +48,7 @@ from XenKvmLib.test_doms import destroy_
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
-from XenKvmLib.common_util import call_request_state_change
+from XenKvmLib.common_util import call_request_state_change, get_cs_instance
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
 sup_types = ['Xen', 'KVM', 'XenFV']
@@ -56,94 +56,102 @@ mem = 128 # MB
 mem = 128 # MB
 # Keeping the bug no for future reference
 # bug_no_req_change_method = "90559"
+bug_no_req_method = "00001"
 bug_no_req_change_prop   = "00002"
 START_STATE = 2 
 FINAL_STATE = 9
 REQUESTED_STATE = FINAL_STATE
 TIME = "00000000000000.000000:000"
 
- at do_main(sup_types)
-def main():
-    options = main.options
+def check_attributes(server, virt, cxml, verify_state):
+    enabledState = RequestedState = None
     status = FAIL
-    
-    cxml = vxml.get_class(options.virt)(test_dom, mem)
-
-#Create VS
-    try:
-        ret = cxml.create(options.ip)
-        if not ret:
-            logger.error("ERROR: VS %s was not created" % test_dom)
-            return status
-        cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom)
-        if cs.Name == test_dom:
-            from_State = cs.EnabledState
-        else:
-            logger.error("ERROR: VS %s not found" % test_dom)
-            return status
-    except Exception, detail:
-        logger.error("Exception variable: %s" % detail)
-        cxml.destroy(options.ip)
-        cxml.undefine(options.ip)
-        return status
- 
-#Suspend the VS
-    rc = call_request_state_change(test_dom, options.ip, REQUESTED_STATE,
-                                   TIME, options.virt)
-    if rc != 0:
-        logger.error("Unable to suspend dom %s using RequestedStateChange()", test_dom)
-        cxml.destroy(options.ip)
-        cxml.undefine(options.ip)
-        return status
-#Polling for the value of EnabledState to be set to 9.
-#We need to wait for the EnabledState to be set appropriately since
-#it does not get set immediatley to value of 9 when suspended.
     timeout = 10
     try:
-
         for i in range(1, (timeout + 1)):
             sleep(1)
-            cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom)
-            if cs.Name == test_dom:
-                to_RequestedState = cs.RequestedState
-                enabledState =  cs.EnabledState
-            else:
-                logger.error("VS %s not found" % test_dom)
-                return status 
-            if enabledState == FINAL_STATE:
+            status, cs = get_cs_instance(test_dom, server, virt)
+            if status != PASS:
+                cxml.destroy(server)
+                cxml.undefine(server)
+                return status, enabledState, RequestedState
+
+            enabledState = cs.EnabledState
+            RequestedState = cs.RequestedState
+
+            if enabledState == verify_state:
                 status = PASS
                 break
 
     except Exception, detail:
         logger.error("Exception variable: %s" % detail)
-        return status
+        cxml.destroy(server)
+        cxml.undefine(server)
+        return status, enabledState, RequestedState
 
-    if enabledState != FINAL_STATE:
-        logger.error("EnabledState has %i instead of %i", enabledState, FINAL_STATE)
+    if enabledState != verify_state:
+        logger.error("EnabledState has %i instead of %i", enabledState, 
+                      verify_state)
         logger.error("Try to increase the timeout and run the test again")
 
     if status != PASS:
-        ret = cxml.destroy(options.ip)
-        cxml.undefine(options.ip)
+        cxml.destroy(server)
+        cxml.undefine(server)
+    return status, enabledState, RequestedState
+
+ at do_main(sup_types)
+def main():
+    options = main.options
+    server = options.ip
+    virt = options.virt
+
+    #Create VS
+    cxml = vxml.get_class(virt)(test_dom, mem)
+    ret = cxml.create(server)
+    if not ret:
+        logger.error("ERROR: VS %s was not created" % test_dom)
         return status
 
-# Success: 
-# if  
-# From state == 9
-# To state == 2
-# Enabled_state == RequestedState
+    status, from_State, req_state = check_attributes(server, virt, cxml, 
+                                                     START_STATE)
+    if status != PASS:
+        return status
+
+    #Suspend the VS
+    status = call_request_state_change(test_dom, server, REQUESTED_STATE,
+                                       TIME, virt)
+    if status != PASS:
+        logger.error("Unable to suspend dom '%s' using RequestedStateChange()",
+                      test_dom)
+        cxml.destroy(server)
+        cxml.undefine(server)
+        status = XFAIL_RC(bug_no_req_method)
+        return status
+
+    status, enabledState, to_RequestedState = check_attributes(server, 
+                                                               virt, cxml, 
+                                                               FINAL_STATE)
+    if status != PASS:
+        return status
+
+    # Success: 
+    # if  
+    # From state == 9
+    # To state == 2
+    # Enabled_state == RequestedState
 
     if from_State == START_STATE and \
         to_RequestedState == FINAL_STATE and \
         enabledState == to_RequestedState:
         status = PASS
     else:
-        logger.error("ERROR: VS %s transition from suspend State to Activate state \
- was not Successful" % test_dom)
-# Replace the status with FAIL once the bug is fixed.
+        logger.error("VS '%s' transition from suspend State to Activate "
+                     "state was not Successful" % test_dom)
+        # Replace the status with FAIL once the bug is fixed.
         status = XFAIL_RC(bug_no_req_change_prop)
-    ret = cxml.destroy(options.ip)
-    cxml.undefine(options.ip)
+
+    ret = cxml.destroy(server)
+    cxml.undefine(server)
     return status
 
 if __name__ == "__main__":



From kaitlin at linux.vnet.ibm.com  Fri Jun 20 15:17:34 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Fri, 20 Jun 2008 08:17:34 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #4 Update RAFP.01 for LXC support
In-Reply-To: <a77ba5eb00a6d9c175ee.1213929260@localhost.localdomain>
References: <a77ba5eb00a6d9c175ee.1213929260@localhost.localdomain>
Message-ID: <485BCA0E.6090607@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1213929254 -28800
> # Node ID a77ba5eb00a6d9c175eee319d8be4c6afe27c615
> # Parent  93dbca94a762bb2ba443025db96d43977484c40d
> [TEST] #4 Update RAFP.01 for LXC support
> 

This fails for me on KVM, Xen, XenFV with:

ResourceAllocationFromPool - 01_forward.py: FAIL
ERROR   - InstanceID Mismatch
ERROR   - Returned RAFP_dom/00:11:22:33:44:aa error
ERROR   - InstanceID Mismatch
ERROR   - Returned RAFP_dom/hda error


Does it fail for you?
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Fri Jun 20 15:19:30 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Fri, 20 Jun 2008 08:19:30 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Modifying devices.py to fix tc
	01_netport.py which was failing on F9 libvirt-cim rpm
In-Reply-To: <2384eeff23be0643b12d.1213941002@elm3b217.beaverton.com>
References: <2384eeff23be0643b12d.1213941002@elm3b217.beaverton.com>
Message-ID: <485BCA82.7070500@linux.vnet.ibm.com>

> +# The branch has to be removed once the new rpm
> +# including the changes in revision 599 is available.
> +# The value of LinkTechnology should be set to 2 for
> +# network, bridge and ethernet type interfaces.
> +if net_rev > CIM_REV:

You'll want this to be net_rev >= CIM_REV because the change went in 
with changeset 599.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Fri Jun 20 16:47:18 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Fri, 20 Jun 2008 09:47:18 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing 06_paused_active_suspend.py
	tc of ComputerSystem
In-Reply-To: <92675efb0941a2550082.1213968633@elm3b217.beaverton.com>
References: <92675efb0941a2550082.1213968633@elm3b217.beaverton.com>
Message-ID: <485BDF16.50503@linux.vnet.ibm.com>

Deepti B. Kalakeri wrote:
> # HG changeset patch
> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> # Date 1213968570 25200
> # Node ID 92675efb0941a25500820ccfde0a7d73d6058acc
> # Parent  1837fcafef1281396deb7d03f6754da320af8a36
> [TEST] Fixing 06_paused_active_suspend.py tc of ComputerSystem.
> 
> 1) Included the poll method since the enabledState was not getting set for XenFV appropriately.
> 2) Included the bugno["0001"], since RequestStateChange() method was not able to suspend a XenFV domain even when it
>    was in a expected running state.

Bug #0001 is related to a problem where a <bootloader /> was being 
appended to a guest's XML.  If you do a dumpxml of the guest created by 
the test (do a dumpxml after the guest is running), you won't see such a 
tag.

What's happening here is that the FV guest will sometimes return "no 
state" instead of running of blocked.  The provider won't pause the 
guest unless it's in the running or the blocked state.

I modified state_change_pause() so that virDomainSuspend() is called if 
the state is VIR_DOMAIN_NOSTATE.  virDomainSuspend() doesn't return an 
error if the state is VIR_DOMAIN_NOSTATE.  I'm wondering if the guest is 
running by the time virDomainSuspend().  We do have a check there so if 
virDomainSuspend() does fail, we return an error.  So this might be a 
reasonable approach here.

Dan - any thoughts on this?

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Fri Jun 20 17:18:45 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Fri, 20 Jun 2008 10:18:45 -0700
Subject: [Libvirt-cim] Cimtest report for LXC on F9 (2008/06/19)
In-Reply-To: <OF07DFE801.31ED56B1-ON4825746E.001E7091-4825746E.001ED639@cn.ibm.com>
References: <OF07DFE801.31ED56B1-ON4825746E.001E7091-4825746E.001ED639@cn.ibm.com>
Message-ID: <485BE675.203@linux.vnet.ibm.com>

>  >
> 
>       May I say the issue related with linux kernel?
>       The domain can be start successfully with 
> kernel-2.6.25-0.121.rc5.git4.fc9.i686,
>       and the other test on Pegaus with kernel 
> 2.6.25-0.218.rc8.git7.fc9.x86_64.
> 

You're using a recent version of libvirt from cvs, correct?  When did 
you check it out?  I checked out a version on 6-12.

Dan - are you seeing similar problems?  The contain fails to start. 
It's attempting to launch a script that just runs "exec /bin/bash", so 
the script shouldn't be immediately failing.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From deeptik at linux.vnet.ibm.com  Fri Jun 20 18:22:15 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Fri, 20 Jun 2008 23:52:15 +0530
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Modifying devices.py to fix tc
	01_netport.py which was failing on F9 libvirt-cim rpm
In-Reply-To: <485BCA82.7070500@linux.vnet.ibm.com>
References: <2384eeff23be0643b12d.1213941002@elm3b217.beaverton.com>
	<485BCA82.7070500@linux.vnet.ibm.com>
Message-ID: <485BF557.8070004@linux.vnet.ibm.com>



Kaitlin Rupert wrote:
>> +# The branch has to be removed once the new rpm
>> +# including the changes in revision 599 is available.
>> +# The value of LinkTechnology should be set to 2 for
>> +# network, bridge and ethernet type interfaces.
>> +if net_rev > CIM_REV:
>
> You'll want this to be net_rev >= CIM_REV because the change went in 
> with changeset 599.
>
If we make this condition as net_rev >= CIM_REV, then for the case where 
net_rev == CIM_REV = 599 , the LinkTechnology_Ethernet = 0 instead of 
LinkTechnology_Ethernet = 2 which is not what is expected , correct ?



From kaitlin at linux.vnet.ibm.com  Sun Jun 22 17:06:19 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Sun, 22 Jun 2008 10:06:19 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #2 Modifying devices.py to fix tc
	01_netport.py which was failing on F9 libvirt-cim rpm
In-Reply-To: <485BF557.8070004@linux.vnet.ibm.com>
References: <2384eeff23be0643b12d.1213941002@elm3b217.beaverton.com>
	<485BCA82.7070500@linux.vnet.ibm.com>
	<485BF557.8070004@linux.vnet.ibm.com>
Message-ID: <485E868B.9080103@linux.vnet.ibm.com>

Deepti B Kalakeri wrote:
> 
> 
> Kaitlin Rupert wrote:
>>> +# The branch has to be removed once the new rpm
>>> +# including the changes in revision 599 is available.
>>> +# The value of LinkTechnology should be set to 2 for
>>> +# network, bridge and ethernet type interfaces.
>>> +if net_rev > CIM_REV:
>>
>> You'll want this to be net_rev >= CIM_REV because the change went in 
>> with changeset 599.
>>
> If we make this condition as net_rev >= CIM_REV, then for the case where 
> net_rev == CIM_REV = 599 , the LinkTechnology_Ethernet = 0 instead of 
> LinkTechnology_Ethernet = 2 which is not what is expected , correct ?
> 

Oops, sorry Deepti.  You're right.  I misread the patch when I looked at 
it on Friday.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Sun Jun 22 23:55:59 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Sun, 22 Jun 2008 16:55:59 -0700
Subject: [Libvirt-cim] [PATCH 0 of 2] Fix VSMS 06_addresource.py failure.
Message-ID: <patchbomb.1214178959@elm3b41.beaverton.ibm.com>




From kaitlin at linux.vnet.ibm.com  Sun Jun 22 23:56:01 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Sun, 22 Jun 2008 16:56:01 -0700
Subject: [Libvirt-cim] [PATCH 2 of 2] [TEST] Modify VSMS 06 to support both
	a defined and running guest
In-Reply-To: <patchbomb.1214178959@elm3b41.beaverton.ibm.com>
Message-ID: <fa81bbea248ae6e54fcc.1214178961@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213147580 25200
# Node ID fa81bbea248ae6e54fcc67073b521499d415f620
# Parent  43aa81b757fdaedd9e9dd7ca70f15104962815d7
[TEST] Modify VSMS 06 to support both a defined and running guest.

These changes also include:
 -Use vsms_util AddResource() calls.
 -Remove add proc call - AddResource() doesn't support processor and memory.
 -Add logic so the test doesn't add a disk ro a running KVM guest (KVM only supports attaching CD type devices, another test case is needed for this).

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 43aa81b757fd -r fa81bbea248a suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py	Sun Jun 22 16:52:58 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py	Tue Jun 10 18:26:20 2008 -0700
@@ -31,11 +31,18 @@
 from CimTest.Globals import logger
 from CimTest.Globals import do_main
 from CimTest.ReturnCodes import FAIL, PASS
+from XenKvmLib import vsms_util
+from XenKvmLib.common_util import create_netpool_conf, destroy_netpool
 
 sup_types = ['Xen', 'KVM']
 default_dom = 'rstest_domain'
-nnmac = '99:aa:bb:cc:ee:ff'
-npvcpu = 2
+nmac = '99:aa:bb:cc:ee:ff'
+ntype = 'network'
+
+def cleanup_env(ip, virt, cxml, net_name):
+    destroy_netpool(ip, virt, net_name)
+    cxml.destroy(ip)
+    cxml.undefine(ip)
 
 @do_main(sup_types)
 def main():
@@ -49,51 +56,67 @@
     service = vsms.get_vsms_class(options.virt)(options.ip)
     cxml = vxml.get_class(options.virt)(default_dom)
     classname = get_typed_class(options.virt, 'VirtualSystemSettingData')
+    inst_id = '%s:%s' % (options.virt, default_dom)
     vssd_ref = CIMInstanceName(classname, keybindings = {
-                               'InstanceID' : '%s:%s' % (options.virt, default_dom),
+                               'InstanceID' : inst_id,
                                'CreationClassName' : classname})
     dasd = vsms.get_dasd_class(options.virt)(dev=nddev,
                                              source=cxml.secondary_disk_path,
                                              name=default_dom)
-    nasd = vsms.get_nasd_class(options.virt)(type='ethernet', mac=nnmac,
-                                             name=default_dom)
-    pasd = vsms.get_pasd_class(options.virt)(vcpu=npvcpu, name=default_dom)
+    disk_attr = { 'nddev' : nddev,
+                  'src_path' : cxml.secondary_disk_path
+                }
+
+    status, net_name = create_netpool_conf(options.ip, options.virt,
+                                           use_existing=False)
+    if status != PASS:
+        logger.error('Unable to create network pool')
+        return FAIL
+
+    nasd = vsms.get_nasd_class(options.virt)(type=ntype,
+                                             mac=nmac,
+                                             name=default_dom,
+                                             virt_net=net_name)
+
+    net_attr = { 'ntype' : ntype,
+                 'net_name' : net_name,
+                 'nmac' : nmac
+               }
 
     status = FAIL
-    try:
-        cxml.define(options.ip)
-        # Add disk resource setting
-        service.AddResourceSettings(AffectedConfiguration=vssd_ref, 
-                                    ResourceSettings=[str(dasd)])
-        cxml.dumpxml(options.ip)
-        disk_dev = cxml.get_value_xpath(
-                    '/domain/devices/disk/target/@dev[. = "%s"]' % nddev) 
-        if disk_dev != nddev:
-            raise Exception('Error adding rs for disk_dev')
-        logger.info('good status for disk_dev')
-        # Add net resource setting
-        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
-                                    ResourceSettings=[str(nasd)])
-        cxml.dumpxml(options.ip)
-        net_mac = cxml.get_value_xpath(
-                    '/domain/devices/interface/mac/@address[. = "%s"]' % nnmac)
-        if net_mac.lower() != nnmac:
-            raise Exception('Error adding rs for net_mac')
-        logger.info('good status for net_mac')
-        # Add processor resource setting
-        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
-                                    ResourceSettings=[str(pasd)])
-        cxml.dumpxml(options.ip)
-        proc_vcpu = cxml.xml_get_vcpu()
-        if int(proc_vcpu) != int(npvcpu):
-            raise Exception('Error adding rs for proc_vcpu')
-        logger.info('good status for proc_vcpu')
-        status = PASS
-    except Exception, details:
-        logger.error('Error invoking AddRS')
-        logger.error(details)
 
-    cxml.undefine(options.ip)
+    if options.virt == "KVM": 
+        test_cases = ["define"]
+    else:
+        test_cases = ["define", "start"]
+
+    for case in test_cases:
+        #Each time through, define guest using a default XML
+        cxml.undefine(options.ip)
+        cxml = vxml.get_class(options.virt)(default_dom)
+        ret = cxml.define(options.ip)
+        if not ret:
+            logger.error("Failed to define the dom: %s", default_dom)
+            cleanup_env(options.ip, options.virt, cxml, net_name)
+            return FAIL
+        if case == "start":
+            ret = cxml.start(options.ip)
+            if not ret:
+                logger.error("Failed to start the dom: %s", default_dom)
+                cleanup_env(options.ip, options.virt, cxml, net_name)
+                return FAIL
+
+        status = vsms_util.add_disk_res(options.ip, service, cxml, vssd_ref,
+                                         dasd, disk_attr)
+        if status != PASS:
+            break
+
+        status = vsms_util.add_net_res(options.ip, service, options.virt, cxml,
+                                       vssd_ref, nasd, net_attr)
+        if status != PASS:
+            break
+
+    cleanup_env(options.ip, options.virt, cxml, net_name)
 
     return status
 



From kaitlin at linux.vnet.ibm.com  Sun Jun 22 23:56:00 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Sun, 22 Jun 2008 16:56:00 -0700
Subject: [Libvirt-cim] [PATCH 1 of 2] [TEST] Add AddResource functions to
	vsms_util
In-Reply-To: <patchbomb.1214178959@elm3b41.beaverton.ibm.com>
Message-ID: <43aa81b757fdaedd9e9d.1214178960@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214178778 25200
# Node ID 43aa81b757fdaedd9e9dd7ca70f15104962815d7
# Parent  db29471408dcc1a2ecc315c1fc21e538cc08e411
[TEST] Add AddResource functions to vsms_util.

Just add disk and network for now.  AddResource() doesn't support processor and memory.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r db29471408dc -r 43aa81b757fd suites/libvirt-cim/lib/XenKvmLib/vsms_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Sun Jun 22 10:46:24 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Sun Jun 22 16:52:58 2008 -0700
@@ -24,7 +24,8 @@
 from CimTest import Globals
 from CimTest.ReturnCodes import FAIL, PASS
 from CimTest.Globals import logger
-from VirtLib.live import network_by_bridge, virsh_vcpuinfo
+from VirtLib.live import network_by_bridge, virsh_vcpuinfo, \
+                         get_bridge_from_network_xml
 
 def print_mod_err_msg(func_str, details):
         logger.error('Error invoking ModifyRS: %s' % func_str)
@@ -104,3 +105,63 @@
 
     return PASS
 
+def print_add_err_msg(func_str, details):
+        logger.error('Error invoking AddRS: %s' % func_str)
+        logger.error(details)
+
+def add_disk_res(server, service, cxml, vssd_ref, dasd, attr):
+    try:
+        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
+                                    ResourceSettings=[str(dasd)])
+        cxml.dumpxml(server)
+        disk_dev = cxml.get_value_xpath(
+                   '/domain/devices/disk/target/@dev[. = "%s"]' % attr['nddev'])
+        dpath = cxml.get_value_xpath(
+               '/domain/devices/disk/source/@file[. = "%s"]' % attr['src_path'])
+        if disk_dev != attr['nddev'] or dpath != attr['src_path']:
+            logger.error("Got %s, exp %s.  Got %s, exp %s" % (disk_dev, 
+                         attr['nddev'], dpath, attr['src_path']))
+            raise Exception('Error adding rs for disk_dev')
+        logger.info('good status for disk path')
+    except Exception, details:
+        print_add_err_msg("add_disk_res", details)
+        return FAIL
+
+    return PASS
+
+def add_net_res(server, service, virt, cxml, vssd_ref, nasd, attr):
+    try:
+        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
+                                    ResourceSettings=[str(nasd)])
+        cxml.dumpxml(server)
+    
+        mac = cxml.get_value_xpath(
+                              '/domain/devices/interface/mac/@address[. = "%s"]'
+                              % attr['nmac'])
+
+        if virt == "KVM":
+            name = cxml.get_value_xpath(
+                           '/domain/devices/interface/source/@network[. = "%s"]'
+                           % attr['net_name'])
+            
+        else:
+            # For Xen, network interfaces are converted to bridge interfaces.
+            br = get_bridge_from_network_xml(attr['net_name'], server, virt)
+            name = cxml.get_value_xpath(
+                           '/domain/devices/interface/source/@bridge[. = "%s"]'
+                           % br)
+            if name != None:
+                name = attr['net_name']
+
+        if mac != attr['nmac'] or name != attr['net_name']:
+            logger.error("Got %s, exp %s. Got %s, exp %s." % (mac, 
+                         attr['nmac'], name, attr['net_name']))
+            raise Exception('Error adding rs for net mac')
+
+        logger.info('good status for net_mac')
+    except Exception, details:
+        print_add_err_msg("add_net_res", details)
+        return FAIL
+
+    return PASS
+



From kaitlin at linux.vnet.ibm.com  Mon Jun 23 18:38:06 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 23 Jun 2008 11:38:06 -0700
Subject: [Libvirt-cim] [PATCH] Fix potiential seg fault in parse_id()
Message-ID: <3d2618df45908eecf363.1214246286@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214246238 25200
# Node ID 3d2618df45908eecf363442d50e43297ebd77a62
# Parent  e3b5268c1b4e18a7b0bfe48d98d1f1017a4498c6
Fix potiential seg fault in parse_id().

It's possible to hit a seg fault with calling VSSDComponent's vssd_to_rasd(), VSSD's get_vssd_by_ref(), or VirtualSystemSnapshotService's destroy_snapshot().

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r e3b5268c1b4e -r 3d2618df4590 libxkutil/misc_util.c
--- a/libxkutil/misc_util.c	Fri Jun 13 18:39:12 2008 -0700
+++ b/libxkutil/misc_util.c	Mon Jun 23 11:37:18 2008 -0700
@@ -408,8 +408,8 @@
              char **name)
 {
         int ret;
-        char *tmp_pfx;
-        char *tmp_name;
+        char *tmp_pfx = NULL;
+        char *tmp_name = NULL;
 
         ret = sscanf(id, "%a[^:]:%as", &tmp_pfx, &tmp_name);
         if (ret != 2) {



From danms at us.ibm.com  Mon Jun 23 19:10:52 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 23 Jun 2008 12:10:52 -0700
Subject: [Libvirt-cim] [PATCH 3 of 6] Make ProcRASD expose stored scheduler
	parameters
In-Reply-To: <patchbomb.1214248249@guaranine.danplanet.com>
Message-ID: <f1e816b33b5e914523b0.1214248252@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214248235 25200
# Node ID f1e816b33b5e914523b064b19b27cb8fc61ebfcd
# Parent  cee13699488177020c8050cd9e4311d74d394b2c
Make ProcRASD expose stored scheduler parameters

When we're constructing a ProcRASD, open the infostore for the domain
and read out the weight and limit attributes so they can be set
in the RASD appropriately.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r cee136994881 -r f1e816b33b5e src/Virt_RASD.c
--- a/src/Virt_RASD.c	Mon Jun 23 12:10:31 2008 -0700
+++ b/src/Virt_RASD.c	Mon Jun 23 12:10:35 2008 -0700
@@ -33,6 +33,7 @@
 
 #include "misc_util.h"
 #include "cs_util.h"
+#include "infostore.h"
 
 #include "Virt_RASD.h"
 #include "svpc_types.h"
@@ -91,6 +92,54 @@
 {
         /* FIXME: Remove this */
         return NULL;
+}
+
+static CMPIStatus set_proc_rasd_params(const CMPIBroker *broker,
+                                       const CMPIObjectPath *ref,
+                                       const char *domain,
+                                       CMPIInstance *inst)
+{
+        CMPIStatus s = {CMPI_RC_OK, NULL};
+        virConnectPtr conn = NULL;
+        virDomainPtr dom = NULL;
+        struct infostore_ctx *info;
+        uint32_t weight;
+        uint64_t limit;
+
+        conn = connect_by_classname(broker, CLASSNAME(ref), &s);
+        if (conn == NULL)
+                return s;
+
+        dom = virDomainLookupByName(conn, domain);
+        if (dom == NULL) {
+                cu_statusf(broker, &s,
+                           CMPI_RC_ERR_NOT_FOUND,
+                           "Domain `%s' not found while getting info", domain);
+                goto out;
+        }
+
+        info = infostore_open(dom);
+        if (info == NULL) {
+                cu_statusf(broker, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Unable to open domain information store");
+                goto out;
+        }
+
+        weight = (uint32_t)infostore_get_u64(info, "weight");
+        limit = infostore_get_u64(info, "limit");
+
+        CMSetProperty(inst, "Weight",
+                      (CMPIValue *)&weight, CMPI_uint32);
+        CMSetProperty(inst, "Limit",
+                      (CMPIValue *)&limit, CMPI_uint64);
+
+ out:
+        virDomainFree(dom);
+        virConnectClose(conn);
+        infostore_close(info);
+
+        return s;
 }
 
 static CMPIInstance *rasd_from_vdev(const CMPIBroker *broker,
@@ -174,6 +223,7 @@
         } else if (dev->type == CIM_RES_TYPE_PROC) {
                 CMSetProperty(inst, "VirtualQuantity",
                               (CMPIValue *)&dev->dev.vcpu.quantity, CMPI_uint64);
+                set_proc_rasd_params(broker, ref, host, inst);
         }
 
         /* FIXME: Put the HostResource in place */



From danms at us.ibm.com  Mon Jun 23 19:10:53 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 23 Jun 2008 12:10:53 -0700
Subject: [Libvirt-cim] [PATCH 4 of 6] Add scheduling information to
	device_parsing structures
In-Reply-To: <patchbomb.1214248249@guaranine.danplanet.com>
Message-ID: <f9ee6cb959cf8c5c63b6.1214248253@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214248235 25200
# Node ID f9ee6cb959cf8c5c63b61219763d0d9f3c494f26
# Parent  f1e816b33b5e914523b064b19b27cb8fc61ebfcd
Add scheduling information to device_parsing structures

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r f1e816b33b5e -r f9ee6cb959cf libxkutil/device_parsing.h
--- a/libxkutil/device_parsing.h	Mon Jun 23 12:10:35 2008 -0700
+++ b/libxkutil/device_parsing.h	Mon Jun 23 12:10:35 2008 -0700
@@ -51,6 +51,8 @@
 
 struct vcpu_device {
         uint64_t quantity;
+        uint32_t weight;
+        uint64_t limit;
 };
 
 struct emu_device {



From danms at us.ibm.com  Mon Jun 23 19:10:49 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 23 Jun 2008 12:10:49 -0700
Subject: [Libvirt-cim] [PATCH 0 of 6] #2 Add scheduling parameter persistence
Message-ID: <patchbomb.1214248249@guaranine.danplanet.com>

Updates to the first and second patches only.



From danms at us.ibm.com  Mon Jun 23 19:10:51 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 23 Jun 2008 12:10:51 -0700
Subject: [Libvirt-cim] [PATCH 2 of 6] Add domain information store utilities
In-Reply-To: <patchbomb.1214248249@guaranine.danplanet.com>
Message-ID: <cee13699488177020c80.1214248251@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214248231 25200
# Node ID cee13699488177020c8050cd9e4311d74d394b2c
# Parent  3f95e5cf96d586b7315516421e7eac66ed0fef86
Add domain information store utilities

This sets up a very simple XML file in /etc/libvirt/cim that can store
some key=value attributes for a domain.

The included test is a very simple example and exercise of the code, and
should probably be improved a bit before moving on.

Changes:
 - Fix inconsistent false return
 - Fix missing free of XML parsing context

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 3f95e5cf96d5 -r cee136994881 libxkutil/Makefile.am
--- a/libxkutil/Makefile.am	Mon Jun 23 12:10:07 2008 -0700
+++ b/libxkutil/Makefile.am	Mon Jun 23 12:10:31 2008 -0700
@@ -4,14 +4,14 @@
 
 CFLAGS += $(CFLAGS_STRICT)
 
-noinst_HEADERS = cs_util.h misc_util.h device_parsing.h xmlgen.h
+noinst_HEADERS = cs_util.h misc_util.h device_parsing.h xmlgen.h infostore.h
 
 lib_LTLIBRARIES = libxkutil.la
 
 AM_LDFLAGS = -lvirt -luuid
 
 libxkutil_la_SOURCES = cs_util_instance.c misc_util.c device_parsing.c \
-                       xmlgen.c
+                       xmlgen.c infostore.c
 
 noinst_PROGRAMS = xml_parse_test
 
diff -r 3f95e5cf96d5 -r cee136994881 libxkutil/infostore.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libxkutil/infostore.c	Mon Jun 23 12:10:31 2008 -0700
@@ -0,0 +1,374 @@
+/*
+ * Copyright IBM Corp. 2008
+ *
+ * Authors:
+ *  Dan Smith <danms at us.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <sys/file.h>
+
+#include <libvirt/libvirt.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+#include <libxml/xmlsave.h>
+#include <libxml/tree.h>
+
+#include <libcmpiutil/libcmpiutil.h>
+#include <config.h>
+
+#include "infostore.h"
+
+struct infostore_ctx {
+        xmlDocPtr doc;
+        xmlNodePtr root;
+        xmlXPathContextPtr xpathctx;
+        int fd;
+};
+
+static void infostore_cleanup_ctx(struct infostore_ctx *ctx)
+{
+        xmlXPathFreeContext(ctx->xpathctx);
+        xmlFreeDoc(ctx->doc);
+        close(ctx->fd);
+
+        free(ctx);
+}
+
+static char *_make_filename(const char *type, const char *name)
+{
+        int ret;
+        char *path;
+
+        ret = asprintf(&path, "%s/%s_%s",
+                       INFO_STORE,
+                       type,
+                       name);
+        if (ret == -1) {
+                CU_DEBUG("Failed to asprintf() path to info store");
+                path = NULL;
+        }
+
+        return path;
+}
+
+static char *make_filename(virDomainPtr dom)
+{
+        virConnectPtr conn;
+        char *path = NULL;
+
+        conn = virDomainGetConnect(dom);
+        if (conn == NULL) {
+                CU_DEBUG("Domain has no libvirt connection");
+                goto out;
+        }
+
+        path = _make_filename(virConnectGetType(conn),
+                              virDomainGetName(dom));
+
+        CU_DEBUG("Path is %s", path);
+
+ out:
+        return path;
+}
+
+static xmlDocPtr parse_xml(int fd)
+{
+        xmlParserCtxtPtr ctx = NULL;
+        xmlDocPtr doc = NULL;
+
+        ctx = xmlNewParserCtxt();
+        if (ctx == NULL)
+                goto err;
+
+        doc = xmlCtxtReadFd(ctx,
+                            fd,
+                            "foo",
+                            NULL,
+                            XML_PARSE_NOWARNING | XML_PARSE_NONET);
+        if (doc == NULL)
+                goto err;
+
+        xmlFreeParserCtxt(ctx);
+
+        return doc;
+ err:
+        xmlFreeDoc(doc);
+        xmlFreeParserCtxt(ctx);
+
+        return NULL;
+}
+
+static xmlDocPtr new_xml(void)
+{
+        xmlDocPtr doc = NULL;
+        xmlNodePtr root = NULL;
+
+        doc = xmlNewDoc(BAD_CAST "1.0");
+        if (doc == NULL) {
+                CU_DEBUG("Failed to create new XML document");
+                goto err;
+        }
+
+        root = xmlNewNode(NULL, BAD_CAST "dominfo");
+        if (root == NULL) {
+                CU_DEBUG("Failed top create new root node");
+                goto err;
+        }
+
+        xmlDocSetRootElement(doc, root);
+
+        return doc;
+ err:
+        xmlFreeDoc(doc);
+
+        return NULL;
+}
+
+static bool save_xml(struct infostore_ctx *ctx)
+{
+        xmlSaveCtxtPtr save = NULL;
+        long size = 0;
+
+        lseek(ctx->fd, 0, SEEK_SET);
+
+        save = xmlSaveToFd(ctx->fd, NULL, 0);
+        if (save == NULL) {
+                CU_DEBUG("Failed to allocate save context");
+                goto out;
+        }
+
+        size = xmlSaveDoc(save, ctx->doc);
+
+        xmlSaveClose(save);
+
+ out:
+        return size >= 0;
+}
+
+struct infostore_ctx *infostore_open(virDomainPtr dom)
+{
+        struct infostore_ctx *isc;
+        struct stat s;
+        char *filename = NULL;
+
+        isc = calloc(1, sizeof(*isc));
+        if (isc == NULL) {
+                CU_DEBUG("Unable to allocate domain_details struct");
+                return NULL;
+        }
+
+        filename = make_filename(dom);
+        if (filename == NULL)
+                goto err;
+
+        isc->fd = open(filename, O_RDWR|O_CREAT, 0600);
+        if (isc->fd < 0) {
+                CU_DEBUG("Unable to open `%s': %m", filename);
+                goto err;
+        }
+
+        if (flock(isc->fd, LOCK_EX) != 0) {
+                CU_DEBUG("Failed to lock infostore");
+                goto err;
+        }
+
+        fstat(isc->fd, &s);
+        if (s.st_size == 0)
+                isc->doc = new_xml();
+        else
+                isc->doc = parse_xml(isc->fd);
+
+        if (isc->doc == NULL) {
+                CU_DEBUG("Failed to parse XML");
+                goto err;
+        }
+
+        isc->root = xmlDocGetRootElement(isc->doc);
+        if (isc->root == NULL) {
+                CU_DEBUG("Failed to parse XML");
+                goto err;
+        }
+
+        if (!xmlStrEqual(isc->root->name, BAD_CAST "dominfo")) {
+                CU_DEBUG("XML does not start with <dominfo>");
+                goto err;
+        }
+
+        isc->xpathctx = xmlXPathNewContext(isc->doc);
+        if (isc->xpathctx == NULL) {
+                CU_DEBUG("Failed to allocate XPath context");
+                goto err;
+        }
+
+        free(filename);
+
+        return isc;
+
+ err:
+        infostore_cleanup_ctx(isc);
+        free(filename);
+
+        return NULL;
+}
+
+void infostore_close(struct infostore_ctx *ctx)
+{
+        if (ctx == NULL)
+                return;
+
+        save_xml(ctx);
+        infostore_cleanup_ctx(ctx);
+}
+
+void infostore_delete(const char *type, const char *name)
+{
+        char *path = NULL;
+
+        path = _make_filename(type, name);
+        if (path == NULL)
+                return;
+
+        unlink(path);
+
+        free(path);
+}
+
+static xmlXPathObjectPtr xpath_query(struct infostore_ctx *ctx, const char *key)
+{
+        char *path = NULL;
+        xmlXPathObjectPtr result = NULL;
+
+        if (asprintf(&path, "/dominfo/%s[1]", key) == -1) {
+                CU_DEBUG("Failed to alloc path string");
+                goto out;
+        }
+
+        result = xmlXPathEval(BAD_CAST path, ctx->xpathctx);
+        if ((result->type != XPATH_NODESET) ||
+            (xmlXPathNodeSetGetLength(result->nodesetval) < 1)) {
+                xmlXPathFreeObject(result);
+                result = NULL;
+        }
+ out:
+        free(path);
+
+        return result;
+}
+
+static char *xpath_query_string(struct infostore_ctx *ctx, const char *key)
+{
+        xmlXPathObjectPtr result;
+        char *val = NULL;
+
+        result = xpath_query(ctx, key);
+        if (result != NULL)
+                val = (char *)xmlXPathCastToString(result);
+
+        xmlXPathFreeObject(result);
+
+        return val;
+}
+
+static bool xpath_set_string(struct infostore_ctx *ctx,
+                             const char *key,
+                             const char *val)
+{
+        xmlXPathObjectPtr result = NULL;
+        xmlNodePtr node = NULL;
+
+        result = xpath_query(ctx, key);
+        if (result == NULL) {
+                CU_DEBUG("Creating new node %s=%s", key, val);
+                node = xmlNewDocNode(ctx->doc, NULL, BAD_CAST key, NULL);
+                xmlAddChild(ctx->root, node);
+        } else {
+                node = result->nodesetval->nodeTab[0];
+        }
+
+        if (node == NULL) {
+                CU_DEBUG("Failed to update node for `%s'", key);
+                goto out;
+        }
+
+        xmlNodeSetContent(node, BAD_CAST val);
+ out:
+        xmlXPathFreeObject(result);
+
+        return node != NULL;
+}
+
+uint64_t infostore_get_u64(struct infostore_ctx *ctx, const char *key)
+{
+        char *sval = NULL;
+        uint64_t val = 0;
+
+        sval = xpath_query_string(ctx, key);
+        if (sval == NULL)
+                goto out;
+
+        if (sscanf((const char *)sval, "%" SCNu64, &val) != 1) {
+                CU_DEBUG("Failed to parse u64 for %s (%s)", key, sval);
+                goto out;
+        }
+ out:
+        free(sval);
+
+        return val;
+}
+
+bool infostore_set_u64(struct infostore_ctx *ctx, const char *key, uint64_t val)
+{
+        char *sval = NULL;
+
+        if (asprintf(&sval, "%" PRIu64, val) == -1) {
+                CU_DEBUG("Failed to format u64 string");
+                sval = NULL;
+                goto out;
+        }
+
+        xpath_set_string(ctx, key, sval);
+ out:
+        free(sval);
+
+        return false;
+}
+
+char *infostore_get_str(struct infostore_ctx *ctx, const char *key)
+{
+        return xpath_query_string(ctx, key);
+}
+
+bool infostore_set_str(struct infostore_ctx *ctx,
+                       const char *key, const char * val)
+{
+        return xpath_set_string(ctx, key, val);
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-set-style: "K&R"
+ * tab-width: 8
+ * c-basic-offset: 8
+ * indent-tabs-mode: nil
+ * End:
+ */
diff -r 3f95e5cf96d5 -r cee136994881 libxkutil/infostore.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libxkutil/infostore.h	Mon Jun 23 12:10:31 2008 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright IBM Corp. 2008
+ *
+ * Authors:
+ *  Dan Smith <danms at us.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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
+ */
+
+#ifndef __INFOSTORE_H
+#define __INFOSTORE_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <libvirt/libvirt.h>
+
+struct infostore_ctx;
+
+struct infostore_ctx *infostore_open(virDomainPtr dom);
+void infostore_close(struct infostore_ctx *ctx);
+void infostore_delete(const char *type, const char *name);
+
+uint64_t infostore_get_u64(struct infostore_ctx *ctx, const char *key);
+bool infostore_set_u64(struct infostore_ctx *ctx,
+                       const char *key, uint64_t val);
+
+char *infostore_get_str(struct infostore_ctx *ctx, const char *key);
+bool infostore_set_str(struct infostore_ctx *ctx,
+                       const char *key, const char * val);
+
+
+#endif
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-set-style: "K&R"
+ * tab-width: 8
+ * c-basic-offset: 8
+ * indent-tabs-mode: nil
+ * End:
+ */
diff -r 3f95e5cf96d5 -r cee136994881 libxkutil/tests/Makefile.am
--- a/libxkutil/tests/Makefile.am	Mon Jun 23 12:10:07 2008 -0700
+++ b/libxkutil/tests/Makefile.am	Mon Jun 23 12:10:31 2008 -0700
@@ -1,10 +1,10 @@
 # Copyright IBM Corp. 2007
-TESTS = xml_tag.test xml_devices.test xmlgen.test xml_dominfo.test
+TESTS = xml_tag.test xml_devices.test xmlgen.test xml_dominfo.test infostore.test
 
 CFLAGS += -g
 
 %.test: %.c
-	$(CC) -o $@ $^ $(CFLAGS) -lvirt `xml2-config --libs`
+	$(CC) -o $@ $^ $(CFLAGS) -lvirt `xml2-config --libs` -L../.libs -lxkutil
 
 clean-local:
 	rm -f *.test
diff -r 3f95e5cf96d5 -r cee136994881 libxkutil/tests/infostore.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libxkutil/tests/infostore.c	Mon Jun 23 12:10:31 2008 -0700
@@ -0,0 +1,80 @@
+/*
+ * Copyright IBM Corp. 2008
+ *
+ * Authors:
+ *  Dan Smith <danms at us.ibm.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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
+ */
+
+#include <stdio.h>
+#include <inttypes.h>
+
+#include <libvirt/libvirt.h>
+
+#include "../infostore.h"
+
+int main(int argc, char **argv)
+{
+        struct infostore_ctx *ctx = NULL;
+        virConnectPtr conn = NULL;
+        virDomainPtr dom = NULL;
+
+        if (argc != 2) {
+                printf("Usage: %s <domain>\n", argv[0]);
+                return 1;
+        }
+
+        conn = virConnectOpen(NULL);
+        if (conn == NULL) {
+                printf("Unable to open connection\n");
+                goto out;
+        }
+
+        dom = virDomainLookupByName(conn, argv[1]);
+        if (dom == NULL) {
+                printf("Unable to lookup domain `%s'\n", argv[1]);
+                goto out;
+        }
+
+        ctx = infostore_open(dom);
+        if (ctx == NULL) {
+                printf("Unable to open infostore for `%s'\n", argv[1]);
+                goto out;
+        }
+
+        printf("Foo: %" PRIu64 "\n", infostore_get_u64(ctx, "foo"));
+
+        infostore_set_u64(ctx, "foo", 321);
+        infostore_set_u64(ctx, "bar", 987);
+        printf("Should be (null): %s\n", infostore_get_str(ctx, "baz"));
+
+ out:
+        infostore_close(ctx);
+        virDomainFree(dom);
+        virConnectClose(conn);
+
+        return 0;
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-set-style: "K&R"
+ * tab-width: 8
+ * c-basic-offset: 8
+ * indent-tabs-mode: nil
+ * End:
+ */



From danms at us.ibm.com  Mon Jun 23 19:10:50 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 23 Jun 2008 12:10:50 -0700
Subject: [Libvirt-cim] [PATCH 1 of 6] Add persistent data location to
	configure.ac
In-Reply-To: <patchbomb.1214248249@guaranine.danplanet.com>
Message-ID: <3f95e5cf96d586b73155.1214248250@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214248207 25200
# Node ID 3f95e5cf96d586b7315516421e7eac66ed0fef86
# Parent  3d2618df45908eecf363442d50e43297ebd77a62
Add persistent data location to configure.ac

Changes:
 - Create the infostore directory on postinstall

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 3d2618df4590 -r 3f95e5cf96d5 Makefile.am
--- a/Makefile.am	Mon Jun 23 11:37:18 2008 -0700
+++ b/Makefile.am	Mon Jun 23 12:10:07 2008 -0700
@@ -113,6 +113,7 @@
 	sh provider-register.sh -v -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS)
 	sh provider-register.sh -v -t @CIMSERVER@ -n root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS)
 	virsh -v | grep -q '^0.3' && cp examples/diskpool.conf $(DISK_POOL_CONFIG) || true
+	mkdir -p $(INFO_STORE)
 
 preuninstall:
 	sh provider-register.sh -v -d -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS)
diff -r 3d2618df4590 -r 3f95e5cf96d5 acinclude.m4
--- a/acinclude.m4	Mon Jun 23 11:37:18 2008 -0700
+++ b/acinclude.m4	Mon Jun 23 12:10:07 2008 -0700
@@ -317,6 +317,17 @@
     ]
 )
 
+#
+# Define info store location.
+#
+AC_DEFUN([DEFINE_INFO_STORE],
+    [
+    AC_DEFINE_UNQUOTED([INFO_STORE], "$1", [Info store location])
+    INFO_STORE=$1
+    AC_SUBST(INFO_STORE)
+    ]
+)
+
 AC_DEFUN([SET_CSET],
 	[
 	if test -d .hg && test -x $(which hg); then
diff -r 3d2618df4590 -r 3f95e5cf96d5 configure.ac
--- a/configure.ac	Mon Jun 23 11:37:18 2008 -0700
+++ b/configure.ac	Mon Jun 23 12:10:07 2008 -0700
@@ -60,6 +60,13 @@
             [DEFINE_DISK_CONFIG($with_diskconfig)], 
             [DEFINE_DISK_CONFIG(/etc/libvirt/diskpool.conf)]
 )
+
+AC_ARG_WITH([info_store],
+	    [  --with-info-store=PATH  Set information store location (default=/etc/libvirt/cim)],
+	    [DEFINE_INFO_STORE($withval)],
+	    [DEFINE_INFO_STORE(/etc/libvirt/cim)]
+)
+
 AC_ARG_WITH([maxmem], 
             [  --with-maxmem=FOO	  Set max memory (KB) for a guest.], 
             [DEFINE_MAXMEM($with_maxmem)], 



From danms at us.ibm.com  Mon Jun 23 19:10:54 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 23 Jun 2008 12:10:54 -0700
Subject: [Libvirt-cim] [PATCH 5 of 6] Make VSMS record scheduler parameters
	when changed
In-Reply-To: <patchbomb.1214248249@guaranine.danplanet.com>
Message-ID: <54d2e0f7e87e78a8a9e8.1214248254@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214248235 25200
# Node ID 54d2e0f7e87e78a8a9e85765f0795300ec7190ce
# Parent  f9ee6cb959cf8c5c63b61219763d0d9f3c494f26
Make VSMS record scheduler parameters when changed

This includes a new function to synchronize information to the infostore
for use during a ModifyResource() or DefineSystem() call.

Also, delete the infostore for a domain on DestroySystem()

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r f9ee6cb959cf -r 54d2e0f7e87e src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Mon Jun 23 12:10:35 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Mon Jun 23 12:10:35 2008 -0700
@@ -42,6 +42,7 @@
 #include <libcmpiutil/std_instance.h>
 
 #include "misc_util.h"
+#include "infostore.h"
 
 #include "Virt_VirtualSystemManagementService.h"
 #include "Virt_ComputerSystem.h"
@@ -471,6 +472,8 @@
                                      struct virt_device *dev)
 {
         cu_get_u64_prop(inst, "VirtualQuantity", &dev->dev.vcpu.quantity);
+        cu_get_u64_prop(inst, "Limit", &dev->dev.vcpu.limit);
+        cu_get_u32_prop(inst, "Weight", &dev->dev.vcpu.weight);
 
         return NULL;
 }
@@ -650,6 +653,54 @@
         return inst;
 }
 
+static CMPIStatus update_dominfo(const struct domain *dominfo,
+                                 const char *refcn)
+{
+        CMPIStatus s = {CMPI_RC_OK, NULL};
+        struct infostore_ctx *ctx = NULL;
+        struct virt_device *dev = dominfo->dev_vcpu;
+        virConnectPtr conn = NULL;
+        virDomainPtr dom = NULL;
+
+        if (dominfo->dev_vcpu_ct != 1) {
+                /* Right now, we only have extra info for processors */
+                CU_DEBUG("Domain has no vcpu devices!");
+                return s;
+        }
+
+        conn = connect_by_classname(_BROKER, refcn, &s);
+        if (conn == NULL) {
+                CU_DEBUG("Failed to connnect by %s", refcn);
+                return s;
+        }
+
+        dom = virDomainLookupByName(conn, dominfo->name);
+        if (dom == NULL) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_NOT_FOUND,
+                           "Unable to lookup domain `%s'", dominfo->name);
+                goto out;
+        }
+
+        ctx = infostore_open(dom);
+        if (ctx == NULL) {
+                cu_statusf(_BROKER, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Unable to open infostore");
+                goto out;
+        }
+
+        infostore_set_u64(ctx, "weight", dev->dev.vcpu.weight);
+        infostore_set_u64(ctx, "limit", dev->dev.vcpu.limit);
+ out:
+        infostore_close(ctx);
+
+        virDomainFree(dom);
+        virConnectClose(conn);
+
+        return s;
+}
+
 static CMPIInstance *create_system(CMPIInstance *vssd,
                                    CMPIArray *resources,
                                    const CMPIObjectPath *ref,
@@ -690,6 +741,8 @@
         CU_DEBUG("System XML:\n%s", xml);
 
         inst = connect_and_create(xml, ref, s);
+        if (inst != NULL)
+                update_dominfo(domain, CLASSNAME(ref));
 
  out:
         cleanup_dominfo(&domain);
@@ -780,6 +833,8 @@
                 rc = IM_RC_SYS_NOT_FOUND;
                 goto error;
         }
+
+        infostore_delete(virConnectGetType(conn), dom_name);
 
         virDomainDestroy(dom); /* Okay for this to fail */
         if (virDomainUndefine(dom) == 0) {
@@ -961,6 +1016,8 @@
                            "Virtual System `%s' not found", dominfo->name);
                 goto out;
         }
+
+        update_dominfo(dominfo, refcn);
 
         if (!domain_online(dom)) {
                 CU_DEBUG("VS `%s' not online; skipping dynamic update",



From danms at us.ibm.com  Mon Jun 23 19:10:55 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 23 Jun 2008 12:10:55 -0700
Subject: [Libvirt-cim] [PATCH 6 of 6] Make
	ComputerSystem::RequestStateChange() set
	scheduling parameters at start
In-Reply-To: <patchbomb.1214248249@guaranine.danplanet.com>
Message-ID: <d2ad8dd8ccbdf66c416d.1214248255@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214248235 25200
# Node ID d2ad8dd8ccbdf66c416deb765d8b738e15dabc2e
# Parent  54d2e0f7e87e78a8a9e85765f0795300ec7190ce
Make ComputerSystem::RequestStateChange() set scheduling parameters at start

Currently, only do this for Xen domains.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 54d2e0f7e87e -r d2ad8dd8ccbd src/Virt_ComputerSystem.c
--- a/src/Virt_ComputerSystem.c	Mon Jun 23 12:10:35 2008 -0700
+++ b/src/Virt_ComputerSystem.c	Mon Jun 23 12:10:35 2008 -0700
@@ -35,6 +35,7 @@
 #include "cs_util.h"
 #include <libcmpiutil/libcmpiutil.h>
 #include "misc_util.h"
+#include "infostore.h"
 #include "device_parsing.h"
 #include <libcmpiutil/std_invokemethod.h>
 #include <libcmpiutil/std_instance.h>
@@ -620,6 +621,40 @@
 DEFAULT_EQ();
 DEFAULT_INST_CLEANUP();
 
+static void set_scheduler_params(virDomainPtr dom)
+{
+        struct infostore_ctx *ctx;
+        virConnectPtr conn = NULL;
+        virSchedParameter params[] =
+                {{ "weight", VIR_DOMAIN_SCHED_FIELD_UINT },
+                 { "cap", VIR_DOMAIN_SCHED_FIELD_UINT },
+                };
+
+        conn = virDomainGetConnect(dom);
+        if (conn == NULL) {
+                CU_DEBUG("Unable to get connection from domain");
+                return;
+        }
+
+        if (!STREQC(virConnectGetType(conn), "xen")) {
+                CU_DEBUG("Not setting sched params for this domain type");
+                return;
+        }
+
+        ctx = infostore_open(dom);
+        if (ctx == NULL) {
+                CU_DEBUG("Unable to open infostore for domain");
+                return;
+        }
+
+        params[0].value.ui = infostore_get_u64(ctx, "weight");
+        params[1].value.ui = infostore_get_u64(ctx, "limit");
+
+        virDomainSetSchedulerParameters(dom, params, 2);
+
+        infostore_close(ctx);
+}
+
 /* This composite operation may be supported as a flag to reboot */
 static int domain_reset(virDomainPtr dom)
 {
@@ -643,6 +678,7 @@
         case VIR_DOMAIN_SHUTOFF:
                 CU_DEBUG("Start domain");
                 ret = virDomainCreate(dom);
+                set_scheduler_params(dom);
                 break;
         case VIR_DOMAIN_PAUSED:
                 CU_DEBUG("Unpause domain");



From danms at us.ibm.com  Mon Jun 23 19:14:31 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 23 Jun 2008 12:14:31 -0700
Subject: [Libvirt-cim] Cimtest report for LXC on F9 (2008/06/19)
References: <OF07DFE801.31ED56B1-ON4825746E.001E7091-4825746E.001ED639@cn.ibm.com>
	<485BE675.203@linux.vnet.ibm.com>
Message-ID: <878wwwvu94.fsf@caffeine.beaverton.ibm.com>

KR> Dan - are you seeing similar problems?  The contain fails to
KR> start. It's attempting to launch a script that just runs "exec
KR> /bin/bash", so the script shouldn't be immediately failing.

Well, the lxc driver is pretty fragile, so I'm sure there's just
something blocking it.

Daisy, you might want to run libvirtd in non-daemon mode.  Also, if
you --enable-debug=yes on the libvirt build and then run the daemon
with LIBVIRT_DEBUG=1 you'll get more information.

You can also just use <init>/bin/bash</init> to take one of the
variables out of the equation.

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080623/3309c6cf/attachment.sig>

From danms at us.ibm.com  Mon Jun 23 20:40:12 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 23 Jun 2008 13:40:12 -0700
Subject: [Libvirt-cim] [PATCH 2 of 6] Add domain information store
	utilities
In-Reply-To: <cee13699488177020c80.1214248251@guaranine.danplanet.com> (Dan
	Smith's message of "Mon, 23 Jun 2008 12:10:51 -0700")
References: <cee13699488177020c80.1214248251@guaranine.danplanet.com>
Message-ID: <87r6anvqab.fsf@caffeine.beaverton.ibm.com>

DS> +bool infostore_set_u64(struct infostore_ctx *ctx, const char *key, uint64_t val)
DS> +{
DS> +        char *sval = NULL;
DS> +
DS> +        if (asprintf(&sval, "%" PRIu64, val) == -1) {
DS> +                CU_DEBUG("Failed to format u64 string");
DS> +                sval = NULL;
DS> +                goto out;
DS> +        }
DS> +
DS> +        xpath_set_string(ctx, key, sval);
DS> + out:
DS> +        free(sval);
DS> +
DS> +        return false;
DS> +}

Looks like I forgot to refresh the patch before sending it out.  It's
fixed locally, I promise :)

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080623/5b3e9f84/attachment.sig>

From kaitlin at linux.vnet.ibm.com  Mon Jun 23 20:41:03 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 23 Jun 2008 13:41:03 -0700
Subject: [Libvirt-cim] SIGSEGV error of VirtualSystemSettingDataComponent
	assocation querying
In-Reply-To: <OF88BB5601.FA801DD2-ON48257465.002421B4-48257465.00253886@cn.ibm.com>
References: <OF88BB5601.FA801DD2-ON48257465.002421B4-48257465.00253886@cn.ibm.com>
Message-ID: <48600A5F.4020302@linux.vnet.ibm.com>

Guo Lian Yun wrote:
> 
> Kaitlin,
> 
> I hit a SIGSEGV error of LXC_VirtualSystemSettingDataComponent 
> associations querying in sfcb, would you please test it on your machine 
> with Pegasus?
> I'm sorry I can't provide more SFCB debug info to you now.  
>  
> wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
> http://root:password at localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="invalid" 
> 
> *
> * wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider 
> Virt_VSSDComponent(23814) exiting due to a SIGSEGV signal
> *
> 

Daisy,

I submitted a fix for this issue, which is now in the tree.  Can you 
update your libvirt-cim sources and try this test again?

Thanks!
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun 23 20:43:32 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 23 Jun 2008 13:43:32 -0700
Subject: [Libvirt-cim] Cimtest report for LXC on F9 (2008/06/19)
In-Reply-To: <878wwwvu94.fsf@caffeine.beaverton.ibm.com>
References: <OF07DFE801.31ED56B1-ON4825746E.001E7091-4825746E.001ED639@cn.ibm.com>
	<485BE675.203@linux.vnet.ibm.com>
	<878wwwvu94.fsf@caffeine.beaverton.ibm.com>
Message-ID: <48600AF4.6010603@linux.vnet.ibm.com>

Dan Smith wrote:
> KR> Dan - are you seeing similar problems?  The contain fails to
> KR> start. It's attempting to launch a script that just runs "exec
> KR> /bin/bash", so the script shouldn't be immediately failing.
> 
> Well, the lxc driver is pretty fragile, so I'm sure there's just
> something blocking it.
> 
> Daisy, you might want to run libvirtd in non-daemon mode.  Also, if
> you --enable-debug=yes on the libvirt build and then run the daemon
> with LIBVIRT_DEBUG=1 you'll get more information.
> 
> You can also just use <init>/bin/bash</init> to take one of the
> variables out of the equation.
> 

Also, I forgot to verify this on Friday - can you make sure the script 
has the proper execute permissions.
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun 23 21:19:05 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 23 Jun 2008 14:19:05 -0700
Subject: [Libvirt-cim] [PATCH 2 of 6] Add domain information store
	utilities
In-Reply-To: <87r6anvqab.fsf@caffeine.beaverton.ibm.com>
References: <cee13699488177020c80.1214248251@guaranine.danplanet.com>
	<87r6anvqab.fsf@caffeine.beaverton.ibm.com>
Message-ID: <48601349.4060906@linux.vnet.ibm.com>

Dan Smith wrote:
> DS> +bool infostore_set_u64(struct infostore_ctx *ctx, const char *key, uint64_t val)
> DS> +{
> DS> +        char *sval = NULL;
> DS> +
> DS> +        if (asprintf(&sval, "%" PRIu64, val) == -1) {
> DS> +                CU_DEBUG("Failed to format u64 string");
> DS> +                sval = NULL;
> DS> +                goto out;
> DS> +        }
> DS> +
> DS> +        xpath_set_string(ctx, key, sval);
> DS> + out:
> DS> +        free(sval);
> DS> +
> DS> +        return false;
> DS> +}
> 
> Looks like I forgot to refresh the patch before sending it out.  It's
> fixed locally, I promise :)

Cool, then +1 for me. =)

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Tue Jun 24 02:09:50 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Tue, 24 Jun 2008 10:09:50 +0800
Subject: [Libvirt-cim] SIGSEGV error of VirtualSystemSettingDataComponent
	assocation querying
In-Reply-To: <48600A5F.4020302@linux.vnet.ibm.com>
Message-ID: <OF552F67EE.17F01575-ON48257472.000C0BEB-48257472.000C2F58@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-24 04:41:03:

> Guo Lian Yun wrote:
> > 
> > Kaitlin,
> > 
> > I hit a SIGSEGV error of LXC_VirtualSystemSettingDataComponent 
> > associations querying in sfcb, would you please test it on your 
machine 
> > with Pegasus?
> > I'm sorry I can't provide more SFCB debug info to you now. 
> > 
> > wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 
> > http://root:password at localhost/root/virt:
> LXC_VirtualSystemSettingData.InstanceID="invalid" 
> > 
> > *
> > * wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider 
> > Virt_VSSDComponent(23814) exiting due to a SIGSEGV signal
> > *
> > 
> 
> Daisy,
> 
> I submitted a fix for this issue, which is now in the tree.  Can you 
> update your libvirt-cim sources and try this test again?
> 
  Thanks Kaitlin. This issues is fixed with your patch, the test return
  expect result.

> Thanks!
> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080624/fc67e94a/attachment.htm>

From yunguol at cn.ibm.com  Tue Jun 24 02:19:46 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Tue, 24 Jun 2008 10:19:46 +0800
Subject: [Libvirt-cim] Cimtest Report for LXC on F9 (2008/06/24)
Message-ID: <OF5F6841E1.DE9AA906-ON48257472.000CEF29-48257472.000D17E2@cn.ibm.com>

stro: Fedora 9 Beta
kernel-2.6.25-0.218.rc8.git7.fc9.x86_64
CIMOM: tog-pegasus-2.7.0-6.fc9.x86_64
cimtest: changeset-227

==================================================================
PASS        :  88
FAIL        :  1
XFAIL       :  1
SKIP        :  39
-----------------
Total       : 129

===================== CIMTEST REPORT===============================

AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: SKIP
ERROR   - System has defined domains; unable to run
ComputerSystem - 03_defineVS.py: PASS
ComputerSystem - 04_defineStartVS.py: FAIL
ERROR   - Error: property values are not set for VS domguest
ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
ERROR   - ERROR: VS DomST1 transition from Defined State to Activate state 
was not Successful
Bug:<00002>
ComputerSystem - 06_paused_active_suspend.py: SKIP
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: PASS
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: SKIP
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: PASS
ComputerSystemIndication - 01_created_indication.py: SKIP
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: SKIP
ElementAllocatedFromPool - 04_forward_errs.py: SKIP
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: SKIP
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: SKIP
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: SKIP
LogicalDisk - 02_nodevs.py: SKIP
LogicalDisk - 03_ld_gi_errs.py: SKIP
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: PASS
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: SKIP
NetworkPort - 02_np_gi_errors.py: SKIP
NetworkPort - 03_user_netport.py: SKIP
Processor - 01_processor.py: SKIP
Processor - 02_definesys_get_procs.py: SKIP
Processor - 03_proc_gi_errs.py: SKIP
Profile - 01_enum.py: PASS
Profile - 02_profile_to_elec.py: SKIP
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
ReferencedProfile - 01_verify_refprof.py: PASS
ReferencedProfile - 02_refprofile_errs.py: PASS
ResourceAllocationFromPool - 01_forward.py: SKIP
ResourceAllocationFromPool - 02_reverse.py: PASS
ResourceAllocationFromPool - 03_forward_errs.py: PASS
ResourceAllocationFromPool - 04_reverse_errs.py: PASS
ResourceAllocationFromPool - 05_RAPF_err.py: SKIP
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: SKIP
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: 
SKIP
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP
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: 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: SKIP
VirtualSystemManagementService - 07_addresource_neg.py: PASS
VirtualSystemManagementService - 08_modifyresource.py: SKIP
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: SKIP
VirtualSystemSettingDataComponent - 02_reverse.py: 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


Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080624/dd2126b6/attachment.htm>

From yunguol at cn.ibm.com  Tue Jun 24 05:07:14 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Tue, 24 Jun 2008 13:07:14 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #5 Update RAFP.01 for LXC support,
	also pass for Xen, KVM and XenFV
Message-ID: <3e9eef552d30fa26009f.1214284034@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1214284001 -28800
# Node ID 3e9eef552d30fa26009f1e823e8eaf586a4eb793
# Parent  c12f7b4a86e606c4fb8c1f32bc3a98bf59b75550
[TEST] #5 Update RAFP.01 for LXC support, also pass for Xen, KVM and XenFV

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r c12f7b4a86e6 -r 3e9eef552d30 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Thu Jun 19 22:49:43 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Tue Jun 24 13:06:41 2008 +0800
@@ -26,68 +26,125 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    elif virt == "XenFV" or virt=="KVM":
+        test_disk = "hda"
+    else:
+        test_disk = None
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def get_instance(server, pool, list, virt='Xen'):
+    try:
+        inst = enumclass.getInstance(server,
+                                     pool,
+                                     list,
+                                     virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE  % pool)
+        return FAIL, inst
+  
+    return PASS, inst
+
+def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
+    try:
+        data = assoc.AssociatorNames(server,
+                                     assoc_cn,
+                                     cn,
+                                     virt,
+                                     InstanceID=list)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
+        return FAIL
+
+    if data[0]['InstanceID'] not in rasd:
+        logger.info ('ID %s' % data[0]['InstanceID'])
+        logger.error("InstanceID Mismatch")
+        logger.error("Returned %s error" % data[0]['InstanceID'])
+        return FAIL
+
+    return PASS
+               
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
+   
+    status, vsxml, test_disk = setup_env(options.ip, options.virt)
+    if status != PASS:
+        return status
+    
+    status, diskid = create_diskpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
 
-    try:
-        key_list = { 'InstanceID' : "MemoryPool/0" }
-        mempool = enumclass.getInstance(options.ip,
-                                        "MemoryPool",
-                                        key_list,
-                                        options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
-        return FAIL
+    status, test_network = create_netpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
+ 
+    if options.virt == 'LXC':
+        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
+        rasd = [ "%s/mem" % test_dom ]
+    else:
+        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
+                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
+                 "DiskPool"      : {'InstanceID' : diskid},
+                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" % test_network }}
+        rasd = [ "%s/mem" % test_dom, 
+                 "%s/proc" % test_dom, 
+                 "%s/%s" %(test_dom, test_disk), 
+                 "%s/%s" % (test_dom, test_mac) ]
 
-    try:
-        key_list = { 'InstanceID' : "ProcessorPool/0" }
-        procpool = enumclass.getInstance(options.ip,
-                                         "ProcessorPool",
-                                         key_list,
-                                         options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
-        return FAIL
-     
-    try:
-        memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                        "MemoryPool",
-                                        options.virt,
-                                        InstanceID = mempool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mempool.InstanceID)
-        status = FAIL
-     
-    for i in range(len(memdata)):
-        if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"):
-            logger.error("ERROR: Association result error")
-            status = FAIL
-                
-    try:
-        procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                         "ProcessorPool",
-                                         options.virt,
-                                         InstanceID = procpool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % procpool.InstanceID)
-        status = FAIL
-      
-    for j in range(len(procdata)):
-        if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"):
-	    logger.error("ERROR: Association result error")
-            status = FAIL
+    for k, v in pool.iteritems():
+        status, inst = get_instance(options.ip, k, v, options.virt) 
 
+        status = verify_rasd(options.ip, "ResourceAllocationFromPool", 
+                             k, options.virt, inst.InstanceID,
+                             rasd)
+
+    cleanup_restore(options.ip, options.virt)
+    vsxml.undefine(options.ip)
     return status 
-        
-        
+   
 if __name__ == "__main__":
     sys.exit(main())



From yunguol at cn.ibm.com  Tue Jun 24 05:08:49 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Tue, 24 Jun 2008 13:08:49 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #4 Update RAFP.01 for LXC support
In-Reply-To: <485BCA0E.6090607@linux.vnet.ibm.com>
Message-ID: <OF461BF3A4.743EB3E4-ON48257472.001C63A4-48257472.001C91FE@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-20 23:17:34:

> yunguol at cn.ibm.com wrote:
> > # HG changeset patch
> > # User Guolian Yun <yunguol at cn.ibm.com>
> > # Date 1213929254 -28800
> > # Node ID a77ba5eb00a6d9c175eee319d8be4c6afe27c615
> > # Parent  93dbca94a762bb2ba443025db96d43977484c40d
> > [TEST] #4 Update RAFP.01 for LXC support
> > 
> 
> This fails for me on KVM, Xen, XenFV with:
> 
> ResourceAllocationFromPool - 01_forward.py: FAIL
> ERROR   - InstanceID Mismatch
> ERROR   - Returned RAFP_dom/00:11:22:33:44:aa error
> ERROR   - InstanceID Mismatch
> ERROR   - Returned RAFP_dom/hda error
> 
> 
> Does it fail for you?
 
  It fails because of incorrect InstanceID setting in rasd. 
  I've send a new patch for LXC support, also fix the issue 
  of Xen, KVM and XenFV fails.

> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080624/1b3891ac/attachment.htm>

From yunguol at cn.ibm.com  Tue Jun 24 05:25:37 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Tue, 24 Jun 2008 13:25:37 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #5 Update RAFP.01 for LXC support,
	also pass for Xen, KVM and XenFV
In-Reply-To: <3e9eef552d30fa26009f.1214284034@localhost.localdomain>
Message-ID: <OFB65AFDE3.97B94F0C-ON48257472.001E0811-48257472.001E1BAA@cn.ibm.com>

Please ignore this patch.

Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203




Guo Lian Yun/China/IBM at IBMCN 
Sent by: libvirt-cim-bounces at redhat.com
2008-06-24 13:07
Please respond to
List for discussion and development of libvirt CIM 
<libvirt-cim at redhat.com>


To
libvirt-cim at redhat.com
cc

Subject
[Libvirt-cim] [PATCH] [TEST] #5 Update RAFP.01 for LXC support, also pass 
for Xen, KVM and XenFV






# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1214284001 -28800
# Node ID 3e9eef552d30fa26009f1e823e8eaf586a4eb793
# Parent  c12f7b4a86e606c4fb8c1f32bc3a98bf59b75550
[TEST] #5 Update RAFP.01 for LXC support, also pass for Xen, KVM and XenFV

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r c12f7b4a86e6 -r 3e9eef552d30 
suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py  
 Thu Jun 19 22:49:43 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py  
 Tue Jun 24 13:06:41 2008 +0800
@@ -26,68 +26,125 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, 
\
+create_netpool_conf
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    elif virt == "XenFV" or virt=="KVM":
+        test_disk = "hda"
+    else:
+        test_disk = None
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def get_instance(server, pool, list, virt='Xen'):
+    try:
+        inst = enumclass.getInstance(server,
+                                     pool,
+                                     list,
+                                     virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE  % pool)
+        return FAIL, inst
+ 
+    return PASS, inst
+
+def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
+    try:
+        data = assoc.AssociatorNames(server,
+                                     assoc_cn,
+                                     cn,
+                                     virt,
+                                     InstanceID=list)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
+        return FAIL
+
+    if data[0]['InstanceID'] not in rasd:
+        logger.info ('ID %s' % data[0]['InstanceID'])
+        logger.error("InstanceID Mismatch")
+        logger.error("Returned %s error" % data[0]['InstanceID'])
+        return FAIL
+
+    return PASS
+ 
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
+ 
+    status, vsxml, test_disk = setup_env(options.ip, options.virt)
+    if status != PASS:
+        return status
+ 
+    status, diskid = create_diskpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
 
-    try:
-        key_list = { 'InstanceID' : "MemoryPool/0" }
-        mempool = enumclass.getInstance(options.ip,
-                                        "MemoryPool",
-                                        key_list,
-                                        options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
-        return FAIL
+    status, test_network = create_netpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
+ 
+    if options.virt == 'LXC':
+        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
+        rasd = [ "%s/mem" % test_dom ]
+    else:
+        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
+                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
+                 "DiskPool"      : {'InstanceID' : diskid},
+                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" % 
test_network }}
+        rasd = [ "%s/mem" % test_dom, 
+                 "%s/proc" % test_dom, 
+                 "%s/%s" %(test_dom, test_disk), 
+                 "%s/%s" % (test_dom, test_mac) ]
 
-    try:
-        key_list = { 'InstanceID' : "ProcessorPool/0" }
-        procpool = enumclass.getInstance(options.ip,
-                                         "ProcessorPool",
-                                         key_list,
-                                         options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool") 
-        return FAIL
- 
-    try:
-        memdata = assoc.AssociatorNames(options.ip, 
"ResourceAllocationFromPool",
-                                        "MemoryPool",
-                                        options.virt,
-                                        InstanceID = mempool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % 
mempool.InstanceID)
-        status = FAIL
- 
-    for i in range(len(memdata)):
-        if memdata[i].classname != get_typed_class(options.virt, 
"MemResourceAllocationSettingData"):
-            logger.error("ERROR: Association result error")
-            status = FAIL
- 
-    try:
-        procdata = assoc.AssociatorNames(options.ip, 
"ResourceAllocationFromPool",
-                                         "ProcessorPool",
-                                         options.virt,
-                                         InstanceID = 
procpool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % 
procpool.InstanceID)
-        status = FAIL
- 
-    for j in range(len(procdata)):
-        if procdata[j].classname != get_typed_class(options.virt, 
"ProcResourceAllocationSettingData"):
-                    logger.error("ERROR: Association result error")
-            status = FAIL
+    for k, v in pool.iteritems():
+        status, inst = get_instance(options.ip, k, v, options.virt) 
 
+        status = verify_rasd(options.ip, "ResourceAllocationFromPool", 
+                             k, options.virt, inst.InstanceID,
+                             rasd)
+
+    cleanup_restore(options.ip, options.virt)
+    vsxml.undefine(options.ip)
     return status 
- 
- 
+ 
 if __name__ == "__main__":
     sys.exit(main())

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


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080624/7a25a4d7/attachment.htm>

From yunguol at cn.ibm.com  Tue Jun 24 05:29:02 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Tue, 24 Jun 2008 13:29:02 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Resubmit RAFP.01 for LXC support,
	also pass for Xen, KVM and XenFV
Message-ID: <a79e3dc30ada12232bd9.1214285342@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1214285339 -28800
# Node ID a79e3dc30ada12232bd948478ce0908c35ad9f41
# Parent  c12f7b4a86e606c4fb8c1f32bc3a98bf59b75550
[TEST] Resubmit RAFP.01 for LXC support, also pass for Xen, KVM and XenFV

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r c12f7b4a86e6 -r a79e3dc30ada suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Thu Jun 19 22:49:43 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Tue Jun 24 13:28:59 2008 +0800
@@ -26,66 +26,125 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
-from XenKvmLib.classes import get_typed_class 
+from XenKvmLib.classes import get_typed_class
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    elif virt == "XenFV" or virt=="KVM":
+        test_disk = "hda"
+    else:
+        test_disk = None
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def get_instance(server, pool, list, virt='Xen'):
+    try:
+        inst = enumclass.getInstance(server,
+                                     pool,
+                                     list,
+                                     virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE  % pool)
+        return FAIL, inst
+  
+    return PASS, inst
+
+def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
+    try:
+        data = assoc.AssociatorNames(server,
+                                     assoc_cn,
+                                     cn,
+                                     virt,
+                                     InstanceID=list)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
+        return FAIL
+
+    if data[0]['InstanceID'] not in rasd:
+        logger.info ('ID %s' % data[0]['InstanceID'])
+        logger.error("InstanceID Mismatch")
+        logger.error("Returned %s error" % data[0]['InstanceID'])
+        return FAIL
+
+    return PASS
+               
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
 
-    try:
-        key_list = { 'InstanceID' : "MemoryPool/0" }
-        mempool = enumclass.getInstance(options.ip,
-                                        "MemoryPool",
-                                        key_list,
-                                        options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
-        return FAIL
+   
+    status, vsxml, test_disk = setup_env(options.ip, options.virt)
+    if status != PASS:
+        return status
+    
+    status, diskid = create_diskpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
 
-    try:
-        key_list = { 'InstanceID' : "ProcessorPool/0" }
-        procpool = enumclass.getInstance(options.ip,
-                                         "ProcessorPool",
-                                         key_list,
-                                         options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
-        return FAIL
-     
-    try:
-        memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                        "MemoryPool",
-                                        options.virt,
-                                        InstanceID = mempool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mempool.InstanceID)
-        status = FAIL
-     
-    for i in range(len(memdata)):
-        if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"):
-            logger.error("ERROR: Association result error")
-            status = FAIL
-                
-    try:
-        procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                         "ProcessorPool",
-                                         options.virt,
-                                         InstanceID = procpool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % procpool.InstanceID)
-        status = FAIL
-      
-    for j in range(len(procdata)):
-        if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"):
-	    logger.error("ERROR: Association result error")
-            status = FAIL
+    status, test_network = create_netpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
+ 
+    if options.virt == 'LXC':
+        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
+        rasd = [ "%s/mem" % test_dom ]
+    else:
+        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
+                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
+                 "DiskPool"      : {'InstanceID' : diskid},
+                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" % test_network }}
+        rasd = [ "%s/mem" % test_dom, 
+                 "%s/proc" % test_dom, 
+                 "%s/%s" %(test_dom, test_disk), 
+                 "%s/%s" % (test_dom, test_mac) ]
 
+    for k, v in pool.iteritems():
+        status, inst = get_instance(options.ip, k, v, options.virt) 
+ 
+        status = verify_rasd(options.ip, "ResourceAllocationFromPool", 
+                             k, options.virt, inst.InstanceID,
+                             rasd)
+
+    cleanup_restore(options.ip, options.virt)
+    vsxml.undefine(options.ip)
     return status 
         
         



From deeptik at linux.vnet.ibm.com  Tue Jun 24 06:01:42 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Tue, 24 Jun 2008 11:31:42 +0530
Subject: [Libvirt-cim] CimTest Report for KVM on F9  24-06-2008
Message-ID: <48608DC6.1040600@linux.vnet.ibm.com>

========================================================================
CIM Test Report for KVM  on F9 with latest libvirt-cim  and libcmpiutil
========================================================================
Distro      : Fedora 9 Beta
Kernel      : 2.6.25-0.121.rc5.git4.fc9
Libvirt     : libvirt-0.4.2-1.fc9.x86_64
CIMOM       : pegasus
PyWBEM      : pywbem-0.6
CIM Schema  : cimv216Experimental
LibCMPIutil :  79
LibVirtCIM  : 619
CIMTEST     : 227
=======================================================
PASS        : 106
FAIL        :   1
XFAIL       :   4
SKIP        :  18
-----------------
Total       : 129
=======================================================

List of tc that are failing:

VirtualSystemManagementService - 06_addresource.py: FAIL

Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Jun24-KVM-report
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080624/bc634f5f/attachment.ksh>

From deeptik at linux.vnet.ibm.com  Tue Jun 24 08:53:40 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Tue, 24 Jun 2008 14:23:40 +0530
Subject: [Libvirt-cim] [PATCH 1 of 2] [TEST] Add AddResource functions
	to vsms_util
In-Reply-To: <43aa81b757fdaedd9e9d.1214178960@elm3b41.beaverton.ibm.com>
References: <43aa81b757fdaedd9e9d.1214178960@elm3b41.beaverton.ibm.com>
Message-ID: <4860B614.6000603@linux.vnet.ibm.com>

+1 for me


Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1214178778 25200
> # Node ID 43aa81b757fdaedd9e9dd7ca70f15104962815d7
> # Parent  db29471408dcc1a2ecc315c1fc21e538cc08e411
> [TEST] Add AddResource functions to vsms_util.
>
> Just add disk and network for now.  AddResource() doesn't support processor and memory.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r db29471408dc -r 43aa81b757fd suites/libvirt-cim/lib/XenKvmLib/vsms_util.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Sun Jun 22 10:46:24 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Sun Jun 22 16:52:58 2008 -0700
> @@ -24,7 +24,8 @@
>  from CimTest import Globals
>  from CimTest.ReturnCodes import FAIL, PASS
>  from CimTest.Globals import logger
> -from VirtLib.live import network_by_bridge, virsh_vcpuinfo
> +from VirtLib.live import network_by_bridge, virsh_vcpuinfo, \
> +                         get_bridge_from_network_xml
>
>  def print_mod_err_msg(func_str, details):
>          logger.error('Error invoking ModifyRS: %s' % func_str)
> @@ -104,3 +105,63 @@
>
>      return PASS
>
> +def print_add_err_msg(func_str, details):
> +        logger.error('Error invoking AddRS: %s' % func_str)
> +        logger.error(details)
> +
> +def add_disk_res(server, service, cxml, vssd_ref, dasd, attr):
> +    try:
> +        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
> +                                    ResourceSettings=[str(dasd)])
> +        cxml.dumpxml(server)
> +        disk_dev = cxml.get_value_xpath(
> +                   '/domain/devices/disk/target/@dev[. = "%s"]' % attr['nddev'])
> +        dpath = cxml.get_value_xpath(
> +               '/domain/devices/disk/source/@file[. = "%s"]' % attr['src_path'])
> +        if disk_dev != attr['nddev'] or dpath != attr['src_path']:
> +            logger.error("Got %s, exp %s.  Got %s, exp %s" % (disk_dev, 
> +                         attr['nddev'], dpath, attr['src_path']))
> +            raise Exception('Error adding rs for disk_dev')
> +        logger.info('good status for disk path')
> +    except Exception, details:
> +        print_add_err_msg("add_disk_res", details)
> +        return FAIL
> +
> +    return PASS
> +
> +def add_net_res(server, service, virt, cxml, vssd_ref, nasd, attr):
> +    try:
> +        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
> +                                    ResourceSettings=[str(nasd)])
> +        cxml.dumpxml(server)
> +    
> +        mac = cxml.get_value_xpath(
> +                              '/domain/devices/interface/mac/@address[. = "%s"]'
> +                              % attr['nmac'])
> +
> +        if virt == "KVM":
> +            name = cxml.get_value_xpath(
> +                           '/domain/devices/interface/source/@network[. = "%s"]'
> +                           % attr['net_name'])
> +            
> +        else:
> +            # For Xen, network interfaces are converted to bridge interfaces.
> +            br = get_bridge_from_network_xml(attr['net_name'], server, virt)
> +            name = cxml.get_value_xpath(
> +                           '/domain/devices/interface/source/@bridge[. = "%s"]'
> +                           % br)
> +            if name != None:
> +                name = attr['net_name']
> +
> +        if mac != attr['nmac'] or name != attr['net_name']:
> +            logger.error("Got %s, exp %s. Got %s, exp %s." % (mac, 
> +                         attr['nmac'], name, attr['net_name']))
> +            raise Exception('Error adding rs for net mac')
> +
> +        logger.info('good status for net_mac')
> +    except Exception, details:
> +        print_add_err_msg("add_net_res", details)
> +        return FAIL
> +
> +    return PASS
> +
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From deeptik at linux.vnet.ibm.com  Tue Jun 24 08:53:57 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Tue, 24 Jun 2008 14:23:57 +0530
Subject: [Libvirt-cim] [PATCH 1 of 2] [TEST] Add AddResource functions
	to vsms_util
In-Reply-To: <43aa81b757fdaedd9e9d.1214178960@elm3b41.beaverton.ibm.com>
References: <43aa81b757fdaedd9e9d.1214178960@elm3b41.beaverton.ibm.com>
Message-ID: <4860B625.4050503@linux.vnet.ibm.com>

+1 for me .

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1214178778 25200
> # Node ID 43aa81b757fdaedd9e9dd7ca70f15104962815d7
> # Parent  db29471408dcc1a2ecc315c1fc21e538cc08e411
> [TEST] Add AddResource functions to vsms_util.
>
> Just add disk and network for now.  AddResource() doesn't support processor and memory.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r db29471408dc -r 43aa81b757fd suites/libvirt-cim/lib/XenKvmLib/vsms_util.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Sun Jun 22 10:46:24 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms_util.py	Sun Jun 22 16:52:58 2008 -0700
> @@ -24,7 +24,8 @@
>  from CimTest import Globals
>  from CimTest.ReturnCodes import FAIL, PASS
>  from CimTest.Globals import logger
> -from VirtLib.live import network_by_bridge, virsh_vcpuinfo
> +from VirtLib.live import network_by_bridge, virsh_vcpuinfo, \
> +                         get_bridge_from_network_xml
>
>  def print_mod_err_msg(func_str, details):
>          logger.error('Error invoking ModifyRS: %s' % func_str)
> @@ -104,3 +105,63 @@
>
>      return PASS
>
> +def print_add_err_msg(func_str, details):
> +        logger.error('Error invoking AddRS: %s' % func_str)
> +        logger.error(details)
> +
> +def add_disk_res(server, service, cxml, vssd_ref, dasd, attr):
> +    try:
> +        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
> +                                    ResourceSettings=[str(dasd)])
> +        cxml.dumpxml(server)
> +        disk_dev = cxml.get_value_xpath(
> +                   '/domain/devices/disk/target/@dev[. = "%s"]' % attr['nddev'])
> +        dpath = cxml.get_value_xpath(
> +               '/domain/devices/disk/source/@file[. = "%s"]' % attr['src_path'])
> +        if disk_dev != attr['nddev'] or dpath != attr['src_path']:
> +            logger.error("Got %s, exp %s.  Got %s, exp %s" % (disk_dev, 
> +                         attr['nddev'], dpath, attr['src_path']))
> +            raise Exception('Error adding rs for disk_dev')
> +        logger.info('good status for disk path')
> +    except Exception, details:
> +        print_add_err_msg("add_disk_res", details)
> +        return FAIL
> +
> +    return PASS
> +
> +def add_net_res(server, service, virt, cxml, vssd_ref, nasd, attr):
> +    try:
> +        service.AddResourceSettings(AffectedConfiguration=vssd_ref,
> +                                    ResourceSettings=[str(nasd)])
> +        cxml.dumpxml(server)
> +    
> +        mac = cxml.get_value_xpath(
> +                              '/domain/devices/interface/mac/@address[. = "%s"]'
> +                              % attr['nmac'])
> +
> +        if virt == "KVM":
> +            name = cxml.get_value_xpath(
> +                           '/domain/devices/interface/source/@network[. = "%s"]'
> +                           % attr['net_name'])
> +            
> +        else:
> +            # For Xen, network interfaces are converted to bridge interfaces.
> +            br = get_bridge_from_network_xml(attr['net_name'], server, virt)
> +            name = cxml.get_value_xpath(
> +                           '/domain/devices/interface/source/@bridge[. = "%s"]'
> +                           % br)
> +            if name != None:
> +                name = attr['net_name']
> +
> +        if mac != attr['nmac'] or name != attr['net_name']:
> +            logger.error("Got %s, exp %s. Got %s, exp %s." % (mac, 
> +                         attr['nmac'], name, attr['net_name']))
> +            raise Exception('Error adding rs for net mac')
> +
> +        logger.info('good status for net_mac')
> +    except Exception, details:
> +        print_add_err_msg("add_net_res", details)
> +        return FAIL
> +
> +    return PASS
> +
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From kaitlin at linux.vnet.ibm.com  Tue Jun 24 16:14:09 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 24 Jun 2008 09:14:09 -0700
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] Add generic poll function to
	poll for guest state
In-Reply-To: <patchbomb.1214324047@elm3b41.beaverton.ibm.com>
Message-ID: <6cb3a4b4b0b21497dbfc.1214324049@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214156795 25200
# Node ID 6cb3a4b4b0b21497dbfc812c49e555699d580d21
# Parent  59fce67164a22315bb712f692dfd93314c4f30e0
[TEST] Add generic poll function to poll for guest state.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 59fce67164a2 -r 6cb3a4b4b0b2 suites/libvirt-cim/lib/XenKvmLib/common_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu Jun 05 19:37:57 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Sun Jun 22 10:46:35 2008 -0700
@@ -23,6 +23,7 @@
 import os
 import pywbem
 import random
+from time import sleep
 from distutils.file_util import move_file
 from XenKvmLib.test_xml import * 
 from XenKvmLib.test_doms import * 
@@ -135,6 +136,33 @@
         return 1
 
     return 0 
+
+def poll_for_state_change(server, virt, dom, exp_state):
+    timeout = 30 
+    cs = computersystem.get_cs_class(virt)
+
+    try:
+        for i in range(1, (timeout + 1)):
+            sleep(1)
+            dom_cs = cs(server, name=dom)
+            if dom_cs is None:
+                logger.error("CS instance not returned for %s." % dom)
+                return FAIL
+
+            if dom_cs.EnabledState == exp_state:
+                break
+
+    except Exception, detail:
+        logger.error("Exception: %s" % detail)
+        return FAIL
+
+    if dom_cs.EnabledState != exp_state:
+        logger.error("EnabledState is %i instead of %i." % (dom_cs.EnabledState,
+                     exp_state))
+        logger.error("Try to increase the timeout and run the test again")
+        return FAIL
+
+    return PASS 
 
 def get_host_info(server, virt="Xen"):
     status = PASS



From kaitlin at linux.vnet.ibm.com  Tue Jun 24 16:14:07 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 24 Jun 2008 09:14:07 -0700
Subject: [Libvirt-cim] [PATCH 0 of 3] Add CPU scheduling test.
Message-ID: <patchbomb.1214324047@elm3b41.beaverton.ibm.com>

This test corresponds to the recent CPU scheduling enhancement.



From kaitlin at linux.vnet.ibm.com  Tue Jun 24 16:14:10 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 24 Jun 2008 09:14:10 -0700
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] Define and create guest with
	CPU scheduling values set
In-Reply-To: <patchbomb.1214324047@elm3b41.beaverton.ibm.com>
Message-ID: <5c90c9a2fd567d7cf592.1214324050@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213896959 25200
# Node ID 5c90c9a2fd567d7cf592932db189afbc8a4756f8
# Parent  6cb3a4b4b0b21497dbfc812c49e555699d580d21
[TEST] Define and create guest with CPU scheduling values set.

Verify these values after the guest starts.  KVM doesn't support CPU scheduling.  For KVM guests, this test just verfies that the guest can be created and defined when CPU scheduling values are defined in the ProcRASD that's passed in to the DefineSystem() call.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 6cb3a4b4b0b2 -r 5c90c9a2fd56 suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py	Thu Jun 19 10:35:59 2008 -0700
@@ -0,0 +1,137 @@
+#!/usr/bin/python
+#
+# Copyright 2008 IBM Corp.
+#
+# Authors:
+#    Kaitlin Rupert <karupert at us.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 sys
+import pywbem
+from XenKvmLib.common_util import call_request_state_change, \
+                                  poll_for_state_change 
+from XenKvmLib import vsms
+from VirtLib import utils 
+from CimTest.Globals import logger
+from CimTest.Globals import do_main
+from CimTest.ReturnCodes import FAIL, PASS
+from XenKvmLib.test_doms import destroy_and_undefine_domain 
+
+sup_types = ['Xen', 'XenFV', 'KVM']
+default_dom = 'rstest_domain'
+
+nvcpu = 2
+weight = 124
+limit = 256
+
+REQUESTED_STATE = 2
+TIME = "00000000000000.000000:000"
+
+def setup_rasd_mof(ip, vtype):
+    vssd, rasd = vsms.default_vssd_rasd_str(default_dom, virt=vtype)
+
+    class_pasd = vsms.get_pasd_class(vtype)
+    proc_inst = class_pasd(nvcpu, default_dom, weight, limit) 
+    proc_mof = proc_inst.mof()
+
+    for i in range(len(rasd)):
+        if "ProcResourceAllocationSettingData" in rasd[i]:
+            rasd[i] = proc_mof
+            return PASS, vssd, rasd
+
+    return FAIL, vssd, rasd
+
+def check_sched_info(str, exp_val, server, virt):
+    if str == "limit":
+        virsh_val = "cap"
+    else:
+        virsh_val = str
+
+    cmd = "virsh -c %s schedinfo %s | awk '/%s/ { print \$3 }'" % \
+          (utils.virt2uri(virt), default_dom, virsh_val)
+    ret, out = utils.run_remote(server, cmd)
+    if not out.isdigit():
+        return FAIL
+
+    try:
+        val = int(out)
+    except ValueError:
+        val = -1
+
+    if val != exp_val: 
+        logger.error("%s is %i, expected %i" % (str, val, exp_val))
+        return FAIL
+
+    return PASS
+
+def check_proc_pinning(server, virt):
+    attr_list = { "weight" : weight,
+                  "limit"  : limit
+                }
+   
+    for k, v in attr_list.iteritems():
+        status = check_sched_info(k, v, server, virt)
+        if status != PASS:
+            return FAIL
+
+    return PASS
+
+ at do_main(sup_types)
+def main():
+    options = main.options
+
+    status, vssd, rasd = setup_rasd_mof(options.ip, options.virt)
+    if status != PASS:
+        return status
+
+    try:
+        service = vsms.get_vsms_class(options.virt)(options.ip)
+
+        service.DefineSystem(SystemSettings=vssd,
+                             ResourceSettings=rasd,
+                             ReferenceConfiguration=' ')
+
+        rc = call_request_state_change(default_dom, options.ip,
+                                       REQUESTED_STATE, TIME, options.virt)
+        if rc != 0:
+            raise Exception("Unable to start %s using RequestedStateChange()" %
+                            default_dom)
+
+        status = poll_for_state_change(options.ip, options.virt, default_dom, 
+                                       REQUESTED_STATE)
+        if status != PASS:
+            raise Exception("%s didn't change state as expected" % default_dom)
+
+        if options.virt == "Xen" or options.virt == "XenFV":
+            status = check_proc_pinning(options.ip, options.virt)
+            if status != PASS:
+                raise Exception("%s CPU scheduling not set properly" % 
+                                default_dom)
+
+        status = PASS
+      
+    except Exception, details:
+        logger.error(details)
+        status = FAIL
+
+    destroy_and_undefine_domain(default_dom, options.ip, options.virt)
+
+    return status 
+
+if __name__ == "__main__":
+    sys.exit(main())
+    
diff -r 6cb3a4b4b0b2 -r 5c90c9a2fd56 suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Sun Jun 22 10:46:35 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Thu Jun 19 10:35:59 2008 -0700
@@ -174,7 +174,7 @@
     pass
 
 class CIM_ProcResourceAllocationSettingData(CIMClassMOF):
-    def __init__(self, vcpu, name):
+    def __init__(self, vcpu, name, weight=None, limit=None):
         self.ResourceType = RASD_TYPE_PROC
         
         if vcpu != None:
@@ -182,6 +182,12 @@
         
         if name != None:
             self.InstanceID = '%s/proc' % name
+
+        if weight != None:
+            self.Weight = weight
+
+        if limit != None:
+            self.Limit = limit 
 
 class Xen_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData):
     pass



From kaitlin at linux.vnet.ibm.com  Tue Jun 24 16:14:08 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 24 Jun 2008 09:14:08 -0700
Subject: [Libvirt-cim] [PATCH 1 of 3] Remove bootloader from vsms.py in the
	Xen case
In-Reply-To: <patchbomb.1214324047@elm3b41.beaverton.ibm.com>
Message-ID: <59fce67164a22315bb71.1214324048@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212719877 25200
# Node ID 59fce67164a22315bb712f692dfd93314c4f30e0
# Parent  727d97c09d77d73f3542ba49a9dd19ba119a67eb
Remove bootloader from vsms.py in the Xen case.

This looks like an old bug that was masked by some tests that are XFAILing.  Since the cimtest guest uses a ramdisk, we should not set a bootloader for paravirtualized guests.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 727d97c09d77 -r 59fce67164a2 suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Tue Jun 10 18:26:20 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Thu Jun 05 19:37:57 2008 -0700
@@ -105,8 +105,6 @@
         elif type == 'LXC':
             self.InitPath = const.LXC_init_path
         else:
-            self.Bootloader = live.bootloader(Globals.CIM_IP, 0)
-            self.BootloaderArgs = ''
             self.Kernel = const.Xen_kernel_path
             self.Ramdisk = const.Xen_init_path
  



From kaitlin at linux.vnet.ibm.com  Tue Jun 24 16:59:17 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 24 Jun 2008 09:59:17 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Resubmit RAFP.01 for LXC support,
	also pass for Xen, KVM and XenFV
In-Reply-To: <a79e3dc30ada12232bd9.1214285342@localhost.localdomain>
References: <a79e3dc30ada12232bd9.1214285342@localhost.localdomain>
Message-ID: <486127E5.6020106@linux.vnet.ibm.com>

> +def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
> +    try:
> +        data = assoc.AssociatorNames(server,
> +                                     assoc_cn,
> +                                     cn,
> +                                     virt,
> +                                     InstanceID=list)
> +    except Exception:
> +        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
> +        return FAIL

It's possible for the AssociatorNames call to return no instances 
without throwing an error.  You'll want to verify that data has at least 
one element.

> +
> +    if data[0]['InstanceID'] not in rasd:

By using data[0], you're relaying on the CIMOM to return the instance 
corresponding to test_dom first in the list.  This might not always be 
the case.  Instead, you should step through the items in data and select 
the instance or instances that correspond to test_dom.  If you don't 
find an instance, you should return an error.

Also, you're checking the value of InstanceID against all the possible 
rasd InstanceIDs for test_dom.  If the provider returns the MemRASD that 
corresponds to test_dom when it should have returned the ProcRASD, this 
check will return a false positive.

To fix this, you could change rasd from an array to a list.  Something 
like the following.  You already have the pool classname in the 
verify_rasd() call, so you can use it as a key value to get the 
corresponding RASD InstanceID.

pool_to_ rasd = { {'MemoryPool' : "%s/mem" % test_dom},
                   {'ProcessorPool' : "%s/proc" % test_dom},
                   {'DiskPool' : "%s/%s" %(test_dom, test_disk)},
                   {'NetworkPool' : "%s/%s" % (test_dom, test_mac)} }


> +        logger.info ('ID %s' % data[0]['InstanceID'])
> +        logger.error("InstanceID Mismatch")
> +        logger.error("Returned %s error" % data[0]['InstanceID'])

Then here, you can print the ID value AssociatorNames returned versus 
the expected value.

> + 
> +    if options.virt == 'LXC':
> +        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
> +        rasd = [ "%s/mem" % test_dom ]
> +    else:
> +        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
> +                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
> +                 "DiskPool"      : {'InstanceID' : diskid},
> +                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" % test_network }}

Can you fix this so that the line is 80 characters in length.

> +        rasd = [ "%s/mem" % test_dom, 
> +                 "%s/proc" % test_dom, 
> +                 "%s/%s" %(test_dom, test_disk), 
> +                 "%s/%s" % (test_dom, test_mac) ]
> 
> +    for k, v in pool.iteritems():
> +        status, inst = get_instance(options.ip, k, v, options.virt) 

If get_instance() returns an error, you should break out of the loop 
here.  The test is only returning the status of the last iteration 
through the loop.  If a previous iteration fails, but the last iteration 
succeeds, the test returns a false positive.

> + 
> +        status = verify_rasd(options.ip, "ResourceAllocationFromPool", 
> +                             k, options.virt, inst.InstanceID,
> +                             rasd)

Same here - you'll need to trap the status and then break from the loop 
in case of error.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From danms at us.ibm.com  Tue Jun 24 17:10:34 2008
From: danms at us.ibm.com (Dan Smith)
Date: Tue, 24 Jun 2008 10:10:34 -0700
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] Define and create guest with
	CPU scheduling values set
In-Reply-To: <5c90c9a2fd567d7cf592.1214324050@elm3b41.beaverton.ibm.com>
	(Kaitlin Rupert's message of "Tue, 24 Jun 2008 09:14:10 -0700")
References: <5c90c9a2fd567d7cf592.1214324050@elm3b41.beaverton.ibm.com>
Message-ID: <874p7ivjw5.fsf@caffeine.beaverton.ibm.com>

KR> +def check_proc_pinning(server, virt):
KR> +    attr_list = { "weight" : weight,
KR> +                  "limit"  : limit
KR> +                }
KR> +   
KR> +    for k, v in attr_list.iteritems():
KR> +        status = check_sched_info(k, v, server, virt)
KR> +        if status != PASS:
KR> +            return FAIL
KR> +
KR> +    return PASS

This method could probably use a better name, since we're not doing
any pinning.

Otherwise it looks good to me.

Thanks!

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms at us.ibm.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080624/18fbbaad/attachment.sig>

From kaitlin at linux.vnet.ibm.com  Tue Jun 24 21:12:35 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Tue, 24 Jun 2008 14:12:35 -0700
Subject: [Libvirt-cim] CimTest Report for KVM on F9  24-06-2008
In-Reply-To: <48608DC6.1040600@linux.vnet.ibm.com>
References: <48608DC6.1040600@linux.vnet.ibm.com>
Message-ID: <48616343.2060703@linux.vnet.ibm.com>

Deepti B Kalakeri wrote:
> ========================================================================
> CIM Test Report for KVM  on F9 with latest libvirt-cim  and libcmpiutil
> ========================================================================
> Distro      : Fedora 9 Beta
> Kernel      : 2.6.25-0.121.rc5.git4.fc9
> Libvirt     : libvirt-0.4.2-1.fc9.x86_64
> CIMOM       : pegasus
> PyWBEM      : pywbem-0.6
> CIM Schema  : cimv216Experimental
> LibCMPIutil :  79
> LibVirtCIM  : 619
> CIMTEST     : 227
> =======================================================
> PASS        : 106
> FAIL        :   1
> XFAIL       :   4
> SKIP        :  18
> -----------------
> Total       : 129
> =======================================================
> 
> List of tc that are failing:
> 
> VirtualSystemManagementService - 06_addresource.py: FAIL
> 

This is really excellent, thanks Deepti!
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Wed Jun 25 05:19:49 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Wed, 25 Jun 2008 13:19:49 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update RAFP.01 for LXC support
Message-ID: <c8c27374e304a66cd71d.1214371189@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1214371183 -28800
# Node ID c8c27374e304a66cd71d1f0b5d0fc462e230a898
# Parent  727d97c09d77d73f3542ba49a9dd19ba119a67eb
[TEST] Update RAFP.01 for LXC support

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 727d97c09d77 -r c8c27374e304 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Tue Jun 10 18:26:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Wed Jun 25 13:19:43 2008 +0800
@@ -26,66 +26,165 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
-from XenKvmLib.classes import get_typed_class 
+from XenKvmLib.classes import get_typed_class
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    elif virt == "XenFV" or virt=="KVM":
+        test_disk = "hda"
+    else:
+        test_disk = None
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def get_instance(server, pool, list, virt='Xen'):
+    try:
+        inst = enumclass.getInstance(server,
+                                     pool,
+                                     list,
+                                     virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE  % pool)
+        return FAIL, inst
+  
+    return PASS, inst
+
+def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
+    try:
+        data = assoc.AssociatorNames(server,
+                                     assoc_cn,
+                                     cn,
+                                     virt,
+                                     InstanceID=list)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
+        return FAIL
+
+    if len(data) < 1:
+        logger.error("Return NULL, expect at least one instance")
+        return FAIL
+    
+    for i in range(0, len(data)):
+        if data[i].classname == "LXC_MemResourceAllocationSettingData" \
+                   and data[i]['InstanceID'] == rasd["MemoryPool"]:
+            logger.info("MemoryPool InstanceID match")
+            return PASS
+        elif i == len(data) and data[i]['InstanceID'] != rasd["MemoryPool"]:
+            logger.error("InstanceID Mismatch, expect %s not %s" % \
+                         (rasd['MemoryPool'], data[i]['InstanceID']))
+            return FAIL
+        if data[i].classname == "LXC_ProcResourceAllocationSettingData" \
+                   and data[i]['InstanceID'] == rasd["ProcessorPool"]:
+            logger.info("ProcessorPool InstanceID match")
+            return PASS
+        elif i == len(data) and data[i]['InstanceID'] != rasd["ProcessorPool"]:
+            logger.error("InstanceID Mismatch, expect %s not %s" % \
+                         (rasd['ProcessorPool'], data[i]['InstanceID']))
+            return FAIL
+        if data[i].classname == "LXC_DiskResourceAllocationSettingData" \
+                   and data[i]['InstanceID'] == rasd["DiskPool"]:
+            logger.info("DiskPool InstanceID match")
+            return PASS
+        elif i == len(data) and data[i]['InstanceID'] != rasd["DiskPool"]:
+            logger.error("InstanceID Mismatch, expect %s" % \
+                         (rasd['DiskPool'], data[i]['InstanceID']))
+            return FAIL
+        if data[i].classname == "LXC_NetResourceAllocationSettingData" \
+                   and data[i]['InstanceID'] == rasd["NetworkPool"]:
+            logger.info("NetworkPool InstanceID match")
+            return PASS
+        elif i == len(data) and data[i]['InstanceID'] != rasd["NetworkPool"]:
+            logger.error("InstanceID Mismatch, expect %s" % \
+                         (rasd['NetworkPool'], data[i]['InstanceID']))
+            return FAIL
+               
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
 
-    try:
-        key_list = { 'InstanceID' : "MemoryPool/0" }
-        mempool = enumclass.getInstance(options.ip,
-                                        "MemoryPool",
-                                        key_list,
-                                        options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
-        return FAIL
+   
+    status, vsxml, test_disk = setup_env(options.ip, options.virt)
+    if status != PASS:
+        return status
+    
+    status, diskid = create_diskpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
 
-    try:
-        key_list = { 'InstanceID' : "ProcessorPool/0" }
-        procpool = enumclass.getInstance(options.ip,
-                                         "ProcessorPool",
-                                         key_list,
-                                         options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
-        return FAIL
-     
-    try:
-        memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                        "MemoryPool",
-                                        options.virt,
-                                        InstanceID = mempool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mempool.InstanceID)
-        status = FAIL
-     
-    for i in range(len(memdata)):
-        if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"):
-            logger.error("ERROR: Association result error")
-            status = FAIL
-                
-    try:
-        procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                         "ProcessorPool",
-                                         options.virt,
-                                         InstanceID = procpool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % procpool.InstanceID)
-        status = FAIL
-      
-    for j in range(len(procdata)):
-        if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"):
-	    logger.error("ERROR: Association result error")
-            status = FAIL
+    status, test_network = create_netpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
+ 
+    if options.virt == 'LXC':
+        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
+        rasd = { "MemoryPool" :  "%s/mem" % test_dom }
+    else:
+        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
+                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
+                 "DiskPool"      : {'InstanceID' : diskid},
+                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" \
+                                     % test_network }}
+        rasd = { "MemoryPool"    : "%s/mem" % test_dom, 
+                 "ProcessorPool" : "%s/proc" % test_dom, 
+                 "DiskPool"      : "%s/%s" %(test_dom, test_disk), 
+                 "NetworkPool"   : "%s/%s" % (test_dom, test_mac) }
 
+    for k, v in pool.iteritems():
+        status, inst = get_instance(options.ip, k, v, options.virt) 
+        if status != PASS:
+            cleanup_restore(options.ip, options.virt)
+            vsxml.undefine(options.ip)
+            return status
+ 
+        status = verify_rasd(options.ip, "ResourceAllocationFromPool", 
+                             k, options.virt, inst.InstanceID,
+                             rasd)
+        if status != PASS:
+            cleanup_restore(options.ip, options.virt)
+            vsxml.undefine(options.ip)
+            return status
+
+
+    cleanup_restore(options.ip, options.virt)
+    vsxml.undefine(options.ip)
     return status 
         
         



From kaitlin at linux.vnet.ibm.com  Wed Jun 25 14:37:55 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 25 Jun 2008 07:37:55 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Update RAFP.01 for LXC support
In-Reply-To: <c8c27374e304a66cd71d.1214371189@localhost.localdomain>
References: <c8c27374e304a66cd71d.1214371189@localhost.localdomain>
Message-ID: <48625843.2010602@linux.vnet.ibm.com>

yunguol at cn.ibm.com wrote:
> # HG changeset patch
> # User Guolian Yun <yunguol at cn.ibm.com>
> # Date 1214371183 -28800
> # Node ID c8c27374e304a66cd71d1f0b5d0fc462e230a898
> # Parent  727d97c09d77d73f3542ba49a9dd19ba119a67eb
> [TEST] Update RAFP.01 for LXC support
> 

Can you keep the revision number in the subject next time around? 
Having the revision number makes it easier to keep track of which patch 
is the current version.

Also, please include a log of what has changed for each iteration of the 
patch.

Thanks!

> +def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
> +    try:
> +        data = assoc.AssociatorNames(server,
> +                                     assoc_cn,
> +                                     cn,
> +                                     virt,
> +                                     InstanceID=list)
> +    except Exception:
> +        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
> +        return FAIL
> +
> +    if len(data) < 1:
> +        logger.error("Return NULL, expect at least one instance")
> +        return FAIL
> +    
> +    for i in range(0, len(data)):
> +        if data[i].classname == "LXC_MemResourceAllocationSettingData" \
> +                   and data[i]['InstanceID'] == rasd["MemoryPool"]:
> +            logger.info("MemoryPool InstanceID match")
> +            return PASS
> +        elif i == len(data) and data[i]['InstanceID'] != rasd["MemoryPool"]:
> +            logger.error("InstanceID Mismatch, expect %s not %s" % \
> +                         (rasd['MemoryPool'], data[i]['InstanceID']))
> +            return FAIL
> +        if data[i].classname == "LXC_ProcResourceAllocationSettingData" \
> +                   and data[i]['InstanceID'] == rasd["ProcessorPool"]:
> +            logger.info("ProcessorPool InstanceID match")
> +            return PASS
> +        elif i == len(data) and data[i]['InstanceID'] != rasd["ProcessorPool"]:
> +            logger.error("InstanceID Mismatch, expect %s not %s" % \
> +                         (rasd['ProcessorPool'], data[i]['InstanceID']))
> +            return FAIL
> +        if data[i].classname == "LXC_DiskResourceAllocationSettingData" \
> +                   and data[i]['InstanceID'] == rasd["DiskPool"]:
> +            logger.info("DiskPool InstanceID match")
> +            return PASS
> +        elif i == len(data) and data[i]['InstanceID'] != rasd["DiskPool"]:
> +            logger.error("InstanceID Mismatch, expect %s" % \
> +                         (rasd['DiskPool'], data[i]['InstanceID']))
> +            return FAIL
> +        if data[i].classname == "LXC_NetResourceAllocationSettingData" \
> +                   and data[i]['InstanceID'] == rasd["NetworkPool"]:
> +            logger.info("NetworkPool InstanceID match")
> +            return PASS
> +        elif i == len(data) and data[i]['InstanceID'] != rasd["NetworkPool"]:
> +            logger.error("InstanceID Mismatch, expect %s" % \
> +                         (rasd['NetworkPool'], data[i]['InstanceID']))
> +            return FAIL
> +               

This is a lot of duplicated code and is difficult to read.  Also, code 
like this can be difficult to maintain.  This can be collapsed into 
something much simpler:

     for item in data:
             if item['InstanceID'] == rasd[cn]:
                 logger.info("%s InstanceID match - expected %s, got %s" 
% (cn,
                             rasd[cn], item['InstanceID']))
                 return PASS

     logger.error("RASD instance with InstanceID %s not found" % rasd[cn])

     return FAIL


> 
> +    for k, v in pool.iteritems():
> +        status, inst = get_instance(options.ip, k, v, options.virt) 
> +        if status != PASS:
> +            cleanup_restore(options.ip, options.virt)
> +            vsxml.undefine(options.ip)
> +            return status

Instead of duplicating the cleanup code here, you can use break instead. 
  That will drop you out of the for loop, and the rest of the code will 
execute normally.

> + 
> +        status = verify_rasd(options.ip, "ResourceAllocationFromPool", 
> +                             k, options.virt, inst.InstanceID,
> +                             rasd)
> +        if status != PASS:
> +            cleanup_restore(options.ip, options.virt)
> +            vsxml.undefine(options.ip)
> +            return status

Same here - use break instead.

> +
> +
> +    cleanup_restore(options.ip, options.virt)
> +    vsxml.undefine(options.ip)
>      return status 
>          

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Wed Jun 25 20:02:57 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 25 Jun 2008 13:02:57 -0700
Subject: [Libvirt-cim] [PATCH] Fix potiential seg fault in
	VSMigrationService.c
Message-ID: <edf96787c23dc7a91a00.1214424177@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214422449 25200
# Node ID edf96787c23dc7a91a008916b4b00b22fc22703a
# Parent  7a00ccfafc36a62f506543c2d767ba667db404e7
Fix potiential seg fault in VSMigrationService.c

This seg fault can happen if the system does not have Pegasus configured for repositoryIsDefaultInstanceProvider=true.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 7a00ccfafc36 -r edf96787c23d src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c	Mon Jun 23 15:13:56 2008 -0700
+++ b/src/Virt_VSMigrationService.c	Wed Jun 25 12:34:09 2008 -0700
@@ -1248,11 +1248,12 @@
                  CMGetCharPtr(CMObjectPathToString(*job_op, NULL)));
 
         *job_op = CBCreateInstance(_BROKER, context, *job_op, jobinst, &s);
-        CMSetNameSpace(*job_op, job->ref_ns);
         if ((s.rc != CMPI_RC_OK) || (CMIsNullObject(*job_op))) {
                 CU_DEBUG("Failed to create job instance: %i", s.rc);
                 goto out;
         }
+
+        CMSetNameSpace(*job_op, job->ref_ns);
 
  out:
         return s;



From kaitlin at linux.vnet.ibm.com  Wed Jun 25 21:18:23 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 25 Jun 2008 14:18:23 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] A few migration related fixes
Message-ID: <ef376bdad2e186904b15.1214428703@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214423985 25200
# Node ID ef376bdad2e186904b15cda1afd230d8056e8015
# Parent  5c90c9a2fd567d7cf592932db189afbc8a4756f8
[TEST] A few migration related fixes.

Fixes:
 -Remove destroy_and_undefine_domain() call from migrate_guest_to_host().  This call takes the domain name as a parameter, but migrate_guest_to_host() doesn't take the domain name  So calling destroy_and_undefine_domain() resulted in an error.
 -Add a hack to get_typed_class() so it supports Virt_MigrationJob (which doesn't fit the typical <virt>_<basename> pattern.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 5c90c9a2fd56 -r ef376bdad2e1 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py	Thu Jun 19 10:35:59 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py	Wed Jun 25 12:59:45 2008 -0700
@@ -90,10 +90,10 @@
         return FAIL
 
     status, ret = migrate_guest_to_host(service, cs_ref, target_ip)
-
     if status == FAIL:
         logger.error("MigrateVirtualSystemToHost: unexpected list length %s"
                      % len(ret))
+        destroy_and_undefine_domain(dom_name, options.ip)
         return status 
     elif len(ret) == 2:
         id = ret[1]['Job'].keybindings['InstanceID']
@@ -102,7 +102,7 @@
                                   guest_name, local_migrate)
 
 
-    destroy_and_undefine_domain(dom_name, options.ip)   
+    destroy_and_undefine_domain(dom_name, options.ip)
 
     return status
 
diff -r 5c90c9a2fd56 -r ef376bdad2e1 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py	Thu Jun 19 10:35:59 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py	Wed Jun 25 12:59:45 2008 -0700
@@ -145,12 +145,11 @@
 
         logger.info("Migrating guest with the following options:")
         logger.info("%s" % item)
-        status, ret = migrate_guest_to_host(service, cs_ref, target_ip,
-                                            item)
-
+        status, ret = migrate_guest_to_host(service, cs_ref, target_ip, item)
         if status == FAIL:
             logger.error("MigrateVirtualSystemToHost: unexpected list length %s"
                          % len(ret))
+            destroy_and_undefine_domain(dom_name, options.ip)   
             return status 
         elif len(ret) == 2:
             id = ret[1]['Job'].keybindings['InstanceID']
diff -r 5c90c9a2fd56 -r ef376bdad2e1 suites/libvirt-cim/lib/XenKvmLib/classes.py
--- a/suites/libvirt-cim/lib/XenKvmLib/classes.py	Thu Jun 19 10:35:59 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py	Wed Jun 25 12:59:45 2008 -0700
@@ -23,7 +23,8 @@
 
 def get_typed_class(virt, basename):
     if virt not in virt_types:
-        raise ValueError('Invalid class type')
+        if virt != "Virt" and basename != "MigrationJob":
+            raise ValueError('Invalid class type')
 
     if basename == None or basename == '':
         raise ValueError('Invalide class base name')
diff -r 5c90c9a2fd56 -r ef376bdad2e1 suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py	Thu Jun 19 10:35:59 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py	Wed Jun 25 12:59:45 2008 -0700
@@ -95,10 +95,10 @@
     except Exception, details:
         logger.error("Error invoke method 'MigrateVirtualSystemToHost\'.")
         logger.error("%s", details)
+        return FAIL, ret
 
     if len(ret) == 0:
         logger.error("MigrateVirtualSystemToHost returns an empty list")
-        destroy_and_undefine_domain(test_dom, ip)
         return FAIL, ret
 
     return PASS, ret



From kaitlin at linux.vnet.ibm.com  Wed Jun 25 22:27:34 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Wed, 25 Jun 2008 15:27:34 -0700
Subject: [Libvirt-cim] [PATCH] For pause, reboot,
	and enable add support for guests in the NOSTATE state
Message-ID: <bd1ee412c6853d5fd005.1214432854@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214428450 25200
# Node ID bd1ee412c6853d5fd005eca535b0b04446e08fb4
# Parent  edf96787c23dc7a91a008916b4b00b22fc22703a
For pause, reboot, and enable add support for guests in the NOSTATE state.

It's possible that a XenFV guest might return no state instead of blocked or running.  When xend schedules to guest to run, the guest needs qemu to run (to handle device emulation).  If we get the state of the guest before qemu is done running its setup, libvirt reports no state.

This should be a safe approach - we return an error if the guest is in some other state or if libvirt is unable to successfully change the state of the guest.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r edf96787c23d -r bd1ee412c685 src/Virt_ComputerSystem.c
--- a/src/Virt_ComputerSystem.c	Wed Jun 25 12:34:09 2008 -0700
+++ b/src/Virt_ComputerSystem.c	Wed Jun 25 14:14:10 2008 -0700
@@ -733,6 +733,7 @@
         switch (info->state) {
         case VIR_DOMAIN_RUNNING:
         case VIR_DOMAIN_BLOCKED:
+        case VIR_DOMAIN_NOSTATE:
                 CU_DEBUG("Pause domain");
                 ret = virDomainSuspend(dom);
                 break;
@@ -758,6 +759,7 @@
         switch (info->state) {
         case VIR_DOMAIN_RUNNING:
         case VIR_DOMAIN_BLOCKED:
+        case VIR_DOMAIN_NOSTATE:
                 CU_DEBUG("Reboot domain");
                 ret = virDomainReboot(dom, 0);
                 break;
@@ -783,6 +785,7 @@
         switch (info->state) {
         case VIR_DOMAIN_RUNNING:
         case VIR_DOMAIN_BLOCKED:
+        case VIR_DOMAIN_NOSTATE:
                 CU_DEBUG("Reset domain");
                 ret = domain_reset(dom);
                 break;



From yunguol at cn.ibm.com  Thu Jun 26 02:16:05 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Thu, 26 Jun 2008 10:16:05 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #7 Update RAFP.01 for LXC support
Message-ID: <5845fbc3a61daa48343f.1214446565@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1214446556 -28800
# Node ID 5845fbc3a61daa48343f121f284dfdf011b5f9d4
# Parent  727d97c09d77d73f3542ba49a9dd19ba119a67eb
[TEST] #7 Update RAFP.01 for LXC support

This patch includes the following changes:
1. Update duplicated verification code into a simple loop
2. Use break instead of duplicating the cleanup code in get_instance() and verify_rasd() call

diff -r 727d97c09d77 -r 5845fbc3a61d suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Tue Jun 10 18:26:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Thu Jun 26 10:15:56 2008 +0800
@@ -26,66 +26,134 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
-from XenKvmLib.classes import get_typed_class 
+from XenKvmLib.classes import get_typed_class
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    elif virt == "XenFV" or virt=="KVM":
+        test_disk = "hda"
+    else:
+        test_disk = None
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def get_instance(server, pool, list, virt='Xen'):
+    try:
+        inst = enumclass.getInstance(server,
+                                     pool,
+                                     list,
+                                     virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE  % pool)
+        return FAIL, inst
+  
+    return PASS, inst
+
+def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
+    try:
+        data = assoc.AssociatorNames(server,
+                                     assoc_cn,
+                                     cn,
+                                     virt,
+                                     InstanceID=list)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
+        return FAIL
+
+    if len(data) < 1:
+        logger.error("Return NULL, expect at least one instance")
+        return FAIL
+   
+    for item in data:
+        if item['InstanceID'] == rasd[cn]:
+            logger.info("%s InstanceID match - expect %s, got %s" \
+                        % (cn, rasd[cn], item['InstanceID']))
+            return PASS 
+        else:
+            logger.error("RASD instance with InstanceID %s not found" % rasd[cn])
+            return FAIL
+               
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
 
-    try:
-        key_list = { 'InstanceID' : "MemoryPool/0" }
-        mempool = enumclass.getInstance(options.ip,
-                                        "MemoryPool",
-                                        key_list,
-                                        options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
-        return FAIL
+   
+    status, vsxml, test_disk = setup_env(options.ip, options.virt)
+    if status != PASS:
+        return status
+    
+    status, diskid = create_diskpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
 
-    try:
-        key_list = { 'InstanceID' : "ProcessorPool/0" }
-        procpool = enumclass.getInstance(options.ip,
-                                         "ProcessorPool",
-                                         key_list,
-                                         options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
-        return FAIL
-     
-    try:
-        memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                        "MemoryPool",
-                                        options.virt,
-                                        InstanceID = mempool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mempool.InstanceID)
-        status = FAIL
-     
-    for i in range(len(memdata)):
-        if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"):
-            logger.error("ERROR: Association result error")
-            status = FAIL
-                
-    try:
-        procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                         "ProcessorPool",
-                                         options.virt,
-                                         InstanceID = procpool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % procpool.InstanceID)
-        status = FAIL
-      
-    for j in range(len(procdata)):
-        if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"):
-	    logger.error("ERROR: Association result error")
-            status = FAIL
+    status, test_network = create_netpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
+ 
+    if options.virt == 'LXC':
+        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
+        rasd = { "MemoryPool" :  "%s/mem" % test_dom }
+    else:
+        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
+                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
+                 "DiskPool"      : {'InstanceID' : diskid},
+                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" \
+                                     % test_network }}
+        rasd = { "MemoryPool"    : "%s/mem" % test_dom, 
+                 "ProcessorPool" : "%s/proc" % test_dom, 
+                 "DiskPool"      : "%s/%s" %(test_dom, test_disk), 
+                 "NetworkPool"   : "%s/%s" % (test_dom, test_mac) }
 
+    for k, v in pool.iteritems():
+        status, inst = get_instance(options.ip, k, v, options.virt) 
+        if status != PASS:
+            break 
+        status = verify_rasd(options.ip, "ResourceAllocationFromPool", 
+                             k, options.virt, inst.InstanceID,
+                             rasd)
+        if status != PASS:
+            break
+
+    cleanup_restore(options.ip, options.virt)
+    vsxml.undefine(options.ip)
     return status 
         
         



From yunguol at cn.ibm.com  Thu Jun 26 02:22:19 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Thu, 26 Jun 2008 10:22:19 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] Update RAFP.01 for LXC support
In-Reply-To: <48625843.2010602@linux.vnet.ibm.com>
Message-ID: <OF28E30F87.411C4AAA-ON48257474.000CED4E-48257474.000D51E2@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-25 22:37:55:

> yunguol at cn.ibm.com wrote:
> > # HG changeset patch
> > # User Guolian Yun <yunguol at cn.ibm.com>
> > # Date 1214371183 -28800
> > # Node ID c8c27374e304a66cd71d1f0b5d0fc462e230a898
> > # Parent  727d97c09d77d73f3542ba49a9dd19ba119a67eb
> > [TEST] Update RAFP.01 for LXC support
> > 
> 
> Can you keep the revision number in the subject next time around? 
> Having the revision number makes it easier to keep track of which patch 
> is the current version.
> 
> Also, please include a log of what has changed for each iteration of the 

> patch.
> 
  Sure. I will keep the revision number and log the changes for each 
patch.
  Thanks a lot for your great comments during the iteration of RAFP.01 
patch.
  Hopefully, the latest #7 revision works well.

 
> Thanks!
> 
> > +def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
> > +    try:
> > +        data = assoc.AssociatorNames(server,
> > +                                     assoc_cn,
> > +                                     cn,
> > +                                     virt,
> > +                                     InstanceID=list)
> > +    except Exception:
> > +        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
> > +        return FAIL
> > +
> > +    if len(data) < 1:
> > +        logger.error("Return NULL, expect at least one instance")
> > +        return FAIL
> > + 
> > +    for i in range(0, len(data)):
> > +        if data[i].classname == 
"LXC_MemResourceAllocationSettingData" \
> > +                   and data[i]['InstanceID'] == rasd["MemoryPool"]:
> > +            logger.info("MemoryPool InstanceID match")
> > +            return PASS
> > +        elif i == len(data) and data[i]['InstanceID'] != 
> rasd["MemoryPool"]:
> > +            logger.error("InstanceID Mismatch, expect %s not %s" % \
> > +                         (rasd['MemoryPool'], data[i]['InstanceID']))
> > +            return FAIL
> > +        if data[i].classname == 
"LXC_ProcResourceAllocationSettingData" \
> > +                   and data[i]['InstanceID'] == 
rasd["ProcessorPool"]:
> > +            logger.info("ProcessorPool InstanceID match")
> > +            return PASS
> > +        elif i == len(data) and data[i]['InstanceID'] != 
> rasd["ProcessorPool"]:
> > +            logger.error("InstanceID Mismatch, expect %s not %s" % \
> > +                         (rasd['ProcessorPool'], 
data[i]['InstanceID']))
> > +            return FAIL
> > +        if data[i].classname == 
"LXC_DiskResourceAllocationSettingData" \
> > +                   and data[i]['InstanceID'] == rasd["DiskPool"]:
> > +            logger.info("DiskPool InstanceID match")
> > +            return PASS
> > +        elif i == len(data) and data[i]['InstanceID'] != 
rasd["DiskPool"]:
> > +            logger.error("InstanceID Mismatch, expect %s" % \
> > +                         (rasd['DiskPool'], data[i]['InstanceID']))
> > +            return FAIL
> > +        if data[i].classname == 
"LXC_NetResourceAllocationSettingData" \
> > +                   and data[i]['InstanceID'] == rasd["NetworkPool"]:
> > +            logger.info("NetworkPool InstanceID match")
> > +            return PASS
> > +        elif i == len(data) and data[i]['InstanceID'] != 
> rasd["NetworkPool"]:
> > +            logger.error("InstanceID Mismatch, expect %s" % \
> > +                         (rasd['NetworkPool'], 
data[i]['InstanceID']))
> > +            return FAIL
> > + 
> 
> This is a lot of duplicated code and is difficult to read.  Also, code 
> like this can be difficult to maintain.  This can be collapsed into 
> something much simpler:
> 
>      for item in data:
>              if item['InstanceID'] == rasd[cn]:
>                  logger.info("%s InstanceID match - expected %s, got %s" 

> % (cn,
>                              rasd[cn], item['InstanceID']))
>                  return PASS
> 
>      logger.error("RASD instance with InstanceID %s not found" % 
rasd[cn])
> 
>      return FAIL
> 
> 
> > 
> > +    for k, v in pool.iteritems():
> > +        status, inst = get_instance(options.ip, k, v, options.virt) 
> > +        if status != PASS:
> > +            cleanup_restore(options.ip, options.virt)
> > +            vsxml.undefine(options.ip)
> > +            return status
> 
> Instead of duplicating the cleanup code here, you can use break instead. 

>   That will drop you out of the for loop, and the rest of the code will 
> execute normally.
> 
> > + 
> > +        status = verify_rasd(options.ip, 
"ResourceAllocationFromPool", 
> > +                             k, options.virt, inst.InstanceID,
> > +                             rasd)
> > +        if status != PASS:
> > +            cleanup_restore(options.ip, options.virt)
> > +            vsxml.undefine(options.ip)
> > +            return status
> 
> Same here - use break instead.
> 
> > +
> > +
> > +    cleanup_restore(options.ip, options.virt)
> > +    vsxml.undefine(options.ip)
> >      return status 
> > 
> 
> -- 
> Kaitlin Rupert
> IBM Linux Technology Center
> kaitlin at linux.vnet.ibm.com
> 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080626/3a88008c/attachment.htm>

From yunguol at cn.ibm.com  Thu Jun 26 05:28:58 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Thu, 26 Jun 2008 13:28:58 +0800
Subject: [Libvirt-cim] Cimtest Report for Xen on RHEL 5.2 (2008/06/26)
Message-ID: <OFC526F357.2AD48517-ON48257474.001E14EF-48257474.001E68A1@cn.ibm.com>

Distro        : RHEL 5.2 
Kernel        : kernel-2.6.18-92.el5
Xen version   : xen-3.0.3-64.el5
Libvirt       : libvirt-0.3.3-7.el5
CIMOM         : pegasus
PyWBEM        : pywbem-3.14
CIM Schema    : cimv216Experimental
LibCMPIutil   : 79
LibVirtCIM    : 620
CIMTEST       : 229
======================================
PASS          : 104
FAILED        : 17
XFAIL         : 7
SKIP          : 1

Total         : 129
======================================

AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: PASS
ComputerSystem - 03_defineVS.py: FAIL
ERROR   - Failed to enumerate the class of Xen_ComputerSystem
ERROR   - Exception: No defined domain (domU1) is found
ERROR   - Error: property values are not set for VS domU1
ComputerSystem - 04_defineStartVS.py: PASS
ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
ERROR   - ERROR: VS DomST1 transition from Defined State to Activate state 
was not Successful
Bug:<00002>
ComputerSystem - 06_paused_active_suspend.py: XFAIL     Bug: 00002
ERROR   - ERROR: VS DomST1 transition from suspend State to Activate state 
 was not Successful
Bug:<00002>
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: XFAIL   Bug: 00001
ERROR   - Exception: (1, u'CIM_ERR_FAILED: Domain Operation Failed')
ERROR   - Unable to Start dom test_domain using RequestedStateChange()
InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed
Bug:<00001>
ComputerSystem - 27_define_suspend_errs.py: PASS
ComputerSystem - 32_start_reboot.py: XFAIL      Bug: 00001
ERROR   - Exception: (1, u'CIM_ERR_FAILED: Domain Operation Failed')
ERROR   - Unable to Start dom test_domain using RequestedStateChange()
InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed
Bug:<00001>
ComputerSystem - 33_suspend_reboot.py: XFAIL    Bug: 00001
ERROR   - Exception: (1, u'CIM_ERR_FAILED: Domain Operation Failed')
ERROR   - Unable to Start dom test_domain using RequestedStateChange()
InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed
Bug:<00001>
ComputerSystem - 35_start_reset.py: XFAIL       Bug: 00001
ERROR   - Exception: (1, u'CIM_ERR_FAILED: Domain Operation Failed')
ERROR   - Unable to Start dom test_domain using RequestedStateChange()
InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed
Bug:<00001>
ComputerSystem - 40_RSC_start.py: XFAIL Bug: 00001
ERROR   - Exception: (1, u'CIM_ERR_FAILED: Domain Operation Failed')
ERROR   - Exception: RequestedStateChange() could not be used to start 
domain: 'test_domain'
InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed
Bug:<00001>
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: FAIL
ERROR   - Failed to get associators information for 
ElementConformsToProfile
ERROR   - Exception: not enough arguments for format string
ElementConforms - 02_reverse.py: FAIL
ERROR   - ERROR: Instance for domgst not created
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: FAIL
ERROR   - Get domain list error, the number of domains is not equal
EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS
HostSystem - 01_enum.py: PASS
HostSystem - 02_hostsystem_to_rasd.py: FAIL
ERROR   - Xen_HostSystem with CrossClass_GuestDom was not returned
HostSystem - 03_hs_to_settdefcap.py: PASS
HostSystem - 04_hs_to_EAPF.py: FAIL
ERROR   - NumberOfBlocks Mismatch
ERROR   - Returned 131072 instead of 128
{'Xen_NetworkPort': {'CreationClassName': 'Xen_NetworkPort', 
'NetworkAddresses': '00:11:22:33:44:aa', 'SystemName': 
'CrossClass_GuestDom', 'DeviceID': 
'CrossClass_GuestDom/00:11:22:33:44:aa'}, 'Xen_Memory': {'NumberOfBlocks': 
128, 'CreationClassName': 'Xen_Memory', 'SystemName': 
'CrossClass_GuestDom', 'DeviceID': 'CrossClass_GuestDom/mem'}, 
'Xen_Processor': {'CreationClassName': 'Xen_Processor', 'SystemName': 
'CrossClass_GuestDom', 'DeviceID': 'CrossClass_GuestDom/0'}, 
'Xen_LogicalDisk': {'CreationClassName': 'Xen_LogicalDisk', 'SystemName': 
'CrossClass_GuestDom', 'DeviceID': 'CrossClass_GuestDom/xvdb', 'Name': 
'xvdb'}}
HostSystem - 05_hs_gi_errs.py: PASS
HostSystem - 06_hs_to_vsms.py: PASS
HostedDependency - 01_forward.py: PASS
HostedDependency - 02_reverse.py: PASS
HostedDependency - 03_enabledstate.py: PASS
HostedDependency - 04_reverse_errs.py: PASS
HostedResourcePool - 01_forward.py: PASS
HostedResourcePool - 02_reverse.py: PASS
HostedResourcePool - 03_forward_errs.py: PASS
HostedResourcePool - 04_reverse_errs.py: PASS
HostedService - 01_forward.py: PASS
HostedService - 02_reverse.py: PASS
HostedService - 03_forward_errs.py: PASS
HostedService - 04_reverse_errs.py: PASS
LogicalDisk - 01_disk.py: PASS
LogicalDisk - 02_nodevs.py: PASS
LogicalDisk - 03_ld_gi_errs.py: 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: PASS
RASD - 03_rasd_errs.py: PASS
ReferencedProfile - 01_verify_refprof.py: PASS
ReferencedProfile - 02_refprofile_errs.py: PASS
ResourceAllocationFromPool - 01_forward.py: PASS
ResourceAllocationFromPool - 02_reverse.py: FAIL
ERROR   - Exception in get_rasdinst_verify_pool_from_RAFP() fn
ERROR   - Exception Details 'list' object has no attribute 'InstanceID'
CIM_ERR_NOT_FOUND: No such instance (RAFP_dom/mem)
ResourceAllocationFromPool - 03_forward_errs.py: PASS
ResourceAllocationFromPool - 04_reverse_errs.py: PASS
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL
ERROR   - Xen_NetResourceAllocationSettingData returned 0 instances, 
excepted atleast 1 instance
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
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: FAIL
ERROR   - Unknow exception happened
ERROR   - (1, u'CIM_ERR_FAILED: Unable to retrieve domain name.')
ERROR   - Destroyed multiple domains
InvokeMethod(DestroySystem): CIM_ERR_FAILED: Unable to retrieve domain 
name.
VirtualSystemManagementService - 03_definesystem_ess.py: PASS
VirtualSystemManagementService - 04_definesystem_ers.py: PASS
VirtualSystemManagementService - 05_destroysystem_neg.py: PASS
VirtualSystemManagementService - 06_addresource.py: PASS
VirtualSystemManagementService - 07_addresource_neg.py: PASS
VirtualSystemManagementService - 08_modifyresource.py: PASS
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: FAIL
ERROR   - Failed to enumerate the class of Virt_MigrationJob
ERROR   - Invalid class type
VirtualSystemMigrationService - 02_host_migrate_type.py: FAIL
ERROR   - Failed to enumerate the class of Virt_MigrationJob
ERROR   - Invalid class type
VirtualSystemMigrationService - 05_migratable_host_errs.py: PASS
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: FAIL
ERROR   - Failed to get instance by the class of 
Xen_VirtualSystemSettingData
ERROR   - Exception : 'list' object has no attribute 'Bootloader'
CIM_ERR_NOT_FOUND: No such instance (VSSDC_dom)
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



Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080626/846f9277/attachment.htm>

From deeptik at linux.vnet.ibm.com  Thu Jun 26 07:03:49 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Thu, 26 Jun 2008 12:33:49 +0530
Subject: [Libvirt-cim] CimTest Report  on XenFV 26-06-2008
Message-ID: <48633F55.6060300@linux.vnet.ibm.com>

======================================
CIM Test Report for XenFV
======================================
Distro        : RHEL 5.2 Beta
Kernel        : 2.6.18-88.el5xen
Xen version   : 3.1.2-88.el5
Libvirt       : libvirt-0.3.3-7.el5
CIMOM         : pegasus
PyWBEM        : pywbem-3.14
CIM Schema    : cimv216Experimental
LibCMPIutil   :  79
LibVirtCIM    : 620+
CIMTEST       : 229
======================================
PASS          : 87
TOTAL FAILED  : 17 [10 test cases passed when ran manually]
ACTUAL FAILED :  7
XFAIL         :  1
SKIP          : 24
-----------------
Total         : 129
======================================

List of tc that are failing:

ComputerSystem - 03_defineVS.py: FAIL                                    
--Passed when run manually
ComputerSystem - 05_activate_defined_start.py: FAIL
ComputerSystem - 06_paused_active_suspend.py: FAIL
ComputerSystem - 23_suspend_suspend.py: FAIL
ComputerSystem - 32_start_reboot.py: FAIL
ComputerSystem - 33_suspend_reboot.py: FAIL
ComputerSystem - 35_start_reset.py: FAIL
ElementConforms - 01_forward.py: FAIL                                   
--Passed when run manually
EnabledLogicalElementCapabilities - 01_enum.py: FAIL                    
--Passed when run manually
HostSystem - 02_hostsystem_to_rasd.py: FAIL                             
--Passed when run manually
LogicalDisk - 03_ld_gi_errs.py: FAIL                                    
--Passed when run manually
Memory - 01_memory.py: FAIL                                             
--Passed when run manually
NetworkPort - 01_netport.py: FAIL                                       
--Passed when run manually
ResourceAllocationFromPool - 02_reverse.py: FAIL                        
--Passed when run manually
ResourceAllocationFromPool - 05_RAPF_err.py: FAIL                       
--Passed when run manually
VSSD - 04_vssd_to_rasd.py: FAIL                                         
--Passed when run manually
VirtualSystemManagementService - 02_destroysystem.py: FAIL

Please find the complete report attached with the mail.

Thanks and Regards,
Deepti.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Jun26-XenFV-report
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080626/7ce35c84/attachment.ksh>

From deeptik at linux.vnet.ibm.com  Thu Jun 26 13:15:15 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Thu, 26 Jun 2008 18:45:15 +0530
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] Add generic poll function
	to poll for guest state
In-Reply-To: <6cb3a4b4b0b21497dbfc.1214324049@elm3b41.beaverton.ibm.com>
References: <6cb3a4b4b0b21497dbfc.1214324049@elm3b41.beaverton.ibm.com>
Message-ID: <48639663.4030700@linux.vnet.ibm.com>



Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1214156795 25200
> # Node ID 6cb3a4b4b0b21497dbfc812c49e555699d580d21
> # Parent  59fce67164a22315bb712f692dfd93314c4f30e0
> [TEST] Add generic poll function to poll for guest state.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r 59fce67164a2 -r 6cb3a4b4b0b2 suites/libvirt-cim/lib/XenKvmLib/common_util.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu Jun 05 19:37:57 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Sun Jun 22 10:46:35 2008 -0700
> @@ -23,6 +23,7 @@
>  import os
>  import pywbem
>  import random
> +from time import sleep
>  from distutils.file_util import move_file
>  from XenKvmLib.test_xml import * 
>  from XenKvmLib.test_doms import * 
> @@ -135,6 +136,33 @@
>          return 1
>
>      return 0 
> +
> +def poll_for_state_change(server, virt, dom, exp_state):
> +    timeout = 30 
>   
It will be good if we pass timeout value as well.

> +    cs = computersystem.get_cs_class(virt)
> +
> +    try:
> +        for i in range(1, (timeout + 1)):
> +            sleep(1)
> +            dom_cs = cs(server, name=dom)
> +            if dom_cs is None:
>   
We can make this better by checking dom_cs.Name, thoughts ?
otherwise +1 for me.
> +                logger.error("CS instance not returned for %s." % dom)
> +                return FAIL
> +
> +            if dom_cs.EnabledState == exp_state:
> +                break
> +
> +    except Exception, detail:
> +        logger.error("Exception: %s" % detail)
> +        return FAIL
> +
> +    if dom_cs.EnabledState != exp_state:
> +        logger.error("EnabledState is %i instead of %i." % (dom_cs.EnabledState,
> +                     exp_state))
> +        logger.error("Try to increase the timeout and run the test again")
> +        return FAIL
> +
> +    return PASS 
>
>  def get_host_info(server, virt="Xen"):
>      status = PASS
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From kaitlin at linux.vnet.ibm.com  Thu Jun 26 15:22:11 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 26 Jun 2008 08:22:11 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] #7 Update RAFP.01 for LXC support
In-Reply-To: <5845fbc3a61daa48343f.1214446565@localhost.localdomain>
References: <5845fbc3a61daa48343f.1214446565@localhost.localdomain>
Message-ID: <4863B423.8020102@linux.vnet.ibm.com>

> +   
> +    for item in data:
> +        if item['InstanceID'] == rasd[cn]:
> +            logger.info("%s InstanceID match - expect %s, got %s" \
> +                        % (cn, rasd[cn], item['InstanceID']))
> +            return PASS 
> +        else:
> +            logger.error("RASD instance with InstanceID %s not found" % rasd[cn])
> +            return FAIL
> +               

You don't want an else statement in the for loop.  If the first element 
in data doesn't match, you'll return an error from the function. 
Instead, you'll want return a failure after the loop is complete:

     for item in data:
         if item['InstanceID'] == rasd[cn]:
             logger.info("%s InstanceID match - expect %s, got %s" \
                         % (cn, rasd[cn], item['InstanceID']))
             return PASS

     logger.error("RASD instance with InstanceID %s not found" % rasd[cn])
     return FAIL

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Thu Jun 26 15:35:52 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 26 Jun 2008 08:35:52 -0700
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] Define and create guest with
	CPU scheduling values set
In-Reply-To: <874p7ivjw5.fsf@caffeine.beaverton.ibm.com>
References: <5c90c9a2fd567d7cf592.1214324050@elm3b41.beaverton.ibm.com>
	<874p7ivjw5.fsf@caffeine.beaverton.ibm.com>
Message-ID: <4863B758.4000806@linux.vnet.ibm.com>

Dan Smith wrote:
> KR> +def check_proc_pinning(server, virt):
> KR> +    attr_list = { "weight" : weight,
> KR> +                  "limit"  : limit
> KR> +                }
> KR> +   
> KR> +    for k, v in attr_list.iteritems():
> KR> +        status = check_sched_info(k, v, server, virt)
> KR> +        if status != PASS:
> KR> +            return FAIL
> KR> +
> KR> +    return PASS
> 
> This method could probably use a better name, since we're not doing

Yes, for some reason - I want to say pinning when I mean scheduling. 
And sorry for the slow reply - I didn't see this message until just now.

Thanks!
-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Thu Jun 26 15:45:36 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 26 Jun 2008 08:45:36 -0700
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] Add generic poll function
	to poll for guest state
In-Reply-To: <48639663.4030700@linux.vnet.ibm.com>
References: <6cb3a4b4b0b21497dbfc.1214324049@elm3b41.beaverton.ibm.com>
	<48639663.4030700@linux.vnet.ibm.com>
Message-ID: <4863B9A0.4090400@linux.vnet.ibm.com>

>>          return 1
>>
>>      return 0 +
>> +def poll_for_state_change(server, virt, dom, exp_state):
>> +    timeout = 30   
> It will be good if we pass timeout value as well.
> 
>> +    cs = computersystem.get_cs_class(virt)
>> +
>> +    try:
>> +        for i in range(1, (timeout + 1)):
>> +            sleep(1)
>> +            dom_cs = cs(server, name=dom)
>> +            if dom_cs is None:
>>   
> We can make this better by checking dom_cs.Name, thoughts ?
> otherwise +1 for me.

That's a really good point. It's possible to get back the wrong CS 
instance.  Good catch =)  I'll add both of these changes and resend.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Thu Jun 26 16:28:42 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 26 Jun 2008 09:28:42 -0700
Subject: [Libvirt-cim] [PATCH] For pause, reboot, and enable add support
	for guests in the NOSTATE state
In-Reply-To: <bd1ee412c6853d5fd005.1214432854@elm3b41.beaverton.ibm.com>
References: <bd1ee412c6853d5fd005.1214432854@elm3b41.beaverton.ibm.com>
Message-ID: <4863C3BA.70104@linux.vnet.ibm.com>

> @@ -758,6 +759,7 @@
>          switch (info->state) {
>          case VIR_DOMAIN_RUNNING:
>          case VIR_DOMAIN_BLOCKED:
> +        case VIR_DOMAIN_NOSTATE:
>                  CU_DEBUG("Reboot domain");
>                  ret = virDomainReboot(dom, 0);
>                  break;

Looking at the VSP, it looks like we're supposed to support reboot from 
the following states:  Active, Paused, Suspended.

If there aren't any objections, I'll rework this patch to support that.

> @@ -783,6 +785,7 @@
>          switch (info->state) {
>          case VIR_DOMAIN_RUNNING:
>          case VIR_DOMAIN_BLOCKED:
> +        case VIR_DOMAIN_NOSTATE:
>                  CU_DEBUG("Reset domain");
>                  ret = domain_reset(dom);
>                  break;

Same story with reset.  We should support Active, Paused, Suspended as 
valid from states.

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Thu Jun 26 22:21:28 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 26 Jun 2008 15:21:28 -0700
Subject: [Libvirt-cim] [PATCH 1 of 3] Remove bootloader from vsms.py in the
	Xen case
In-Reply-To: <patchbomb.1214518887@elm3b41.beaverton.ibm.com>
Message-ID: <59fce67164a22315bb71.1214518888@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1212719877 25200
# Node ID 59fce67164a22315bb712f692dfd93314c4f30e0
# Parent  727d97c09d77d73f3542ba49a9dd19ba119a67eb
Remove bootloader from vsms.py in the Xen case.

This looks like an old bug that was masked by some tests that are XFAILing.  Since the cimtest guest uses a ramdisk, we should not set a bootloader for paravirtualized guests.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 727d97c09d77 -r 59fce67164a2 suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Tue Jun 10 18:26:20 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Thu Jun 05 19:37:57 2008 -0700
@@ -105,8 +105,6 @@
         elif type == 'LXC':
             self.InitPath = const.LXC_init_path
         else:
-            self.Bootloader = live.bootloader(Globals.CIM_IP, 0)
-            self.BootloaderArgs = ''
             self.Kernel = const.Xen_kernel_path
             self.Ramdisk = const.Xen_init_path
  



From kaitlin at linux.vnet.ibm.com  Thu Jun 26 22:21:29 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 26 Jun 2008 15:21:29 -0700
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] #2 Add generic poll function to
	poll for guest state
In-Reply-To: <patchbomb.1214518887@elm3b41.beaverton.ibm.com>
Message-ID: <a379b9abb12cffae8e19.1214518889@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214156795 25200
# Node ID a379b9abb12cffae8e19c5db0e312df0581b9541
# Parent  59fce67164a22315bb712f692dfd93314c4f30e0
[TEST] #2 Add generic poll function to poll for guest state.

Updates from patch 1 to 2:
  -Added timeout as a parameter - still has defualt value of 30
  -Added a check to verify the Name of the CS instance returned matches the name of the guest we're polling for.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 59fce67164a2 -r a379b9abb12c suites/libvirt-cim/lib/XenKvmLib/common_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu Jun 05 19:37:57 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Sun Jun 22 10:46:35 2008 -0700
@@ -23,6 +23,7 @@
 import os
 import pywbem
 import random
+from time import sleep
 from distutils.file_util import move_file
 from XenKvmLib.test_xml import * 
 from XenKvmLib.test_doms import * 
@@ -135,6 +136,32 @@
         return 1
 
     return 0 
+
+def poll_for_state_change(server, virt, dom, exp_state, timeout=30):
+    cs = computersystem.get_cs_class(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
+
+            if dom_cs.EnabledState == exp_state:
+                break
+
+    except Exception, detail:
+        logger.error("Exception: %s" % detail)
+        return FAIL
+
+    if dom_cs.EnabledState != exp_state:
+        logger.error("EnabledState is %i instead of %i." % (dom_cs.EnabledState,
+                     exp_state))
+        logger.error("Try to increase the timeout and run the test again")
+        return FAIL
+
+    return PASS 
 
 def get_host_info(server, virt="Xen"):
     status = PASS



From kaitlin at linux.vnet.ibm.com  Thu Jun 26 22:21:27 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 26 Jun 2008 15:21:27 -0700
Subject: [Libvirt-cim] [PATCH 0 of 3] [TEST] #2 Add CPU scheduling test.
Message-ID: <patchbomb.1214518887@elm3b41.beaverton.ibm.com>

This test corresponds to the recent CPU scheduling enhancement.



From kaitlin at linux.vnet.ibm.com  Thu Jun 26 22:21:30 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Thu, 26 Jun 2008 15:21:30 -0700
Subject: [Libvirt-cim] [PATCH 3 of 3] [TEST] #2 Define and create guest with
	CPU scheduling values set
In-Reply-To: <patchbomb.1214518887@elm3b41.beaverton.ibm.com>
Message-ID: <1f1365baac0e8cc57905.1214518890@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1213896959 25200
# Node ID 1f1365baac0e8cc5790533d9bb79d9c06eb68402
# Parent  a379b9abb12cffae8e19c5db0e312df0581b9541
[TEST] #2 Define and create guest with CPU scheduling values set.

Verify these values after the guest starts.  KVM doesn't support CPU scheduling.  For KVM guests, this test just verfies that the guest can be created and defined when CPU scheduling values are defined in the ProcRASD that's passed in to the DefineSystem() call.

Updates from patch 1 to 2:
 -Change check_proc_pinning() to check_proc_sched() since this test is verifying vcpu scheduling.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r a379b9abb12c -r 1f1365baac0e suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py	Thu Jun 19 10:35:59 2008 -0700
@@ -0,0 +1,137 @@
+#!/usr/bin/python
+#
+# Copyright 2008 IBM Corp.
+#
+# Authors:
+#    Kaitlin Rupert <karupert at us.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 sys
+import pywbem
+from XenKvmLib.common_util import call_request_state_change, \
+                                  poll_for_state_change 
+from XenKvmLib import vsms
+from VirtLib import utils 
+from CimTest.Globals import logger
+from CimTest.Globals import do_main
+from CimTest.ReturnCodes import FAIL, PASS
+from XenKvmLib.test_doms import destroy_and_undefine_domain 
+
+sup_types = ['Xen', 'XenFV', 'KVM']
+default_dom = 'rstest_domain'
+
+nvcpu = 2
+weight = 124
+limit = 256
+
+REQUESTED_STATE = 2
+TIME = "00000000000000.000000:000"
+
+def setup_rasd_mof(ip, vtype):
+    vssd, rasd = vsms.default_vssd_rasd_str(default_dom, virt=vtype)
+
+    class_pasd = vsms.get_pasd_class(vtype)
+    proc_inst = class_pasd(nvcpu, default_dom, weight, limit) 
+    proc_mof = proc_inst.mof()
+
+    for i in range(len(rasd)):
+        if "ProcResourceAllocationSettingData" in rasd[i]:
+            rasd[i] = proc_mof
+            return PASS, vssd, rasd
+
+    return FAIL, vssd, rasd
+
+def check_sched_info(str, exp_val, server, virt):
+    if str == "limit":
+        virsh_val = "cap"
+    else:
+        virsh_val = str
+
+    cmd = "virsh -c %s schedinfo %s | awk '/%s/ { print \$3 }'" % \
+          (utils.virt2uri(virt), default_dom, virsh_val)
+    ret, out = utils.run_remote(server, cmd)
+    if not out.isdigit():
+        return FAIL
+
+    try:
+        val = int(out)
+    except ValueError:
+        val = -1
+
+    if val != exp_val: 
+        logger.error("%s is %i, expected %i" % (str, val, exp_val))
+        return FAIL
+
+    return PASS
+
+def check_proc_sched(server, virt):
+    attr_list = { "weight" : weight,
+                  "limit"  : limit
+                }
+   
+    for k, v in attr_list.iteritems():
+        status = check_sched_info(k, v, server, virt)
+        if status != PASS:
+            return FAIL
+
+    return PASS
+
+ at do_main(sup_types)
+def main():
+    options = main.options
+
+    status, vssd, rasd = setup_rasd_mof(options.ip, options.virt)
+    if status != PASS:
+        return status
+
+    try:
+        service = vsms.get_vsms_class(options.virt)(options.ip)
+
+        service.DefineSystem(SystemSettings=vssd,
+                             ResourceSettings=rasd,
+                             ReferenceConfiguration=' ')
+
+        rc = call_request_state_change(default_dom, options.ip,
+                                       REQUESTED_STATE, TIME, options.virt)
+        if rc != 0:
+            raise Exception("Unable to start %s using RequestedStateChange()" %
+                            default_dom)
+
+        status = poll_for_state_change(options.ip, options.virt, default_dom, 
+                                       REQUESTED_STATE)
+        if status != PASS:
+            raise Exception("%s didn't change state as expected" % default_dom)
+
+        if options.virt == "Xen" or options.virt == "XenFV":
+            status = check_proc_sched(options.ip, options.virt)
+            if status != PASS:
+                raise Exception("%s CPU scheduling not set properly" % 
+                                default_dom)
+
+        status = PASS
+      
+    except Exception, details:
+        logger.error(details)
+        status = FAIL
+
+    destroy_and_undefine_domain(default_dom, options.ip, options.virt)
+
+    return status 
+
+if __name__ == "__main__":
+    sys.exit(main())
+    
diff -r a379b9abb12c -r 1f1365baac0e suites/libvirt-cim/lib/XenKvmLib/vsms.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Sun Jun 22 10:46:35 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py	Thu Jun 19 10:35:59 2008 -0700
@@ -174,7 +174,7 @@
     pass
 
 class CIM_ProcResourceAllocationSettingData(CIMClassMOF):
-    def __init__(self, vcpu, name):
+    def __init__(self, vcpu, name, weight=None, limit=None):
         self.ResourceType = RASD_TYPE_PROC
         
         if vcpu != None:
@@ -182,6 +182,12 @@
         
         if name != None:
             self.InstanceID = '%s/proc' % name
+
+        if weight != None:
+            self.Weight = weight
+
+        if limit != None:
+            self.Limit = limit 
 
 class Xen_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData):
     pass



From yunguol at cn.ibm.com  Fri Jun 27 01:57:16 2008
From: yunguol at cn.ibm.com (yunguol at cn.ibm.com)
Date: Fri, 27 Jun 2008 09:57:16 +0800
Subject: [Libvirt-cim] [PATCH] [TEST] #8 Update RAFP.01 for LXC support
Message-ID: <fc04e9a959fc33ef8c55.1214531836@localhost.localdomain>

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1214531831 -28800
# Node ID fc04e9a959fc33ef8c552fbc8f74d839ac6c1105
# Parent  727d97c09d77d73f3542ba49a9dd19ba119a67eb
[TEST] #8 Update RAFP.01 for LXC support

This patch remove else statement in the for loop of verify_rasd() function

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 727d97c09d77 -r fc04e9a959fc suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Tue Jun 10 18:26:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Fri Jun 27 09:57:11 2008 +0800
@@ -26,66 +26,133 @@
 from VirtLib import utils
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
-from XenKvmLib.classes import get_typed_class 
+from XenKvmLib.classes import get_typed_class
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.vxml import get_class 
 from CimTest import Globals
 from CimTest.Globals import logger, do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \
+create_netpool_conf
 
-sup_types = ['Xen', 'XenFV', 'KVM']
+sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 
+test_dom    = "RAFP_dom"
+test_vcpus  = 1
+test_mem    = 128
+test_mac    = "00:11:22:33:44:aa"
+
+def setup_env(server, virt):
+    destroy_and_undefine_all(server)
+    vsxml = None
+    if virt == "Xen":
+        test_disk = "xvda"
+    elif virt == "XenFV" or virt=="KVM":
+        test_disk = "hda"
+    else:
+        test_disk = None
+
+    virtxml = get_class(virt)
+    if virt == 'LXC':
+        vsxml = virtxml(test_dom)
+    else:
+        vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+                        mac = test_mac, disk = test_disk)
+    try:
+        ret = vsxml.define(server)
+        if not ret:
+            logger.error("Failed to Define the domain: %s", test_dom)
+            return FAIL, vsxml, test_disk
+
+    except Exception, details:
+        logger.error("Exception : %s", details)
+        return FAIL, vsxml, test_disk
+
+    return PASS, vsxml, test_disk
+
+def get_instance(server, pool, list, virt='Xen'):
+    try:
+        inst = enumclass.getInstance(server,
+                                     pool,
+                                     list,
+                                     virt)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_GETINSTANCE  % pool)
+        return FAIL, inst
+  
+    return PASS, inst
+
+def verify_rasd(server, assoc_cn, cn, virt, list, rasd):
+    try:
+        data = assoc.AssociatorNames(server,
+                                     assoc_cn,
+                                     cn,
+                                     virt,
+                                     InstanceID=list)
+    except Exception:
+        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn)
+        return FAIL
+
+    if len(data) < 1:
+        logger.error("Return NULL, expect at least one instance")
+        return FAIL
+   
+    for item in data:
+        if item['InstanceID'] == rasd[cn]:
+            logger.info("%s InstanceID match - expect %s, got %s" \
+                        % (cn, rasd[cn], item['InstanceID']))
+            return PASS 
+    logger.error("RASD instance with InstanceID %s not found" % rasd[cn])
+    return FAIL
+               
 @do_main(sup_types)
 def main():
     options = main.options
     status = PASS
 
-    try:
-        key_list = { 'InstanceID' : "MemoryPool/0" }
-        mempool = enumclass.getInstance(options.ip,
-                                        "MemoryPool",
-                                        key_list,
-                                        options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE  % "MemoryPool")
-        return FAIL
+   
+    status, vsxml, test_disk = setup_env(options.ip, options.virt)
+    if status != PASS:
+        return status
+    
+    status, diskid = create_diskpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
 
-    try:
-        key_list = { 'InstanceID' : "ProcessorPool/0" }
-        procpool = enumclass.getInstance(options.ip,
-                                         "ProcessorPool",
-                                         key_list,
-                                         options.virt)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_GETINSTANCE % "ProcessorPool")  
-        return FAIL
-     
-    try:
-        memdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                        "MemoryPool",
-                                        options.virt,
-                                        InstanceID = mempool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mempool.InstanceID)
-        status = FAIL
-     
-    for i in range(len(memdata)):
-        if memdata[i].classname != get_typed_class(options.virt, "MemResourceAllocationSettingData"):
-            logger.error("ERROR: Association result error")
-            status = FAIL
-                
-    try:
-        procdata = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool",
-                                         "ProcessorPool",
-                                         options.virt,
-                                         InstanceID = procpool.InstanceID)
-    except Exception:
-        logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % procpool.InstanceID)
-        status = FAIL
-      
-    for j in range(len(procdata)):
-        if procdata[j].classname != get_typed_class(options.virt, "ProcResourceAllocationSettingData"):
-	    logger.error("ERROR: Association result error")
-            status = FAIL
+    status, test_network = create_netpool_conf(options.ip, options.virt)
+    if status != PASS:
+        cleanup_restore(options.ip, options.virt)
+        vsxml.undefine(options.ip)
+        return status
+ 
+    if options.virt == 'LXC':
+        pool = { "MemoryPool" : {'InstanceID' : "MemoryPool/0"} }
+        rasd = { "MemoryPool" :  "%s/mem" % test_dom }
+    else:
+        pool = { "MemoryPool"    : {'InstanceID' : "MemoryPool/0"},
+                 "ProcessorPool" : {'InstanceID' : "ProcessorPool/0"},
+                 "DiskPool"      : {'InstanceID' : diskid},
+                 "NetworkPool"   : {'InstanceID' : "NetworkPool/%s" \
+                                     % test_network }}
+        rasd = { "MemoryPool"    : "%s/mem" % test_dom, 
+                 "ProcessorPool" : "%s/proc" % test_dom, 
+                 "DiskPool"      : "%s/%s" %(test_dom, test_disk), 
+                 "NetworkPool"   : "%s/%s" % (test_dom, test_mac) }
 
+    for k, v in pool.iteritems():
+        status, inst = get_instance(options.ip, k, v, options.virt) 
+        if status != PASS:
+            break 
+        status = verify_rasd(options.ip, "ResourceAllocationFromPool", 
+                             k, options.virt, inst.InstanceID,
+                             rasd)
+        if status != PASS:
+            break
+
+    cleanup_restore(options.ip, options.virt)
+    vsxml.undefine(options.ip)
     return status 
         
         



From deeptik at linux.vnet.ibm.com  Fri Jun 27 10:25:19 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Fri, 27 Jun 2008 15:55:19 +0530
Subject: [Libvirt-cim] [PATCH 2 of 3] [TEST] #2 Add generic poll function
	to poll for guest state
In-Reply-To: <a379b9abb12cffae8e19.1214518889@elm3b41.beaverton.ibm.com>
References: <a379b9abb12cffae8e19.1214518889@elm3b41.beaverton.ibm.com>
Message-ID: <4864C00F.5090507@linux.vnet.ibm.com>

+1 for me.

Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1214156795 25200
> # Node ID a379b9abb12cffae8e19c5db0e312df0581b9541
> # Parent  59fce67164a22315bb712f692dfd93314c4f30e0
> [TEST] #2 Add generic poll function to poll for guest state.
>
> Updates from patch 1 to 2:
>   -Added timeout as a parameter - still has defualt value of 30
>   -Added a check to verify the Name of the CS instance returned matches the name of the guest we're polling for.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r 59fce67164a2 -r a379b9abb12c suites/libvirt-cim/lib/XenKvmLib/common_util.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu Jun 05 19:37:57 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Sun Jun 22 10:46:35 2008 -0700
> @@ -23,6 +23,7 @@
>  import os
>  import pywbem
>  import random
> +from time import sleep
>  from distutils.file_util import move_file
>  from XenKvmLib.test_xml import * 
>  from XenKvmLib.test_doms import * 
> @@ -135,6 +136,32 @@
>          return 1
>
>      return 0 
> +
> +def poll_for_state_change(server, virt, dom, exp_state, timeout=30):
> +    cs = computersystem.get_cs_class(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
> +
> +            if dom_cs.EnabledState == exp_state:
> +                break
> +
> +    except Exception, detail:
> +        logger.error("Exception: %s" % detail)
> +        return FAIL
> +
> +    if dom_cs.EnabledState != exp_state:
> +        logger.error("EnabledState is %i instead of %i." % (dom_cs.EnabledState,
> +                     exp_state))
> +        logger.error("Try to increase the timeout and run the test again")
> +        return FAIL
> +
> +    return PASS 
>
>  def get_host_info(server, virt="Xen"):
>      status = PASS
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From deeptik at linux.vnet.ibm.com  Fri Jun 27 13:01:38 2008
From: deeptik at linux.vnet.ibm.com (Deepti B Kalakeri)
Date: Fri, 27 Jun 2008 18:31:38 +0530
Subject: [Libvirt-cim] [PATCH] For pause, reboot, and enable add support
	for guests in the NOSTATE state
In-Reply-To: <bd1ee412c6853d5fd005.1214432854@elm3b41.beaverton.ibm.com>
References: <bd1ee412c6853d5fd005.1214432854@elm3b41.beaverton.ibm.com>
Message-ID: <4864E4B2.1030700@linux.vnet.ibm.com>

+1 for me.


Kaitlin Rupert wrote:
> # HG changeset patch
> # User Kaitlin Rupert <karupert at us.ibm.com>
> # Date 1214428450 25200
> # Node ID bd1ee412c6853d5fd005eca535b0b04446e08fb4
> # Parent  edf96787c23dc7a91a008916b4b00b22fc22703a
> For pause, reboot, and enable add support for guests in the NOSTATE state.
>
> It's possible that a XenFV guest might return no state instead of blocked or running.  When xend schedules to guest to run, the guest needs qemu to run (to handle device emulation).  If we get the state of the guest before qemu is done running its setup, libvirt reports no state.
>
> This should be a safe approach - we return an error if the guest is in some other state or if libvirt is unable to successfully change the state of the guest.
>
> Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>
>
> diff -r edf96787c23d -r bd1ee412c685 src/Virt_ComputerSystem.c
> --- a/src/Virt_ComputerSystem.c	Wed Jun 25 12:34:09 2008 -0700
> +++ b/src/Virt_ComputerSystem.c	Wed Jun 25 14:14:10 2008 -0700
> @@ -733,6 +733,7 @@
>          switch (info->state) {
>          case VIR_DOMAIN_RUNNING:
>          case VIR_DOMAIN_BLOCKED:
> +        case VIR_DOMAIN_NOSTATE:
>                  CU_DEBUG("Pause domain");
>                  ret = virDomainSuspend(dom);
>                  break;
> @@ -758,6 +759,7 @@
>          switch (info->state) {
>          case VIR_DOMAIN_RUNNING:
>          case VIR_DOMAIN_BLOCKED:
> +        case VIR_DOMAIN_NOSTATE:
>                  CU_DEBUG("Reboot domain");
>                  ret = virDomainReboot(dom, 0);
>                  break;
> @@ -783,6 +785,7 @@
>          switch (info->state) {
>          case VIR_DOMAIN_RUNNING:
>          case VIR_DOMAIN_BLOCKED:
> +        case VIR_DOMAIN_NOSTATE:
>                  CU_DEBUG("Reset domain");
>                  ret = domain_reset(dom);
>                  break;
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>   



From danms at us.ibm.com  Fri Jun 27 16:03:32 2008
From: danms at us.ibm.com (Dan Smith)
Date: Fri, 27 Jun 2008 09:03:32 -0700
Subject: [Libvirt-cim] [PATCH] Add in default scheduler parameters for Xen
	domains
Message-ID: <b123b6b1fb08c3ab956f.1214582612@caffeine.beaverton.ibm.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214582349 25200
# Node ID b123b6b1fb08c3ab956f1c33801e743e082192b9
# Parent  edf96787c23dc7a91a008916b4b00b22fc22703a
Add in default scheduler parameters for Xen domains

This fixes the case where you don't specify them and they're assumed to
be zero (which is an invalid value for Xen's weight parameter).

diff -r edf96787c23d -r b123b6b1fb08 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Wed Jun 25 12:34:09 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Fri Jun 27 08:59:09 2008 -0700
@@ -55,6 +55,7 @@
 #include "config.h"
 
 #define DEFAULT_MAC_PREFIX "00:16:3e"
+#define DEFAULT_XEN_WEIGHT 1024
 
 const static CMPIBroker *_BROKER;
 
@@ -471,9 +472,29 @@ static const char *proc_rasd_to_vdev(CMP
 static const char *proc_rasd_to_vdev(CMPIInstance *inst,
                                      struct virt_device *dev)
 {
+        CMPIObjectPath *op = NULL;
+        CMPIrc rc;
+        uint32_t def_weight = 0;
+        uint64_t def_limit = 0;
+
         cu_get_u64_prop(inst, "VirtualQuantity", &dev->dev.vcpu.quantity);
-        cu_get_u64_prop(inst, "Limit", &dev->dev.vcpu.limit);
-        cu_get_u32_prop(inst, "Weight", &dev->dev.vcpu.weight);
+
+        op = CMGetObjectPath(inst, NULL);
+        if (op == NULL) {
+                CU_DEBUG("Unable to determine class of ProcRASD");
+                return NULL;
+        }
+
+        if (STARTS_WITH(CLASSNAME(op), "Xen")) 
+                def_weight = DEFAULT_XEN_WEIGHT;
+
+        rc = cu_get_u64_prop(inst, "Limit", &dev->dev.vcpu.limit);
+        if (rc != CMPI_RC_OK)
+                dev->dev.vcpu.limit = def_limit;
+
+        rc = cu_get_u32_prop(inst, "Weight", &dev->dev.vcpu.weight);
+        if (rc != CMPI_RC_OK)
+                dev->dev.vcpu.weight = def_weight;
 
         return NULL;
 }



From kaitlin at linux.vnet.ibm.com  Fri Jun 27 19:09:46 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Fri, 27 Jun 2008 12:09:46 -0700
Subject: [Libvirt-cim] [PATCH] Add in default scheduler parameters for
	Xen domains
In-Reply-To: <b123b6b1fb08c3ab956f.1214582612@caffeine.beaverton.ibm.com>
References: <b123b6b1fb08c3ab956f.1214582612@caffeine.beaverton.ibm.com>
Message-ID: <48653AFA.20208@linux.vnet.ibm.com>

Dan Smith wrote:
> # HG changeset patch
> # User Dan Smith <danms at us.ibm.com>
> # Date 1214582349 25200
> # Node ID b123b6b1fb08c3ab956f1c33801e743e082192b9
> # Parent  edf96787c23dc7a91a008916b4b00b22fc22703a
> Add in default scheduler parameters for Xen domains
> 
> This fixes the case where you don't specify them and they're assumed to
> be zero (which is an invalid value for Xen's weight parameter).
> 
> diff -r edf96787c23d -r b123b6b1fb08 src/Virt_VirtualSystemManagementService.c

+1

-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From yunguol at cn.ibm.com  Mon Jun 30 02:30:53 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 30 Jun 2008 10:30:53 +0800
Subject: [Libvirt-cim] Cimtest Report for LXC on F9 (2008/06/30)
Message-ID: <OF85EEEB5C.7D6D9A60-ON48257478.000DDA74-48257478.000E1BB4@cn.ibm.com>

stro: Fedora 9 Beta
kernel-2.6.25-0.218.rc8.git7.fc9.x86_64
CIMOM: tog-pegasus-2.7.0-6.fc9.x86_64
cimtest: changeset-227

==================================================================
PASS        :  88
FAIL        :  2
XFAIL       :  1
SKIP        :  38
-----------------
Total       : 129

=========================  FAILED 
==========================================
ComputerSystem - 04_defineStartVS.py: FAIL
ERROR   - Error: property values are not set for VS domguest
HostSystem - 03_hs_to_settdefcap.py: FAIL
ERROR   - HostedResourcePool has returned 3 instances, expected 4 
instances

======================CIMTEST FULL 
REPORT==================================
AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: PASS
ComputerSystem - 03_defineVS.py: PASS
ComputerSystem - 04_defineStartVS.py: FAIL
ERROR   - Error: property values are not set for VS domguest
ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
ERROR   - ERROR: VS DomST1 transition from Defined State to Activate state 
was not Successful
Bug:<00002>
ComputerSystem - 06_paused_active_suspend.py: SKIP
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: PASS
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: SKIP
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: PASS
ComputerSystemIndication - 01_created_indication.py: SKIP
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: SKIP
ElementAllocatedFromPool - 04_forward_errs.py: SKIP
ElementCapabilities - 01_forward.py: PASS
ElementCapabilities - 02_reverse.py: PASS
ElementCapabilities - 03_forward_errs.py: PASS
ElementCapabilities - 04_reverse_errs.py: PASS
ElementCapabilities - 05_hostsystem_cap.py: PASS
ElementConforms - 01_forward.py: PASS
ElementConforms - 02_reverse.py: PASS
ElementConforms - 03_ectp_fwd_errs.py: PASS
ElementConforms - 04_ectp_rev_errs.py: PASS
ElementSettingData - 01_forward.py: PASS
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS
EnabledLogicalElementCapabilities - 01_enum.py: PASS
EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS
HostSystem - 01_enum.py: PASS
HostSystem - 02_hostsystem_to_rasd.py: PASS
HostSystem - 03_hs_to_settdefcap.py: FAIL
ERROR   - HostedResourcePool has returned 3 instances, expected 4 
instances
HostSystem - 04_hs_to_EAPF.py: SKIP
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: SKIP
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: SKIP
LogicalDisk - 02_nodevs.py: SKIP
LogicalDisk - 03_ld_gi_errs.py: SKIP
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: PASS
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: SKIP
NetworkPort - 02_np_gi_errors.py: SKIP
NetworkPort - 03_user_netport.py: SKIP
Processor - 01_processor.py: SKIP
Processor - 02_definesys_get_procs.py: SKIP
Processor - 03_proc_gi_errs.py: SKIP
Profile - 01_enum.py: PASS
Profile - 02_profile_to_elec.py: SKIP
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
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: SKIP
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: SKIP
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: SKIP
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: 
SKIP
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP
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: 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: SKIP
VirtualSystemManagementService - 07_addresource_neg.py: PASS
VirtualSystemManagementService - 08_modifyresource.py: SKIP
VirtualSystemManagementService - 09_procrasd_persist.py: SKIP
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: SKIP
VirtualSystemSettingDataComponent - 02_reverse.py: 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


Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080630/65c2290e/attachment.htm>

From yunguol at cn.ibm.com  Mon Jun 30 02:52:29 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 30 Jun 2008 10:52:29 +0800
Subject: [Libvirt-cim] Cimtest Report for LXC on F9 (2008/06/30)
In-Reply-To: <OF85EEEB5C.7D6D9A60-ON48257478.000DDA74-48257478.000E1BB4@cn.ibm.com>
Message-ID: <OFFF7CC5D7.9F269D69-ON48257478.000FEE09-48257478.00101626@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-30 10:30:53:

> 
> stro: Fedora 9 Beta 
> kernel-2.6.25-0.218.rc8.git7.fc9.x86_64 
> CIMOM: tog-pegasus-2.7.0-6.fc9.x86_64 
> cimtest: changeset-227 

  Sorry for my mistake, the changeset number of cimtest should be 233 not 
227.

> 
> ================================================================== 
> PASS        :  88 
> FAIL        :  2 
> XFAIL       :  1 
> SKIP        :  38 
> ----------------- 
> Total       : 129 
> 
> =========================  FAILED 
========================================== 
> ComputerSystem - 04_defineStartVS.py: FAIL 
> ERROR   - Error: property values are not set for VS domguest 
> HostSystem - 03_hs_to_settdefcap.py: FAIL 
> ERROR   - HostedResourcePool has returned 3 instances, expected 4 
instances 
> 
> ======================CIMTEST FULL 
REPORT================================== 
> AllocationCapabilities - 01_enum.py: PASS 
> AllocationCapabilities - 02_alloccap_gi_errs.py: PASS 
> ComputerSystem - 01_enum.py: PASS 
> ComputerSystem - 02_nosystems.py: PASS 
> ComputerSystem - 03_defineVS.py: PASS 
> ComputerSystem - 04_defineStartVS.py: FAIL 
> ERROR   - Error: property values are not set for VS domguest 
> ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002 
> ERROR   - ERROR: VS DomST1 transition from Defined State to Activate
> state was not Successful 
> Bug:<00002> 
> ComputerSystem - 06_paused_active_suspend.py: SKIP 
> ComputerSystem - 22_define_suspend.py: PASS 
> ComputerSystem - 23_suspend_suspend.py: SKIP 
> ComputerSystem - 27_define_suspend_errs.py: PASS 
> ComputerSystem - 32_start_reboot.py: SKIP 
> ComputerSystem - 33_suspend_reboot.py: SKIP 
> ComputerSystem - 35_start_reset.py: SKIP 
> ComputerSystem - 40_RSC_start.py: SKIP 
> ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP 
> ComputerSystem - 42_cs_gi_errs.py: PASS 
> ComputerSystemIndication - 01_created_indication.py: SKIP 
> ElementAllocatedFromPool - 01_forward.py: SKIP 
> ElementAllocatedFromPool - 02_reverse.py: SKIP 
> ElementAllocatedFromPool - 03_reverse_errs.py: SKIP 
> ElementAllocatedFromPool - 04_forward_errs.py: SKIP 
> ElementCapabilities - 01_forward.py: PASS 
> ElementCapabilities - 02_reverse.py: PASS 
> ElementCapabilities - 03_forward_errs.py: PASS 
> ElementCapabilities - 04_reverse_errs.py: PASS 
> ElementCapabilities - 05_hostsystem_cap.py: PASS 
> ElementConforms - 01_forward.py: PASS 
> ElementConforms - 02_reverse.py: PASS 
> ElementConforms - 03_ectp_fwd_errs.py: PASS 
> ElementConforms - 04_ectp_rev_errs.py: PASS 
> ElementSettingData - 01_forward.py: PASS 
> ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS 
> EnabledLogicalElementCapabilities - 01_enum.py: PASS 
> EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS 
> HostSystem - 01_enum.py: PASS 
> HostSystem - 02_hostsystem_to_rasd.py: PASS 
> HostSystem - 03_hs_to_settdefcap.py: FAIL 
> ERROR   - HostedResourcePool has returned 3 instances, expected 4 
instances 
> HostSystem - 04_hs_to_EAPF.py: SKIP 
> 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: SKIP 
> 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: SKIP 
> LogicalDisk - 02_nodevs.py: SKIP 
> LogicalDisk - 03_ld_gi_errs.py: SKIP 
> Memory - 01_memory.py: PASS 
> Memory - 02_defgetmem.py: PASS 
> Memory - 03_mem_gi_errs.py: PASS 
> NetworkPort - 01_netport.py: SKIP 
> NetworkPort - 02_np_gi_errors.py: SKIP 
> NetworkPort - 03_user_netport.py: SKIP 
> Processor - 01_processor.py: SKIP 
> Processor - 02_definesys_get_procs.py: SKIP 
> Processor - 03_proc_gi_errs.py: SKIP 
> Profile - 01_enum.py: PASS 
> Profile - 02_profile_to_elec.py: SKIP 
> 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 
> 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: SKIP 
> 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: SKIP 
> ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP 
> ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: 
SKIP 
> ResourcePoolConfigurationService - 
06_RemoveResourcesFromResourcePool.py: SKIP
> ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP 
> 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: 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: SKIP 
> VirtualSystemManagementService - 07_addresource_neg.py: PASS 
> VirtualSystemManagementService - 08_modifyresource.py: SKIP 
> VirtualSystemManagementService - 09_procrasd_persist.py: SKIP 
> VirtualSystemMigrationCapabilities - 01_enum.py: PASS 
> VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS 
> VirtualSystemMigrationService - 01_migratable_host.py: SKIP 
> VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP 
> VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP 
> VirtualSystemMigrationSettingData - 01_enum.py: PASS 
> VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS 
> VirtualSystemSettingDataComponent - 01_forward.py: SKIP 
> VirtualSystemSettingDataComponent - 02_reverse.py: 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
> 
> 
> Best,
> Regards
> 
> Daisy (???)
> VSM Team, China Systems & Technology Labs (CSTL)
> E-mail: yunguol at cn.ibm.com
> TEL: (86)-21-60922144
> Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080630/1e7c1536/attachment.htm>

From yunguol at cn.ibm.com  Mon Jun 30 03:04:19 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 30 Jun 2008 11:04:19 +0800
Subject: [Libvirt-cim] Cimtest Report for Xen on RHEL 5.2 (2008/06/30)
Message-ID: <OF99373B50.01266988-ON48257478.0011161E-48257478.00112B78@cn.ibm.com>

Distro        : RHEL 5.2 Beta
Kernel        : kernel-2.6.18-92.el5
Xen version   : xen-3.0.3-64.el5
Libvirt       : libvirt-0.3.3-7.el5
CIMOM         : pegasus
PyWBEM        : pywbem-3.14
CIM Schema    : cimv216Experimental
LibCMPIutil   : 79
LibVirtCIM    : 621
CIMTEST       : 233
=========================================================
PASS          : 106
FAILED        : 17
XFAIL         : 3
SKIP          : 3

Total         : 129
==========================================================

llocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: SKIP
ERROR   - System has defined domains; unable to run
ComputerSystem - 03_defineVS.py: PASS
ComputerSystem - 04_defineStartVS.py: PASS
ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002
ERROR   - ERROR: VS DomST1 transition from Defined State to Activate state 
was not Successful
Bug:<00002>
ComputerSystem - 06_paused_active_suspend.py: XFAIL     Bug: 00002
ERROR   - ERROR: VS DomST1 transition from suspend State to Activate state 
 was not Successful
Bug:<00002>
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: FAIL
ERROR   - RequestedState should be 2 not 12
ERROR   - Attributes for dom test_domain not set as expected.
ComputerSystem - 27_define_suspend_errs.py: PASS
ComputerSystem - 32_start_reboot.py: FAIL
ERROR   - RequestedState should be 2 not 12
ERROR   - Attributes for dom test_domain not set as expected.
ComputerSystem - 33_suspend_reboot.py: FAIL
ERROR   - RequestedState should be 2 not 12
ERROR   - Attributes for dom test_domain not set as expected.
ComputerSystem - 35_start_reset.py: FAIL
ERROR   - RequestedState should be 2 not 12
ERROR   - Attributes for dom test_domain not set as expected.
ComputerSystem - 40_RSC_start.py: XFAIL Bug: 00002
ERROR   - RequestedState should be 2 not 12
ERROR   - Exception: Attributes were not set as expected for domain: 
'test_domain'
Bug:<00002>
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: FAIL
ERROR   - Failed to get associators information for 
ElementConformsToProfile
ERROR   - Exception: not enough arguments for format string
ElementConforms - 02_reverse.py: PASS
ElementConforms - 03_ectp_fwd_errs.py: PASS
ElementConforms - 04_ectp_rev_errs.py: PASS
ElementSettingData - 01_forward.py: FAIL
ERROR   - ElementSettingData returned 0 VirtualSystemSettingData instances
ERROR   - Unable to get associated VirtualSystemSettingData from 
ElementSettingData
CIM_ERR_NOT_FOUND: No such instance (domgst)
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: FAIL
ERROR   - NumberOfBlocks Mismatch
ERROR   - Returned 131072 instead of 128
{'Xen_NetworkPort': {'CreationClassName': 'Xen_NetworkPort', 
'NetworkAddresses': '00:11:22:33:44:aa', 'SystemName': 
'CrossClass_GuestDom', 'DeviceID': 
'CrossClass_GuestDom/00:11:22:33:44:aa'}, 'Xen_Memory': {'NumberOfBlocks': 
128, 'CreationClassName': 'Xen_Memory', 'SystemName': 
'CrossClass_GuestDom', 'DeviceID': 'CrossClass_GuestDom/mem'}, 
'Xen_Processor': {'CreationClassName': 'Xen_Processor', 'SystemName': 
'CrossClass_GuestDom', 'DeviceID': 'CrossClass_GuestDom/0'}, 
'Xen_LogicalDisk': {'CreationClassName': 'Xen_LogicalDisk', 'SystemName': 
'CrossClass_GuestDom', 'DeviceID': 'CrossClass_GuestDom/xvdb', 'Name': 
'xvdb'}}
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 
(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: PASS
RASD - 03_rasd_errs.py: PASS
ReferencedProfile - 01_verify_refprof.py: PASS
ReferencedProfile - 02_refprofile_errs.py: PASS
ResourceAllocationFromPool - 01_forward.py: PASS
ResourceAllocationFromPool - 02_reverse.py: PASS
ResourceAllocationFromPool - 03_forward_errs.py: PASS
ResourceAllocationFromPool - 04_reverse_errs.py: PASS
ResourceAllocationFromPool - 05_RAPF_err.py: PASS
ResourcePool - 01_enum.py: 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
CIM_ERR_NOT_FOUND: No such instance (dom)
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: FAIL
ERROR   - Unknow exception happened
ERROR   - (1, u'CIM_ERR_FAILED: Unable to retrieve domain name.')
ERROR   - Destroyed multiple domains
InvokeMethod(DestroySystem): CIM_ERR_FAILED: Unable to retrieve domain 
name.
VirtualSystemManagementService - 03_definesystem_ess.py: PASS
VirtualSystemManagementService - 04_definesystem_ers.py: PASS
VirtualSystemManagementService - 05_destroysystem_neg.py: PASS
VirtualSystemManagementService - 06_addresource.py: FAIL
ERROR   - Error invoking AddRS: add_disk_res
ERROR   - (1, u"CIM_ERR_FAILED: Unknown system `rstest_domain'")
InvokeMethod(AddResourceSettings): CIM_ERR_FAILED: Unknown system 
`rstest_domain'
VirtualSystemManagementService - 07_addresource_neg.py: PASS
VirtualSystemManagementService - 08_modifyresource.py: FAIL
ERROR   - Error invoking ModifyRS: mod_vcpu_res
ERROR   - (1, u"CIM_ERR_FAILED: Unknown system `rstest_domain'")
InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Unknown system 
`rstest_domain'
VirtualSystemManagementService - 09_procrasd_persist.py: PASS
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: FAIL
ERROR   - Failed to enumerate the class of Virt_MigrationJob
ERROR   - Invalid class type
VirtualSystemMigrationService - 02_host_migrate_type.py: FAIL
ERROR   - Failed to enumerate the class of Virt_MigrationJob
ERROR   - Invalid class type
VirtualSystemMigrationService - 05_migratable_host_errs.py: PASS
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: FAIL
ERROR   - Xen_VirtualSystemSettingDataComponent returned 0 Resource 
objects for class 'Xen_ProcResourceAllocationSettingData'
ERROR   - Xen_VirtualSystemSettingDataComponent returned 0 Resource 
objects for class 'Xen_ProcResourceAllocationSettingData'
CIM_ERR_NOT_FOUND: No such instance (VSSDC_dom/xvda)
CIM_ERR_NOT_FOUND: No such instance (VSSDC_dom/mem)
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




Best,
Regards

Daisy (???)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol at cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080630/e5227bad/attachment.htm>

From yunguol at cn.ibm.com  Mon Jun 30 05:13:10 2008
From: yunguol at cn.ibm.com (Guo Lian Yun)
Date: Mon, 30 Jun 2008 13:13:10 +0800
Subject: [Libvirt-cim] Cimtest Report for LXC on F9 (2008/06/30)
In-Reply-To: <OFFF7CC5D7.9F269D69-ON48257478.000FEE09-48257478.00101626@cn.ibm.com>
Message-ID: <OF89FC1394.F57B8FC6-ON48257478.001CC5F6-48257478.001CF765@cn.ibm.com>

libvirt-cim-bounces at redhat.com wrote on 2008-06-30 10:52:29:

> 
> libvirt-cim-bounces at redhat.com wrote on 2008-06-30 10:30:53:
> 
> > 
> > stro: Fedora 9 Beta 
> > kernel-2.6.25-0.218.rc8.git7.fc9.x86_64 
> > CIMOM: tog-pegasus-2.7.0-6.fc9.x86_64 
> > cimtest: changeset-227 
> 
>   Sorry for my mistake, the changeset number of cimtest should be 233 
not 227.
> 
> > 
> > ================================================================== 
> > PASS        :  88 
> > FAIL        :  2 
> > XFAIL       :  1 
> > SKIP        :  38 
> > ----------------- 
> > Total       : 129 
> > 
> > =========================  FAILED 
> ========================================== 
> > ComputerSystem - 04_defineStartVS.py: FAIL 
> > ERROR   - Error: property values are not set for VS domguest 
> > HostSystem - 03_hs_to_settdefcap.py: FAIL 
> > ERROR   - HostedResourcePool has returned 3 instances, expected 4 
instances 
> > 
    I can't reproduce this failure any more. If any one get this failure, 
please
    let me know.
 
    Thanks!
 
> > ======================CIMTEST FULL 
REPORT================================== 
> > AllocationCapabilities - 01_enum.py: PASS 
> > AllocationCapabilities - 02_alloccap_gi_errs.py: PASS 
> > ComputerSystem - 01_enum.py: PASS 
> > ComputerSystem - 02_nosystems.py: PASS 
> > ComputerSystem - 03_defineVS.py: PASS 
> > ComputerSystem - 04_defineStartVS.py: FAIL 
> > ERROR   - Error: property values are not set for VS domguest 
> > ComputerSystem - 05_activate_defined_start.py: XFAIL    Bug: 00002 
> > ERROR   - ERROR: VS DomST1 transition from Defined State to Activate
> > state was not Successful 
> > Bug:<00002> 
> > ComputerSystem - 06_paused_active_suspend.py: SKIP 
> > ComputerSystem - 22_define_suspend.py: PASS 
> > ComputerSystem - 23_suspend_suspend.py: SKIP 
> > ComputerSystem - 27_define_suspend_errs.py: PASS 
> > ComputerSystem - 32_start_reboot.py: SKIP 
> > ComputerSystem - 33_suspend_reboot.py: SKIP 
> > ComputerSystem - 35_start_reset.py: SKIP 
> > ComputerSystem - 40_RSC_start.py: SKIP 
> > ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP 
> > ComputerSystem - 42_cs_gi_errs.py: PASS 
> > ComputerSystemIndication - 01_created_indication.py: SKIP 
> > ElementAllocatedFromPool - 01_forward.py: SKIP 
> > ElementAllocatedFromPool - 02_reverse.py: SKIP 
> > ElementAllocatedFromPool - 03_reverse_errs.py: SKIP 
> > ElementAllocatedFromPool - 04_forward_errs.py: SKIP 
> > ElementCapabilities - 01_forward.py: PASS 
> > ElementCapabilities - 02_reverse.py: PASS 
> > ElementCapabilities - 03_forward_errs.py: PASS 
> > ElementCapabilities - 04_reverse_errs.py: PASS 
> > ElementCapabilities - 05_hostsystem_cap.py: PASS 
> > ElementConforms - 01_forward.py: PASS 
> > ElementConforms - 02_reverse.py: PASS 
> > ElementConforms - 03_ectp_fwd_errs.py: PASS 
> > ElementConforms - 04_ectp_rev_errs.py: PASS 
> > ElementSettingData - 01_forward.py: PASS 
> > ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS 
> > EnabledLogicalElementCapabilities - 01_enum.py: PASS 
> > EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS 
> > HostSystem - 01_enum.py: PASS 
> > HostSystem - 02_hostsystem_to_rasd.py: PASS 
> > HostSystem - 03_hs_to_settdefcap.py: FAIL 
> > ERROR   - HostedResourcePool has returned 3 instances, expected 4 
instances 
> > HostSystem - 04_hs_to_EAPF.py: SKIP 
> > 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: SKIP 
> > 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: SKIP 
> > LogicalDisk - 02_nodevs.py: SKIP 
> > LogicalDisk - 03_ld_gi_errs.py: SKIP 
> > Memory - 01_memory.py: PASS 
> > Memory - 02_defgetmem.py: PASS 
> > Memory - 03_mem_gi_errs.py: PASS 
> > NetworkPort - 01_netport.py: SKIP 
> > NetworkPort - 02_np_gi_errors.py: SKIP 
> > NetworkPort - 03_user_netport.py: SKIP 
> > Processor - 01_processor.py: SKIP 
> > Processor - 02_definesys_get_procs.py: SKIP 
> > Processor - 03_proc_gi_errs.py: SKIP 
> > Profile - 01_enum.py: PASS 
> > Profile - 02_profile_to_elec.py: SKIP 
> > 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 
> > 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: SKIP 
> > 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: SKIP 
> > ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: SKIP 

> > ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: 
SKIP 
> > ResourcePoolConfigurationService - 
> 06_RemoveResourcesFromResourcePool.py: SKIP
> > ResourcePoolConfigurationService - 07_DeleteResourcePool.py: SKIP 
> > 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: 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: SKIP 
> > VirtualSystemManagementService - 07_addresource_neg.py: PASS 
> > VirtualSystemManagementService - 08_modifyresource.py: SKIP 
> > VirtualSystemManagementService - 09_procrasd_persist.py: SKIP 
> > VirtualSystemMigrationCapabilities - 01_enum.py: PASS 
> > VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS 
> > VirtualSystemMigrationService - 01_migratable_host.py: SKIP 
> > VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP 
> > VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP 
> > VirtualSystemMigrationSettingData - 01_enum.py: PASS 
> > VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS 
> > VirtualSystemSettingDataComponent - 01_forward.py: SKIP 
> > VirtualSystemSettingDataComponent - 02_reverse.py: 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
> > 
> > 
> > Best,
> > Regards
> > 
> > Daisy (???)
> > VSM Team, China Systems & Technology Labs (CSTL)
> > E-mail: yunguol at cn.ibm.com
> > TEL: (86)-21-60922144
> > Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203
> > _______________________________________________
> > Libvirt-cim mailing list
> > Libvirt-cim at redhat.com
> > https://www.redhat.com/mailman/listinfo/libvirt-cim 
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvirt-cim/attachments/20080630/2779bba9/attachment.htm>

From deeptik at linux.vnet.ibm.com  Mon Jun 30 12:53:30 2008
From: deeptik at linux.vnet.ibm.com (Deepti B. Kalakeri)
Date: Mon, 30 Jun 2008 05:53:30 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing the ComputerSystem tc's
Message-ID: <197ecb3db922d841a2cd.1214830410@elm3b217.beaverton.ibm.com>

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1214830309 25200
# Node ID 197ecb3db922d841a2cdfbcdec5a4bf149dddc83
# Parent  0c3bd5f782c4776719799ad5c74226c95e70092e
[TEST] Fixing the ComputerSystem tc's.

Updated the tc to report XFAIL since the tc are failing as the requested_state property is not being set appropriately.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py	Fri Jun 27 09:57:11 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py	Mon Jun 30 05:51:49 2008 -0700
@@ -52,7 +52,8 @@ ACTIVE_STATE = 2
 ACTIVE_STATE = 2
 SUSPND_STATE = 9
 
-bug         = "00001"
+bug               = "00001"
+bug_req_state     = "00002"
 default_dom = 'test_domain'
 TIME        = "00000000000000.000000:000"
 
@@ -61,13 +62,15 @@ def check_attributes(domain_name, ip, en
     if rc != 0:
         return rc
     if cs.RequestedState != rq_state:
-        logger.error("RequestedState should be %d not %d", \
+        logger.error("RequestedState should be %d not %d", 
                      rq_state, cs.RequestedState)
-        return FAIL
+        return XFAIL_RC(bug_req_state)
+
     if cs.EnabledState != en_state:
-        logger.error("EnabledState should be %d not %d", \
+        logger.error("EnabledState should be %d not %d", 
                      en_state, cs.EnabledState)
         return FAIL
+
     return PASS
 
 @do_main(sup_types)
@@ -106,8 +109,8 @@ RequestedStateChange()", action, default
             status = check_attributes(default_dom, options.ip,
                                       en_state, rq_state, options.virt)
             if status != PASS:
-                logger.error("Attributes for dom %s not set as expected.", \
-                                                                default_dom)
+                logger.error("Attributes for dom %s not set as expected.", 
+                              default_dom)
                 break
 
     except Exception, detail:
diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py	Fri Jun 27 09:57:11 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py	Mon Jun 30 05:51:49 2008 -0700
@@ -51,7 +51,8 @@ ACTIVE_STATE = 2
 ACTIVE_STATE = 2
 REBOOT_STATE = 10
 
-bug         = "00001"
+bug               = "00001"
+bug_req_state     = "00002"
 default_dom = 'test_domain'
 TIME        = "00000000000000.000000:000"
 
@@ -60,13 +61,15 @@ def check_attributes(domain_name, ip, en
     if rc != 0:
         return rc
     if cs.RequestedState != rq_state:
-        logger.error("RequestedState should be %d not %d", \
+        logger.error("RequestedState should be %d not %d", 
                      rq_state, cs.RequestedState)
-        return FAIL
+        return XFAIL_RC(bug_req_state)
+
     if cs.EnabledState != en_state:
-        logger.error("EnabledState should be %d not %d", \
+        logger.error("EnabledState should be %d not %d", 
                      en_state, cs.EnabledState)
         return FAIL
+
     return PASS
 
 @do_main(sup_types)
@@ -105,8 +108,8 @@ RequestedStateChange()", action, default
             status = check_attributes(default_dom, options.ip,
                                       en_state, rq_state, options.virt)
             if status != PASS:
-                logger.error("Attributes for dom %s not set as expected.", \
-                                                                default_dom)
+                logger.error("Attributes for dom %s not set as expected.", 
+                              default_dom)
                 break
 
     except Exception, detail:
diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py	Fri Jun 27 09:57:11 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py	Mon Jun 30 05:51:49 2008 -0700
@@ -54,7 +54,8 @@ SUSPND_STATE = 9
 SUSPND_STATE = 9
 REBOOT_STATE = 10
 
-bug         = "00001"
+bug               = "00001"
+bug_req_state     = "00002"
 default_dom = 'test_domain'
 TIME        = "00000000000000.000000:000"
 
@@ -63,13 +64,15 @@ def check_attributes(domain_name, ip, en
     if rc != 0:
         return rc
     if cs.RequestedState != rq_state:
-        logger.error("RequestedState should be %d not %d", \
+        logger.error("RequestedState should be %d not %d", 
                      rq_state, cs.RequestedState)
-        return FAIL
+        return XFAIL_RC(bug_req_state)
+
     if cs.EnabledState != en_state:
-        logger.error("EnabledState should be %d not %d", \
+        logger.error("EnabledState should be %d not %d", 
                      en_state, cs.EnabledState)
         return FAIL
+
     return PASS
 
 @do_main(sup_types)
@@ -109,8 +112,8 @@ RequestedStateChange()", action, default
             status = check_attributes(default_dom, options.ip,
                                       en_state, rq_state, options.virt)
             if status != PASS:
-                logger.error("Attributes for dom %s not set as expected.", \
-                                                                default_dom)
+                logger.error("Attributes for dom %s not set as expected.", 
+                              default_dom)
                 break
 
     except Exception, detail:
diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py	Fri Jun 27 09:57:11 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py	Mon Jun 30 05:51:49 2008 -0700
@@ -52,7 +52,8 @@ ACTIVE_STATE = 2
 ACTIVE_STATE = 2
 RESET_STATE  = 11
 
-bug         = "00001"
+bug               = "00001"
+bug_req_state     = "00002"
 default_dom = 'test_domain'
 TIME        = "00000000000000.000000:000"
 
@@ -61,13 +62,15 @@ def check_attributes(domain_name, ip, en
     if rc != 0:
         return rc
     if cs.RequestedState != rq_state:
-        logger.error("RequestedState should be %d not %d", \
+        logger.error("RequestedState should be %d not %d", 
                      rq_state, cs.RequestedState)
-        return FAIL
+        return XFAIL_RC(bug_req_state)
+
     if cs.EnabledState != en_state:
-        logger.error("EnabledState should be %d not %d", \
+        logger.error("EnabledState should be %d not %d", 
                      en_state, cs.EnabledState)
         return FAIL
+
     return PASS
 
 @do_main(sup_types)
@@ -106,8 +109,8 @@ RequestedStateChange()", action, default
             status = check_attributes(default_dom, options.ip,
                                       en_state, rq_state, options.virt)
             if status != PASS:
-                logger.error("Attributes for dom %s not set as expected.", \
-                                                                default_dom)
+                logger.error("Attributes for dom %s not set as expected.", 
+                              default_dom)
                 break
 
     except Exception, detail:



From kaitlin at linux.vnet.ibm.com  Mon Jun 30 14:57:06 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 30 Jun 2008 07:57:06 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fixing the ComputerSystem tc's
In-Reply-To: <197ecb3db922d841a2cd.1214830410@elm3b217.beaverton.ibm.com>
References: <197ecb3db922d841a2cd.1214830410@elm3b217.beaverton.ibm.com>
Message-ID: <4868F442.3020007@linux.vnet.ibm.com>

Deepti B. Kalakeri wrote:
> # HG changeset patch
> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> # Date 1214830309 25200
> # Node ID 197ecb3db922d841a2cdfbcdec5a4bf149dddc83
> # Parent  0c3bd5f782c4776719799ad5c74226c95e70092e
> [TEST] Fixing the ComputerSystem tc's.
> 
> Updated the tc to report XFAIL since the tc are failing as the requested_state property is not being set appropriately.
> 
> Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> 
> diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py
> --- a/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py	Fri Jun 27 09:57:11 2008 +0800
> +++ b/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py	Mon Jun 30 05:51:49 2008 -0700
> @@ -52,7 +52,8 @@ ACTIVE_STATE = 2
>  ACTIVE_STATE = 2
>  SUSPND_STATE = 9
> 
> -bug         = "00001"
> +bug               = "00001"
> +bug_req_state     = "00002"

For each of these tests, can you also remove the XFAIL for the 00001 bug 
case.  And can you also remove the corresponding XFAIL call.  I don't 
think tests should be failing for that bug anymore.

Thanks!

>  default_dom = 'test_domain'
>  TIME        = "00000000000000.000000:000"
> 
> @@ -61,13 +62,15 @@ def check_attributes(domain_name, ip, en
>      if rc != 0:
>          return rc
>      if cs.RequestedState != rq_state:
> -        logger.error("RequestedState should be %d not %d", \
> +        logger.error("RequestedState should be %d not %d", 
>                       rq_state, cs.RequestedState)
> -        return FAIL
> +        return XFAIL_RC(bug_req_state)
> +
>      if cs.EnabledState != en_state:
> -        logger.error("EnabledState should be %d not %d", \
> +        logger.error("EnabledState should be %d not %d", 
>                       en_state, cs.EnabledState)
>          return FAIL
> +
>      return PASS
> 
>  @do_main(sup_types)
> @@ -106,8 +109,8 @@ RequestedStateChange()", action, default
>              status = check_attributes(default_dom, options.ip,
>                                        en_state, rq_state, options.virt)
>              if status != PASS:
> -                logger.error("Attributes for dom %s not set as expected.", \
> -                                                                default_dom)
> +                logger.error("Attributes for dom %s not set as expected.", 
> +                              default_dom)
>                  break
> 


-- 
Kaitlin Rupert
IBM Linux Technology Center
kaitlin at linux.vnet.ibm.com



From kaitlin at linux.vnet.ibm.com  Mon Jun 30 16:59:06 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 30 Jun 2008 09:59:06 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fix HostSystem - 04_hs_to_EAPF.py to
	verify proper mem val
Message-ID: <692121d37b3aefafce0d.1214845146@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214845116 25200
# Node ID 692121d37b3aefafce0d6856d81468add629514d
# Parent  450c5a235e0c95d7be7ef4a967fcb30d2f2abb9c
[TEST] Fix HostSystem - 04_hs_to_EAPF.py to verify proper mem val

The memory value used for NumberOfBlocks needs to be multiplied by 1024, since the memory value supplied when the guest is created is multiplied by 1024.

Also removed an extraneous print statement.  Removed some functions that were no longer being used.  Also fixed some line length issues.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 450c5a235e0c -r 692121d37b3a suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py
--- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py	Mon Jun 30 09:27:42 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py	Mon Jun 30 09:58:36 2008 -0700
@@ -76,8 +76,9 @@
 
 def setup_env(server):
     destroy_and_undefine_all(server)
-    test_xml, bridge = testxml_bridge(test_dom, mem = test_mem, vcpus = test_vcpus, \
-                                   mac = test_mac, disk = test_disk, server = server)
+    test_xml, bridge = testxml_bridge(test_dom, mem = test_mem, 
+                                      vcpus = test_vcpus, mac = test_mac, 
+                                      disk = test_disk, server = server)
     if bridge == None:
         logger.error("Unable to find virtual bridge")
         return SKIP
@@ -100,14 +101,6 @@
 def print_err(err, detail, cn):
     logger.error(err % cn)
     logger.error("Exception: %s", detail)
-
-def field_err(assoc_info, field_list, fieldname):
-    logger.error("%s Mismatch", fieldname)
-    logger.error("Returned %s instead of %s", assoc_info[fieldname], field_list[fieldname])
-
-def spec_err(fieldvalue, field_list, fieldname):
-    logger.error("%s Mismatch", fieldname)
-    logger.error("Returned %s instead of %s", fieldvalue, field_list[fieldname])
 
 def pool_init_list(pool_assoc):
     """
@@ -142,14 +135,13 @@
               'SystemName'        : test_dom, 
               'CreationClassName' : "Xen_Memory", 
               'DeviceID'          : "%s/%s" % (test_dom, "mem"), 
-              'NumberOfBlocks'    : test_mem 
+              'NumberOfBlocks'    : test_mem * 1024
            }
     eaf_values = {  "Xen_Processor"   : proc, 
                     "Xen_LogicalDisk" : disk, 
                     "Xen_NetworkPort" : net, 
                     "Xen_Memory"      : mem
                   }
-    print eaf_values
     return eaf_values 
 
 def get_inst_for_dom(assoc_val):
@@ -171,7 +163,8 @@
                        CreationClassName=cn,
                             Name = hostname)
         if len(assoc_info) < 1:
-            logger.error("%s returned %i %s objects" % (an, len(assoc_info), qcn))
+            logger.error("%s returned %i %s objects" % (an, 
+                         len(assoc_info), qcn))
             status = FAIL
 
     except Exception, detail:
@@ -186,7 +179,8 @@
 
 def check_len(an, assoc_list_info, qcn, exp_len):
     if len(assoc_list_info) != exp_len:
-        logger.error("%s returned %i %s objects" % (an, len(assoc_list_info), qcn))
+        logger.error("%s returned %i %s objects" % (an, 
+                     len(assoc_list_info), qcn))
         return FAIL
     return PASS
 



From kaitlin at linux.vnet.ibm.com  Mon Jun 30 19:04:41 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 30 Jun 2008 12:04:41 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Some VirtualSystemManagementService -t
	02_destroysystem.py cleanup
Message-ID: <7d3d5dcffad210d1da9f.1214852681@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214852675 25200
# Node ID 7d3d5dcffad210d1da9f208ce1881f391a21ba9e
# Parent  692121d37b3aefafce0d6856d81468add629514d
[TEST] Some VirtualSystemManagementService -t 02_destroysystem.py cleanup.

Add checks to see if the define() / start() calls pass.
Added cleanup_env() function to destroy()/undefine() guest in case of error.
Ensure status is set to PASS only if the guest is not found in the domain list after the DestroySystem() call is made.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 692121d37b3a -r 7d3d5dcffad2 suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Mon Jun 30 09:58:36 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Mon Jun 30 12:04:35 2008 -0700
@@ -35,47 +35,53 @@
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 default_dom = 'test_domain'
 
+def cleanup_env(ip, cxml):
+    cxml.destroy(ip)
+    cxml.undefine(ip)
+
 @do_main(sup_types)
 def main():
     options = main.options
     
     service = vsms.get_vsms_class(options.virt)(options.ip)
     cxml = vxml.get_class(options.virt)(default_dom)
-    cxml.define(options.ip)
-    cxml.start(options.ip)
+    ret = cxml.define(options.ip)
+    if not ret:
+        logger.error("Failed to define the dom: %s", default_dom)
+        return FAIL
+    ret = cxml.start(options.ip)
+    if not ret:
+        logger.error("Failed to define the dom: %s", default_dom)
+        cleanup_env(options.ip, cxml)
+        return FAIL
 
     classname = get_typed_class(options.virt, 'ComputerSystem')
     cs_ref = CIMInstanceName(classname, keybindings = {
                                         'Name':default_dom,
                                         'CreationClassName':classname})
     list_before = domain_list(options.ip, options.virt)
-    status = PASS
-    rc = -1
+    if default_dom not in list_before:
+        logger.error("Domain not in domain list")
+        cleanup_env(options.ip, cxml)
+        return FAIL
     
     try:
         service.DestroySystem(AffectedSystem=cs_ref)
-        rc = 0
     except Exception, details:
         logger.error('Unknow exception happened')
         logger.error(details)
-        status = FAIL
+        cleanup_env(options.ip, cxml)
+        return FAIL
 
     list_after = domain_list(options.ip, options.virt)
 
-    status = PASS
-    if default_dom not in list_before:
-        logger.error("Domain not started, check config")
+    if default_dom in list_after:
+        logger.error("Domain %s not destroyed: provider didn't return error" % \
+                     default_dom)
+        cleanup_env(options.ip, cxml)
         status = FAIL
     else:
-        destroyed = set(list_before) - set(list_after)
-        if len(destroyed) != 1:
-            logger.error("Destroyed multiple domains")
-            status = FAIL
-        elif default_dom not in destroyed:
-            logger.error("Wrong domain destroyed")
-            status = FAIL
-
-    cxml.undefine(options.ip)
+        status = PASS
 
     return status
      



From kaitlin at linux.vnet.ibm.com  Mon Jun 30 19:05:44 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 30 Jun 2008 12:05:44 -0700
Subject: [Libvirt-cim] [PATCH] Add state transition poll to DestroySystem()
	call
Message-ID: <98e6e7b6160be701c412.1214852744@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214850941 25200
# Node ID 98e6e7b6160be701c4124cb04eef9c893fdfaa1d
# Parent  b123b6b1fb08c3ab956f1c33801e743e082192b9
Add state transition poll to DestroySystem() call.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r b123b6b1fb08 -r 98e6e7b6160b src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Fri Jun 27 08:59:09 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Mon Jun 30 11:35:41 2008 -0700
@@ -56,6 +56,7 @@
 
 #define DEFAULT_MAC_PREFIX "00:16:3e"
 #define DEFAULT_XEN_WEIGHT 1024
+#define STATE_TRANSITION_TIMEOUT 120
 
 const static CMPIBroker *_BROKER;
 
@@ -832,6 +833,8 @@
         CMPIObjectPath *sys;
         virConnectPtr conn = NULL;
         virDomainPtr dom = NULL;
+        virDomainInfo info;
+        int i;
 
         conn = connect_by_classname(_BROKER,
                                     CLASSNAME(reference),
@@ -858,6 +861,34 @@
         infostore_delete(virConnectGetType(conn), dom_name);
 
         virDomainDestroy(dom); /* Okay for this to fail */
+
+        for (i = 0; i < STATE_TRANSITION_TIMEOUT; i++) {
+                if ((i % 30) == 0) {
+                        CU_DEBUG("Polling for destroy completion...");
+                }
+
+                dom = virDomainLookupByName(conn, dom_name);
+                if (dom == NULL) {
+                        CU_DEBUG("Domain successfully destroyed");
+                        rc = IM_RC_OK;
+                        trigger_indication(context,
+                                           "ComputerSystemDeletedIndication",
+                                           NAMESPACE(reference));
+                        goto error;
+                }
+
+                if (virDomainGetInfo(dom, &info) != 0) {
+                        CU_DEBUG("Unable to get domain current state");
+                        rc = IM_RC_SYS_NOT_FOUND;
+                        goto error;
+                }
+
+                if (info.state == VIR_DOMAIN_SHUTOFF)
+                        break;
+
+                sleep(1);
+        }
+
         if (virDomainUndefine(dom) == 0) {
                 rc = IM_RC_OK;
                 trigger_indication(context,



From kaitlin at linux.vnet.ibm.com  Mon Jun 30 20:04:20 2008
From: kaitlin at linux.vnet.ibm.com (Kaitlin Rupert)
Date: Mon, 30 Jun 2008 13:04:20 -0700
Subject: [Libvirt-cim] [PATCH] [TEST] Fix VirtualSystemSettingDataComponent
	- 01_forward.py failure
Message-ID: <5f49d1d08e8e7f9b905e.1214856260@elm3b41.beaverton.ibm.com>

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1214856251 25200
# Node ID 5f49d1d08e8e7f9b905ef77d1a43e4b54917bd03
# Parent  7d3d5dcffad210d1da9f208ce1881f391a21ba9e
[TEST] Fix VirtualSystemSettingDataComponent - 01_forward.py failure.

Test was expecting one ProcRASD for each domain processor. It should expect onky one RASD.

Also updated this test to use PASS/FAIL, removed global variables, and cleaned up indention.

This test will need to be updated to support other XenFV, etc.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 7d3d5dcffad2 -r 5f49d1d08e8e suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py	Mon Jun 30 12:04:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py	Mon Jun 30 13:04:11 2008 -0700
@@ -58,6 +58,7 @@
 from CimTest import Globals 
 from XenKvmLib import assoc
 from CimTest.Globals import logger, do_main
+from CimTest.ReturnCodes import FAIL, PASS
 
 sup_types = ['Xen']
 
@@ -67,35 +68,30 @@
 test_disk   = 'xvda'
 status      = 0
 VSType      = "Xen"
-vssd_names  = []
-vssd_values = []
 
-RASD_cllist = [
-          'Xen_DiskResourceAllocationSettingData', \
-          'Xen_MemResourceAllocationSettingData',  \
-          'Xen_NetResourceAllocationSettingData',  \
-          'Xen_ProcResourceAllocationSettingData'
-         ]
-          
 def init_list():
     """
         Creating the lists that will be used for comparisons.
     """
-    prop_list = [] 
-    prop_list = ["%s/%s"  % (test_dom, test_disk), \
-                 "%s/%s" % (test_dom, "mem"), \
-                 "%s/%s" % (test_dom, test_mac)
-                ]
-    proc_list = []
-    for i in range(test_vcpus):
-        proc_list.append("%s/%s" % (test_dom, i))
-    return prop_list, proc_list
+
+    rlist = ['Xen_DiskResourceAllocationSettingData',
+             'Xen_MemResourceAllocationSettingData',
+             'Xen_NetResourceAllocationSettingData',
+             'Xen_ProcResourceAllocationSettingData'
+            ]
+
+    prop_list = {rlist[0] : "%s/%s"  % (test_dom, test_disk),
+                 rlist[1] : "%s/%s" % (test_dom, "mem"),
+                 rlist[2] : "%s/%s" % (test_dom, test_mac),
+                 rlist[3] : "%s/%s" % (test_dom, "proc")
+                }
+
+    return prop_list
 
 def build_vssd_info(ip, vssd):
     """
         Creating the vssd fileds lists that will be used for comparisons.
     """
-    global vssd_names, vssd_values
 
     if vssd.Bootloader == "" or vssd.Caption == "" or \
       vssd.InstanceID == "" or vssd.ElementName == "" or \
@@ -105,26 +101,17 @@
         test_domain_function(test_dom, ip, "undefine")
         sys.exit(status)
  
-    vssd_names = [
-                  'Bootloader',    \
-                  'Caption',       \
-                  'InstanceID',    \
-                  'ElementName',   \
-        'VirtualSystemIdentifier', \
-              'VirtualSystemType', \
-    ]
-       
-    vssd_values = [
-                    vssd.Bootloader,  \
-                       vssd.Caption,  \
-                     vssd.InstanceID, \
-                    vssd.ElementName, \
-        vssd.VirtualSystemIdentifier, \
-              vssd.VirtualSystemType, \
-       ]
+    vssd_vals = {'Bootloader'			: vssd.Bootloader,
+                 'Caption'			: vssd.Caption,
+                 'InstanceID'			: vssd.InstanceID,
+                 'ElementName'			: vssd.ElementName,
+                 'VirtualSystemIdentifier'	: vssd.VirtualSystemIdentifier,
+                 'VirtualSystemType'		: vssd.VirtualSystemType
+                }
 
+    return vssd_vals
 
-def assoc_values(ip, assoc_info, cn):
+def assoc_values(ip, assoc_info, cn, an, vals):
     """
         The association info of 
         Xen_VirtualSystemSettingDataComponent with every RASDclass is
@@ -132,36 +119,29 @@
         Caption, InstanceID, ElementName, VirtualSystemIdentifier,
         VirtualSystemType, Bootloader
     """
-    global status
-    global vssd_names, vssd_values
 
     try: 
         if len(assoc_info) != 1:
-            Globals.logger.error("Xen_VirtualSystemSettingDataComponent \
-returned %i Resource objects for class '%s'", len(assoc_info),cn)
-            status = 1
-            return status
+            Globals.logger.error("%s returned %i resource objects for '%s'" % \
+                                 (an, len(assoc_info), cn))
+            return FAIL 
 
-        for idx in range(len(vssd_names)):
-            if assoc_info[0][vssd_names[idx]] != vssd_values[idx]:
-                Globals.logger.error("%s Mismatch", vssd_names[idx])
-                Globals.logger.error("Returned %s instead of %s", \
-                               assoc_info[0][vssd_names[idx]], \
-                                                vssd_fields[idx])
-                status = 1
-            if status != 0:
-                break
+        for prop, val in vals.iteritems():
+            if assoc_info[0][prop] != val:
+                Globals.logger.error("%s mismatch: returned %s instead of %s" %\
+                                     (prop, assoc_info[0][prop], val))
+                return FAIL
+
+        return PASS
+
     except  Exception, detail :
         logger.error("Exception in assoc_values function: %s" % detail)
-        status = 1
-        test_domain_function(test_dom, ip, "undefine")
-        return status
-
+        return FAIL 
 
 @do_main(sup_types)
 def main():
     options = main.options
-    global  status 
+    status = FAIL
 
     destroy_and_undefine_all(options.ip)
     test_xml = testxml_bl(test_dom, vcpus = test_vcpus, \
@@ -171,9 +151,7 @@
     ret = test_domain_function(test_xml, options.ip, cmd = "define")
     if not ret:
         logger.error("Failed to define the dom: %s", test_dom)
-        status = 1
-        return status
-
+        return FAIL 
 
     instIdval = "%s:%s" % (VSType, test_dom)
     keyname = "InstanceID"
@@ -183,48 +161,39 @@
         vssd = enumclass.getInstance(options.ip, \
                                     enumclass.Xen_VirtualSystemSettingData, \
                                     key_list)
-        build_vssd_info(options.ip, vssd)
+        if vssd is None:
+            logger.error("VSSD instance for %s not found" % test_dom)
+            test_domain_function(test_dom, options.ip, "undefine")
+            return FAIL
+
+        vssd_vals = build_vssd_info(options.ip, vssd)
 
     except  Exception, detail :
         logger.error(Globals.CIM_ERROR_GETINSTANCE, \
-                                            'Xen_VirtualSystemSettingData')
+                     'Xen_VirtualSystemSettingData')
         logger.error("Exception : %s" % detail)
         test_domain_function(test_dom, options.ip, "undefine")
-        status = 1
-        return status
+        return FAIL 
 
-    prop_list, proc_list = init_list() 
+    prop_list = init_list()
 
     try:
-        idx = 0
-    # Looping through the RASD_cllist, call association 
-    # Xen_VirtualSystemSettingDataComponent with each class in RASD_cllist
-        for rasd_cname in RASD_cllist:
-            if rasd_cname != 'Xen_ProcResourceAllocationSettingData':
-                assoc_info = assoc.Associators(options.ip, \
-                                     'Xen_VirtualSystemSettingDataComponent', \
-                                                                  rasd_cname, \
-                                                   InstanceID = prop_list[idx])
-             # Verify the association fields returned for particular rasd_cname.
-                assoc_values(options.ip, assoc_info, rasd_cname)
-                idx = idx + 1
-            else:
-            # Xen_ProcResourceAllocationSettingData, we need to find 
-            # association information for all the proc InstanceID and hence 
-            # we loop from 0 to (test_vcpus - 1 )
-                for index in range(len(proc_list)):  
-                    assoc_info = assoc.Associators(options.ip, \
-                                    'Xen_VirtualSystemSettingDataComponent', \
-                                                                  rasd_cname, \
-                                                  InstanceID = prop_list[index])
+        # Looping through the RASD_cllist, call association 
+        # Xen_VirtualSystemSettingDataComponent with each class in RASD_cllist
+        an = 'Xen_VirtualSystemSettingDataComponent'
+        for rasd_cname, prop in prop_list.iteritems():
+            assoc_info = assoc.Associators(options.ip, an, rasd_cname,
+                                           InstanceID = prop)
             # Verify the association fields returned for particular rasd_cname.
-                    assoc_values(options.ip, assoc_info, rasd_cname)
+            status = assoc_values(options.ip, assoc_info, rasd_cname, an, 
+                                  vssd_vals)
+            if status != PASS:
+                break
  
     except  Exception, detail :
-        logger.error(Globals.CIM_ERROR_ASSOCIATORS, \
-                                      'Xen_VirtualSystemSettingDataComponent')
+        logger.error(Globals.CIM_ERROR_ASSOCIATORS, an)
         logger.error("Exception : %s" % detail)
-        status = 1 
+        status = FAIL
 
     test_domain_function(test_dom, options.ip, "undefine")
     return status



From danms at us.ibm.com  Mon Jun 30 20:05:47 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 30 Jun 2008 13:05:47 -0700
Subject: [Libvirt-cim] [PATCH 0 of 3] Indications for state changes
Message-ID: <patchbomb.1214856347@guaranine.danplanet.com>

This set:
 - Makes domain state an explicit factor in the dom_changed() determination
   for CSI
 - Makes CS trigger CSI on state change to avoid waiting for the loop
 - Fixes up registration of KVM_ and LXC_ CSI variants



From danms at us.ibm.com  Mon Jun 30 20:05:48 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 30 Jun 2008 13:05:48 -0700
Subject: [Libvirt-cim] [PATCH 1 of 3] Make CSI throw an indication for
	domain state changes
In-Reply-To: <patchbomb.1214856347@guaranine.danplanet.com>
Message-ID: <0734a17d5aa18239e8a5.1214856348@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214850492 25200
# Node ID 0734a17d5aa18239e8a53b1131ccc02dfecc4874
# Parent  b123b6b1fb08c3ab956f1c33801e743e082192b9
Make CSI throw an indication for domain state changes

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r b123b6b1fb08 -r 0734a17d5aa1 src/Virt_ComputerSystemIndication.c
--- a/src/Virt_ComputerSystemIndication.c	Fri Jun 27 08:59:09 2008 -0700
+++ b/src/Virt_ComputerSystemIndication.c	Mon Jun 30 11:28:12 2008 -0700
@@ -62,6 +62,12 @@
 struct dom_xml {
         char uuid[VIR_UUID_STRING_BUFLEN];
         char *xml;
+        enum {DOM_OFFLINE,
+              DOM_ONLINE,
+              DOM_PAUSED,
+              DOM_CRASHED,
+              DOM_GONE,
+        } state;
 };
 
 static void free_dom_xml (struct dom_xml dom)
@@ -85,6 +91,35 @@
 
  out:        
         return name;
+}
+
+static int dom_state(virDomainPtr dom)
+{
+        virDomainInfo info;
+        int ret;
+
+        ret = virDomainGetInfo(dom, &info);
+        if (ret != 0)
+                return DOM_GONE;
+
+        switch (info.state) {
+        case VIR_DOMAIN_NOSTATE:
+        case VIR_DOMAIN_RUNNING:
+        case VIR_DOMAIN_BLOCKED:
+                return DOM_ONLINE;
+
+        case VIR_DOMAIN_PAUSED:
+                return DOM_PAUSED;
+
+        case VIR_DOMAIN_SHUTOFF:
+                return DOM_OFFLINE;
+
+        case VIR_DOMAIN_CRASHED:
+                return DOM_CRASHED;
+
+        default:
+                return DOM_GONE;
+        };
 }
 
 static CMPIStatus doms_to_xml(struct dom_xml **dom_xml_list, 
@@ -115,6 +150,8 @@
                                    "Failed to get xml desc");
                         break;
                 }
+
+                (*dom_xml_list)[i].state = dom_state(dom_ptr_list[i]);
         }
         
         return s;
@@ -131,8 +168,15 @@
                 if (strcmp(cur_xml[i].uuid, prev_dom.uuid) != 0)
                         continue;
                 
-                if (strcmp(cur_xml[i].xml, prev_dom.xml) != 0)
+                if (strcmp(cur_xml[i].xml, prev_dom.xml) != 0) {
+                        CU_DEBUG("Domain config changed");
                         ret = true;
+                }
+
+                if (prev_dom.state != cur_xml[i].state) {
+                        CU_DEBUG("Domain state changed");
+                        ret = true;
+                }
 
                 break;
         }



From danms at us.ibm.com  Mon Jun 30 20:05:49 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 30 Jun 2008 13:05:49 -0700
Subject: [Libvirt-cim] [PATCH 2 of 3] Make ComputerSystem trigger CSI on
	RequestStateChange
In-Reply-To: <patchbomb.1214856347@guaranine.danplanet.com>
Message-ID: <25963f4ea20e26b353d1.1214856349@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214852562 25200
# Node ID 25963f4ea20e26b353d11d4d6f394ae38ce09e9e
# Parent  0734a17d5aa18239e8a53b1131ccc02dfecc4874
Make ComputerSystem trigger CSI on RequestStateChange

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 0734a17d5aa1 -r 25963f4ea20e src/Virt_ComputerSystem.c
--- a/src/Virt_ComputerSystem.c	Mon Jun 30 11:28:12 2008 -0700
+++ b/src/Virt_ComputerSystem.c	Mon Jun 30 12:02:42 2008 -0700
@@ -39,6 +39,7 @@
 #include "device_parsing.h"
 #include <libcmpiutil/std_invokemethod.h>
 #include <libcmpiutil/std_instance.h>
+#include <libcmpiutil/std_indication.h>
 
 #include "Virt_ComputerSystem.h"
 #include "Virt_HostSystem.h"
@@ -880,9 +881,19 @@
 
         s = __state_change(name, state, reference);
 
-        if (s.rc == CMPI_RC_OK)
+        if (s.rc == CMPI_RC_OK) {
+                char *type;
+
+                type = get_typed_class(CLASSNAME(reference),
+                                       "ComputerSystemModifiedIndication");
+
+                /* Failure to raise the indication is okay */
+                stdi_trigger_indication(_BROKER,
+                                        context,
+                                        type,
+                                        NAMESPACE(reference));
                 rc = 0;
-
+        }
  out:
         CMReturnData(results, &rc, CMPI_uint32);
 



From danms at us.ibm.com  Mon Jun 30 20:05:50 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 30 Jun 2008 13:05:50 -0700
Subject: [Libvirt-cim] [PATCH 3 of 3] Make CSI declare support for KVM and
	LXC indications
In-Reply-To: <patchbomb.1214856347@guaranine.danplanet.com>
Message-ID: <834563d8520b1876d99b.1214856350@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214852563 25200
# Node ID 834563d8520b1876d99bf579cc3319b1dfa09795
# Parent  25963f4ea20e26b353d11d4d6f394ae38ce09e9e
Make CSI declare support for KVM and LXC indications

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 25963f4ea20e -r 834563d8520b src/Virt_ComputerSystemIndication.c
--- a/src/Virt_ComputerSystemIndication.c	Mon Jun 30 12:02:42 2008 -0700
+++ b/src/Virt_ComputerSystemIndication.c	Mon Jun 30 12:02:43 2008 -0700
@@ -505,11 +505,23 @@
 DECLARE_FILTER(xen_created, "Xen_ComputerSystemCreatedIndication");
 DECLARE_FILTER(xen_deleted, "Xen_ComputerSystemDeletedIndication");
 DECLARE_FILTER(xen_modified, "Xen_ComputerSystemModifiedIndication");
+DECLARE_FILTER(kvm_created, "KVM_ComputerSystemCreatedIndication");
+DECLARE_FILTER(kvm_deleted, "KVM_ComputerSystemDeletedIndication");
+DECLARE_FILTER(kvm_modified, "KVM_ComputerSystemModifiedIndication");
+DECLARE_FILTER(lxc_created, "LXC_ComputerSystemCreatedIndication");
+DECLARE_FILTER(lxc_deleted, "LXC_ComputerSystemDeletedIndication");
+DECLARE_FILTER(lxc_modified, "LXC_ComputerSystemModifiedIndication");
 
 static struct std_ind_filter *filters[] = {
         &xen_created,
         &xen_deleted,
         &xen_modified,
+        &kvm_created,
+        &kvm_deleted,
+        &kvm_modified,
+        &lxc_created,
+        &lxc_deleted,
+        &lxc_modified,
         NULL,
 };
 



From danms at us.ibm.com  Mon Jun 30 20:12:58 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 30 Jun 2008 13:12:58 -0700
Subject: [Libvirt-cim] [PATCH] Remove explicit "Xen" from VSMS indication
	trigger
Message-ID: <f72441bf10fdd467d3f4.1214856778@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214856741 25200
# Node ID f72441bf10fdd467d3f47d33e4bfb29537cc53e1
# Parent  834563d8520b1876d99bf579cc3319b1dfa09795
Remove explicit "Xen" from VSMS indication trigger

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 834563d8520b -r f72441bf10fd src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Mon Jun 30 12:02:43 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Mon Jun 30 13:12:21 2008 -0700
@@ -774,14 +774,14 @@
 
 static bool trigger_indication(const CMPIContext *context,
                                const char *base_type,
-                               const char *ns)
+                               const CMPIObjectPath *ref)
 {
         char *type;
         CMPIStatus s;
 
-        type = get_typed_class("Xen", base_type);
+        type = get_typed_class(CLASSNAME(ref), base_type);
 
-        s = stdi_trigger_indication(_BROKER, context, type, ns);
+        s = stdi_trigger_indication(_BROKER, context, type, NAMESPACE(ref));
 
         free(type);
 
@@ -814,7 +814,7 @@
 
         trigger_indication(context,
                            "ComputerSystemCreatedIndication",
-                           NAMESPACE(reference));
+                           reference);
  out:
         return s;
 }
@@ -862,7 +862,7 @@
                 rc = IM_RC_OK;
                 trigger_indication(context,
                                    "ComputerSystemDeletedIndication",
-                                   NAMESPACE(reference));
+                                   reference);
         }
 
 error:
@@ -936,7 +936,7 @@
         if (s.rc == CMPI_RC_OK) {
                 trigger_indication(context,
                                    "ComputerSystemModifiedIndication",
-                                   NAMESPACE(ref));
+                                   ref);
         }
 
  out:



From danms at us.ibm.com  Mon Jun 30 20:28:16 2008
From: danms at us.ibm.com (Dan Smith)
Date: Mon, 30 Jun 2008 13:28:16 -0700
Subject: [Libvirt-cim] [PATCH] Fix CSI failure path
Message-ID: <02aaaea433146ad4f6dc.1214857696@guaranine.danplanet.com>

# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1214857687 25200
# Node ID 02aaaea433146ad4f6dc5c63b34701bc46567fb4
# Parent  f72441bf10fdd467d3f47d33e4bfb29537cc53e1
Fix CSI failure path

Since connect_by_classname() can return NULL without it being an
error condition, printing the status message is not valid unless you
check the s.rc field.  I don't think the message adds much here, since there
is only one place that the message is filled out, and it's a static string.
Instead, change the debug message to something useful to avoid the SEGV.

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r f72441bf10fd -r 02aaaea43314 src/Virt_ComputerSystemIndication.c
--- a/src/Virt_ComputerSystemIndication.c	Mon Jun 30 13:12:21 2008 -0700
+++ b/src/Virt_ComputerSystemIndication.c	Mon Jun 30 13:28:07 2008 -0700
@@ -339,7 +339,8 @@
 
         conn = connect_by_classname(_BROKER, args->classname, &s);
         if (conn == NULL) {
-                CU_DEBUG("Failed to connect: %s", CMGetCharPtr(s.msg));
+                CU_DEBUG("Unable to start lifecycle thread: "
+                         "Failed to connect (cn: %s)", args->classname);
                 goto out;
         }