[PATCH] [CU] Remove duplicate arguments in indication_tester.py
by Kaitlin Rupert
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1208880086 25200
# Node ID 56aaff93c90f0dc0dd51131168e3e477a7f97db3
# Parent 4341611a634d03ae4d084cc1aac5e4a955d8db81
[CU] Remove duplicate arguments in indication_tester.py
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 4341611a634d -r 56aaff93c90f tools/indication_tester.py
--- a/tools/indication_tester.py Mon Apr 21 21:00:47 2008 -0700
+++ b/tools/indication_tester.py Tue Apr 22 09:01:26 2008 -0700
@@ -395,9 +395,9 @@
action="store_true",
help="Print received indications to stdout.")
parser.add_option("-U", "--user", dest="username", default=None,
- help="HTTP Auth username", dest="username")
+ help="HTTP Auth username")
parser.add_option("-P", "--pass", dest="password", default=None,
- help="HTTP Auth password", dest="password")
+ help="HTTP Auth password")
(options, args) = parser.parse_args()
16 years, 7 months
[PATCH] [TEST] modified the revision number and resent the patch of RAFP.03
by Guo Lian Yun
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1209434502 25200
# Node ID 130f68638b54942c80c869451bee81efb4057a39
# Parent 2b83c1992dfc44573ba0c00729e36311355807ad
[TEST] modified the revision number and resent the patch of RAFP.03
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 2b83c1992dfc -r 130f68638b54 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Sun Apr 27 19:22:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Mon Apr 28 19:01:42 2008 -0700
@@ -28,12 +28,10 @@ from CimTest import Globals
from CimTest import Globals
from CimTest.Globals import logger, do_main
from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from XenKvmLib.const import CIM_REV
sup_types = ['Xen', 'XenFV', 'KVM']
-
-exp_rc = 6 #CIM_ERR_NOT_FOUND
-exp_desc = "No such instance (wrong) - resource pool type mismatch"
-
+rev = 393
@do_main(sup_types)
def main():
@@ -47,6 +45,13 @@ def main():
conn = assoc.myWBEMConnection('http://%s' % options.ip,
(Globals.CIM_USER, Globals.CIM_PASS),
Globals.CIM_NS)
+
+ exp_rc = 6 #CIM_ERR_NOT_FOUND
+ exp_desc = "No such instance (wrong) - resource pool type mismatch"
+ if CIM_REV < rev:
+ exp_rc = 1 # CIM_ERR_FAILED
+ exp_desc = "Invalid InstanceID or unsupported pool type"
+
for k, v in poollist.items():
instanceref = CIMInstanceName(k,
keybindings = {"InstanceID" : v})
16 years, 7 months
[PATCH] [TEST] .2# Add revision branch for VSMS.02_destroysystem
by zli@linux.vnet.ibm.com
# HG changeset patch
# User Zhengang Li <lizg(a)cn.ibm.com>
# Date 1209433339 -28800
# Node ID 45c4fad193746d9d971389758851d4858a5049d3
# Parent 292223637d873644587835e44aa3aadba11c924e
[TEST] .2# Add revision branch for VSMS.02_destroysystem
Changed to use if-else statement other than conditional expression.
Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>
diff -r 292223637d87 -r 45c4fad19374 suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Tue Apr 29 09:38:28 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Tue Apr 29 09:42:19 2008 +0800
@@ -25,15 +25,17 @@ import pywbem
import pywbem
from pywbem.cim_obj import CIMInstanceName
from VirtLib import utils
-from VirtLib.live import domain_list
+from VirtLib.live import domain_list, active_domain_list
from XenKvmLib import vsms, vxml
from XenKvmLib.classes import get_typed_class
+from XenKvmLib.const import CIM_REV
from CimTest.Globals import do_main
from CimTest.Globals import logger
from CimTest.ReturnCodes import PASS, FAIL
sup_types = ['Xen', 'KVM', 'XenFV']
default_dom = 'test_domain'
+rev = 528
@do_main(sup_types)
def main():
@@ -48,8 +50,11 @@ def main():
cs_ref = CIMInstanceName(classname, keybindings = {
'Name':default_dom,
'CreationClassName':classname})
-
- list_before = domain_list(options.ip, options.virt)
+ if CIM_REV < rev:
+ dl_func = active_domain_list
+ else:
+ dl_func = domain_list
+ list_before = dl_func(options.ip, options.virt)
status = PASS
rc = -1
@@ -61,7 +66,7 @@ def main():
logger.error(details)
status = FAIL
- list_after = domain_list(options.ip, options.virt)
+ list_after = dl_func(options.ip, options.virt)
status = PASS
if default_dom not in list_before:
16 years, 7 months
[PATCH] [TEST] .2# Add revision branch to RASD.01 & 02
by zli@linux.vnet.ibm.com
# HG changeset patch
# User Zhengang Li <lizg(a)cn.ibm.com>
# Date 1209433108 -28800
# Node ID 292223637d873644587835e44aa3aadba11c924e
# Parent 22ed2c7c77e8ff3d96b40f1e0db2a931b5a7c37e
[TEST] .2# Add revision branch to RASD.01 & 02
- Added prev & mrev for 'proc' vs. '0', 'KiloBytes' vs. 'MegaBytes' issue.
- Updated style format.
- Added commonly used class name in XenKvmLib.rasd
- Use if statements instead of conditional expressions
Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>
diff -r 22ed2c7c77e8 -r 292223637d87 suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Fri Apr 25 03:20:54 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Tue Apr 29 09:38:28 2008 +0800
@@ -47,18 +47,14 @@
import sys
-from XenKvmLib import enumclass
-from VirtLib import utils
from CimTest import Globals
from CimTest.Globals import do_main
from XenKvmLib.test_doms import destroy_and_undefine_all
-import XenKvmLib
from XenKvmLib import assoc
from XenKvmLib import vxml
-from XenKvmLib.vxml import XenXML, KVMXML, get_class
from XenKvmLib.classes import get_typed_class
-from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+from XenKvmLib import rasd
+from XenKvmLib.const import CIM_REV
from CimTest.Globals import logger
from CimTest.ReturnCodes import PASS, FAIL
@@ -68,42 +64,43 @@ test_vcpus = 1
test_vcpus = 1
test_mem = 128
test_mac = "00:11:22:33:44:aa"
+prev = 531
+mrev = 529
def init_list(xml, disk, virt="Xen"):
"""
Creating the lists that will be used for comparisons.
"""
procrasd = {
- "InstanceID" : '%s/%s' %(test_dom, "proc"),\
- "ResourceType" : 3,\
- "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
- }
-
+ "InstanceID" : '%s/%s' % (test_dom, "proc"),
+ "ResourceType" : 3,
+ "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
netrasd = {
- "InstanceID" : '%s/%s' %(test_dom,test_mac), \
- "ResourceType" : 10 , \
- "ntype1": "bridge", \
- "ntype2": "ethernet", \
- "CreationClassName": get_typed_class(virt, 'NetResourceAllocationSettingData')
- }
-
+ "InstanceID" : '%s/%s' % (test_dom,test_mac),
+ "ResourceType" : 10 ,
+ "ntype1" : "bridge",
+ "ntype2" : "ethernet",
+ "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
address = xml.xml_get_disk_source()
diskrasd = {
- "InstanceID" : '%s/%s' %(test_dom, disk), \
- "ResourceType" : 17, \
- "Address" : address, \
- "CreationClassName": get_typed_class(virt, 'DiskResourceAllocationSettingData')
- }
+ "InstanceID" : '%s/%s' % (test_dom, disk),
+ "ResourceType" : 17,
+ "Address" : address,
+ "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
memrasd = {
- "InstanceID" : '%s/%s' %(test_dom, "mem"), \
- "ResourceType" : 4, \
- "AllocationUnits" : "KiloBytes",\
- "VirtualQuantity" : (test_mem * 1024), \
- "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
- }
+ "InstanceID" : '%s/%s' % (test_dom, "mem"),
+ "ResourceType" : 4,
+ "AllocationUnits" : "KiloBytes",
+ "VirtualQuantity" : (test_mem * 1024),
+ "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
+ if CIM_REV < prev:
+ procrasd['InstanceID'] = '%s/0' % test_dom
+ if CIM_REV < mrev:
+ memrasd['AllocationUnits'] = 'MegaBytes'
+
return procrasd, netrasd, diskrasd, memrasd
-def assoc_values(ip, assoc_info, xml, disk, virt="Xen"):
+def assoc_values(assoc_info, xml, disk, virt="Xen"):
procrasd, netrasd, diskrasd, memrasd = init_list(xml, disk, virt)
proc_status = 1
net_status = 0
@@ -111,15 +108,15 @@ def assoc_values(ip, assoc_info, xml, di
mem_status = 1
status = 0
try:
- for i in range(len(assoc_info)):
- if assoc_info[i]['InstanceID'] == procrasd['InstanceID']:
- proc_status = verify_procrasd_values(assoc_info[i], procrasd)
- elif assoc_info[i]['InstanceID'] == netrasd['InstanceID']:
- net_status = verify_netrasd_values(assoc_info[i], netrasd)
- elif assoc_info[i]['InstanceID'] == diskrasd['InstanceID']:
- disk_status = verify_diskrasd_values(assoc_info[i], diskrasd)
- elif assoc_info[i]['InstanceID'] == memrasd['InstanceID']:
- mem_status = verify_memrasd_values(assoc_info[i], memrasd)
+ for res in assoc_info:
+ if res['InstanceID'] == procrasd['InstanceID']:
+ proc_status = rasd.verify_procrasd_values(res, procrasd)
+ elif res['InstanceID'] == netrasd['InstanceID']:
+ net_status = rasd.verify_netrasd_values(res, netrasd)
+ elif res['InstanceID'] == diskrasd['InstanceID']:
+ disk_status = rasd.verify_diskrasd_values(res, diskrasd)
+ elif res['InstanceID'] == memrasd['InstanceID']:
+ mem_status = rasd.verify_memrasd_values(res, memrasd)
else:
status = 1
if status != 0 or proc_status != 0 or net_status != 0 or \
@@ -135,8 +132,7 @@ def assoc_values(ip, assoc_info, xml, di
@do_main(sup_types)
def main():
options = main.options
- status = 0
- rc = 1
+ status = PASS
destroy_and_undefine_all(options.ip)
if options.virt == 'Xen':
test_disk = 'xvda'
@@ -144,31 +140,32 @@ def main():
test_disk = 'hda'
virt_xml = vxml.get_class(options.virt)
- cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+ cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus,
+ mac = test_mac, disk = test_disk)
ret = cxml.create(options.ip)
if not ret:
logger.error('Unable to create domain %s' % test_dom)
return FAIL
if status == 1:
destroy_and_undefine_all(options.ip)
- return 1
+ return FAIL
if options.virt == "XenFV":
instIdval = "Xen:%s" % test_dom
else:
instIdval = "%s:%s" % (options.virt, test_dom)
-
+
+ vssdc_cn = 'VirtualSystemSettingDataComponent'
+ vssd_cn = 'VirtualSystemSettingData'
try:
- assoc_info = assoc.Associators(options.ip, \
- 'VirtualSystemSettingDataComponent', \
- 'VirtualSystemSettingData', \
- options.virt, \
+ assoc_info = assoc.Associators(options.ip, vssdc_cn, vssd_cn,
+ options.virt,
InstanceID = instIdval)
- status = assoc_values(options.ip, assoc_info, cxml, test_disk, options.virt)
+ status = assoc_values(assoc_info, cxml, test_disk, options.virt)
except Exception, details:
- logger.error(Globals.CIM_ERROR_ASSOCIATORS, \
- get_typed_class(options.virt, 'VirtualSystemSettingDataComponent'))
+ logger.error(Globals.CIM_ERROR_ASSOCIATORS,
+ get_typed_class(options.virt, vssdc_cn))
logger.error("Exception : %s" % details)
- status = 1
+ status = FAIL
try:
cxml.destroy(options.ip)
diff -r 22ed2c7c77e8 -r 292223637d87 suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py Fri Apr 25 03:20:54 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py Tue Apr 29 09:38:28 2008 +0800
@@ -28,14 +28,13 @@
import sys
-import XenKvmLib
from XenKvmLib import enumclass
from CimTest.Globals import do_main, CIM_ERROR_ENUMERATE
from XenKvmLib.test_doms import destroy_and_undefine_all
from XenKvmLib.vxml import get_class
from XenKvmLib.classes import get_typed_class
-from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+from XenKvmLib import rasd
+from XenKvmLib.const import CIM_REV
from CimTest.Globals import logger
from CimTest.ReturnCodes import PASS, FAIL
@@ -45,41 +44,43 @@ test_vcpus = 1
test_vcpus = 1
test_mem = 128
test_mac = "00:11:22:33:44:aa"
-
-def init_list(virt="Xen"):
+prev = 531
+mrev = 529
+
+def init_list(virt):
"""
Creating the lists that will be used for comparisons.
"""
- procrasd = {
- "InstanceID" : '%s/%s' %(test_dom, "proc"),\
- "ResourceType" : 3,\
- "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
- }
-
- netrasd = {
- "InstanceID" : '%s/%s' %(test_dom,test_mac), \
- "ResourceType" : 10 , \
- "ntype1": "bridge", \
- "ntype2": "ethernet", \
- "CreationClassName": get_typed_class(virt, 'NetResourceAllocationSettingData')
- }
+ proc = {
+ "InstanceID" : '%s/%s' % (test_dom, "proc"),
+ "ResourceType" : 3,
+ "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
+ net = {
+ "InstanceID" : '%s/%s' % (test_dom,test_mac),
+ "ResourceType" : 10 ,
+ "ntype1" : "bridge",
+ "ntype2" : "ethernet",
+ "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
address = vsxml.xml_get_disk_source()
- diskrasd = {
- "InstanceID" : '%s/%s' %(test_dom, test_disk), \
- "ResourceType" : 17, \
- "Address" : address, \
- "CreationClassName": get_typed_class(virt, 'DiskResourceAllocationSettingData')
- }
- memrasd = {
- "InstanceID" : '%s/%s' %(test_dom, "mem"), \
- "ResourceType" : 4, \
- "AllocationUnits" : "KiloBytes",\
- "VirtualQuantity" : (test_mem * 1024), \
- "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
- }
- return procrasd, netrasd, diskrasd, memrasd
-
-def get_inst_from_list(classname, rasd_list, filter_name, exp_val):
+ disk = {
+ "InstanceID" : '%s/%s' % (test_dom, test_disk),
+ "ResourceType" : 17,
+ "Address" : address,
+ "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
+ mem = {
+ "InstanceID" : '%s/%s' % (test_dom, "mem"),
+ "ResourceType" : 4,
+ "AllocationUnits" : "KiloBytes",
+ "VirtualQuantity" : (test_mem * 1024),
+ "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
+ if CIM_REV < prev:
+ proc['InstanceID'] = '%s/0' % test_dom
+ if CIM_REV < mrev:
+ mem['AllocationUnits'] = 'MegaBytes'
+
+ return proc, net, disk, mem
+
+def get_inst_from_list(server, classname, rasd_list, filter_name, exp_val):
status = PASS
ret = FAIL
inst = []
@@ -94,14 +95,14 @@ def get_inst_from_list(classname, rasd_l
status = FAIL
return status, inst
-def get_rasd_values(classname):
+def get_rasd_values(classname, virt, server):
status = PASS
rasd_list = []
try:
- rasd_list = enumclass.enumerate_inst(server, eval('enumclass.' + classname), virt)
+ rasd_list = enumclass.enumerate_inst(server, classname, virt)
if len(rasd_list) < 1:
- logger.error("%s returned %i instances, excepted atleast 1 instance", classname, \
- len(rasd_list))
+ logger.error("%s returned %i instances, excepted at least 1.",
+ classname, len(rasd_list))
return FAIL, rasd_list
except Exception, detail:
logger.error(CIM_ERROR_ENUMERATE, classname)
@@ -111,7 +112,8 @@ def get_rasd_values(classname):
# Get the RASD info related to the domain "ONLY".
# We should get atleast one record.
filter_name = {"key" : "InstanceID"}
- status, rasd_values = get_inst_from_list(classname, rasd_list, filter_name, test_dom)
+ status, rasd_values = get_inst_from_list(server, classname, rasd_list,
+ filter_name, test_dom)
if status != PASS or len(rasd_values) == 0:
return status, rasd_values
@@ -122,14 +124,14 @@ def verify_rasd_values(rasd_values_info)
try:
for rasd_instance in rasd_values_info:
CCName = rasd_instance.classname
- if 'ProcResourceAllocationSettingData' in CCName :
- status = verify_procrasd_values(rasd_instance, procrasd,)
- elif 'NetResourceAllocationSettingData' in CCName :
- status = verify_netrasd_values(rasd_instance, netrasd)
- elif 'DiskResourceAllocationSettingData' in CCName:
- status = verify_diskrasd_values(rasd_instance, diskrasd)
- elif 'MemResourceAllocationSettingData' in CCName :
- status = verify_memrasd_values(rasd_instance, memrasd)
+ if rasd.pasd_cn in CCName :
+ status = rasd.verify_procrasd_values(rasd_instance, procrasd,)
+ elif rasd.nasd_cn in CCName :
+ status = rasd.verify_netrasd_values(rasd_instance, netrasd)
+ elif rasd.dasd_cn in CCName:
+ status = rasd.verify_diskrasd_values(rasd_instance, diskrasd)
+ elif rasd.masd_cn in CCName :
+ status = rasd.verify_memrasd_values(rasd_instance, memrasd)
else:
status = FAIL
if status != PASS:
@@ -142,32 +144,31 @@ def verify_rasd_values(rasd_values_info)
@do_main(sup_types)
def main():
- options = main.options
- destroy_and_undefine_all(options.ip)
+ virt = main.options.virt
+ server = main.options.ip
+ destroy_and_undefine_all(server)
global test_disk, vsxml
- global virt, server
global procrasd, netrasd, diskrasd, memrasd
- server = options.ip
- virt = options.virt
if virt == "Xen":
test_disk = "xvda"
else:
test_disk = "hda"
- vsxml = get_class(virt)(test_dom, mem=test_mem, vcpus = test_vcpus, mac = test_mac,
- disk = test_disk)
+ virtxml = get_class(virt)
+ vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+ mac = test_mac, disk = test_disk)
try:
- bridge = vsxml.set_vbridge(server)
- ret = vsxml.define(options.ip)
+ vsxml.set_vbridge(server)
+ ret = vsxml.define(server)
if not ret:
logger.error("Failed to Define the domain: %s", test_dom)
return FAIL
except Exception, details:
logger.error("Exception : %s", details)
return FAIL
- class_list = [ get_typed_class(virt, "DiskResourceAllocationSettingData"),
- get_typed_class(virt, "MemResourceAllocationSettingData"),
- get_typed_class(virt, "ProcResourceAllocationSettingData"),
- get_typed_class(virt, "NetResourceAllocationSettingData")
+ class_list = [ get_typed_class(virt, rasd.dasd_cn),
+ get_typed_class(virt, rasd.masd_cn),
+ get_typed_class(virt, rasd.pasd_cn),
+ get_typed_class(virt, rasd.nasd_cn)
]
status = PASS
procrasd, netrasd, diskrasd, memrasd = init_list(virt)
@@ -175,11 +176,12 @@ def main():
# For each loop
# 1) Enumerate one RASD type
# 2) Get the RASD info related to the domain "ONLY".
- # 3) Verifies the RASD values with those supplied during defining the domain.
+ # 3) Verifies the RASD values with those supplied during
+ # defining the domain.
for classname in sorted(class_list):
# Enumerate each RASD types
- status, rasd_values = get_rasd_values(classname)
+ status, rasd_values = get_rasd_values(classname, virt, server)
if status != PASS or len(rasd_values) ==0 :
break
diff -r 22ed2c7c77e8 -r 292223637d87 suites/libvirt-cim/lib/XenKvmLib/rasd.py
--- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py Fri Apr 25 03:20:54 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py Tue Apr 29 09:38:28 2008 +0800
@@ -24,6 +24,11 @@ from CimTest import Globals
from CimTest import Globals
from CimTest.Globals import log_param, logger
from CimTest.ReturnCodes import FAIL, PASS
+
+pasd_cn = 'ProcResourceAllocationSettingData'
+nasd_cn = 'NetResourceAllocationSettingData'
+dasd_cn = 'DiskResourceAllocationSettingData'
+masd_cn = 'MemResourceAllocationSettingData'
def CCN_err(assoc_info, list):
Globals.logger.error("%s Mismatch", 'CreationClassName')
16 years, 7 months
[PATCH] [TEST] Add revision branch for VSMS.02_destroysystem
by zli@linux.vnet.ibm.com
# HG changeset patch
# User Zhengang Li <lizg(a)cn.ibm.com>
# Date 1209391870 -28800
# Node ID 17873ab6228cc92c6cd5e92a41b5a19ed312792c
# Parent 5ed6cd841f7b65eeea4af7af845c4ebfc2da4cf1
[TEST] Add revision branch for VSMS.02_destroysystem
Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>
diff -r 5ed6cd841f7b -r 17873ab6228c suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Mon Apr 28 17:00:36 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Mon Apr 28 22:11:10 2008 +0800
@@ -25,15 +25,17 @@ import pywbem
import pywbem
from pywbem.cim_obj import CIMInstanceName
from VirtLib import utils
-from VirtLib.live import domain_list
+from VirtLib.live import domain_list, active_domain_list
from XenKvmLib import vsms, vxml
from XenKvmLib.classes import get_typed_class
+from XenKvmLib.const import CIM_REV
from CimTest.Globals import do_main
from CimTest.Globals import logger
from CimTest.ReturnCodes import PASS, FAIL
sup_types = ['Xen', 'KVM', 'XenFV']
default_dom = 'test_domain'
+rev = 528
@do_main(sup_types)
def main():
@@ -48,8 +50,8 @@ def main():
cs_ref = CIMInstanceName(classname, keybindings = {
'Name':default_dom,
'CreationClassName':classname})
-
- list_before = domain_list(options.ip, options.virt)
+ dl_func = CIM_REV < rev and active_domain_list or domain_list
+ list_before = dl_func(options.ip, options.virt)
status = PASS
rc = -1
@@ -61,7 +63,7 @@ def main():
logger.error(details)
status = FAIL
- list_after = domain_list(options.ip, options.virt)
+ list_after = dl_func(options.ip, options.virt)
status = PASS
if default_dom not in list_before:
16 years, 7 months
KVM test report on Fedora 9 (2008/04/28)
by Guo Lian Yun
stro: Fedora 9 Beta
Kernel: 2.6.25-0.121.rc5.git4.fc9
Libvirt: 0.4.1-7.fc9
CIMOM: 2.7.0-6.fc9
PyWBEM: 0.6-1
libcmpiutil: 0.3-1.fc9
libvirt-cim: 0.3-4.fc9
cimtest: changeset-121
=================== FAIL ======================================
ComputerSystemIndication - 01_created_indication.py: FAIL
It crashs the CIMOM on running
ElementAllocatedFromPool - 03_reverse_errs.py: FAIL
exp: ERR_NOT_FOUND(6) - No such instance
ret: ERR_FAILED(1) - Invalid InstanceID or unsupported pool type
ElementConforms - 02_reverse.py: FAIL
Binary rpm provider returns CIM_ERR_INVALID_PARAMETER:
KVM_ElementConformsToProfile on the following query:
wbemain -ac KVM_ElementConformsToProfile
'http://u:p@host:5988/root/virt:KVM_ComputerSystem.CreationClassName="KVM_ComputerSystem",Name="domgst"'
Same wbemcli command gets the correct results on another system using
latest libvirt-cim tree (changeset 533).
ElementConforms - 04_ectp_rev_errs.py: FAIL
All negative checks result in the CIM_ERR_INVALID_PARAMETER. Should be
the same reason as ElementConforms.02
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: FAIL
This one failed on bulk run, but passed on single group run.
Probably it's because of un-cleaned domains in previous groups.
HostSystem - 02_hostsystem_to_rasd.py: FAIL
sent a patch earlier today
NetworkPort - 03_user_netport.py: FAIL
'user' network type.
RASD - 01_verify_rasd_fields.py: FAIL
RASD - 02_enum.py: FAIL
MegaBytes vs. KiloBytes issue on RASD
ReferencedProfile - 01_verify_refprof.py: FAIL
ReferencedProfile - 02_refprofile_errs.py: FAIL
Binary rpm provider gives 2 results on the following query:
wbemein http://u:p@host:5988/root/interop:KVM_RegisteredProfile
"CIM:DSP1042-SystemVirtualization-1.0.0"
"CIM:DSP1057-VirtualSystem-1.0.0a"
Same wbemcli command gets 5 results on changeset-533 tree on another
system.
"CIM:DSP1042-SystemVirtualization-1.0.0"
"CIM:DSP1057-VirtualSystem-1.0.0a"
"CIM:DSP1059-GenericDeviceResourceVirtualization-1.0.0"
"CIM:DSP1045-MemoryResourceVirtualization-1.0.0"
"CIM:DSP1081-VirtualSystemMigration-1.0"
This leads to ReferencedProfile's 'ain' query gets only 2 results.
[Known issue]
ResourceAllocationFromPool - 03_forward_errs.py: FAIL
sent a patch earlier today
ResourcePoolConfigurationService - 03_CreateResourcePool.py: FAIL
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py:
FAIL
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: FAIL
CIM_ERR_NOT_SUPPORTED for 03, 04, 06, 07
SettingsDefine - 02_reverse.py: FAIL
ProcRASD.InstanceID is 'domname/0' in binary rpm provider. Test case
expects 'domname/proc' now.
VSSD - 04_vssd_to_rasd.py: FAIL
sent a patch earlier today
VirtualSystemManagementService - 02_destroysystem.py: FAIL
Test case expect DestroySystem to destroy and to undefine the domain.
Binary rpm provider doesn't. This is fixed in recent provider.
VirtualSystemManagementService - 06_addresource.py: FAIL
Invoking AddResource results in 'CIM_ERR_FAILED: Failed to create
domain' error.
Latest provider has the same result. It passed on Xen & XenFV environment.
VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: FAIL
sent a patch earlier today
========FULL CIMTEST REPORT=PASS(84)=FAIL(21)=SKIP(17)=XFAIL(7)===
AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: PASS
ComputerSystem - 01_enum.py: PASS
ComputerSystem - 02_nosystems.py: PASS
ComputerSystem - 03_defineVS.py: PASS
ComputerSystem - 04_defineStartVS.py: PASS
ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 85769
ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 85769
ComputerSystem - 22_define_suspend.py: PASS
ComputerSystem - 23_suspend_suspend.py: SKIP
ComputerSystem - 27_define_suspend_errs.py: SKIP
ComputerSystem - 32_start_reboot.py: SKIP
ComputerSystem - 33_suspend_reboot.py: SKIP
ComputerSystem - 35_start_reset.py: SKIP
ComputerSystem - 40_RSC_start.py: XFAIL Bug: 91410
InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed
Bug:<91410>
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: PASS
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: FAIL
ElementAllocatedFromPool - 04_forward_errs.py: XFAIL Bug: 88651
ElementCapabilities - 01_forward.py: PASS
ElementCapabilities - 02_reverse.py: PASS
ElementCapabilities - 03_forward_errs.py: PASS
ElementCapabilities - 04_reverse_errs.py: PASS
ElementCapabilities - 05_hostsystem_cap.py: PASS
ElementConforms - 01_forward.py: PASS
ElementConforms - 02_reverse.py: FAIL
CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ElementConforms - 03_ectp_fwd_errs.py: XFAIL Bug: 92642
Bug:<92642>
Bug:<92642>
Bug:<92642>
ElementConforms - 04_ectp_rev_errs.py: FAIL
ElementSettingData - 01_forward.py: PASS
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: FAIL
EnabledLogicalElementCapabilities - 01_enum.py: PASS
EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS
HostSystem - 01_enum.py: PASS
HostSystem - 02_hostsystem_to_rasd.py: FAIL
HostSystem - 03_hs_to_settdefcap.py: PASS
HostSystem - 04_hs_to_EAPF.py: SKIP
HostSystem - 05_hs_gi_errs.py: PASS
HostSystem - 06_hs_to_vsms.py: PASS
HostedDependency - 01_forward.py: PASS
HostedDependency - 02_reverse.py: PASS
HostedDependency - 03_enabledstate.py: PASS
HostedDependency - 04_reverse_errs.py: PASS
HostedResourcePool - 01_forward.py: PASS
HostedResourcePool - 02_reverse.py: PASS
HostedResourcePool - 03_forward_errs.py: PASS
HostedResourcePool - 04_reverse_errs.py: PASS
HostedService - 01_forward.py: PASS
HostedService - 02_reverse.py: PASS
HostedService - 03_forward_errs.py: PASS
HostedService - 04_reverse_errs.py: PASS
LogicalDisk - 01_disk.py: PASS
LogicalDisk - 02_nodevs.py: PASS
LogicalDisk - 03_ld_gi_errs.py: PASS
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: PASS
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: PASS
NetworkPort - 02_np_gi_errors.py: PASS
NetworkPort - 03_user_netport.py: FAIL
Processor - 01_processor.py: PASS
Processor - 02_definesys_get_procs.py: PASS
Processor - 03_proc_gi_errs.py: PASS
Profile - 01_enum.py: PASS
Profile - 02_profile_to_elec.py: SKIP
Profile - 03_rprofile_gi_errs.py: SKIP
RASD - 01_verify_rasd_fields.py: FAIL
RASD - 02_enum.py: FAIL
RASD - 03_rasd_errs.py: PASS
ReferencedProfile - 01_verify_refprof.py: FAIL
ReferencedProfile - 02_refprofile_errs.py: FAIL
ResourceAllocationFromPool - 01_forward.py: PASS
ResourceAllocationFromPool - 02_reverse.py: PASS
ResourceAllocationFromPool - 03_forward_errs.py: FAIL
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: FAIL
InvokeMethod(CreateResourcePool): CIM_ERR_NOT_SUPPORTED
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL
InvokeMethod(CreateChildResourcePool): CIM_ERR_NOT_SUPPORTED
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL
Bug: 92173
InvokeMethod(AddResourcesToResourcePool): CIM_ERR_FAILED: Unknown Method
Bug:<92173>
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py:
FAIL
InvokeMethod(RemoveResourcesFromResourcePool): CIM_ERR_NOT_SUPPORTED
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: FAIL
InvokeMethod(DeleteResourcePool): CIM_ERR_NOT_SUPPORTED
SettingsDefine - 01_forward.py: PASS
SettingsDefine - 02_reverse.py: FAIL
SettingsDefine - 03_sds_fwd_errs.py: PASS
SettingsDefine - 04_sds_rev_errs.py: PASS
SettingsDefineCapabilities - 01_forward.py: SKIP
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: FAIL
VirtualSystemManagementCapabilities - 01_enum.py: PASS
VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS
VirtualSystemManagementService - 01_definesystem_name.py: PASS
VirtualSystemManagementService - 02_destroysystem.py: FAIL
VirtualSystemManagementService - 03_definesystem_ess.py: PASS
VirtualSystemManagementService - 04_definesystem_ers.py: PASS
VirtualSystemManagementService - 05_destroysystem_neg.py: PASS
VirtualSystemManagementService - 06_addresource.py: FAIL
InvokeMethod(AddResourceSettings): CIM_ERR_FAILED: Failed to create domain
VirtualSystemManagementService - 07_addresource_neg.py: PASS
VirtualSystemManagementService - 08_modifyresource.py: XFAIL Bug: 90853
InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Failed to create
domain
Bug:<90853>
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: FAIL
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 Guo Lian Yun
E-mail: yunguol(a)cn.ibm.com
IBM China Development Lab, Shanghai, China
TEL: (86)-21-61008057
16 years, 7 months
CimTest Report for KVM on F9 24-04-2008
by Deepti B Kalakeri
====================================================
CIM Test Report for KVM on F9 with libvirt-cim rpm
====================================================
Distro : Fedora 9 Beta
Kernel : 2.6.25-0.121.rc5.git4.fc9
Libvirt : libvirt-0.4.2-1.fc9.x86_64
CIMOM : pegasus
PyWBEM : pywbem-0.6
CIM Schema : cimv216Experimental
LibCMPIutil : libcmpiutil-0.3-1.fc9.x86_64
LibVirtCIM : libvirt-cim-0.3-4.fc9.x86_64
CIMTEST : 105
====================================================
PASS : 77
FAIL : 26
XFAIL : 6
SKIP : 20
-----------------
Total : 129
====================================================
AllocationCapabilities - 02_alloccap_gi_errs.py: FAIL
ComputerSystem - 40_RSC_start.py: FAIL
ComputerSystemIndication - 01_created_indication.py: FAIL
ElementAllocatedFromPool - 03_reverse_errs.py: FAIL
ElementConforms - 02_reverse.py: FAIL
ElementConforms - 04_ectp_rev_errs.py: FAIL
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: FAIL
HostSystem - 02_hostsystem_to_rasd.py: FAIL
Memory - 02_defgetmem.py: FAIL
NetworkPort - 03_user_netport.py: FAIL
Processor - 02_definesys_get_procs.py: FAIL
RASD - 01_verify_rasd_fields.py: FAIL
RASD - 02_enum.py: FAIL
ReferencedProfile - 01_verify_refprof.py: FAIL
ReferencedProfile - 02_refprofile_errs.py: FAIL
ResourceAllocationFromPool - 03_forward_errs.py: FAIL
ResourcePoolConfigurationService - 03_CreateResourcePool.py: FAIL
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL
ResourcePoolConfigurationService -
06_RemoveResourcesFromResourcePool.py: FAIL
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: FAIL
SettingsDefine - 02_reverse.py: FAIL
VSSD - 04_vssd_to_rasd.py: FAIL
VirtualSystemManagementService - 01_definesystem_name.py: FAIL
VirtualSystemManagementService - 02_destroysystem.py: FAIL
VirtualSystemManagementService - 06_addresource.py: FAIL
VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: FAIL
Please find the complete the report attached the mail.
Thanks and Regards,
Deepti.
CIM_NS=root/virt CIM_USER=root CIM_PASS=vsm4you ./runtests libvirt-cim -i localhost -c -v KVM -d
Starting test suite: libvirt-cim
Cleaned log files.
Testing KVM hypervisor
AllocationCapabilities - 01_enum.py: PASS
AllocationCapabilities - 02_alloccap_gi_errs.py: FAIL
ERROR - Unexpected rc code 6 and description CIM_ERR_NOT_FOUND: Requested Object could not be found.
ERROR - ------ FAILED: Invalid InstanceID Key Value.------
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: 85769
ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful
Bug:<85769>
ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 85769
ERROR - ERROR: VS DomST1 transition from suspend State to Activate state was not Successful
Bug:<85769>
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: FAIL
ERROR - Error invoke method `DefineSystem'. invalid extra attributes [u'EMBEDDEDOBJECT']
ERROR - Exception: ('Unable create domain %s using DefineSystem()', 'test_domain')
ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP
ComputerSystem - 42_cs_gi_errs.py: PASS
ComputerSystemIndication - 01_created_indication.py: FAIL
ERROR - error : (110, 'Connection timed out')
ElementAllocatedFromPool - 01_forward.py: SKIP
ElementAllocatedFromPool - 02_reverse.py: SKIP
ElementAllocatedFromPool - 03_reverse_errs.py: FAIL
ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Invalid InstanceID or unsupported pool type
ERROR - ------FAILED: Invalid KeyValue.------
ElementAllocatedFromPool - 04_forward_errs.py: XFAIL Bug: 88651
ERROR - KVM_ElementAllocatedFromPool association should NOT have returned records. 'Invalid SystemName Key Name was supplied.'
ERROR - ------FAILED: Invalid SystemName Key Name.------
Bug:<88651>
ElementCapabilities - 01_forward.py: PASS
ElementCapabilities - 02_reverse.py: PASS
ElementCapabilities - 03_forward_errs.py: PASS
ElementCapabilities - 04_reverse_errs.py: PASS
ElementCapabilities - 05_hostsystem_cap.py: PASS
ElementConforms - 01_forward.py: PASS
ElementConforms - 02_reverse.py: FAIL
ERROR - ElementConformsToProfile assoc failed
CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ElementConforms - 03_ectp_fwd_errs.py: XFAIL Bug: 92642
ERROR - 'Xen_ElementConformsToProfile' association failed to generate an exception and 'INVALID_InstID_Keyname' passed.
ERROR - ------ FAILED: INVALID_InstID_Keyname------
ERROR - 'Xen_ElementConformsToProfile' association failed to generate an exception and 'INVALID_InstID_Keyvalue' passed.
ERROR - ------ FAILED: INVALID_InstID_Keyvalue------
ERROR - 'KVM_ElementConformsToProfile' association failed to generate an exception and 'INVALID_InstID_Keyvalue' passed.
ERROR - ------ FAILED: INVALID_InstID_Keyvalue------
Bug:<92642>
Bug:<92642>
Bug:<92642>
ElementConforms - 04_ectp_rev_errs.py: FAIL
ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ERROR - ------ FAILED: INVALID_CCName_Keyname------
ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ERROR - ------ FAILED: INVALID_CCName_Keyvalue------
ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ERROR - ------ FAILED: INVALID_Name_Keyname------
ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ERROR - ------ FAILED: INVALID_Name_Keyvalue------
ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ERROR - ------ FAILED: INVALID_CCName_Keyname------
ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ERROR - ------ FAILED: INVALID_CCName_Keyvalue------
ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ERROR - ------ FAILED: INVALID_Name_Keyname------
ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER: KVM_ElementConformsToProfile
ERROR - ------ FAILED: INVALID_Name_Keyvalue------
ElementSettingData - 01_forward.py: PASS
ElementSettingData - 03_esd_assoc_with_rasd_errs.py: FAIL
ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED
ERROR - ------ FAILED: Invalid InstanceID Key Name.------
EnabledLogicalElementCapabilities - 01_enum.py: PASS
EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS
HostSystem - 01_enum.py: PASS
HostSystem - 02_hostsystem_to_rasd.py: FAIL
ERROR - AllocationUnits Mismatch
ERROR - Returned MegaBytes instead of KiloBytes
ERROR - Mistmatching association values
HostSystem - 03_hs_to_settdefcap.py: PASS
HostSystem - 04_hs_to_EAPF.py: SKIP
HostSystem - 05_hs_gi_errs.py: PASS
HostSystem - 06_hs_to_vsms.py: PASS
HostedDependency - 01_forward.py: PASS
HostedDependency - 02_reverse.py: PASS
HostedDependency - 03_enabledstate.py: PASS
HostedDependency - 04_reverse_errs.py: PASS
HostedResourcePool - 01_forward.py: PASS
HostedResourcePool - 02_reverse.py: PASS
HostedResourcePool - 03_forward_errs.py: PASS
HostedResourcePool - 04_reverse_errs.py: PASS
HostedService - 01_forward.py: PASS
HostedService - 02_reverse.py: PASS
HostedService - 03_forward_errs.py: PASS
HostedService - 04_reverse_errs.py: PASS
LogicalDisk - 01_disk.py: PASS
LogicalDisk - 02_nodevs.py: PASS
LogicalDisk - 03_ld_gi_errs.py: PASS
Memory - 01_memory.py: PASS
Memory - 02_defgetmem.py: FAIL
ERROR - Error invoke method `DefineSystem'. invalid extra attributes [u'EMBEDDEDOBJECT']
ERROR - Exception: Unable to create domain domu using DefineSys()
Memory - 03_mem_gi_errs.py: PASS
NetworkPort - 01_netport.py: PASS
NetworkPort - 02_np_gi_errors.py: PASS
NetworkPort - 03_user_netport.py: FAIL
ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)')
Processor - 01_processor.py: PASS
Processor - 02_definesys_get_procs.py: FAIL
ERROR - Error invoke method `DefineSystem'. invalid extra attributes [u'EMBEDDEDOBJECT']
ERROR - Exception: Unable create domain test_domain using DefineSystem()
Processor - 03_proc_gi_errs.py: PASS
Profile - 01_enum.py: PASS
Profile - 02_profile_to_elec.py: SKIP
Profile - 03_rprofile_gi_errs.py: SKIP
RASD - 01_verify_rasd_fields.py: FAIL
ERROR - AllocationUnits Mismatch
ERROR - Returned MegaBytes instead of KiloBytes
ERROR - Mistmatching association values
RASD - 02_enum.py: FAIL
ERROR - AllocationUnits Mismatch
ERROR - Returned MegaBytes instead of KiloBytes
ERROR - Mistmatching KVM_MemResourceAllocationSettingData values
RASD - 03_rasd_errs.py: PASS
ReferencedProfile - 01_verify_refprof.py: FAIL
ERROR - KVM_RegisteredProfile returned 2 Profile objects, expected atleast 5
ReferencedProfile - 02_refprofile_errs.py: FAIL
ERROR - KVM_RegisteredProfile returned 2 Profile objects, expected atleast 5
ResourceAllocationFromPool - 01_forward.py: PASS
ResourceAllocationFromPool - 02_reverse.py: PASS
ResourceAllocationFromPool - 03_forward_errs.py: FAIL
ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Invalid InstanceID or unsupported pool type
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: FAIL
ERROR - Unexpected rc code 7 and description CIM_ERR_NOT_SUPPORTED
InvokeMethod(CreateResourcePool): CIM_ERR_NOT_SUPPORTED
ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL
ERROR - Unexpected rc code 7 and description CIM_ERR_NOT_SUPPORTED
InvokeMethod(CreateChildResourcePool): CIM_ERR_NOT_SUPPORTED
ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL Bug: 92173
ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Unknown Method
InvokeMethod(AddResourcesToResourcePool): CIM_ERR_FAILED: Unknown Method
Bug:<92173>
ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: FAIL
ERROR - Unexpected rc code 7 and description CIM_ERR_NOT_SUPPORTED
InvokeMethod(RemoveResourcesFromResourcePool): CIM_ERR_NOT_SUPPORTED
ResourcePoolConfigurationService - 07_DeleteResourcePool.py: FAIL
ERROR - Unexpected rc code 7 and description CIM_ERR_NOT_SUPPORTED
InvokeMethod(DeleteResourcePool): CIM_ERR_NOT_SUPPORTED
SettingsDefine - 01_forward.py: PASS
SettingsDefine - 02_reverse.py: FAIL
ERROR - InstanceID Mismatch
ERROR - Exception in VSSDCAssoc function: string indices must be integers
SettingsDefine - 03_sds_fwd_errs.py: PASS
SettingsDefine - 04_sds_rev_errs.py: PASS
SettingsDefineCapabilities - 01_forward.py: SKIP
SettingsDefineCapabilities - 03_forward_errs.py: PASS
SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS
SettingsDefineCapabilities - 05_reverse_vsmcap.py: SKIP
SystemDevice - 01_forward.py: PASS
SystemDevice - 02_reverse.py: PASS
SystemDevice - 03_fwderrs.py: PASS
VSSD - 01_enum.py: PASS
VSSD - 02_bootldr.py: SKIP
VSSD - 03_vssd_gi_errs.py: SKIP
VSSD - 04_vssd_to_rasd.py: FAIL
ERROR - InstanceID Mismatch
ERROR - Returned VSSDC_dom/0 instead of VSSDC_dom/proc
ERROR - Mistmatching KVM_ProcResourceAllocationSettingData values
VirtualSystemManagementCapabilities - 01_enum.py: PASS
VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS
VirtualSystemManagementService - 01_definesystem_name.py: FAIL
ERROR - Error invoke method `DefineSystem'. invalid extra attributes [u'EMBEDDEDOBJECT']
VirtualSystemManagementService - 02_destroysystem.py: FAIL
ERROR - Destroyed multiple domains
VirtualSystemManagementService - 03_definesystem_ess.py: PASS
VirtualSystemManagementService - 04_definesystem_ers.py: PASS
VirtualSystemManagementService - 05_destroysystem_neg.py: PASS
VirtualSystemManagementService - 06_addresource.py: FAIL
ERROR - Error invoking AddRS
ERROR - (1, u'CIM_ERR_FAILED: Failed to create domain')
InvokeMethod(AddResourceSettings): CIM_ERR_FAILED: Failed to create domain
VirtualSystemManagementService - 07_addresource_neg.py: PASS
VirtualSystemManagementService - 08_modifyresource.py: XFAIL Bug: 90853
ERROR - Error invoking ModifyRS
ERROR - (1, u'CIM_ERR_FAILED: Failed to create domain')
InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Failed to create domain
Bug:<90853>
VirtualSystemMigrationCapabilities - 01_enum.py: PASS
VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS
VirtualSystemMigrationService - 01_migratable_host.py: SKIP
VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP
VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP
VirtualSystemMigrationSettingData - 01_enum.py: PASS
VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS
VirtualSystemSettingDataComponent - 01_forward.py: SKIP
VirtualSystemSettingDataComponent - 02_reverse.py: SKIP
VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: FAIL
ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Invalid InstanceID
ERROR - ------ FAILED: KVM_DiskResourceAllocationSettingData INVALID_InstID_Keyval------
ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Invalid InstanceID
ERROR - ------ FAILED: KVM_MemResourceAllocationSettingData INVALID_InstID_Keyval------
ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Invalid InstanceID
ERROR - ------ FAILED: KVM_NetResourceAllocationSettingData INVALID_InstID_Keyval------
ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Invalid InstanceID
ERROR - ------ FAILED: KVM_ProcResourceAllocationSettingData INVALID_InstID_Keyval------
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, 7 months
[PATCH] [TEST] Add revision branch to RASD.01 & 02
by zli@linux.vnet.ibm.com
# HG changeset patch
# User Zhengang Li <lizg(a)cn.ibm.com>
# Date 1209373236 -28800
# Node ID 5ed6cd841f7b65eeea4af7af845c4ebfc2da4cf1
# Parent 22ed2c7c77e8ff3d96b40f1e0db2a931b5a7c37e
[TEST] Add revision branch to RASD.01 & 02
- Added prev & mrev for 'proc' vs. '0', 'KiloBytes' vs. 'MegaBytes' issue.
- Updated style format.
- Added commonly used class name in XenKvmLib.rasd
Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>
diff -r 22ed2c7c77e8 -r 5ed6cd841f7b suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Fri Apr 25 03:20:54 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Mon Apr 28 17:00:36 2008 +0800
@@ -47,18 +47,14 @@
import sys
-from XenKvmLib import enumclass
-from VirtLib import utils
from CimTest import Globals
from CimTest.Globals import do_main
from XenKvmLib.test_doms import destroy_and_undefine_all
-import XenKvmLib
from XenKvmLib import assoc
from XenKvmLib import vxml
-from XenKvmLib.vxml import XenXML, KVMXML, get_class
from XenKvmLib.classes import get_typed_class
-from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+from XenKvmLib import rasd
+from XenKvmLib.const import CIM_REV
from CimTest.Globals import logger
from CimTest.ReturnCodes import PASS, FAIL
@@ -68,42 +64,40 @@ test_vcpus = 1
test_vcpus = 1
test_mem = 128
test_mac = "00:11:22:33:44:aa"
+prev = 531
+mrev = 529
def init_list(xml, disk, virt="Xen"):
"""
Creating the lists that will be used for comparisons.
"""
procrasd = {
- "InstanceID" : '%s/%s' %(test_dom, "proc"),\
- "ResourceType" : 3,\
- "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
- }
-
+ "InstanceID" : '%s/%s' % (test_dom,
+ CIM_REV < prev and "0" or "proc"),
+ "ResourceType" : 3,
+ "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
netrasd = {
- "InstanceID" : '%s/%s' %(test_dom,test_mac), \
- "ResourceType" : 10 , \
- "ntype1": "bridge", \
- "ntype2": "ethernet", \
- "CreationClassName": get_typed_class(virt, 'NetResourceAllocationSettingData')
- }
-
+ "InstanceID" : '%s/%s' % (test_dom,test_mac),
+ "ResourceType" : 10 ,
+ "ntype1" : "bridge",
+ "ntype2" : "ethernet",
+ "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
address = xml.xml_get_disk_source()
diskrasd = {
- "InstanceID" : '%s/%s' %(test_dom, disk), \
- "ResourceType" : 17, \
- "Address" : address, \
- "CreationClassName": get_typed_class(virt, 'DiskResourceAllocationSettingData')
- }
+ "InstanceID" : '%s/%s' % (test_dom, disk),
+ "ResourceType" : 17,
+ "Address" : address,
+ "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
memrasd = {
- "InstanceID" : '%s/%s' %(test_dom, "mem"), \
- "ResourceType" : 4, \
- "AllocationUnits" : "KiloBytes",\
- "VirtualQuantity" : (test_mem * 1024), \
- "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
- }
+ "InstanceID" : '%s/%s' % (test_dom, "mem"),
+ "ResourceType" : 4,
+ "AllocationUnits" : CIM_REV < mrev and "MegaBytes" or "KiloBytes",
+ "VirtualQuantity" : (test_mem * 1024),
+ "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
+
return procrasd, netrasd, diskrasd, memrasd
-def assoc_values(ip, assoc_info, xml, disk, virt="Xen"):
+def assoc_values(assoc_info, xml, disk, virt="Xen"):
procrasd, netrasd, diskrasd, memrasd = init_list(xml, disk, virt)
proc_status = 1
net_status = 0
@@ -111,15 +105,15 @@ def assoc_values(ip, assoc_info, xml, di
mem_status = 1
status = 0
try:
- for i in range(len(assoc_info)):
- if assoc_info[i]['InstanceID'] == procrasd['InstanceID']:
- proc_status = verify_procrasd_values(assoc_info[i], procrasd)
- elif assoc_info[i]['InstanceID'] == netrasd['InstanceID']:
- net_status = verify_netrasd_values(assoc_info[i], netrasd)
- elif assoc_info[i]['InstanceID'] == diskrasd['InstanceID']:
- disk_status = verify_diskrasd_values(assoc_info[i], diskrasd)
- elif assoc_info[i]['InstanceID'] == memrasd['InstanceID']:
- mem_status = verify_memrasd_values(assoc_info[i], memrasd)
+ for res in assoc_info:
+ if res['InstanceID'] == procrasd['InstanceID']:
+ proc_status = rasd.verify_procrasd_values(res, procrasd)
+ elif res['InstanceID'] == netrasd['InstanceID']:
+ net_status = rasd.verify_netrasd_values(res, netrasd)
+ elif res['InstanceID'] == diskrasd['InstanceID']:
+ disk_status = rasd.verify_diskrasd_values(res, diskrasd)
+ elif res['InstanceID'] == memrasd['InstanceID']:
+ mem_status = rasd.verify_memrasd_values(res, memrasd)
else:
status = 1
if status != 0 or proc_status != 0 or net_status != 0 or \
@@ -135,8 +129,7 @@ def assoc_values(ip, assoc_info, xml, di
@do_main(sup_types)
def main():
options = main.options
- status = 0
- rc = 1
+ status = PASS
destroy_and_undefine_all(options.ip)
if options.virt == 'Xen':
test_disk = 'xvda'
@@ -144,31 +137,32 @@ def main():
test_disk = 'hda'
virt_xml = vxml.get_class(options.virt)
- cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+ cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus,
+ mac = test_mac, disk = test_disk)
ret = cxml.create(options.ip)
if not ret:
logger.error('Unable to create domain %s' % test_dom)
return FAIL
if status == 1:
destroy_and_undefine_all(options.ip)
- return 1
+ return FAIL
if options.virt == "XenFV":
instIdval = "Xen:%s" % test_dom
else:
instIdval = "%s:%s" % (options.virt, test_dom)
-
+
+ vssdc_cn = 'VirtualSystemSettingDataComponent'
+ vssd_cn = 'VirtualSystemSettingData'
try:
- assoc_info = assoc.Associators(options.ip, \
- 'VirtualSystemSettingDataComponent', \
- 'VirtualSystemSettingData', \
- options.virt, \
+ assoc_info = assoc.Associators(options.ip, vssdc_cn, vssd_cn,
+ options.virt,
InstanceID = instIdval)
- status = assoc_values(options.ip, assoc_info, cxml, test_disk, options.virt)
+ status = assoc_values(assoc_info, cxml, test_disk, options.virt)
except Exception, details:
- logger.error(Globals.CIM_ERROR_ASSOCIATORS, \
- get_typed_class(options.virt, 'VirtualSystemSettingDataComponent'))
+ logger.error(Globals.CIM_ERROR_ASSOCIATORS,
+ get_typed_class(options.virt, vssdc_cn))
logger.error("Exception : %s" % details)
- status = 1
+ status = FAIL
try:
cxml.destroy(options.ip)
diff -r 22ed2c7c77e8 -r 5ed6cd841f7b suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py Fri Apr 25 03:20:54 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py Mon Apr 28 17:00:36 2008 +0800
@@ -28,14 +28,13 @@
import sys
-import XenKvmLib
from XenKvmLib import enumclass
from CimTest.Globals import do_main, CIM_ERROR_ENUMERATE
from XenKvmLib.test_doms import destroy_and_undefine_all
from XenKvmLib.vxml import get_class
from XenKvmLib.classes import get_typed_class
-from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
-verify_diskrasd_values, verify_memrasd_values
+from XenKvmLib import rasd
+from XenKvmLib.const import CIM_REV
from CimTest.Globals import logger
from CimTest.ReturnCodes import PASS, FAIL
@@ -45,41 +44,39 @@ test_vcpus = 1
test_vcpus = 1
test_mem = 128
test_mac = "00:11:22:33:44:aa"
+prev = 531
+mrev = 529
-def init_list(virt="Xen"):
+def init_list(virt):
"""
Creating the lists that will be used for comparisons.
"""
- procrasd = {
- "InstanceID" : '%s/%s' %(test_dom, "proc"),\
- "ResourceType" : 3,\
- "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData')
- }
+ proc = {
+ "InstanceID" : '%s/%s' % (test_dom,
+ CIM_REV < prev and "0" or "proc"),
+ "ResourceType" : 3,
+ "CreationClassName" : get_typed_class(virt, rasd.pasd_cn)}
+ net = {
+ "InstanceID" : '%s/%s' % (test_dom,test_mac),
+ "ResourceType" : 10 ,
+ "ntype1" : "bridge",
+ "ntype2" : "ethernet",
+ "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)}
+ address = vsxml.xml_get_disk_source()
+ disk = {
+ "InstanceID" : '%s/%s' % (test_dom, test_disk),
+ "ResourceType" : 17,
+ "Address" : address,
+ "CreationClassName" : get_typed_class(virt, rasd.dasd_cn)}
+ mem = {
+ "InstanceID" : '%s/%s' % (test_dom, "mem"),
+ "ResourceType" : 4,
+ "AllocationUnits" : CIM_REV < mrev and "MegaBytes" or "KiloBytes",
+ "VirtualQuantity" : (test_mem * 1024),
+ "CreationClassName" : get_typed_class(virt, rasd.masd_cn)}
+ return proc, net, disk, mem
- netrasd = {
- "InstanceID" : '%s/%s' %(test_dom,test_mac), \
- "ResourceType" : 10 , \
- "ntype1": "bridge", \
- "ntype2": "ethernet", \
- "CreationClassName": get_typed_class(virt, 'NetResourceAllocationSettingData')
- }
- address = vsxml.xml_get_disk_source()
- diskrasd = {
- "InstanceID" : '%s/%s' %(test_dom, test_disk), \
- "ResourceType" : 17, \
- "Address" : address, \
- "CreationClassName": get_typed_class(virt, 'DiskResourceAllocationSettingData')
- }
- memrasd = {
- "InstanceID" : '%s/%s' %(test_dom, "mem"), \
- "ResourceType" : 4, \
- "AllocationUnits" : "KiloBytes",\
- "VirtualQuantity" : (test_mem * 1024), \
- "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData')
- }
- return procrasd, netrasd, diskrasd, memrasd
-
-def get_inst_from_list(classname, rasd_list, filter_name, exp_val):
+def get_inst_from_list(server, classname, rasd_list, filter_name, exp_val):
status = PASS
ret = FAIL
inst = []
@@ -94,14 +91,14 @@ def get_inst_from_list(classname, rasd_l
status = FAIL
return status, inst
-def get_rasd_values(classname):
+def get_rasd_values(classname, virt, server):
status = PASS
rasd_list = []
try:
- rasd_list = enumclass.enumerate_inst(server, eval('enumclass.' + classname), virt)
+ rasd_list = enumclass.enumerate_inst(server, classname, virt)
if len(rasd_list) < 1:
- logger.error("%s returned %i instances, excepted atleast 1 instance", classname, \
- len(rasd_list))
+ logger.error("%s returned %i instances, excepted at least 1.",
+ classname, len(rasd_list))
return FAIL, rasd_list
except Exception, detail:
logger.error(CIM_ERROR_ENUMERATE, classname)
@@ -111,7 +108,8 @@ def get_rasd_values(classname):
# Get the RASD info related to the domain "ONLY".
# We should get atleast one record.
filter_name = {"key" : "InstanceID"}
- status, rasd_values = get_inst_from_list(classname, rasd_list, filter_name, test_dom)
+ status, rasd_values = get_inst_from_list(server, classname, rasd_list,
+ filter_name, test_dom)
if status != PASS or len(rasd_values) == 0:
return status, rasd_values
@@ -122,14 +120,14 @@ def verify_rasd_values(rasd_values_info)
try:
for rasd_instance in rasd_values_info:
CCName = rasd_instance.classname
- if 'ProcResourceAllocationSettingData' in CCName :
- status = verify_procrasd_values(rasd_instance, procrasd,)
- elif 'NetResourceAllocationSettingData' in CCName :
- status = verify_netrasd_values(rasd_instance, netrasd)
- elif 'DiskResourceAllocationSettingData' in CCName:
- status = verify_diskrasd_values(rasd_instance, diskrasd)
- elif 'MemResourceAllocationSettingData' in CCName :
- status = verify_memrasd_values(rasd_instance, memrasd)
+ if rasd.pasd_cn in CCName :
+ status = rasd.verify_procrasd_values(rasd_instance, procrasd,)
+ elif rasd.nasd_cn in CCName :
+ status = rasd.verify_netrasd_values(rasd_instance, netrasd)
+ elif rasd.dasd_cn in CCName:
+ status = rasd.verify_diskrasd_values(rasd_instance, diskrasd)
+ elif rasd.masd_cn in CCName :
+ status = rasd.verify_memrasd_values(rasd_instance, memrasd)
else:
status = FAIL
if status != PASS:
@@ -142,32 +140,31 @@ def verify_rasd_values(rasd_values_info)
@do_main(sup_types)
def main():
- options = main.options
- destroy_and_undefine_all(options.ip)
+ virt = main.options.virt
+ server = main.options.ip
+ destroy_and_undefine_all(server)
global test_disk, vsxml
- global virt, server
global procrasd, netrasd, diskrasd, memrasd
- server = options.ip
- virt = options.virt
if virt == "Xen":
test_disk = "xvda"
else:
test_disk = "hda"
- vsxml = get_class(virt)(test_dom, mem=test_mem, vcpus = test_vcpus, mac = test_mac,
- disk = test_disk)
+ virtxml = get_class(virt)
+ vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus,
+ mac = test_mac, disk = test_disk)
try:
- bridge = vsxml.set_vbridge(server)
- ret = vsxml.define(options.ip)
+ vsxml.set_vbridge(server)
+ ret = vsxml.define(server)
if not ret:
logger.error("Failed to Define the domain: %s", test_dom)
return FAIL
except Exception, details:
logger.error("Exception : %s", details)
return FAIL
- class_list = [ get_typed_class(virt, "DiskResourceAllocationSettingData"),
- get_typed_class(virt, "MemResourceAllocationSettingData"),
- get_typed_class(virt, "ProcResourceAllocationSettingData"),
- get_typed_class(virt, "NetResourceAllocationSettingData")
+ class_list = [ get_typed_class(virt, rasd.dasd_cn),
+ get_typed_class(virt, rasd.masd_cn),
+ get_typed_class(virt, rasd.pasd_cn),
+ get_typed_class(virt, rasd.nasd_cn)
]
status = PASS
procrasd, netrasd, diskrasd, memrasd = init_list(virt)
@@ -175,11 +172,12 @@ def main():
# For each loop
# 1) Enumerate one RASD type
# 2) Get the RASD info related to the domain "ONLY".
- # 3) Verifies the RASD values with those supplied during defining the domain.
+ # 3) Verifies the RASD values with those supplied during
+ # defining the domain.
for classname in sorted(class_list):
# Enumerate each RASD types
- status, rasd_values = get_rasd_values(classname)
+ status, rasd_values = get_rasd_values(classname, virt, server)
if status != PASS or len(rasd_values) ==0 :
break
diff -r 22ed2c7c77e8 -r 5ed6cd841f7b suites/libvirt-cim/lib/XenKvmLib/rasd.py
--- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py Fri Apr 25 03:20:54 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py Mon Apr 28 17:00:36 2008 +0800
@@ -24,6 +24,11 @@ from CimTest import Globals
from CimTest import Globals
from CimTest.Globals import log_param, logger
from CimTest.ReturnCodes import FAIL, PASS
+
+pasd_cn = 'ProcResourceAllocationSettingData'
+nasd_cn = 'NetResourceAllocationSettingData'
+dasd_cn = 'DiskResourceAllocationSettingData'
+masd_cn = 'MemResourceAllocationSettingData'
def CCN_err(assoc_info, list):
Globals.logger.error("%s Mismatch", 'CreationClassName')
16 years, 7 months
[PATCH] [TEST] add branch of err exp in RAFP.03
by Guo Lian Yun
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1209361718 25200
# Node ID 6ffd17b2289f8ab1a043f452bce3ba79a24938e1
# Parent 22ed2c7c77e8ff3d96b40f1e0db2a931b5a7c37e
[TEST] add branch of err exp in RAFP.03
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 22ed2c7c77e8 -r 6ffd17b2289f suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Fri Apr 25 03:20:54 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Sun Apr 27 22:48:38 2008 -0700
@@ -28,12 +28,11 @@ from CimTest import Globals
from CimTest import Globals
from CimTest.Globals import logger, do_main
from CimTest.ReturnCodes import PASS, FAIL, XFAIL
+from XenKvmLib.const import CIM_REV
sup_types = ['Xen', 'XenFV', 'KVM']
-exp_rc = 6 #CIM_ERR_NOT_FOUND
-exp_desc = "No such instance (wrong) - resource pool type mismatch"
-
+rev = 2
@do_main(sup_types)
def main():
@@ -47,6 +46,13 @@ def main():
conn = assoc.myWBEMConnection('http://%s' % options.ip,
(Globals.CIM_USER, Globals.CIM_PASS),
Globals.CIM_NS)
+
+ exp_rc = 6 #CIM_ERR_NOT_FOUND
+ exp_desc = "No such instance (wrong) - resource pool type mismatch"
+ if CIM_REV < rev:
+ exp_rc = 1 # CIM_ERR_FAILED
+ exp_desc = "Invalid InstanceID or unsupported pool type"
+
for k, v in poollist.items():
instanceref = CIMInstanceName(k,
keybindings = {"InstanceID" : v})
16 years, 7 months
[PATCH] [TEST] add brach of err expr in VSSDC.03
by Guo Lian Yun
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1209357260 25200
# Node ID c42e96b5347e24dbcfa1326f8f7101ebe361caa2
# Parent 22ed2c7c77e8ff3d96b40f1e0db2a931b5a7c37e
[TEST] add brach of err expr in VSSDC.03
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 22ed2c7c77e8 -r c42e96b5347e suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py Fri Apr 25 03:20:54 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py Sun Apr 27 21:34:20 2008 -0700
@@ -62,12 +62,14 @@ from CimTest.ReturnCodes import PASS, FA
from CimTest.ReturnCodes import PASS, FAIL
from CimTest.Globals import do_main, logger
from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
+from XenKvmLib.const import CIM_REV
sup_types = ['Xen', 'XenFV', 'KVM']
test_dom = "domu1"
test_mac = "00:11:22:33:44:aa"
test_vcpus = 1
+rev = 2
expr_values = {
"INVALID_InstID_Keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, \
@@ -75,6 +77,10 @@ expr_values = {
"INVALID_InstID_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \
'desc' : 'No such instance (INVALID_InstID_Keyval)'}
}
+
+if CIM_REV < 2:
+ expr_values['INVALID_InstID_Keyval'] = {'rc' : pywbem.CIM_ERR_FAILED, \
+ 'desc' : 'Invalid InstanceID'}
def try_invalid_assoc(classname, name_val, i, field, virt="Xen"):
ac_classname = get_typed_class(virt, "VirtualSystemSettingDataComponent")
16 years, 7 months