# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1212142223 -28800 # Node ID 5bcfdd805bba1b6ce1e2f8c2d01cb5e3523b4ca3 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Update VirtualSystemSnapshotServiceCapabilities.01&02 for LXC support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 3ac66cf562f0 -r 5bcfdd805bba suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py Fri May 30 18:10:23 2008 +0800 @@ -25,14 +25,16 @@ from XenKvmLib import enumclass from CimTest.Globals import CIM_ERROR_ENUMERATE, logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class + +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] def print_error(fieldname, ret_value, exp_value): logger.error("%s Mismatch", fieldname) logger.error("Returned %s instead of %s", ret_value, exp_value) -@do_main(platform_sup) +@do_main(sup_types) def main(): options = main.options # Expected results from enumeration diff -r 3ac66cf562f0 -r 5bcfdd805bba suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py Fri May 30 18:10:23 2008 +0800 @@ -49,10 +49,10 @@ from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.ReturnCodes import PASS from XenKvmLib.common_util import try_getinstance -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class - +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] expr_values = { "invalid_instid" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ 'desc' : 'No such instance (InstanceID)' } @@ -62,7 +62,7 @@ return try_getinstance(conn, classname, keys, field_name=field, \ expr_values=expr_values['invalid_instid'], bug_no="") -@do_main(platform_sup) +@do_main(sup_types) def main(): global options options = main.options diff -r 3ac66cf562f0 -r 5bcfdd805bba suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 18:10:23 2008 +0800 @@ -209,6 +209,9 @@ class KVM_VirtualSystemSnapshotServiceCapabilities(CIM_VirtualSystemSnapshotServiceCapabilities): pass +class LXC_VirtualSystemSnapshotServiceCapabilities(CIM_VirtualSystemSnapshotServiceCapabilities): + pass + class Xen_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData): pass