yunguol@cn.ibm.com wrote:
# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1213279228 -28800 # Node ID 2fff464cfcf81a56ffb627085eebf995a54b3833 # Parent 254bc5464030a03b6f791fd49acd208f6ec1db23 [TEST] Update VirtualSystemSettingDataComponent.04 for LXC support
Signed-off-by: Guolian Yun <yunguol@cn.ibm.com>
diff -r 254bc5464030 -r 2fff464cfcf8 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py Wed Jun 11 20:56:07 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py Thu Jun 12 22:00:28 2008 +0800 @@ -66,15 +66,15 @@ from CimTest.Globals import do_main, logger from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
-sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
test_dom = "domu1"
expr_values = { "INVALID_InstID_Keyname" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : 'No such instance (InstanceID)' }, \ + 'desc' : 'No such instance' }, \ "INVALID_InstID_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : 'No such instance (InstanceID)'} + 'desc' : 'No such instance'} }
Why the change here? I see the following errors: wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 'http://localhost/root/virt:LXC_VirtualSystemSettingData.Invalid="LXC:meep"' * * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID) wbemcli ain -ac LXC_VirtualSystemSettingDataComponent 'http://localhost/root/virt:LXC_VirtualSystemSettingData.InstanceID="Invalid"' * * wbemcli: Cim: (6) CIM_ERR_NOT_FOUND: No such instance (InstanceID) * Are you seeing a different error?
def try_invalid_assoc(name_val, i, field, virt="Xen"): @@ -120,6 +120,8 @@
if options.virt == "Xen" or options.virt == "XenFV": inst_id = "Xen:%s" % test_dom + elif options.virt == "LXC": + inst_id = "LXC:%s" % test_dom else: inst_id = "KVM:%s" % test_dom
Instead of adding another condition here, you can just modify the else to be: inst_id = "%s:%s" % (options.virt, test_dom) -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com