# HG changeset patch # User Richard Maciel <rmaciel@linux.vnet.ibm.com> # Date 1260579910 7200 # Node ID 7377a5c5b8d587fac75f06a511f3f43f666b7294 # Parent 7ce11553d0f236f8bd961852720e33a6f7c63ac3 [TEST] Fixed expected LXC devices List of expected devices must not include LXC_Processor, but must include LXC_PointingDevice and LXC_LogicalDisk (with proper path) Signed-off-by: Richard Maciel <rmaciel@linux.vnet.ibm.com> diff -r 7ce11553d0f2 -r 7377a5c5b8d5 suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Fri Nov 27 19:24:42 2009 -0200 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Fri Dec 11 23:05:10 2009 -0200 @@ -49,6 +49,8 @@ if virt == 'Xen': test_disk = 'xvdb' + elif virt == 'LXC': + test_disk = '/tmp' else: test_disk = 'hdb' @@ -90,29 +92,32 @@ mem_cn = get_typed_class(virt, "Memory") exp_pllist = { mem_cn : ['%s/mem' % test_dom] } - proc_cn = get_typed_class(virt, "Processor") - exp_pllist[proc_cn] = [] - for i in range(test_cpu): - exp_pllist[proc_cn].append( '%s/%s' % (test_dom, i)) + + input_cn = get_typed_class(virt, "PointingDevice") + if virt == 'LXC': + point_device = "%s/%s" %(test_dom, "mouse:usb") + elif virt == 'Xen': + point_device = "%s/%s" %(test_dom, "mouse:xen") + else: + point_device = "%s/%s" %(test_dom, "mouse:ps2") + + exp_pllist[input_cn] = [point_device] + + disk_cn = get_typed_class(virt, "LogicalDisk") + exp_pllist[disk_cn] = [ '%s/%s' % (test_dom, test_disk)] if virt != 'LXC': net_cn = get_typed_class(virt, "NetworkPort") - disk_cn = get_typed_class(virt, "LogicalDisk") exp_pllist[net_cn] = ['%s/%s' % (test_dom, test_mac)] - exp_pllist[disk_cn] = [ '%s/%s' % (test_dom, test_disk)] + + proc_cn = get_typed_class(virt, "Processor") + exp_pllist[proc_cn] = [] + for i in range(test_cpu): + exp_pllist[proc_cn].append( '%s/%s' % (test_dom, i)) curr_cim_rev, changeset = get_provider_version(virt, server) if curr_cim_rev >= input_graphics_pool_rev: - input_cn = get_typed_class(virt, "PointingDevice") graphics_cn = get_typed_class(virt, "DisplayController") - if virt == 'LXC': - point_device = "%s/%s" %(test_dom, "mouse:usb") - elif virt == 'Xen': - point_device = "%s/%s" %(test_dom, "mouse:xen") - else: - point_device = "%s/%s" %(test_dom, "mouse:ps2") - - exp_pllist[input_cn] = [point_device] exp_pllist[graphics_cn] = ['%s/graphics' % test_dom]