KVM on sfcb Test Run Summary for Oct 14 2008
by Guo Lian Yun
=================================================
KVM on sfcb Test Run Summary for Oct 14 2008
=================================================
Distro: Fedora release 9.90.1 (Rawhide)
Kernel: 2.6.27-0.323.rc6.fc10.x86_64
libvirt: 0.4.5
Hypervisor: QEMU 0.9.1
CIMOM: sfcb sfcbd 1.3.3preview
Libvirt-cim revision: 715+
Libvirt-cim changeset: f7dfc83a73ac+
=================================================
FAIL : 1
XFAIL : 3
SKIP : 4
PASS : 127
-----------------
Total : 135
=================================================
FAIL Test Summary:
ComputerSystemIndication - 01_created_indication.py: FAIL
=================================================
XFAIL Test Summary:
ComputerSystem - 32_start_reboot.py: XFAIL
ComputerSystem - 33_suspend_reboot.py: XFAIL
SettingsDefineCapabilities - 03_forward_errs.py: XFAIL
=================================================
SKIP Test Summary:
VSSD - 02_bootldr.py: SKIP
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
=================================================
Full report:
--------------------------------------------------------------------
AllocationCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
--------------------------------------------------------------------
ComputerSystem - 01_enum.py: PASS
--------------------------------------------------------------------
ComputerSystem - 02_nosystems.py: PASS
--------------------------------------------------------------------
ComputerSystem - 03_defineVS.py: PASS
--------------------------------------------------------------------
ComputerSystem - 04_defineStartVS.py: PASS
--------------------------------------------------------------------
ComputerSystem - 05_activate_defined_start.py: PASS
--------------------------------------------------------------------
ComputerSystem - 06_paused_active_suspend.py: PASS
--------------------------------------------------------------------
ComputerSystem - 22_define_suspend.py: PASS
--------------------------------------------------------------------
ComputerSystem - 23_suspend_suspend.py: PASS
--------------------------------------------------------------------
ComputerSystem - 27_define_suspend_errs.py: PASS
--------------------------------------------------------------------
ComputerSystem - 32_start_reboot.py: XFAIL
ERROR - Exception: (1, u'Domain Operation Failed')
ERROR - Unable to 'Reboot' dom 'cs_test_domain' using
RequestedStateChange()
InvokeMethod(RequestStateChange): Domain Operation Failed
Bug:<00005>
--------------------------------------------------------------------
ComputerSystem - 33_suspend_reboot.py: XFAIL
ERROR - Exception: (1, u'Domain Operation Failed')
ERROR - Unable to 'Reboot' dom 'test_domain' using
RequestedStateChange()
InvokeMethod(RequestStateChange): Domain Operation Failed
Bug:<00005>
--------------------------------------------------------------------
ComputerSystem - 35_start_reset.py: PASS
--------------------------------------------------------------------
ComputerSystem - 40_RSC_start.py: PASS
--------------------------------------------------------------------
ComputerSystem - 41_cs_to_settingdefinestate.py: PASS
--------------------------------------------------------------------
ComputerSystem - 42_cs_gi_errs.py: PASS
--------------------------------------------------------------------
ComputerSystemIndication - 01_created_indication.py: FAIL
ERROR - Exception: not enough arguments for format string
Got indication: KVM_ComputerSystemCreatedIndication
ERROR - Received indication error: 256
ERROR - Exception: not enough arguments for format string
Got indication: KVM_ComputerSystemCreatedIndication
ERROR - Received indication error: 256
--------------------------------------------------------------------
ElementAllocatedFromPool - 01_forward.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 02_reverse.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 03_reverse_errs.py: PASS
--------------------------------------------------------------------
ElementAllocatedFromPool - 04_forward_errs.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 01_forward.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 02_reverse.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 03_forward_errs.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
ElementCapabilities - 05_hostsystem_cap.py: PASS
--------------------------------------------------------------------
ElementConforms - 01_forward.py: PASS
--------------------------------------------------------------------
ElementConforms - 02_reverse.py: PASS
--------------------------------------------------------------------
ElementConforms - 03_ectp_fwd_errs.py: PASS
--------------------------------------------------------------------
ElementConforms - 04_ectp_rev_errs.py: PASS
--------------------------------------------------------------------
ElementSettingData - 01_forward.py: PASS
--------------------------------------------------------------------
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS
--------------------------------------------------------------------
EnabledLogicalElementCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS
--------------------------------------------------------------------
HostSystem - 01_enum.py: PASS
--------------------------------------------------------------------
HostSystem - 02_hostsystem_to_rasd.py: PASS
--------------------------------------------------------------------
HostSystem - 03_hs_to_settdefcap.py: PASS
--------------------------------------------------------------------
HostSystem - 04_hs_to_EAPF.py: PASS
--------------------------------------------------------------------
HostSystem - 05_hs_gi_errs.py: PASS
--------------------------------------------------------------------
HostSystem - 06_hs_to_vsms.py: PASS
--------------------------------------------------------------------
HostedDependency - 01_forward.py: PASS
--------------------------------------------------------------------
HostedDependency - 02_reverse.py: PASS
--------------------------------------------------------------------
HostedDependency - 03_enabledstate.py: PASS
--------------------------------------------------------------------
HostedDependency - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 01_forward.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 02_reverse.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 03_forward_errs.py: PASS
--------------------------------------------------------------------
HostedResourcePool - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
HostedService - 01_forward.py: PASS
--------------------------------------------------------------------
HostedService - 02_reverse.py: PASS
--------------------------------------------------------------------
HostedService - 03_forward_errs.py: PASS
--------------------------------------------------------------------
HostedService - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
LogicalDisk - 01_disk.py: PASS
--------------------------------------------------------------------
LogicalDisk - 02_nodevs.py: 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: PASS
--------------------------------------------------------------------
NetworkPort - 02_np_gi_errors.py: PASS
--------------------------------------------------------------------
NetworkPort - 03_user_netport.py: PASS
--------------------------------------------------------------------
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
--------------------------------------------------------------------
RASD - 04_disk_rasd_size.py: PASS
--------------------------------------------------------------------
ReferencedProfile - 01_verify_refprof.py: PASS
--------------------------------------------------------------------
ReferencedProfile - 02_refprofile_errs.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 01_forward.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 02_reverse.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 03_forward_errs.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 04_reverse_errs.py: PASS
--------------------------------------------------------------------
ResourceAllocationFromPool - 05_RAPF_err.py: 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: XFAIL
ERROR - 'KVM_SettingsDefineCapabilities' association failed to
generate an exception and 'WrongClassName' passed.
ERROR - ------ FAILED: Invalid CCName Key Name.------
Bug:<>
--------------------------------------------------------------------
SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS
--------------------------------------------------------------------
SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS
--------------------------------------------------------------------
SystemDevice - 01_forward.py: PASS
--------------------------------------------------------------------
SystemDevice - 02_reverse.py: PASS
--------------------------------------------------------------------
SystemDevice - 03_fwderrs.py: PASS
--------------------------------------------------------------------
VSSD - 01_enum.py: PASS
--------------------------------------------------------------------
VSSD - 02_bootldr.py: SKIP
--------------------------------------------------------------------
VSSD - 03_vssd_gi_errs.py: PASS
--------------------------------------------------------------------
VSSD - 04_vssd_to_rasd.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 01_definesystem_name.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 02_destroysystem.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 03_definesystem_ess.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 04_definesystem_ers.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 05_destroysystem_neg.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 06_addresource.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 07_addresource_neg.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 08_modifyresource.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 09_procrasd_persist.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 10_hv_version.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 11_define_memrasdunits.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 12_referenced_config.py: PASS
--------------------------------------------------------------------
VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemMigrationService - 01_migratable_host.py: 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: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 02_reverse.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotService - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS
--------------------------------------------------------------------
VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py:
PASS
--------------------------------------------------------------------
16 years, 2 months
[PATCH] [TEST] Fixing and updating 01_forward.py of HostedService to work with/without sblim-base-provider
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1224152067 25200
# Node ID 385c3d0a59afd7283a3ef8d26a49b690e601a19c
# Parent dd9065d32ce97c688cf09ce6ed4df1a477fd136b
[TEST] Fixing and updating 01_forward.py of HostedService to work with/without sblim-base-provider.
Fixed the debug stmt.
Updated to with/without sblim-base-provider.
Tested with Xen, XenFV, KVM with current sources, with/without sblim-base-provider.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r dd9065d32ce9 -r 385c3d0a59af suites/libvirt-cim/cimtest/HostedService/01_forward.py
--- a/suites/libvirt-cim/cimtest/HostedService/01_forward.py Thu Oct 16 01:38:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostedService/01_forward.py Thu Oct 16 03:14:27 2008 -0700
@@ -22,6 +22,7 @@
#
import sys
+from sets import Set
from VirtLib import utils
from XenKvmLib import assoc
from XenKvmLib import enumclass
@@ -29,23 +30,25 @@
from CimTest import Globals
from XenKvmLib.const import do_main
from CimTest.Globals import logger
-from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
from XenKvmLib.common_util import get_host_info
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
+bug_sblim = '00007'
@do_main(sup_types)
def main():
options = main.options
virt = options.virt
+ server = options.ip
try:
- status, host_name, host_ccn = get_host_info(options.ip, virt)
+ status, host_name, host_ccn = get_host_info(server, virt)
if status != PASS:
logger.error("Failed to get host info.")
return status
an = get_typed_class(virt, "HostedService")
- service = assoc.AssociatorNames(options.ip,
+ service = assoc.AssociatorNames(server,
an, host_ccn,
CreationClassName = host_ccn,
Name = host_name)
@@ -58,26 +61,27 @@
logger.error("No association return")
return FAIL
- valid_services = [get_typed_class(virt, "ResourcePoolConfigurationService"),
- get_typed_class(virt, "VirtualSystemManagementService"),
- get_typed_class(virt, "VirtualSystemMigrationService"),
- get_typed_class(virt, "ConsoleRedirectionService")]
+ val_serv = Set([get_typed_class(virt, "ResourcePoolConfigurationService"),
+ get_typed_class(virt, "VirtualSystemManagementService"),
+ get_typed_class(virt, "VirtualSystemMigrationService"),
+ get_typed_class(virt, "ConsoleRedirectionService")])
ccn_list = []
for item in service:
ccn_list.append(item.keybindings["CreationClassName"])
-
- if len(ccn_list) != len(valid_services):
- logger.error("'%s' returned %d, expected %d",
- an, len(valid_services), len(ccn_list))
+
+ ccn_list = Set(ccn_list)
+
+ if (len(val_serv) - len(ccn_list)) != 0:
+ if host_ccn == 'Linux_ComputerSystem':
+ return XFAIL_RC(bug_sblim)
+ else:
+
+ logger.error("Mismatching services values")
+ logger.error("'%s' returned %d, expected %d",
+ an, len(ccn_list), len(val_serv))
return FAIL
- for ccn in ccn_list:
- if ccn not in valid_services:
- logger.error("Invalid Value '%s' returned for association '%s'",
- ccn, an)
- return FAIL
-
-
+ return PASS
if __name__ == "__main__":
sys.exit(main())
16 years, 2 months
[PATCH] [TEST] Add bug number to SettingsDefineCapabilities/03_forward_errs.py
by yunguol@cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1224151280 25200
# Node ID 46678f7f5697f804c8caa2f2c98f48bc7702ba71
# Parent 96d45b1dcc0801ade819413abe1af43b3957dde4
[TEST] Add bug number to SettingsDefineCapabilities/03_forward_errs.py
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 96d45b1dcc08 -r 46678f7f5697 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py Wed Oct 15 06:07:28 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/03_forward_errs.py Thu Oct 16 03:01:20 2008 -0700
@@ -36,6 +36,7 @@
from XenKvmLib.classes import get_typed_class
platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
+bug = '00009'
expr_values = {
"invalid_instid_keyname" : { 'rc' : pywbem.CIM_ERR_FAILED,
@@ -100,7 +101,7 @@
keys = { 'InstanceID' : 'MemoryPool/0' }
return try_assoc(conn, classname, assoc_classname, keys, field_name=field, \
expr_values=expr_values['invalid_ccname_keyname'],
- bug_no="")
+ bug_no=bug)
@do_main(platform_sup)
def main():
16 years, 2 months
[PATCH] [TEST] Updating 04_reverse_errs.py tc of HostedDependency to work with/without sblim-base-provider
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1224144770 25200
# Node ID 4ad371d62e4073f07958e9c5bf521ad4c1a6c32f
# Parent 7b11fbb20dbfa346f4aa4d2a8fd1731490cd26da
[TEST] Updating 04_reverse_errs.py tc of HostedDependency to work with/without sblim-base-provider.
Tested with Xen, XenFV, KVM with current sources, with/without sblim-base-provider.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r 7b11fbb20dbf -r 4ad371d62e40 suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py Tue Oct 14 06:12:11 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py Thu Oct 16 01:12:50 2008 -0700
@@ -42,110 +42,95 @@
test_dom = "hd_domain1"
test_mac = "00:11:22:33:44:55"
-bug='90264'
+bug_sblim='00007'
exp_rc = 6 #CIM_ERR_NOT_FOUND
exp_d1 = "No such instance (Name)"
exp_d2 = "No such instance (CreationClassName)"
expr_values = {
- "invalid_name_keyname" : { 'rc' : exp_rc, 'desc' : exp_d1 },
- "invalid_name_keyvalue" : { 'rc' : exp_rc, 'desc' : exp_d1 },
- "invalid_ccname_keyname" : { 'rc' : exp_rc, 'desc' : exp_d2 },
- "invalid_ccname_keyvalue" : { 'rc' : exp_rc, 'desc' : exp_d2 }
+ "INVALID_KeyName" : { 'rc' : exp_rc, 'desc' : exp_d1 },
+ "INVALID_NameValue" : { 'rc' : exp_rc, 'desc' : exp_d1 },
+ "INVALID_CCNKeyName" : { 'rc' : exp_rc, 'desc' : exp_d2 },
+ "INVALID_CCNameValue" : { 'rc' : exp_rc, 'desc' : exp_d2 }
}
-def err_invalid_name_keyname(server, conn, virt, assoc_classname, field):
- status, host_name, classname = get_host_info(server, virt)
- if status:
- return status
- keys = {
- 'CreationClassName' : classname, \
- field : host_name
- }
- return try_assoc(conn, classname, assoc_classname, keys, field_name=field, \
- expr_values=expr_values['invalid_name_keyname'], \
- bug_no=bug)
-
-def err_invalid_name_keyvalue(server, conn, virt, assoc_classname, field):
- status, host_name, classname = get_host_info(server, virt)
- if status:
- return status
- keys = {
- 'CreationClassName' : classname, \
- 'Name' : field
- }
- return try_assoc(conn, classname, assoc_classname, keys, field_name=field, \
- expr_values=expr_values['invalid_name_keyvalue'], \
- bug_no=bug)
-
-def err_invalid_ccname_keyname(server, conn, virt, assoc_classname, field):
- status, host_name, classname = get_host_info(server, virt)
- if status:
- return status
- keys = {
- field : classname, \
- 'Name' : host_name
- }
- return try_assoc(conn, classname, assoc_classname, keys, field_name=field, \
- expr_values=expr_values['invalid_ccname_keyname'], \
- bug_no=bug)
-def err_invalid_ccname_keyvalue(server, conn, virt, assoc_classname, field):
- status, host_name, classname = get_host_info(server, virt)
- if status:
- return status
- keys = {
- 'CreationClassName' : field, \
- 'Name' : host_name
- }
- return try_assoc(conn, classname, assoc_classname, keys, field_name=field, \
- expr_values=expr_values['invalid_ccname_keyvalue'], \
- bug_no=bug)
+def verify_err_fields(cxml, server, conn, keys, classname,
+ assoc_classname, msg, field):
+ try:
+ ret = try_assoc(conn, classname, assoc_classname, keys,
+ field_name=field, expr_values=expr_values[field],
+ bug_no="")
+ if ret != PASS:
+ if classname == 'Linux_ComputerSystem':
+ return XFAIL_RC(bug_sblim)
+ else:
+ logger.error("--- FAILED: %s---", msg)
+ cxml.destroy(server)
+ cxml.undefine(server)
+ except Exception, details:
+ logger.error("Exception: %s", details)
+ return FAIL
+ return ret
@do_main(sup_types)
def main():
options = main.options
+ server = options.ip
+ virt = options.virt
- status = PASS
- server = options.ip
- virtxml = vxml.get_class(options.virt)
- if options.virt == "LXC":
+ virtxml = vxml.get_class(virt)
+ if virt == "LXC":
cxml = virtxml(test_dom)
else:
cxml = virtxml(test_dom, mac = test_mac)
- ret = cxml.create(options.ip)
+ ret = cxml.create(server)
if not ret:
logger.error("Failed to Create the dom: %s" % test_dom)
- status = FAIL
+ return FAIL
+
+ conn = assoc.myWBEMConnection('http://%s' % server,
+ (CIM_USER, CIM_PASS), CIM_NS)
+
+ acn = get_typed_class(virt, 'HostedDependency')
+ status, host_name, classname = get_host_info(server, virt)
+ if status:
+ logger.error("Unable to get host info")
return status
- conn = assoc.myWBEMConnection('http://%s' % options.ip,
- (CIM_USER, CIM_PASS), CIM_NS)
- acn = get_typed_class(options.virt, 'HostedDependency')
- ret_value = err_invalid_name_keyname(server, conn, options.virt, acn,
- field='INVALID_KeyName')
+
+ msg = 'Invalid Name Key Name'
+ field = 'INVALID_KeyName'
+ keys = { 'CreationClassName' : classname, field : host_name }
+ ret_value = verify_err_fields(cxml, server, conn, keys, classname,
+ acn, msg, field)
if ret_value != PASS:
- logger.error("--- FAILED: Invalid Name Key Name.---")
- status = ret_value
- ret_value = err_invalid_name_keyvalue(server, conn, options.virt, acn,
- field='INVALID_NameValue')
+ return ret_value
+
+ msg = 'Invalid Name Key Value'
+ field='INVALID_NameValue'
+ keys = { 'CreationClassName' : classname, 'Name' : field }
+ ret_value = verify_err_fields(cxml, server, conn, keys, classname,
+ acn, msg, field)
if ret_value != PASS:
- logger.error("--- FAILED: Invalid Name Key Value.---")
- status = ret_value
- ret_value = err_invalid_ccname_keyname(server, conn, options.virt, acn,
- field='INVALID_CCNKeyName')
+ return ret_value
+
+ msg = 'Invalid CreationClassName Key Name'
+ field='INVALID_CCNKeyName'
+ keys = { field : classname, 'Name' : host_name }
+ ret_value = verify_err_fields(cxml, server, conn, keys, classname,
+ acn, msg, field)
if ret_value != PASS:
- logger.error("--- FAILED: Invalid CreationClassName Key Name---")
- status = ret_value
- ret_value = err_invalid_ccname_keyvalue(server, conn, options.virt, acn,
- field='INVALID_CCNameValue')
- if ret_value != PASS:
- logger.error("--- FAILED: Invalid CreationClassName Key Value---")
- status = ret_value
- cxml.destroy(options.ip)
- cxml.undefine(options.ip)
- return status
+ return ret_value
+ msg = 'Invalid CreationClassName Key Value'
+ field='INVALID_CCNameValue'
+ keys = { 'CreationClassName' : field, 'Name' : host_name }
+ ret_value = verify_err_fields(cxml, server, conn, keys, classname,
+ acn, msg, field)
+ cxml.destroy(server)
+ cxml.undefine(server)
+ return ret_value
if __name__ == "__main__":
sys.exit(main())
16 years, 2 months
[PATCH] Signed-off-by: Richard Maciel <richardm@br.ibm.com>
by Richard Maciel
# HG changeset patch
# User Richard Maciel <richardm(a)br.ibm.com>
# Date 1224109379 25200
# Node ID e71c0941849da4338ed56d784a6c3966b73ffaf7
# Parent 5f835a32ab3aa0dc26718371c3f4a0a0abe879ae
Signed-off-by: Richard Maciel <richardm(a)br.ibm.com>
* Added association Console Redirections Service <-> Console Redirection Service
Capabilities into the ElementCapabilities.c file
* Added ConsoleRedirectionServiceCapabilities.h to export the get_console_rs_caps function
* get_console_rs_caps is not static anymore
diff -r 5f835a32ab3a -r e71c0941849d src/Makefile.am
--- a/src/Makefile.am Wed Oct 15 14:14:09 2008 -0700
+++ b/src/Makefile.am Wed Oct 15 15:22:59 2008 -0700
@@ -21,7 +21,8 @@
Virt_VirtualSystemSnapshotService.h \
Virt_VirtualSystemSnapshotServiceCapabilities.h \
Virt_VSMigrationSettingData.h \
- Virt_ConsoleRedirectionService.h
+ Virt_ConsoleRedirectionService.h \
+ Virt_ConsoleRedirectionServiceCapabilities.h
XKUADD = $(top_builddir)/libxkutil/libxkutil.la
@@ -119,7 +120,7 @@
libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c
libVirt_AllocationCapabilities_la_LIBADD = -lVirt_DevicePool
-libVirt_ElementCapabilities_la_DEPENDENCIES = libVirt_VirtualSystemManagementCapabilities.la libVirt_EnabledLogicalElementCapabilities.la libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_VSMigrationCapabilities.la libVirt_VirtualSystemManagementService.la libVirt_VSMigrationService.la libVirt_DevicePool.la
+libVirt_ElementCapabilities_la_DEPENDENCIES = libVirt_VirtualSystemManagementCapabilities.la libVirt_EnabledLogicalElementCapabilities.la libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_VSMigrationCapabilities.la libVirt_VirtualSystemManagementService.la libVirt_VSMigrationService.la libVirt_DevicePool.la libVirt_ConsoleRedirectionService.la libVirt_ConsoleRedirectionServiceCapabilities.la
libVirt_ElementCapabilities_la_SOURCES = Virt_ElementCapabilities.c
libVirt_ElementCapabilities_la_LIBADD = -lVirt_VirtualSystemManagementCapabilities \
-lVirt_EnabledLogicalElementCapabilities \
@@ -129,7 +130,9 @@
-lVirt_AllocationCapabilities \
-lVirt_VirtualSystemManagementService \
-lVirt_VSMigrationService \
- -lVirt_DevicePool
+ -lVirt_DevicePool \
+ -lVirt_ConsoleRedirectionService \
+ -lVirt_ConsoleRedirectionServiceCapabilities
libVirt_SettingsDefineCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_VSMigrationCapabilities.la libVirt_VSMigrationSettingData.la
libVirt_SettingsDefineCapabilities_la_SOURCES = Virt_SettingsDefineCapabilities.c
diff -r 5f835a32ab3a -r e71c0941849d src/Virt_ConsoleRedirectionServiceCapabilities.c
--- a/src/Virt_ConsoleRedirectionServiceCapabilities.c Wed Oct 15 14:14:09 2008 -0700
+++ b/src/Virt_ConsoleRedirectionServiceCapabilities.c Wed Oct 15 15:22:59 2008 -0700
@@ -32,6 +32,7 @@
#include "svpc_types.h"
#include "Virt_ConsoleRedirectionService.h"
+#include "Virt_ConsoleRedirectionServiceCapabilities.h"
const static CMPIBroker *_BROKER;
@@ -69,7 +70,9 @@
return s;
}
-static CMPIStatus get_console_rs_caps(const CMPIBroker *broker,
+/* Removed the static keyword from the function declaration to
+ * make it available for other modules */
+CMPIStatus get_console_rs_caps(const CMPIBroker *broker,
const CMPIObjectPath *ref,
CMPIInstance **_inst,
bool is_get_inst)
diff -r 5f835a32ab3a -r e71c0941849d src/Virt_ElementCapabilities.c
--- a/src/Virt_ElementCapabilities.c Wed Oct 15 14:14:09 2008 -0700
+++ b/src/Virt_ElementCapabilities.c Wed Oct 15 15:22:59 2008 -0700
@@ -41,6 +41,8 @@
#include "Virt_VSMigrationCapabilities.h"
#include "Virt_AllocationCapabilities.h"
#include "Virt_DevicePool.h"
+#include "Virt_ConsoleRedirectionService.h"
+#include "Virt_ConsoleRedirectionServiceCapabilities.h"
#include "svpc_types.h"
@@ -75,7 +77,15 @@
goto out;
s = get_migration_service(ref, &_inst, _BROKER, context, false);
- } else
+ } else if (STREQC(classname, "ConsoleRedirectionServiceCapabilities")) {
+ s = get_console_rs_caps(_BROKER, ref, &_inst, true);
+
+ if((s.rc != CMPI_RC_OK) || (_inst == NULL))
+ goto out;
+
+
+ s = get_console_rs(ref, &_inst, _BROKER, context, false);
+ } else
cu_statusf(_BROKER, &s,
CMPI_RC_ERR_NOT_FOUND,
"Not found");
@@ -100,7 +110,7 @@
char* classname;
classname = class_base_name(CLASSNAME(ref));
-
+ CU_DEBUG("After class_base_name\n: %s", classname);
if (STREQC(classname, "VirtualSystemManagementService")) {
s = get_vsms(ref, &_inst, _BROKER, context, true);
if ((s.rc != CMPI_RC_OK) || (_inst == NULL))
@@ -113,7 +123,18 @@
goto out;
s = get_migration_caps(ref, &_inst, _BROKER, false);
- } else
+ } else if(STREQC(classname, "ConsoleRedirectionService")) {
+ CU_DEBUG("before console_rs\n");
+ s = get_console_rs(ref, &_inst, _BROKER, context, true);
+ if((s.rc != CMPI_RC_OK) || (_inst == NULL))
+ goto out;
+
+ CU_DEBUG("before console_rs_caps\n");
+ s = get_console_rs_caps(_BROKER, ref, &_inst, false);
+ if((s.rc != CMPI_RC_OK) || (_inst == NULL))
+ goto out;
+ CU_DEBUG("after console_rs_Caps\n");
+ } else
cu_statusf(_BROKER, &s,
CMPI_RC_ERR_NOT_FOUND,
"");
@@ -190,6 +211,8 @@
{
CMPIInstance *inst = NULL;
CMPIStatus s = {CMPI_RC_OK, NULL};
+
+ CU_DEBUG("service_to_cap\n");
if (!match_hypervisor_prefix(ref, info))
goto out;
@@ -382,22 +405,28 @@
"Xen_HostSystem",
"Xen_VirtualSystemManagementService",
"Xen_VirtualSystemMigrationService",
+ "Xen_ConsoleRedirectionService",
"KVM_HostSystem",
"KVM_VirtualSystemManagementService",
"KVM_VirtualSystemMigrationService",
+ "KVM_ConsoleRedirectionService",
"LXC_HostSystem",
"LXC_VirtualSystemManagementService",
"LXC_VirtualSystemMigrationService",
+ "LXC_ConsoleRedirectionService",
NULL
};
static char *host_caps[] = {
"Xen_VirtualSystemManagementCapabilities",
"Xen_VirtualSystemMigrationCapabilities",
+ "Xen_ConsoleRedirectionServiceCapabilities",
"KVM_VirtualSystemManagementCapabilities",
"KVM_VirtualSystemMigrationCapabilities",
+ "KVM_ConsoleRedirectionServiceCapabilities",
"LXC_VirtualSystemManagementCapabilities",
"LXC_VirtualSystemMigrationCapabilities",
+ "LXC_ConsoleRedirectionServiceCapabilities",
NULL,
};
@@ -434,6 +463,9 @@
"Xen_VirtualSystemMigrationService",
"KVM_VirtualSystemMigrationService",
"LXC_VirtualSystemMigrationService",
+ "Xen_ConsoleRedirectionService",
+ "KVM_ConsoleRedirectionService",
+ "LXC_ConsoleRedirectionService",
NULL
};
16 years, 2 months
[PATCH] [TEST] Update RASD.02 and 04 to call new EnumNames
by yunguol@cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1224142098 25200
# Node ID 2826e6986d8ac5ec6016fa43890260794841f185
# Parent 96d45b1dcc0801ade819413abe1af43b3957dde4
[TEST] Update RASD.02 and 04 to call new EnumNames
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 96d45b1dcc08 -r 2826e6986d8a suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py Wed Oct 15 06:07:28 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py Thu Oct 16 00:28:18 2008 -0700
@@ -68,7 +68,7 @@ def get_rasd_values(classname, virt, ser
status = PASS
rasd_list = []
try:
- rasd_list = enumclass.enumerate_inst(server, classname, virt)
+ rasd_list = enumclass.EnumNames(server, classname)
if len(rasd_list) < 1:
logger.error("%s returned %i instances, excepted at least 1.",
classname, len(rasd_list))
diff -r 96d45b1dcc08 -r 2826e6986d8a suites/libvirt-cim/cimtest/RASD/04_disk_rasd_size.py
--- a/suites/libvirt-cim/cimtest/RASD/04_disk_rasd_size.py Wed Oct 15 06:07:28 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/04_disk_rasd_size.py Thu Oct 16 00:28:18 2008 -0700
@@ -90,7 +90,7 @@ def test_rasd(options, temp, test_size):
params=params,
virt=options.virt)
- rasds = enumclass.enumerate_inst(options.ip, drasd_class, options.virt)
+ rasds = enumclass.EnumNames(options.ip, drasd_class)
status = FAIL
for rasd in rasds:
16 years, 2 months
[PATCH] [TEST] Update VirtualSystemManagementService/11_define_memrasdunits.py to call new EnumNames
by yunguol@cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1224141233 25200
# Node ID 2a361d2a042e88322ddfba286106de2c6e5c5aaa
# Parent 96d45b1dcc0801ade819413abe1af43b3957dde4
[TEST] Update VirtualSystemManagementService/11_define_memrasdunits.py to call new EnumNames
This tc fails for me, I don't know why it is
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 96d45b1dcc08 -r 2a361d2a042e suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py Wed Oct 15 06:07:28 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py Thu Oct 16 00:13:53 2008 -0700
@@ -69,7 +69,8 @@ def try_define(options, vssd, units, val
def check_value(options):
mrasd_cn = get_typed_class(options.virt, rasd.masd_cn)
- rasds = enumclass.enumerate_inst(options.ip, mrasd_cn, options.virt)
+
+ rasds = enumclass.EnumNames(options.ip, mrasd_cn)
the_rasd = None
mem_kb = mem_bytes >> 10
16 years, 2 months
[PATCH] [TEST] Updating 02_hostsystem_to_rasd.py of HostSystem to work with/without sblim-base-provider
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1224153688 25200
# Node ID 9d17e6d2f6b5f2d9614cd3b3f6df753886feffa8
# Parent 96d45b1dcc0801ade819413abe1af43b3957dde4
[TEST] Updating 02_hostsystem_to_rasd.py of HostSystem to work with/without sblim-base-provider.
Tested with Xen, XenFV, KVM with current sources, with/without sblim-base-provider.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r 96d45b1dcc08 -r 9d17e6d2f6b5 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py
--- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Wed Oct 15 06:07:28 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Thu Oct 16 03:41:28 2008 -0700
@@ -55,12 +55,12 @@
from XenKvmLib.common_util import get_host_info
from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \
CIM_ERROR_ASSOCIATORS
-from CimTest.ReturnCodes import PASS, FAIL
+from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
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']
-
+bug_sblim = '00007'
test_dom = "CrossClass_GuestDom"
test_vcpus = 1
@@ -112,7 +112,7 @@
return status, inst
-def get_assoc_info(server, cn, an, qcn, name, vsxml, virt="Xen"):
+def get_assoc_info(server, cn, an, qcn, name, vsxml):
status = PASS
assoc_info = []
try:
@@ -122,8 +122,11 @@
CreationClassName = cn,
Name = name)
if len(assoc_info) < 1:
- logger.error("%s returned %i %s objects" % (an, len(assoc_info), qcn))
- status = FAIL
+ if cn == 'Linux_ComputerSystem':
+ status = XFAIL_RC(bug_sblim)
+ else:
+ logger.error("%s returned %i %s objects", an, len(assoc_info), qcn)
+ status = FAIL
except Exception, detail:
print_err(CIM_ERROR_ASSOCIATORNAMES, detail, cn)
@@ -201,9 +204,10 @@
an = get_typed_class(options.virt, 'HostedDependency')
qcn = get_typed_class(options.virt, 'ComputerSystem')
name = host_name
- status, cs_assoc_info = get_assoc_info(server, cn, an, qcn, name, vsxml, options.virt)
+ status, cs_assoc_info = get_assoc_info(server, cn, an, qcn, name, vsxml)
if status != PASS or len(cs_assoc_info) == 0:
return status
+
filter_name = {"key" : "Name"}
status, cs_dom = get_inst_from_list(server,
cn,
@@ -217,7 +221,7 @@
an = get_typed_class(options.virt, 'SystemDevice')
qcn = 'Devices'
name = test_dom
- status, sd_assoc_info = get_assoc_info(server, cn, an, qcn, name, vsxml, options.virt)
+ status, sd_assoc_info = get_assoc_info(server, cn, an, qcn, name, vsxml)
if status != PASS or len(sd_assoc_info) == 0:
return status
status = verify_RASD_values(server, sd_assoc_info, vsxml, options.virt)
16 years, 2 months
[PATCH] [TEST] Updating 05_hostsystem_cap.py tc of EC to work with/without sblim-base-provider
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1224146298 25200
# Node ID dd9065d32ce97c688cf09ce6ed4df1a477fd136b
# Parent 4ad371d62e4073f07958e9c5bf521ad4c1a6c32f
[TEST] Updating 05_hostsystem_cap.py tc of EC to work with/without sblim-base-provider.
Tested with Xen, XenFV, KVM with current sources, with/without sblim-base-provider.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r 4ad371d62e40 -r dd9065d32ce9 suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Thu Oct 16 01:12:50 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Thu Oct 16 01:38:18 2008 -0700
@@ -54,9 +54,10 @@
from XenKvmLib.classes import get_typed_class
from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES
from XenKvmLib.const import do_main
-from CimTest.ReturnCodes import PASS, FAIL
+from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
+bug_sblim = '00007'
def print_err(err, detail, cn):
logger.error(err % cn)
@@ -81,7 +82,7 @@
return status, inst
-def get_assoc_info(server, cn, an, qcn, name, virt="Xen"):
+def get_assoc_info(server, cn, an, qcn, name):
status = PASS
assoc_info = []
try:
@@ -89,10 +90,14 @@
an,
cn,
CreationClassName = cn,
- Name = name,)
+ Name = name)
if len(assoc_info) < 1:
- logger.error("%s returned %i %s objects" % (an, len(assoc_info), qcn))
- status = FAIL
+ if cn == 'Linux_ComputerSystem':
+ return XFAIL_RC(bug_sblim), assoc_info
+ else:
+ logger.error("%s returned %i %s objects", an,
+ len(assoc_info), qcn)
+ return FAIL, assoc_info
except Exception, detail:
print_err(CIM_ERROR_ASSOCIATORNAMES, detail, cn)
status = FAIL
@@ -116,7 +121,7 @@
SystemCreationClassName=sccname,
SystemName=sname)
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:
@@ -143,8 +148,8 @@
cn = service_list[service_fieldname]['CreationClassName']
an = get_typed_class(virt, 'ElementCapabilities')
qcn = 'Capabilities'
- status, cap_assoc_info = get_association_info(server, service_fieldname, \
- cn, an, qcn, virt)
+ status, cap_assoc_info = get_association_info(server, service_fieldname,
+ cn, an, qcn, virt)
if status != PASS or len(cap_assoc_info) == 0:
return status
cn = cap_assoc_info[0].classname
@@ -163,37 +168,40 @@
def main():
options = main.options
server = options.ip
+ virt = options.virt
global service_list
global cap_list
# initialising the list
- service_list = { 'ManagementService' : 'Management Service', \
+ service_list = { 'ManagementService' : 'Management Service',
'MigrationService' : 'MigrationService'
}
# This will be used for the comparison at the end.
- mgtcap = { 'ClassName' : get_typed_class(options.virt, 'VirtualSystemManagementCapabilities'), \
+ vsmancap_cn = get_typed_class(virt, 'VirtualSystemManagementCapabilities')
+ vsmigcap_cn = get_typed_class(virt, 'VirtualSystemMigrationCapabilities')
+ mgtcap = { 'ClassName' : vsmancap_cn,
'InstanceID' : 'ManagementCapabilities'
}
- migcap = { 'ClassName' : get_typed_class(options.virt, 'VirtualSystemMigrationCapabilities'), \
+ migcap = { 'ClassName' : vsmigcap_cn,
'InstanceID' : 'MigrationCapabilities'
}
cap_list = {
- 'ManagementCapabilities' : mgtcap, \
+ 'ManagementCapabilities' : mgtcap,
'MigrationCapabilities' : migcap
}
# Get the host info
- status, host_name, classname = get_host_info(server, options.virt)
+ status, host_name, classname = get_host_info(server, virt)
if status != PASS:
return status
- an = get_typed_class(options.virt, 'HostedService')
+ an = get_typed_class(virt, 'HostedService')
cn = classname
qcn = 'Service'
name = host_name
# Get the service available on the host
- status, service_assoc_info = get_assoc_info(server, cn, an, qcn, name, options.virt)
+ status, service_assoc_info = get_assoc_info(server, cn, an, qcn, name)
if status != PASS or len(service_assoc_info) == 0:
return status
@@ -212,7 +220,7 @@
# Query ElementCapabilities and verify the ManagementCapabilities information.
service_fieldname = 'ManagementService'
cap_key = 'ManagementCapabilities'
- status = verify_cap_fields(server, service_fieldname, cap_key, options.virt)
+ status = verify_cap_fields(server, service_fieldname, cap_key, virt)
if status != PASS:
logger.error("ManagementCapabilities Verification failed")
return status
@@ -220,7 +228,7 @@
# Query ElementCapabilities and verify the MigrationCapabilities information.
service_fieldname = 'MigrationService'
cap_key = 'MigrationCapabilities'
- status = verify_cap_fields(server, service_fieldname, cap_key, options.virt)
+ status = verify_cap_fields(server, service_fieldname, cap_key, virt)
if status != PASS:
logger.error("MigrationCapabilities Verification failed")
return status
16 years, 2 months
[PATCH] [TEST] Update ElementConforms/02_reverse.py to call new EnumInstances
by yunguol@cn.ibm.com
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1224139829 25200
# Node ID 911740d773d5e33000506db533a19d646ab2f18f
# Parent 96d45b1dcc0801ade819413abe1af43b3957dde4
[TEST] Update ElementConforms/02_reverse.py to call new EnumInstances
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 96d45b1dcc08 -r 911740d773d5 suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Wed Oct 15 06:07:28 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Wed Oct 15 23:50:29 2008 -0700
@@ -107,7 +107,8 @@ def main():
keys = ['Name', 'CreationClassName']
try:
#Getting the hostname, to verify with the value returned by the assoc.
- host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)
+ cn = get_typed_class(options.virt, 'HostSystem')
+ host_sys = enumclass.EnumInstances(options.ip, cn)
if len(host_sys) < 1:
logger.error("ERROR: Enumerate returned 0 host instances")
@@ -123,14 +124,10 @@ def main():
Globals.CIM_NS = 'root/interop'
try:
- key_list = ["InstanceID"]
- proflist = enumclass.enumerate(options.ip,
- "RegisteredProfile",
- key_list,
- options.virt)
+ cn = get_typed_class(options.virt, 'RegisteredProfile')
+ proflist = enumclass.EnumInstances(options.ip, cn)
except Exception, details:
- logger.error(CIM_ERROR_ENUMERATE,
- get_typed_class(options.virt, 'RegisteredProfile'))
+ logger.error(CIM_ERROR_ENUMERATE, cn)
logger.error("Exception: %s", details)
return status
16 years, 2 months