# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1211376761 -28800 # Node ID 02203222a4281881f470fd98049cbaaefc41f97b # Parent b2b2bb6cc8d87ba0eeddcf3d361d3085104d3492 [TEST] change helpers function for LXC support diff -r b2b2bb6cc8d8 -r 02203222a428 lib/CimTest/Globals.py --- a/lib/CimTest/Globals.py Mon May 19 10:43:33 2008 -0700 +++ b/lib/CimTest/Globals.py Wed May 21 21:32:41 2008 +0800 @@ -49,7 +49,7 @@ CIM_IP = os.getenv("CIM_IP") CIM_PORT = "5988" NM = "TEST LOG" -platform_sup = ["Xen", "KVM", "XenFV"] +platform_sup = ["Xen", "KVM", "XenFV", "LXC"] logging.basicConfig(filename='/dev/null') logger = logging.getLogger(NM) logging.PRINT = logging.DEBUG + 50 @@ -67,7 +67,7 @@ help="IP address of machine to test, default: localhost") parser.add_option("-v", "--virt", dest="virt", type="choice", choices=platform_sup, default="Xen", - help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV', default: Xen") + help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV' & 'LXC', default: Xen") parser.add_option("-d", "--debug-output", action="store_true", dest="debug", help="Duplicate the output to stderr") diff -r b2b2bb6cc8d8 -r 02203222a428 lib/VirtLib/utils.py --- a/lib/VirtLib/utils.py Mon May 19 10:43:33 2008 -0700 +++ b/lib/VirtLib/utils.py Wed May 21 21:32:41 2008 +0800 @@ -161,5 +161,7 @@ return "xen:///" if virt == "KVM": return "qemu:///system" + if virt == "LXC": + return "lxc:///system" return "" diff -r b2b2bb6cc8d8 -r 02203222a428 suites/libvirt-cim/lib/XenKvmLib/classes.py --- a/suites/libvirt-cim/lib/XenKvmLib/classes.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py Wed May 21 21:32:41 2008 +0800 @@ -19,7 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -virt_types = ['Xen', 'KVM', 'XenFV'] +virt_types = ['Xen', 'KVM', 'XenFV', 'LXC'] def get_typed_class(virt, basename): if virt not in virt_types: diff -r b2b2bb6cc8d8 -r 02203222a428 suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/main.py Wed May 21 21:32:41 2008 +0800 @@ -51,7 +51,7 @@ help="Will remove existing log files before test run") parser.add_option("-v", "--virt", dest="virt", type="choice", choices=platform_sup, default="Xen", - help="Virt type, select from 'Xen' & 'KVM' & 'XenFV'(default: Xen). ") + help="Virt type, select from 'Xen' & 'KVM' & 'XenFV' & 'LXC'(default: Xen). ") parser.add_option("-d", "--debug-output", action="store_true", dest="debug", help="Duplicate the output to stderr")