8:16 a.m.
New subject: [PATCH 1 of 3] [TEST] update EC.01 for XenFV and KVM support
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1206688341 25200
# Node ID 5eae4d73506a53965f3fcf1bb132d04bd9266c4a
# Parent c9bb4d898469450c851139d5faa58a5818835e08
[TEST] update EC.01 for XenFV and KVM support
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r c9bb4d898469 -r 5eae4d73506a
suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Thu Mar 27 11:07:12
2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Fri Mar 28 00:12:21
2008 -0700
@@ -25,11 +25,12 @@ from VirtLib import live
from VirtLib import live
from XenKvmLib import assoc
from XenKvmLib import hostsystem
+from XenKvmLib.classes import get_typed_class
from CimTest import Globals
from CimTest.Globals import do_main
from CimTest.ReturnCodes import PASS, FAIL, SKIP
-sup_types = ['Xen']
+sup_types = ['Xen', 'XenFV', 'KVM']
@do_main(sup_types)
def main():
@@ -37,15 +38,16 @@ def main():
Globals.log_param()
try:
- host_sys = hostsystem.enumerate(options.ip)[0]
+ host_sys = hostsystem.enumerate(options.ip, options.virt)[0]
except Exception:
- Globals.logger.error(Globals.CIM_ERROR_ENUMERATE, 'Xen_HostSystem')
+ Globals.logger.error(Globals.CIM_ERROR_ENUMERATE, get_typed_class(options.virt,
'HostSystem'))
return FAIL
try:
elc = assoc.AssociatorNames(options.ip,
- "Xen_ElementCapabilities",
- "Xen_HostSystem",
+ "ElementCapabilities",
+ "HostSystem",
+ options.virt,
Name = host_sys.Name,
CreationClassName = host_sys.CreationClassName)
except Exception:
@@ -53,8 +55,8 @@ def main():
return FAIL
- valid_elc_name = ["Xen_VirtualSystemManagementCapabilities",
- "Xen_VirtualSystemMigrationCapabilities"]
+ valid_elc_name = [get_typed_class(options.virt,
"VirtualSystemManagementCapabilities"),
+ get_typed_class(options.virt,
"VirtualSystemMigrationCapabilities")]
valid_elc_id = ["ManagementCapabilities",
"MigrationCapabilities"]
@@ -74,15 +76,16 @@ def main():
for system in cs:
try:
elec = assoc.AssociatorNames(options.ip,
- "Xen_ElementCapabilities",
- "Xen_ComputerSystem",
+ "ElementCapabilities",
+ "ComputerSystem",
+ options.virt,
Name = system,
- CreationClassName =
"Xen_ComputerSystem")
+ CreationClassName =
get_typed_class(options.virt, "ComputerSystem"))
except Exception:
Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % system)
return FAIL
- if elec[0].classname != "Xen_EnabledLogicalElementCapabilities":
+ if elec[0].classname != get_typed_class(options.virt,
"EnabledLogicalElementCapabilities"):
Globals.logger.error("ElementCapabilities association classname error")
return FAIL
elif elec[0].keybindings['InstanceID'] != system:
8:16 a.m.
New subject: [PATCH 2 of 3] [TEST] update EC.03 for XenFV and KVM support
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1206688450 25200
# Node ID b8c7f56633f9f273e615f58f7c82b6524dea82d5
# Parent 5eae4d73506a53965f3fcf1bb132d04bd9266c4a
[TEST] update EC.03 for XenFV and KVM support
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 5eae4d73506a -r b8c7f56633f9
suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Fri Mar 28
00:12:21 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Fri Mar 28
00:14:10 2008 -0700
@@ -25,11 +25,12 @@ from pywbem.cim_obj import CIMInstanceNa
from pywbem.cim_obj import CIMInstanceName
from XenKvmLib import assoc
from XenKvmLib import hostsystem
+from XenKvmLib.classes import get_typed_class
from CimTest import Globals
from CimTest.Globals import log_param, logger, do_main
from CimTest.ReturnCodes import PASS, FAIL
-sup_types = ['Xen']
+sup_types = ['Xen', 'XenFV', 'KVM']
exp_rc = 6 #CIM_ERR_NOT_FOUND
exp_desc = "No such instance"
@@ -44,7 +45,7 @@ def try_assoc(ref, ref_class, exp_rc, ex
names = []
try:
- names = conn.AssociatorNames(ref, AssocClass =
"Xen_ElementCapabilities")
+ names = conn.AssociatorNames(ref, AssocClass = get_typed_class(options.virt,
"ElementCapabilities"))
rc = 0
except pywbem.CIMError, (rc, desc):
if rc == exp_rc and desc.find(exp_desc) >= 0:
@@ -57,7 +58,8 @@ def try_assoc(ref, ref_class, exp_rc, ex
logger.error(details)
finally:
if rc == 0:
- logger.error("Xen_ElementCapabilities associator should NOT return
excepted result with a wrong key name and value of %s input" % ref_class)
+ logger.error("%s_ElementCapabilities associator should NOT return
excepted result \
+ with a wrong key name and value of %s input" %
(options.virt, ref_class))
status = FAIL
return status
@@ -67,18 +69,20 @@ def main():
def main():
options = main.options
rc = PASS
+ log_param()
- instanceref = CIMInstanceName("Xen_HostSystem",
+ instanceref = CIMInstanceName(get_typed_class(options.virt, "HostSystem"),
keybindings = {"Name" : "wrong",
"CreationClassName" : "wrong"})
- rc = try_assoc(instanceref, "Xen_HostSystem", exp_rc, exp_desc, options)
+ rc = try_assoc(instanceref, get_typed_class(options.virt, "HostSystem"),
exp_rc, exp_desc, options)
if rc != PASS:
status = FAIL
return status
- instance_cs = CIMInstanceName("Xen_ComputerSystem",
- keybindings = {"Name" : "wrong",
"CreationClassName" : "Xen_ComputerSystem"})
- rc = try_assoc(instance_cs, "Xen_ComputerSystem", exp_rc, exp_desc,
options)
+ instance_cs = CIMInstanceName(get_typed_class(options.virt,
"ComputerSystem"),
+ keybindings = {"Name" : "wrong",
+ "CreationClassName" :
get_typed_class(options.virt,"ComputerSystem")})
+ rc = try_assoc(instance_cs, get_typed_class(options.virt,
"ComputerSystem"), exp_rc, exp_desc, options)
if rc != PASS:
status = FAIL
return status
11:06 a.m.
New subject: [PATCH 2 of 3] [TEST] update EC.03 for XenFV and KVM support
Guo Lian Yun wrote:
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1206688450 25200
# Node ID b8c7f56633f9f273e615f58f7c82b6524dea82d5
# Parent 5eae4d73506a53965f3fcf1bb132d04bd9266c4a
[TEST] update EC.03 for XenFV and KVM support
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 5eae4d73506a -r b8c7f56633f9
suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Fri Mar 28
00:12:21 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Fri Mar 28
00:14:10 2008 -0700
@@ -25,11 +25,12 @@ from pywbem.cim_obj import CIMInstanceNa
from pywbem.cim_obj import CIMInstanceName
from XenKvmLib import assoc
from XenKvmLib import hostsystem
+from XenKvmLib.classes import get_typed_class
from CimTest import Globals
from CimTest.Globals import log_param, logger, do_main
from CimTest.ReturnCodes import PASS, FAIL
-sup_types = ['Xen']
+sup_types = ['Xen', 'XenFV', 'KVM']
exp_rc = 6 #CIM_ERR_NOT_FOUND
exp_desc = "No such instance"
@@ -44,7 +45,7 @@ def try_assoc(ref, ref_class, exp_rc, ex
names = []
try:
- names = conn.AssociatorNames(ref, AssocClass =
"Xen_ElementCapabilities")
+ names = conn.AssociatorNames(ref, AssocClass = get_typed_class(options.virt,
"ElementCapabilities"))
rc = 0
except pywbem.CIMError, (rc, desc):
if rc == exp_rc and desc.find(exp_desc) >= 0:
@@ -57,7 +58,8 @@ def try_assoc(ref, ref_class, exp_rc, ex
logger.error(details)
finally:
if rc == 0:
- logger.error("Xen_ElementCapabilities associator should NOT return
excepted result with a wrong key name and value of %s input" % ref_class)
+ logger.error("%s_ElementCapabilities associator should NOT return
excepted result \
+ with a wrong key name and value of %s input" %
(options.virt, ref_class))
I prefer the error log use the base classname. So
possibly we don't
necessarily need to pass the options.virt here.
status = FAIL
return status
--
- Zhengang
8:16 a.m.
New subject: [PATCH 3 of 3] [TEST] update EC.04 for XenFV and KVM support
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1206688562 25200
# Node ID 2d0b34afb5b4b886f1690d17d7d2f2adb4b054b1
# Parent b8c7f56633f9f273e615f58f7c82b6524dea82d5
[TEST] update EC.04 for XenFV and KVM support
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r b8c7f56633f9 -r 2d0b34afb5b4
suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Fri Mar 28
00:14:10 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Fri Mar 28
00:16:02 2008 -0700
@@ -24,11 +24,12 @@ import pywbem
import pywbem
from pywbem.cim_obj import CIMInstanceName
from XenKvmLib import assoc
+from XenKvmLib.classes import get_typed_class
from CimTest import Globals
from CimTest.Globals import log_param, logger, do_main
from CimTest.ReturnCodes import PASS, FAIL, SKIP
-sup_types = ['Xen']
+sup_types = ['Xen', 'XenFV', 'KVM']
exp_rc = 6 #CIM_ERR_NOT_FOUND
exp_desc = "No such instance"
@@ -37,13 +38,12 @@ def try_assoc(ref, ref_class, exp_rc, ex
conn = assoc.myWBEMConnection('http://%s' % options.ip,
(Globals.CIM_USER, Globals.CIM_PASS),
Globals.CIM_NS)
- log_param()
status = FAIL
rc = -1
names = []
try:
- names = conn.AssociatorNames(ref, AssocClass =
"Xen_ElementCapabilities")
+ names = conn.AssociatorNames(ref, AssocClass = get_typed_class(options.virt,
"ElementCapabilities"))
rc = 0
except pywbem.CIMError, (rc, desc):
if rc == exp_rc and desc.find(exp_desc) >= 0:
@@ -56,16 +56,19 @@ def try_assoc(ref, ref_class, exp_rc, ex
logger.error(details)
finally:
if rc == 0:
- logger.error("Xen_ElementCapabilities associator should NOT return
excepted result with a wrong key name and value of %s input" % ref_class)
+ logger.error("%s_ElementCapabilities associator should NOT return
excepted \
+ result with a wrong key name and value of %s input" %
(options.virt, ref_class))
status = FAIL
return status
@do_main(sup_types)
def main():
+ options = main.options
rc = PASS
- cap_list = {"Xen_VirtualSystemManagementCapabilities" :
"ManagementCapabilities",
- "Xen_VirtualSystemMigrationCapabilities" :
"MigrationCapabilities"}
+ log_param()
+ cap_list = {get_typed_class(options.virt,
"VirtualSystemManagementCapabilities") : "ManagementCapabilities",
+ get_typed_class(options.virt,
"VirtualSystemMigrationCapabilities") : "MigrationCapabilities"}
for k, v in cap_list.items():
instanceref = CIMInstanceName(k,
@@ -75,9 +78,9 @@ def main():
status = FAIL
return status
- elecref = CIMInstanceName("Xen_EnabledLogicalElementCapabilities",
+ elecref = CIMInstanceName(get_typed_class(options.virt,
"EnabledLogicalElementCapabilities"),
keybindings = {"InstanceID" :
"wrong"})
- rc = try_assoc(elecref, "Xen_EnabledLogicalElementCapabilities",
+ rc = try_assoc(elecref, get_typed_class(options.virt,
"EnabledLogicalElementCapabilities"),
exp_rc, exp_desc, options)
if rc != PASS:
status = FAIL
6018
days inactive
6018
days old
4 comments
2 participants
participants (2)
-
Guo Lian Yun -
Zhengang Li