2 a.m.
New subject: [PATCH 1 of 2] [TEST] Add KVM support for ElementSettingData.01
# HG changeset patch
# User Zhengang Li <lizg(a)cn.ibm.com>
# Date 1208241728 -28800
# Node ID 823907d0d5b3c03ff675f9fe116307b5570622b6
# Parent a22ea10d1e46adfcd2e878328c1746b5c618230b
[TEST] Add KVM support for ElementSettingData.01
Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>
diff -r a22ea10d1e46 -r 823907d0d5b3
suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Tue Apr 15 10:25:08 2008
+0800
+++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Tue Apr 15 14:42:08 2008
+0800
@@ -51,34 +51,33 @@ from VirtLib import utils
from VirtLib import utils
from XenKvmLib import enumclass
from XenKvmLib import assoc
+from XenKvmLib.classes import get_class_basename
from CimTest import Globals
from CimTest.Globals import do_main
-sup_types = ['Xen']
+sup_types = ['Xen', 'KVM']
+esd_cn = 'ElementSettingData'
+vssd_cn = 'VirtualSystemSettingData'
+vssdc_cn = 'VirtualSystemSettingDataComponent'
+rasd_cn = 'ResourceAllocationSettingData'
-def test_assoc(host, class_name, id):
+def test_assoc(host, class_name, id, virt):
try:
- ret_inst = assoc.AssociatorNames(host,
- "Xen_ElementSettingData",
- class_name,
+ ret_inst = assoc.AssociatorNames(host,esd_cn, class_name, virt,
InstanceID = id)
except Exception:
- Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS,
- 'Xen_ElementSettingData')
+ Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS, esd_cn)
return 1
if len(ret_inst) != 1:
- Globals.logger.error("Xen_ElementSettingData returned %i %s
instances",
- len(ret_inst),
- class_name)
+ Globals.logger.error("%s returned %i %s instances", esd_cn,
+ len(ret_inst), class_name)
return 1
ret_id = ret_inst[0].keybindings["InstanceID"]
if ret_id != id:
Globals.logger.error("%s returned %s instance with wrong id %s",
- "Xen_ElementSettingData",
- class_name,
- ret_id)
+ esd_cn, class_name, ret_id)
return 1
return 0;
@@ -90,9 +89,8 @@ def main():
try:
key_list = ["InstanceID"]
- vssd_lst = enumclass.enumerate(options.ip,
- enumclass.Xen_VirtualSystemSettingData,
- key_list)
+ vssd_lst = enumclass.enumerate(options.ip, vssd_cn, key_list,
+ options.virt)
except Exception, details:
Globals.logger.error("Exception %s", details)
@@ -100,40 +98,31 @@ def main():
for vssd in vssd_lst:
- rc = test_assoc(options.ip,
- "Xen_VirtualSystemSettingData",
- vssd.InstanceID)
+ rc = test_assoc(options.ip, vssd_cn, vssd.InstanceID, options.virt)
if rc != 0:
Globals.logger.error("Unable to get associated %s from %s",
- "Xen_VirtualSystemSettingData",
- "Xen_ElementSettingData")
+ vssd_cn, esd_cn)
return 1
try:
- rasd_list = assoc.Associators(options.ip,
-
"Xen_VirtualSystemSettingDataComponent",
- "Xen_VirtualSystemSettingData",
- InstanceID = vssd.InstanceID)
+ rasd_list = assoc.Associators(options.ip, vssdc_cn, vssd_cn,
+ options.virt,
+ InstanceID = vssd.InstanceID)
except Exception:
- Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS,
- 'Xen_VirtualSystemSettingDataComponent')
+ Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS, vssdc_cn)
return 1
if len(rasd_list) == 0:
- Globals.logger.error("%s returned %i %s instances",
- "Xen_ElementSettingData",
- len(rasd_list),
- "Xen_VirtualSystemSettingData")
+ Globals.logger.error("%s returned %i %s instances", esd_cn,
+ len(rasd_list), vssd_cn)
return 1
for rasd in rasd_list:
- rc = test_assoc(options.ip,
- rasd.classname,
- rasd["InstanceID"])
+ rc = test_assoc(options.ip, get_class_basename(rasd.classname),
+ rasd["InstanceID"], options.virt)
if rc != 0:
Globals.logger.error("Unable to get associated %s from %s",
- "Xen_ResourceAllocationSettingData",
- "Xen_ElementSettingData")
+ rasd_cn, esd_cn)
return 1
return 0
2 a.m.
New subject: [PATCH 2 of 2] [TEST] Add KVM support to ElementSettingData.03
# HG changeset patch
# User Zhengang Li <lizg(a)cn.ibm.com>
# Date 1208242801 -28800
# Node ID f972b4f3276f784136bfccef22d50ac8e43972ed
# Parent 823907d0d5b3c03ff675f9fe116307b5570622b6
[TEST] Add KVM support to ElementSettingData.03
Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>
diff -r 823907d0d5b3 -r f972b4f3276f
suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py
--- a/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py Tue Apr
15 14:42:08 2008 +0800
+++ b/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py Tue Apr
15 15:00:01 2008 +0800
@@ -50,20 +50,24 @@
import sys
import pywbem
-from XenKvmLib.test_xml import testxml
from VirtLib import utils
+from XenKvmLib import vxml
from XenKvmLib import assoc
-from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all
from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, CIM_NS, \
CIM_ERROR_ASSOCIATORS
from CimTest.Globals import do_main
from XenKvmLib.common_util import try_assoc
+from XenKvmLib.classes import get_typed_class
from CimTest.ReturnCodes import PASS, FAIL
-sup_types = ['Xen']
+sup_types = ['Xen', 'KVM']
test_dom = "hd_domain1"
test_mac = "00:11:22:33:44:55"
+
+vssdc_cn = "VirtualSystemSettingDataComponent"
+vssd_cn = "VirtualSystemSettingData"
+esd_cn = "ElementSettingData"
expr_values = {
"invalid_instid_keyvalue" : { 'rc' :
pywbem.CIM_ERR_NOT_FOUND, \
@@ -78,30 +82,30 @@ def main():
log_param()
status = PASS
- destroy_and_undefine_all(options.ip)
- test_xml = testxml(test_dom, mac = test_mac)
- ret = test_domain_function(test_xml, options.ip, cmd = "create")
+ virtxml = vxml.get_class(options.virt)
+ cxml = virtxml(test_dom, mac = test_mac)
+ ret = cxml.create(options.ip)
if not ret:
logger.error("Failed to Create the dom: %s" % test_dom)
status = FAIL
return status
try:
- instid = 'Xen:%s' %test_dom
- rasd_list = assoc.Associators(options.ip,
- "Xen_VirtualSystemSettingDataComponent",
- "Xen_VirtualSystemSettingData",
- InstanceID = instid)
+ instid = '%s:%s' % (options.virt, test_dom)
+ rasd_list = assoc.Associators(options.ip, vssdc_cn, vssd_cn,
+ options.virt, InstanceID=instid)
except Exception:
- logger.error(CIM_ERROR_ASSOCIATORS,
'Xen_VirtualSystemSettingDataComponent')
- test_domain_function(test_dom, options.ip, cmd = "destroy")
+ logger.error(CIM_ERROR_ASSOCIATORS, vssdc_cn)
+ cxml.destroy(options.ip)
+ cxml.undefine(options.ip)
return FAIL
if len(rasd_list) < 1:
- logger.error("eturned %i objects, expected at least 1",
len(rasd_list))
- test_domain_function(test_dom, options.ip, cmd = "destroy")
+ logger.error("returned %i objects, expected at least 1",
len(rasd_list))
+ cxml.destroy(options.ip)
+ cxml.undefine(options.ip)
return FAIL
conn = assoc.myWBEMConnection('http://%s' % options.ip,
(CIM_USER, CIM_PASS), CIM_NS)
- assoc_classname = 'Xen_ElementSettingData'
+ assoc_classname = get_typed_class(options.virt, esd_cn)
for rasd in rasd_list:
classname = rasd.classname
field = 'INVALID_InstID_KeyName'
@@ -124,7 +128,8 @@ def main():
status = ret_value
if status != PASS:
break
- test_domain_function(test_dom, options.ip, cmd = "destroy")
+ cxml.destroy(options.ip)
+ cxml.undefine(options.ip)
return status
if __name__ == "__main__":
sys.exit(main())
6095
days inactive
6095
days old
2 comments
1 participants
participants (1)
-
zli＠linux.vnet.ibm.com