[PATCH] [TEST] Fix proc InstanceID in vsms.py
by Kaitlin Rupert
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1213153446 25200
# Node ID 00ed91b75fd62cdcdcfb51c403646118edb91c54
# Parent 58f7c9cf54677356b88b30e2b5a5db9685a15604
[TEST] Fix proc InstanceID in vsms.py
Signed-off-by: Kaitlin Rupert <karupert(a)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
16 years, 6 months
Cimtest Report for LXC on F9 (2008/06/16)
by Guo Lian Yun
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(a)cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203
16 years, 6 months
[PATCH] [TEST] Update SettingsDefineCapabilities.03 for LXC support
by yunguol＠cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1213582207 -28800
# Node ID 6988bb7f7803927f7c5330cc858c891430199f2f
# Parent 6900d7da2228de4e48cb9919b61dcdda7af500c9
[TEST] Update SettingsDefineCapabilities.03 for LXC support
Signed-off-by: Guolian Yun <yunguol(a)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,
16 years, 6 months
[PATCH] Add missing comma to EC
by Kaitlin Rupert
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1213407552 25200
# Node ID e3b5268c1b4e18a7b0bfe48d98d1f1017a4498c6
# Parent 959831f603a0ef93c468ac0cea0b1413ca102222
Add missing comma to EC.
Signed-off-by: Kaitlin Rupert <karupert(a)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",
16 years, 6 months
[PATCH] [TEST] Update SettingsDefineCapabilities.03 for LXC support
by yunguol＠cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1213266000 -28800
# Node ID a69394e8052f65132dce5886e0a8670717133bf1
# Parent 254bc5464030a03b6f791fd49acd208f6ec1db23
[TEST] Update SettingsDefineCapabilities.03 for LXC support
Signed-off-by: Guolian Yun <yunguol(a)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):
16 years, 6 months
[PATCH] [TEST] Update ResourceAllocationFromPool.02 for LXC support
by yunguol＠cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1213339312 -28800
# Node ID bad1f84147e979809c1da8f165b3181f354e9d53
# Parent b9100cec9aedb9f9243d753111a9a856e9480335
[TEST] Update ResourceAllocationFromPool.02 for LXC support
Signed-off-by: Guolian Yun <yunguol(a)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,
16 years, 6 months
[PATCH] [TEST] Update ResourceAllocationFromPool.01 for LXC support, create a guest and verification
by yunguol＠cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)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(a)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
16 years, 6 months
[PATCH] [TEST] Update ComputerSystem.04&42 for LXC support
by yunguol＠cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)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(a)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, \
16 years, 6 months
