Here's my bundle of cimtest related changes to support Controllers, Controller Pools, and libvirt upstream addition of a keyboard device. I have tested all these changes on both my upstream libvirt-cim environment and a RHEL6.5 libvirt-cim environment. The only failures I get are in the indiciations tests which I've never had working quite right. My testing process was to add each patch separately and ensure that each didn't change the RHEL6.5 results. I've used the currently posted libvirt-cim revision number sequence as the key to whether or not support for the controller and controller pool will be added/checked. The numbers 1310 and 1312 may changed base on how the libvirt-cim submit goes. I have split them up into "bundles" of changes: Patch 1: is a rebase/repost of a change I posted back in November. It's still a valid change since then. I don't think I got an ACk for it back then, so reposted Patch 2: is a change because nfs server tests were failing in my upstream environment on f19. I just added a parameter as nfs-server.service told me to do and things worked. Patch 3 Patch 4: These are infrastructure changes - Patch 3 is basically converting all code that uses Dictionaries and the Class Name as the key to the dictionary with lists of tuples that have the classname and the element formerly inserted into the dictionary key. Patch 4 is much of the same, but a bit more gnarly with respect to what it did - so I kept it separate Patch5 Patch6: Adds support for controller RASD - I can merge these later, but keeping them separate was easier for code review purposes Patch7 Patch8: Adds support for controller pools. Again, these can be merged, but for review purposes - I'll keep them separate. Patch9 Patch10: Adds support to handle the keyboard RASD as an input device. I have a set of libvirt-cim code that will go along with this, but since it's in my branch already - I just posted it anyway. It was part of my RHEL6 environment testing. These won't be pushed with the controller changes, but would be pushed eventually. John Ferlan (10): live.full_hostname: Adjust mechanism to get FQDN XenKvmLib: Adjust systemd nfs server settings cimtest: Use lists instead of dictionaries cimtest: VSSDC - 02-reverse.py - adjust iteration of association XenKvmLib: Add controller device cimtest: Add controller RASD support XenKvmLib: Add controller pool cimtest: Add controller pool support XenKvmLib: Add keyboard input RASD cimtest: Add support for keyboard input device lib/VirtLib/live.py | 11 +- .../cimtest/AllocationCapabilities/01_enum.py | 4 + .../ComputerSystem/41_cs_to_settingdefinestate.py | 57 +++++----- .../cimtest/ElementCapabilities/01_forward.py | 1 + .../cimtest/HostSystem/02_hostsystem_to_rasd.py | 25 +++-- .../cimtest/HostSystem/04_hs_to_EAPF.py | 3 + .../cimtest/HostedResourcePool/01_forward.py | 7 +- .../cimtest/RASD/01_verify_rasd_fields.py | 18 ++- .../ResourceAllocationFromPool/02_reverse.py | 12 +- .../cimtest/ServiceAffectsElement/01_forward.py | 57 +++++----- .../cimtest/ServiceAffectsElement/02_reverse.py | 22 ++-- .../cimtest/SettingsDefine/02_reverse.py | 36 +++--- .../libvirt-cim/cimtest/SystemDevice/01_forward.py | 19 +++- suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py | 27 ++++- .../02_reverse.py | 124 ++++++++++++++------- suites/libvirt-cim/lib/XenKvmLib/common_util.py | 4 +- suites/libvirt-cim/lib/XenKvmLib/devices.py | 6 + suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py | 2 +- suites/libvirt-cim/lib/XenKvmLib/pool.py | 6 + suites/libvirt-cim/lib/XenKvmLib/rasd.py | 47 +++++++- suites/libvirt-cim/lib/XenKvmLib/vsms.py | 24 ++++ suites/libvirt-cim/lib/XenKvmLib/vxml.py | 40 +++++-- 22 files changed, 393 insertions(+), 159 deletions(-) -- 1.8.5.3