[PATCH] [TEST] #2 Fix potiential false positive with HostSystem 01
by Kaitlin Rupert
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1216138460 25200
# Node ID aee2bda69644fbf01ec3fbe038ecf6c52d63555a
# Parent 7e91a4012131a1200f9d25711061a61f009bb4bc
[TEST] #2 Fix potiential false positive with HostSystem 01.
This test doesn't verify that exactly one instances was returned from the EnumerateInstances() call.
Also, if the EnumerateInstance() call doesn't return any instances, then the test falls through the loop and returns PASS.
Updates from 1 to 2:
-If either the CreationClassName or Name properties don't match, return a failure.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 7e91a4012131 -r aee2bda69644 suites/libvirt-cim/cimtest/HostSystem/01_enum.py
--- a/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Fri Jul 11 13:04:59 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Tue Jul 15 09:14:20 2008 -0700
@@ -26,13 +26,11 @@
# and verifies the hostname returned by the provider
import sys
-from CimTest.Globals import do_main
from XenKvmLib import hostsystem
from XenKvmLib.classes import get_typed_class
from VirtLib import live
from VirtLib import utils
-from CimTest import Globals
-from CimTest.Globals import logger
+from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, do_main
from CimTest.ReturnCodes import PASS, FAIL
SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC']
@@ -40,22 +38,29 @@
@do_main(SUPPORTED_TYPES)
def main():
options = main.options
- status = PASS
host = live.hostname(options.ip)
+ status = FAIL
try:
hs = hostsystem.enumerate(options.ip, options.virt)
name = get_typed_class(options.virt, 'HostSystem')
- for system in hs:
- if system.CreationClassName != name and system.Name != host:
- logger.error("%s Enumerate Instance error" % name)
- status = FAIL
- else:
- logger.info("%s is %s" % (name, host))
+ if len(hs) != 1:
+ logger.error("Expected 1 %s instance returned" % name)
+ return FAIL
+
+ system = hs[0]
- except BaseException:
- logger.error(Globals.CIM_ERROR_ENUMERATE % hostsystem.CIM_System)
+ if system.CreationClassName != name or system.Name != host:
+ logger.error("Exp %s, got %s" % (name, system.CreationClassName))
+ logger.error("Exp %s, got %s" % (host, system.Name))
+ status = FAIL
+ else:
+ logger.info("%s is %s" % (name, host))
+ status = PASS
+
+ except Exception, details:
+ logger.error("%s %s: %s" % (CIM_ERROR_ENUMERATE, name, details))
status = FAIL
return status
16 years, 2 months
help for libvirt-cim
by 072021096
dear everyone,
I am a student from china, i am studying the SVPC and libvirt-cim, I have successed in installing the Xen, libvirt API and openwbem on Ubuntu, but when I tried to compile the libvirt-cim, I got some problems. First, when I carried out the ./configure, it tells CANNOT FIND THE CMPI HEADERS, I tried to add the header files to the corresponding lib folder, and it's OK. Next, when i carry out "make" instruction, i met another problem, i lis
ted here...
gcc -DHAVE_CONFIG_H -I. -I.. -DCMPI_VERSION=100 -I/usr/include/openwbem -I/usr/include/libxml2 -I/usr/local/include/libcmpiutil -g -O2 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wpointer-arith -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-format-y2k -Wcast-align -Wno-unused-value -DLIBVIRT_CIM_CS=\"\" -DLIBVIRT_CIM_RV=\"\" -I../libxkutil -Werror -c Virt_ComputerSystem.c
-fPIC -DPIC -o .libs/Virt_ComputerSystem.o
Virt_ComputerSystem.c:903: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘CMPIInstanceMI’
Virt_ComputerSystem.c:922: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘CMPIMethodMI’
make[3]: *** [Virt_ComputerSystem.lo] Error 1
make[3]: Leaving directory `/opt/libvirt-cim-bbcd58a5a44a/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/opt/libvirt-cim-bbcd58a5a44a/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/opt/libvirt-cim-bbcd58a5a44a'
make: *** [all] Error 2
i am eager to solve the problem, thank all of you for your kind advices!
best wishes!
hope good health!
sinceresly
sean_ggz from Shanghai China
16 years, 2 months
[PATCH] [TEST] Update VirtualSystemSettingDataComponent.01 for KVM/XenFV/LXC support
by Guo Lian Yun
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1216097308 25200
# Node ID c8a06679508f8aca9e64f911864bad3c71f4cf6b
# Parent 64abdd1495dc05e69061151baf2ea25a682e8d8d
[TEST] Update VirtualSystemSettingDataComponent.01 for KVM/XenFV/LXC support
The test defines non-bootloader guests for all platform types, also remove the
part of thet test that verifies the bootloader
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 64abdd1495dc -r c8a06679508f suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Fri Jul 11 00:42:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Mon Jul 14 21:48:28 2008 -0700
@@ -53,32 +53,36 @@ from XenKvmLib import enumclass
from XenKvmLib import enumclass
from VirtLib import utils
from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all
-from XenKvmLib.test_xml import testxml_bl
-from XenKvmLib.test_xml import xml_get_dom_bootloader
from CimTest import Globals
from XenKvmLib import assoc
+from XenKvmLib import vxml
+from XenKvmLib.classes import get_typed_class
from CimTest.Globals import logger, do_main
from CimTest.ReturnCodes import FAIL, PASS
-sup_types = ['Xen']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
test_dom = "VSSDC_dom"
test_vcpus = 2
-test_mac = "00:11:22:33:44:aa"
-test_disk = 'xvda'
-status = 0
-VSType = "Xen"
-
-def init_list():
+status = PASS
+
+def init_list(virt='Xen'):
"""
Creating the lists that will be used for comparisons.
"""
- rlist = ['Xen_DiskResourceAllocationSettingData',
- 'Xen_MemResourceAllocationSettingData',
- 'Xen_NetResourceAllocationSettingData',
- 'Xen_ProcResourceAllocationSettingData'
+ rlist = [get_typed_class(virt, 'DiskResourceAllocationSettingData'),
+ get_typed_class(virt, 'MemResourceAllocationSettingData'),
+ get_typed_class(virt, 'NetResourceAllocationSettingData'),
+ get_typed_class(virt, 'ProcResourceAllocationSettingData')
]
+
+ if virt == 'Xen' or virt == 'XenFV':
+ test_disk = 'xvda'
+ test_mac = "00:11:22:33:44:aa"
+ else:
+ test_disk = 'hda'
+ test_mac = '11:22:33:aa:bb:cc'
prop_list = {rlist[0] : "%s/%s" % (test_dom, test_disk),
rlist[1] : "%s/%s" % (test_dom, "mem"),
@@ -86,21 +90,25 @@ def init_list():
rlist[3] : "%s/%s" % (test_dom, "proc")
}
- return prop_list
+ if virt == 'LXC':
+ rlist = [get_typed_class(virt, 'MemResourceAllocationSettingData')]
+ prop_list = {rlist[0] : "%s/%s" % (test_dom, "mem")}
+
+ return prop_list, test_disk, test_mac
def build_vssd_info(ip, vssd):
"""
Creating the vssd fileds lists that will be used for comparisons.
"""
- if vssd.Bootloader == "" or vssd.Caption == "" or \
- vssd.InstanceID == "" or vssd.ElementName == "" or \
- vssd.VirtualSystemIdentifier == "" or vssd.VirtualSystemType == "":
+ if vssd.Caption == "" or \
+ vssd.InstanceID == "" or vssd.ElementName == "" or \
+ vssd.VirtualSystemIdentifier == "" or vssd.VirtualSystemType == "":
logger.error("One of the required VSSD details seems to be empty")
test_domain_function(test_dom, ip, "undefine")
return FAIL
- vssd_vals = {'Bootloader' : vssd.Bootloader,
+ vssd_vals = {
'Caption' : vssd.Caption,
'InstanceID' : vssd.InstanceID,
'ElementName' : vssd.ElementName,
@@ -143,46 +151,53 @@ def main():
status = FAIL
destroy_and_undefine_all(options.ip)
- test_xml = testxml_bl(test_dom, vcpus = test_vcpus, \
- mac = test_mac, disk = test_disk, \
- server = options.ip,\
- gtype = 0)
- ret = test_domain_function(test_xml, options.ip, cmd = "define")
+
+ prop_list, test_disk, test_mac = init_list(options.virt)
+ virt_xml = vxml.get_class(options.virt)
+ 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.define(options.ip)
if not ret:
- logger.error("Failed to define the dom: %s", test_dom)
- return FAIL
-
- instIdval = "%s:%s" % (VSType, test_dom)
+ logger.error('Unable to define domain %s' % test_dom)
+ return FAIL
+
+ if options.virt == 'XenFV':
+ instIdval = "Xen:%s" % test_dom
+ else:
+ instIdval = "%s:%s" % (options.virt, test_dom)
keyname = "InstanceID"
key_list = { 'InstanceID' : instIdval }
+ vssd_cn = get_typed_class(options.virt, 'VirtualSystemSettingData')
try:
vssd = enumclass.getInstance(options.ip, \
- enumclass.Xen_VirtualSystemSettingData, \
- key_list)
+ 'VirtualSystemSettingData', \
+ key_list, \
+ options.virt)
if vssd is None:
logger.error("VSSD instance for %s not found" % test_dom)
- test_domain_function(test_dom, options.ip, "undefine")
+ cxml.undefine(options.ip)
return FAIL
vssd_vals = build_vssd_info(options.ip, vssd)
except Exception, detail :
- logger.error(Globals.CIM_ERROR_GETINSTANCE, \
- 'Xen_VirtualSystemSettingData')
+ logger.error(Globals.CIM_ERROR_GETINSTANCE, vssd_cn)
logger.error("Exception : %s" % detail)
- test_domain_function(test_dom, options.ip, "undefine")
+ cxml.undefine(options.ip)
return FAIL
- prop_list = init_list()
try:
# Looping through the RASD_cllist, call association
# Xen_VirtualSystemSettingDataComponent with each class in RASD_cllist
- an = 'Xen_VirtualSystemSettingDataComponent'
+ an = get_typed_class(options.virt, 'VirtualSystemSettingDataComponent')
for rasd_cname, prop in prop_list.iteritems():
assoc_info = assoc.Associators(options.ip, an, rasd_cname,
- InstanceID = prop)
+ options.virt, InstanceID = prop)
# Verify the association fields returned for particular rasd_cname.
status = assoc_values(options.ip, assoc_info, rasd_cname, an,
vssd_vals)
@@ -194,7 +209,7 @@ def main():
logger.error("Exception : %s" % detail)
status = FAIL
- test_domain_function(test_dom, options.ip, "undefine")
+ cxml.undefine(options.ip)
return status
if __name__ == "__main__":
16 years, 2 months
[PATCH] [TEST] Remove guest creation from LogicalDisk - 02_nodevs.py
by Kaitlin Rupert
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1216051613 25200
# Node ID d44423ea6fcf1af4d75ccc69caa3fd727459a770
# Parent 7caeda6d0b06d47dd3e1b2758db16954e09725ce
[TEST] Remove guest creation from LogicalDisk - 02_nodevs.py.
The point of this test is to ensure no devices are returned from EnumerateInstances() in the case where no guest is defined (or in the case where only Domain-0 is defined).
Also add support for LXC.
In the case where devices.enumerate() encountered a CIM error, raise an exception instead of printing an error.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 7caeda6d0b06 -r d44423ea6fcf suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py
--- a/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Mon Jul 14 08:42:34 2008 -0700
+++ b/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Mon Jul 14 09:06:53 2008 -0700
@@ -25,21 +25,23 @@
import sys
import pywbem
-from VirtLib import utils
from VirtLib import live
from XenKvmLib import devices
-from XenKvmLib.classes import get_typed_class
-from XenKvmLib.vxml import XenXML, KVMXML, get_class
-from XenKvmLib.test_doms import define_test_domain, undefine_test_domain
-from XenKvmLib.test_xml import testxml
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger, do_main, CIM_ERROR_ENUMERATE
+from CimTest.ReturnCodes import PASS, FAIL, SKIP
-sup_types = ['Xen', 'KVM', 'XenFV']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
test_dom = "test_domain"
def clean_system(host, virt='Xen'):
l = live.domain_list(host, virt)
- if len(l) > 1:
+
+ if virt == "XenFV" or virt == "Xen":
+ if len(l) > 1:
+ return False
+ else:
+ return True
+ elif len(l) > 0:
return False
else:
return True
@@ -49,31 +51,27 @@
options = main.options
if not clean_system(options.ip, options.virt):
logger.error("System has defined domains; unable to run")
- return 2
+ return SKIP
- if options.virt == 'Xen':
- test_dev = 'xvda'
- else:
- test_dev = 'hda'
+ key_list = ["DeviceID", "CreationClassName", "SystemName",
+ "SystemCreationClassName"]
- vsxml = get_class(options.virt)(test_dom, disk=test_dev)
- ret = vsxml.define(options.ip)
- if not ret:
- logger.error("Failed to Define the dom: %s", test_dom)
+ cn = "LogicalDisk"
+
+ try:
+ devs = devices.enumerate(options.ip, cn, key_list, options.virt)
+
+ except Exception, details:
+ logger.error(CIM_ERROR_ENUMERATE, cn)
+ logger.error(details)
return FAIL
- devid = "%s/%s" % (test_dom, test_dev)
+ if len(devs) != 0:
+ logger.error("%s returned %d instead of empty list" % (cn, len(devs)))
+ status = FAIL
+ else:
+ status = PASS
- status = 0
- key_list = ["DeviceID", "CreationClassName", "SystemName", "SystemCreationClassName"]
-
- devs = devices.enumerate(options.ip, 'LogicalDisk', key_list)
- if devs.__class__ == str:
- logger.error("Got error instead of empty list: %s" % devs)
- status = 1
-
- vsxml.undefine(options.ip)
-
return status
if __name__ == "__main__":
diff -r 7caeda6d0b06 -r d44423ea6fcf suites/libvirt-cim/lib/XenKvmLib/devices.py
--- a/suites/libvirt-cim/lib/XenKvmLib/devices.py Mon Jul 14 08:42:34 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py Mon Jul 14 09:06:53 2008 -0700
@@ -85,6 +85,9 @@
class KVM_LogicalDisk(CIM_LogicalDisk):
pass
+class LXC_LogicalDisk(CIM_LogicalDisk):
+ pass
+
class Xen_NetworkPort(CIM_NetworkPort):
pass
@@ -123,7 +126,7 @@
try:
names = conn.EnumerateInstanceNames(devtype.__name__)
except pywbem.CIMError, arg:
- print arg[1]
+ raise Exception("%s" % arg[1])
return list
for name in names:
16 years, 2 months
[PATCH] [TEST] Fix potiential false positive with HostSystem 01
by Kaitlin Rupert
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1216048393 25200
# Node ID b5d2f6621f5731e5a6508cdd6e7b82bfba0ff9df
# Parent 463274d67d8f35ac562c5665e561ab970ddc55c1
[TEST] Fix potiential false positive with HostSystem 01.
This test doesn't verify that exactly one instances was returned from the EnumerateInstances() call.
Also, if the EnumerateInstance() call doesn't return any instances, then the test falls through the loop and returns PASS.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 463274d67d8f -r b5d2f6621f57 suites/libvirt-cim/cimtest/HostSystem/01_enum.py
--- a/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Fri Jul 11 13:04:59 2008 -0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Mon Jul 14 08:13:13 2008 -0700
@@ -26,13 +26,11 @@
# and verifies the hostname returned by the provider
import sys
-from CimTest.Globals import do_main
from XenKvmLib import hostsystem
from XenKvmLib.classes import get_typed_class
from VirtLib import live
from VirtLib import utils
-from CimTest import Globals
-from CimTest.Globals import logger
+from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, do_main
from CimTest.ReturnCodes import PASS, FAIL
SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC']
@@ -40,22 +38,29 @@
@do_main(SUPPORTED_TYPES)
def main():
options = main.options
- status = PASS
host = live.hostname(options.ip)
+ status = FAIL
try:
hs = hostsystem.enumerate(options.ip, options.virt)
name = get_typed_class(options.virt, 'HostSystem')
- for system in hs:
- if system.CreationClassName != name and system.Name != host:
- logger.error("%s Enumerate Instance error" % name)
- status = FAIL
- else:
- logger.info("%s is %s" % (name, host))
+ if len(hs) != 1:
+ logger.error("Expected 1 %s instance returned" % name)
+ return FAIL
+
+ system = hs[0]
- except BaseException:
- logger.error(Globals.CIM_ERROR_ENUMERATE % hostsystem.CIM_System)
+ if system.CreationClassName != name and system.Name != host:
+ logger.error("Exp %s, got %s" % (name, system.CreationClassName))
+ logger.error("Exp %s, got %s" % (host, system.Name))
+ status = FAIL
+ else:
+ logger.info("%s is %s" % (name, host))
+ status = PASS
+
+ except Exception, details:
+ logger.error("%s %s: %s" % (CIM_ERROR_ENUMERATE, name, details))
status = FAIL
return status
16 years, 2 months
Update tests in skip status for KVM and on the next work
by Guo Lian Yun
I'd talked to Deepti about test for KVM/XenFV support.
She is working on EAFP now, and she would like to work
on cim_Define() because Zhengang is quite busy with
VSM work. Also she will start to work on ComputerSystem
tests that are currently in SKIP status for KVM/XenFV, which
depend on cim_Define().
I've complete Profile.01&03 for KVM/XenFV support, and just
sent a patch of VSSDC for KVM/XenFV/LXC support. On the next
I will work on VirtualSystemMigrationService for KVM/XenFV support,
which maybe takes much time.
Below is the details for the tests to convert to support KVM.
Y - Needs to be implemented
Test
KVM
Person Responsible
ComputerSystem - 23_suspend_suspend.py
Y
Deepti
ComputerSystem - 27_define_suspend_errs.py
Y
Deepti
ComputerSystem - 32_start_reboot.py
Y
Deepti
ComputerSystem - 33_suspend_reboot.py
Y
Deepti
ComputerSystem - 35_start_reset.py
Y
Deepti
ComputerSystem - 41_cs_to_settingdefinestate.py
Y
Deepti
ElementAllocatedFromPool - 01_forward.py
Working
Deepti
ElementAllocatedFromPool - 02_reverse.py
Working
Deepti
HostSystem - 04_hs_to_EAPF.py
Y
Who is interested in working on this?
Profile - 01_enum.py
Implementation completed
Daisy
Profile - 02_profile_to_elec.py
Y
Deepti
Profile - 03_rprofile_gi_errs.py
Implementation completed
Daisy
VirtualSystemMigrationService - 01_migratable_host.py
Y
Daisy
VirtualSystemMigrationService - 02_host_migrate_type.py
Y
Daisy
VirtualSystemMigrationService - 05_migratable_host_errs.py
Y
Daisy
VirtualSystemSettingDataComponent - 01_forward.py
Working
Daisy
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, 2 months
Cimtest Report for LXC on F9 (2008/07/14)
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-240
==================================================================
PASS : 91
XFAIL : 1
SKIP : 38
-----------------
Total : 130
======================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: PASS
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: 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: 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(a)cn.ibm.com
TEL: (86)-21-60922144
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203
16 years, 2 months
[PATCH] [CU] Remove statement to set the port equal to 8000
by Kaitlin Rupert
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1216074765 25200
# Node ID b27fbfbc713cae6807aa9ecc97ae6de34cc5d5d2
# Parent be269371a819744e742c24a55d011610cf6d3485
[CU] Remove statement to set the port equal to 8000.
The port is set prior to the BaseHTTPServer.HTTPServer() call.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r be269371a819 -r b27fbfbc713c tools/indication_tester.py
--- a/tools/indication_tester.py Tue Jul 08 12:12:18 2008 -0700
+++ b/tools/indication_tester.py Mon Jul 14 15:32:45 2008 -0700
@@ -308,7 +308,6 @@ class CIMIndicationSubscription:
self.server = BaseHTTPServer.HTTPServer(('', self.port),
CIMSocketHandler)
self.server.print_ind = print_ind
- self.port = 8000
self.server.indications = []
self.filter_xml = filter_xml(name, typ, ns, sysname)
16 years, 2 months
[PATCH] [TEST] Update Profile.02 for KVM/XenFV/LXC support
by Guo Lian Yun
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1216010940 25200
# Node ID 472b025c9fb6b5f59302ce36d95d5f930b1f4ebb
# Parent 64abdd1495dc05e69061151baf2ea25a682e8d8d
[TEST] Update Profile.02 for KVM/XenFV/LXC support
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 64abdd1495dc -r 472b025c9fb6 suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py
--- a/suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py Fri Jul 11 00:42:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py Sun Jul 13 21:49:00 2008 -0700
@@ -42,16 +42,17 @@ from XenKvmLib.assoc import Associators
from XenKvmLib.assoc import Associators
from XenKvmLib.vxml import get_class
from XenKvmLib.test_doms import destroy_and_undefine_all
+from XenKvmLib.classes import get_typed_class
from CimTest import Globals
from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORNAMES
from CimTest.Globals import do_main
from CimTest.ReturnCodes import PASS, FAIL
-sup_types = ['Xen']
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
test_dom = "domguest"
-def setup_env(server):
+def setup_env(server, virt='Xen'):
rc = -1
status = PASS
csxml_info = None
@@ -59,10 +60,10 @@ def setup_env(server):
destroy_and_undefine_all(server)
virt_xml = get_class(virt)
csxml_info = virt_xml(test_dom)
- rc = csxml_info.cim_define(server)
+ rc = csxml_info.define(server)
if not rc:
- logger.error("Unable define domain %s using DefineSystem() " % test_dom)
+ logger.error("Unable define domain %s" % test_dom)
status = FAIL
except Exception, detail:
@@ -96,15 +97,16 @@ def get_inst_from_list(server, cn, qcn,
return PASS, inst
-def get_profile(server):
+def get_profile(server, virt='Xen'):
registeredname = 'Virtual System Profile'
- cn = 'Xen_RegisteredProfile'
+ cn = get_typed_class(virt, 'RegisteredProfile')
status = PASS
profile = None
try:
proflist = enumclass.enumerate_inst(server,
- enumclass.Xen_RegisteredProfile)
+ 'RegisteredProfile',
+ virt)
filter = {"key" : "RegisteredName"}
status, profile = get_inst_from_list(server,
@@ -120,9 +122,9 @@ def get_profile(server):
return status, profile
-def get_cs(server, profile):
- cn = 'Xen_RegisteredProfile'
- an = 'Xen_ElementConformsToProfile'
+def get_cs(server, profile, virt='Xen'):
+ cn = get_typed_class(virt, 'RegisteredProfile')
+ an = get_typed_class(virt, 'ElementConformsToProfile')
status = PASS
cs = None
@@ -130,9 +132,10 @@ def get_cs(server, profile):
assoc_info = Associators(server,
an,
cn,
+ virt,
InstanceID = profile['InstanceID'])
- cn = 'Xen_ComputerSystem'
+ cn = get_typed_class(virt, 'ComputerSystem')
filter = {"key" : "Name"}
status, cs = get_inst_from_list(server,
cn,
@@ -147,9 +150,9 @@ def get_cs(server, profile):
return status, cs
-def get_elec(server, cs):
- cn = 'Xen_ComputerSystem'
- an = 'Xen_ElementCapabilities'
+def get_elec(server, cs, virt='Xen'):
+ cn = get_typed_class(virt, 'ComputerSystem')
+ an = get_typed_class(virt, 'ElementCapabilities')
status = FAIL
elec = None
@@ -158,10 +161,11 @@ def get_elec(server, cs):
assoc_info = Associators(server,
an,
cn,
+ virt,
Name = cs['Name'],
CreationClassName = ccn)
- cn = 'Xen_EnabledLogicalElementCapabilities'
+ cn = get_typed_class(virt, 'EnabledLogicalElementCapabilities')
filter = {"key" : "InstanceID"}
status, elec = get_inst_from_list(server,
cn,
@@ -185,27 +189,27 @@ def main():
server = options.ip
status = PASS
-
- status, csxml = setup_env(server)
+
+ status, csxml = setup_env(server, virt)
if status != PASS:
return status
prev_namespace = Globals.CIM_NS
Globals.CIM_NS = 'root/interop'
- status, prof = get_profile(server)
+ status, prof = get_profile(server, virt)
if status != PASS or prof == None:
csxml.undefine(server)
return status
- status, cs = get_cs(server, prof)
+ status, cs = get_cs(server, prof, virt)
if status != PASS or cs == None:
csxml.undefine(server)
return status
Globals.CIM_NS = prev_namespace
- status, elec = get_elec(server, cs)
+ status, elec = get_elec(server, cs, virt)
if status != PASS or elec == None:
return status
16 years, 2 months