Re: [Libvirt-cim] [PATCH] cimtest: Update controller type from pci to scsi

On 05/08/2014 05:25 AM, Xu Wang wrote: The patch fails for me in the upstream environment... Testing KVM hypervisor -------------------------------------------------------------------- SystemDevice - 01_forward.py: FAIL ERROR - DeviceID mismatch ERROR - Exception Expected DeviceID: ['test_domain/controller:scsi:0', 'test_domain/controller:usb:0'] Got: [u'test_domain/controller:pci:0', u'test_domain/controller:scsi:0', u'test_domain/controller:usb:0'] -------------------------------------------------------------------- ... -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 02_reverse.py: FAIL ERROR - Assoc instances don't match expect=10 found=9. ERROR - Did not find association id=VSSDC_dom/controller:pci:0 in assoc_list -------------------------------------------------------------------- What were the failures you saw in the 6.5 environment? I'm sure we can come to some sort of "middle ground"... How about the following squashed in (does it work in your environment)?: diff --git a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py b/suites/libv index 052efc1..b2a4bfa 100644 --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py @@ -134,6 +134,10 @@ def main(): controller_cn = get_typed_class(virt, "Controller") exp_pllist[controller_cn] = [] exp_pllist[controller_cn].append('%s/controller:scsi:0' % test_dom) + # pci-root gets added automagically for us since scsi has to + # hang somewhere + if virsh_version_cmp(libvirt_version, "1.0.5") >= 0: + exp_pllist[controller_cn].append('%s/controller:pci:0' % test_dom) exp_pllist[controller_cn].append('%s/controller:usb:0' % test_dom) try: and diff --git a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_rev index 9060ae4..33877bf 100644 --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py @@ -102,6 +102,10 @@ def assoc_values(ip, assoc_info, virt="Xen"): if curr_cim_rev >= controller_rev: # Add controllers too ... will need a cim/cimtest version check rasd_list.update({"scsi_rasd":"%s/controller:scsi:0" % test_dom}) + # pci-root gets added automagically for us since scsi has to + # hang somewhere + if virsh_version_cmp(libvirt_version, "1.0.5") >= 0: + rasd_list.update({"pci_rasd":"%s/controller:pci:0" % test_dom}) rasd_list.update({"usb_rasd":"%s/controller:usb:0" % test_dom}) expect_rasds = len(rasd_list) BTW: I use 1.0.5 only because of your note... John