# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1212141720 -28800
# Node ID 7614eb8b8023999620e91d0ec74917ba24aa98a0
# Parent 3ac66cf562f082546883c1de0d748471b557cd39
[TEST] Update VirtualSystemSnapshotService.01&02 for LXC support
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 3ac66cf562f0 -r 7614eb8b8023
suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Fri May 30
00:24:45 2008 +0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Fri May 30
18:02:00 2008 +0800
@@ -25,7 +25,7 @@
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
from XenKvmLib.common_util import get_host_info
@@ -33,7 +33,8 @@
logger.error("%s Mismatch", fieldname)
logger.error("Returned %s instead of %s", ret_value, exp_value)
-@do_main(platform_sup)
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
+@do_main(sup_types)
def main():
options = main.options
# Expected results from enumeration
diff -r 3ac66cf562f0 -r 7614eb8b8023
suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py
---
a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Fri
May 30 00:24:45 2008 +0800
+++
b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Fri
May 30 18:02:00 2008 +0800
@@ -31,10 +31,11 @@
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
from XenKvmLib.common_util import get_host_info
+sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
expr_values = {
"INVALID_CCName" : { 'rc' :
pywbem.CIM_ERR_NOT_FOUND, \
'desc' : 'No such instance
(CreationClassName)' }, \
@@ -219,7 +220,7 @@
return status
return PASS
-@do_main(platform_sup)
+@do_main(sup_types)
def main():
global options
options = main.options
diff -r 3ac66cf562f0 -r 7614eb8b8023 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:02:00 2008 +0800
@@ -203,6 +203,9 @@
class KVM_VirtualSystemSnapshotService(CIM_VirtualSystemSnapshotService):
pass
+class LXC_VirtualSystemSnapshotService(CIM_VirtualSystemSnapshotService):
+ pass
+
class
Xen_VirtualSystemSnapshotServiceCapabilities(CIM_VirtualSystemSnapshotServiceCapabilities):
pass