# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1211895201 -28800 # Node ID 0d0b144585dd37e68e1e4d6086954743e897f014 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] Update HostedService.01~04 for LXC support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/cimtest/HostedService/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedService/01_forward.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/01_forward.py Tue May 27 21:33:21 2008 +0800 @@ -31,7 +31,7 @@ from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @do_main(sup_types) def main(): diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/cimtest/HostedService/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Tue May 27 21:33:21 2008 +0800 @@ -31,7 +31,7 @@ from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @do_main(sup_types) def main(): diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Tue May 27 21:33:21 2008 +0800 @@ -30,7 +30,7 @@ from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] exp_rc = 6 #CIM_ERR_NOT_FOUND exp_desc = "No such instance" diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Tue May 27 21:33:21 2008 +0800 @@ -30,7 +30,7 @@ from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] exp_rc = 6 #CIM_ERR_NOT_FOUND exp_desc = "No such instance" diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/lib/XenKvmLib/hostsystem.py --- a/suites/libvirt-cim/lib/XenKvmLib/hostsystem.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/hostsystem.py Tue May 27 21:33:21 2008 +0800 @@ -50,6 +50,9 @@ class KVM_HostSystem(CIM_System): pass +class LXC_HostSystem(CIM_System): + pass + def enumerate(server, virt='Xen'): conn = pywbem.WBEMConnection('http://%s' % server, diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/lib/XenKvmLib/rpcs.py --- a/suites/libvirt-cim/lib/XenKvmLib/rpcs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/rpcs.py Tue May 27 21:33:21 2008 +0800 @@ -50,6 +50,8 @@ class KVM_ResourcePoolConfigurationService(CIM_ResourcePoolConfigurationService): pass +class LXC_ResourcePoolConfigurationService(CIM_ResourcePoolConfigurationService): + pass def enumerate(server, classname): conn = pywbem.WBEMConnection('http://%s' % server, diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Tue May 27 21:33:21 2008 +0800 @@ -64,6 +64,9 @@ pass class KVM_VirtualSystemManagementService(CIM_VirtualSystemManagementService): + pass + +class LXC_VirtualSystemManagementService(CIM_VirtualSystemManagementService): pass @eval_cls('VirtualSystemManagementService')