- CIM - libvirt List Archives

[PATCH] [TEST] Fixing 09_procrasd_persist.py of VSMS
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225880784 28800 # Node ID b1d7f871c2553a461600ef7f82cc8fd931e11551 # Parent 319e2e9509d360334c0e38e17abc9bf2b163e1cb [TEST] Fixing 09_procrasd_persist.py of VSMS. The tc was failing bcs of the changes made to ProcResourceAllocationSettingData of vsms.py Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 319e2e9509d3 -r b1d7f871c255 suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py Tue Nov 04 05:22:21 2008 -0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py Wed Nov 05 02:26:24 2008 -0800 @@ -47,7 +47,7 @@ vssd, rasd = vsms.default_vssd_rasd_str(default_dom, virt=vtype) class_pasd = vsms.get_pasd_class(vtype) - proc_inst = class_pasd(nvcpu, default_dom, weight, limit) + proc_inst = class_pasd(default_dom, nvcpu, weight, limit) proc_mof = proc_inst.mof() for i in range(len(rasd)):

1 0

[PATCH] [TEST] #3 Fixing 01_forward.py tc of SystemDevice
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225873834 28800 # Node ID 0814061c13e22cdfa552a2e7e578fb717195e26c # Parent 319e2e9509d360334c0e38e17abc9bf2b163e1cb [TEST] #3 Fixing 01_forward.py tc of SystemDevice. changes form patch2: -------------------- Modified the for loop. The test needs to be updated with cim_define(). Tested on KVM, LXC and Xen with current sources and F9 rpm. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 319e2e9509d3 -r 0814061c13e2 suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Tue Nov 04 05:22:21 2008 -0800 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Wed Nov 05 00:30:34 2008 -0800 @@ -8,6 +8,7 @@ # Kaitlin Rupert <karupert(a)us.ibm.com> # Veerendra Chandrappa <vechandr(a)in.ibm.com> # Zhengang Li <lizg(a)cn.ibm.com> +# Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public @@ -25,10 +26,10 @@ # import sys +from sets import Set from VirtLib import utils from XenKvmLib import assoc from XenKvmLib import vxml -from XenKvmLib import devices from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger from XenKvmLib.const import do_main @@ -38,72 +39,88 @@ test_dom = "test_domain" test_mac = "00:11:22:33:44:55" -test_cpu = 1 +test_cpu = 3 @do_main(sup_types) def main(): - options= main.options - - if options.virt == 'Xen': + options = main.options + server = options.ip + virt = options.virt + + if virt == 'Xen': test_disk = 'xvdb' else: test_disk = 'hdb' status = PASS - virt_xml = vxml.get_class(options.virt) - if options.virt == 'LXC': - cxml = virt_xml(test_dom) + virt_xml = vxml.get_class(virt) + if virt == 'LXC': + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac) else: - cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk) - ret = cxml.create(options.ip) + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, + disk = test_disk) + + ret = cxml.create(server) if not ret: logger.error('Unable to create domain %s' % test_dom) return FAIL - sd_classname = get_typed_class(options.virt, 'SystemDevice') - cs_classname = get_typed_class(options.virt, 'ComputerSystem') + sd_classname = get_typed_class(virt, 'SystemDevice') + cs_classname = get_typed_class(virt, 'ComputerSystem') - devs = assoc.AssociatorNames(options.ip, sd_classname, cs_classname, + devs = assoc.AssociatorNames(server, sd_classname, cs_classname, Name=test_dom, CreationClassName=cs_classname) if devs == None: - logger.error("System association failed") - return FAIL - elif len(devs) == 0: - logger.error("No devices returned") + logger.error("'%s' association failed", sd_classname) + cxml.destroy(server) return FAIL - cn_devid = { - get_typed_class(options.virt, "NetworkPort") : '%s/%s' % (test_dom, test_mac), - get_typed_class(options.virt, "Memory") : '%s/mem' % test_dom, - get_typed_class(options.virt, "LogicalDisk") : '%s/%s' % (test_dom, test_disk), - get_typed_class(options.virt, "Processor") : '%s/%s' % (test_dom, test_cpu-1) - } + if len(devs) == 0: + logger.error("No devices returned") + cxml.destroy(server) + return FAIL - key_list = {'DeviceID' : '', - 'CreationClassName' : '', - 'SystemName' : test_dom, - 'SystemCreationClassname' : cs_classname - } - - for dev_cn in cn_devid.keys(): - for dev in devs: - key_list['CreationClassName'] = dev['CreationClassname'] - key_list['DeviceID'] = dev['DeviceID'] - device = devices.device_of(options.ip, key_list) - if device.CreationClassName != dev_cn: - continue - devid = device.DeviceID + 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)) - _devid = cn_devid[dev_cn] - if devid != _devid: - logger.error("DeviceID `%s` != `%s'" % (devid, _devid)) - status = FAIL - else: - logger.info("Examined %s" % _devid) - - cxml.destroy(options.ip) - cxml.undefine(options.ip) + 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)] + try: + res_pllist = {} + for items in devs: + if items.classname in res_pllist.keys(): + res_pllist[items.classname].append(items['DeviceID']) + else: + res_pllist[items.classname] = [items['DeviceID']] + + #Verifying we get all the expected device class info + if Set(exp_pllist.keys()) != Set(res_pllist.keys()): + logger.error("Device Class mismatch") + raise Exception("Expected Device class list: %s \n \t Got: %s" + % (sorted(exp_pllist.keys()), + sorted(res_pllist.keys()))) + + #Verifying that we get only the expected deviceid + #for every device class + for key in exp_pllist.keys(): + if Set(exp_pllist[key]) != Set(res_pllist[key]): + logger.error("DeviceID mismatch") + raise Exception("Expected DeviceID: %s \n \t Got: %s" + % (sorted(exp_pllist[key]), + sorted(res_pllist[key]))) + except Exception, details: + logger.error("Exception %s", details) + status = FAIL + + cxml.destroy(server) return status if __name__ == "__main__":

1 0

[PATCH] [TEST] Updating 01_forward.py tc of SettingsDefineCapabilities
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225865973 28800 # Node ID f0c349a1321c590b172b3ecaa279e5d0c2f0b26d # Parent f5a2c1cc3df0bc76fbdcefad05c2254669a42428 [TEST] Updating 01_forward.py tc of SettingsDefineCapabilities. This modification is required for libvirt-cim providers which does not include the properties of template RASDs changes. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r f5a2c1cc3df0 -r f0c349a1321c suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Tue Nov 04 22:09:41 2008 -0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Tue Nov 04 22:19:33 2008 -0800 @@ -63,8 +63,10 @@ from XenKvmLib.const import do_main, def from XenKvmLib.const import do_main, default_pool_name, default_network_name from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import print_field_error +from XenKvmLib.const import get_provider_version platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC'] +libvirt_rasd_template_changes = 707 memid = "MemoryPool/0" procid = "ProcessorPool/0" @@ -168,7 +170,9 @@ def verify_sdc_with_ac(virt, server, poo assoc_info = assoc.Associators(server, assoc_cname, cn, InstanceID = instid) - if 'DiskPool' in instid and (virt =='Xen' or virt == 'XenFV'): + curr_cim_rev, changeset = get_provider_version(virt, server) + if 'DiskPool' in instid and (virt =='Xen' or virt == 'XenFV') and \ + curr_cim_rev >= libvirt_rasd_template_changes: # For Diskpool, we have info 1 for each of Min, Max, # default, Increment and 1 for each of PV and FV # hence 4 * 2 = 8 records

1 0

[PATCH] [TEST] Updating 03_hs_to_settdefcap.py tc of HostSystem
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225865381 28800 # Node ID f5a2c1cc3df0bc76fbdcefad05c2254669a42428 # Parent b1634f5d4f0b0cb0f373e3790754536786e9b008 [TEST] Updating 03_hs_to_settdefcap.py tc of HostSystem . This modification is required for libvirt-cim providers which does not include the properties of template RASDs changes. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r b1634f5d4f0b -r f5a2c1cc3df0 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Tue Nov 04 21:25:46 2008 -0800 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Tue Nov 04 22:09:41 2008 -0800 @@ -50,11 +50,13 @@ from CimTest.ReturnCodes import PASS, FA from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.test_xml import testxml from XenKvmLib.test_doms import destroy_and_undefine_all +from XenKvmLib.const import get_provider_version sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domgst_test" test_vcpus = 1 bug_sblim='00007' +libvirt_rasd_template_changes = 707 def setup_env(server, virt="Xen"): status = PASS @@ -215,7 +217,9 @@ def get_rasddetails(server, alloccap, vi ccn, InstanceID = ap['InstanceID']) - if 'DiskPool' in ap['InstanceID'] and virt =='Xen': + curr_cim_rev, changeset = get_provider_version(virt, server) + if 'DiskPool' in ap['InstanceID'] and virt =='Xen' and \ + curr_cim_rev >= libvirt_rasd_template_changes: # For Diskpool, we have info 1 for each of Min, Max, # default, Increment and 1 for each of PV and FV # hence 4 * 2 = 8 records

1 0

[PATCH] [TEST] Updating the tc to verify fewer Profile when rev < 680
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225862746 28800 # Node ID b1634f5d4f0b0cb0f373e3790754536786e9b008 # Parent f5bac806db6e00499b572364216031240a31fe8f [TEST] Updating the tc to verify fewer Profile when rev < 680. This tc will still fail since the following query does not work yet. Will send a follow up patch for the same. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r f5bac806db6e -r b1634f5d4f0b suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Tue Nov 04 20:55:00 2008 -0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Tue Nov 04 21:25:46 2008 -0800 @@ -51,11 +51,13 @@ from CimTest.ReturnCodes import PASS, FA from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.enumclass import EnumInstances from XenKvmLib.const import default_network_name, default_pool_name +from XenKvmLib.const import get_provider_version sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] test_dom = "domU" bug_sblim = '00007' +libvirt_cim_ectp_changes = 680 def pool_init(verify_list, pool_cn, pool_name, virt): ccn = get_typed_class(virt, pool_cn) @@ -141,9 +143,14 @@ def get_proflist(server, reg_classname, status = PASS try: proflist = EnumInstances(server, reg_classname) - if len(proflist) < 7: - logger.error("'%s' returned '%d' '%s' objects, expected atleast 7", - reg_classname, len(proflist), 'Profile') + curr_cim_rev, changeset = get_provider_version(virt, server) + if curr_cim_rev < libvirt_cim_ectp_changes: + len_prof_list = 5 + else: + len_prof_list = 7 + if len(proflist) < len_prof_list: + logger.error("'%s' returned '%d' '%s' objects, expected atleast %d", + reg_classname, len(proflist), 'Profile', len_prof_list) status = FAIL except Exception, detail:

1 0

[PATCH] [TEST] Fixing xm_virt_util.py to import fv_cap
by Deepti B. Kalakeri 04 Nov '08

04 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225860900 28800 # Node ID f5bac806db6e00499b572364216031240a31fe8f # Parent 319e2e9509d360334c0e38e17abc9bf2b163e1cb [TEST] Fixing xm_virt_util.py to import fv_cap. This is req for tc which use bootloader() will fail otherwise. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 319e2e9509d3 -r f5bac806db6e suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Tue Nov 04 05:22:21 2008 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Tue Nov 04 20:55:00 2008 -0800 @@ -25,6 +25,7 @@ import os import os from VirtLib import utils import socket +from VirtLib.live import fv_cap def xm_domname(ip, domid):

1 0

[PATCH 0 of 5] (#2) Fix up associations to SBLIM host system
by Dan Smith 04 Nov '08

04 Nov '08

This time with the base schema changes...

2 8

[PATCH] [TEST] #2 Fixing 01_forward.py tc of SystemDevice
by Deepti B. Kalakeri 04 Nov '08

04 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225792617 28800 # Node ID 3ce5cf8fb12feb015f5ecce5c72517c7836b407c # Parent d1614c101c281b57bd2bc98dfb6625f790748e54 [TEST] #2 Fixing 01_forward.py tc of SystemDevice. The test needs to be updated with cim_define(). Tested on KVM, LXC and Xen with current sources and F9 rpm. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r d1614c101c28 -r 3ce5cf8fb12f suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Wed Oct 29 20:11:47 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Tue Nov 04 01:56:57 2008 -0800 @@ -8,6 +8,7 @@ # Kaitlin Rupert <karupert(a)us.ibm.com> # Veerendra Chandrappa <vechandr(a)in.ibm.com> # Zhengang Li <lizg(a)cn.ibm.com> +# Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public @@ -25,10 +26,10 @@ # import sys +from sets import Set from VirtLib import utils from XenKvmLib import assoc from XenKvmLib import vxml -from XenKvmLib import devices from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger from XenKvmLib.const import do_main @@ -38,72 +39,99 @@ test_dom = "test_domain" test_mac = "00:11:22:33:44:55" -test_cpu = 1 +test_cpu = 3 @do_main(sup_types) def main(): - options= main.options - - if options.virt == 'Xen': + options = main.options + server = options.ip + virt = options.virt + + if virt == 'Xen': test_disk = 'xvdb' else: test_disk = 'hdb' status = PASS - virt_xml = vxml.get_class(options.virt) - if options.virt == 'LXC': - cxml = virt_xml(test_dom) + virt_xml = vxml.get_class(virt) + if virt == 'LXC': + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac) else: - cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk) - ret = cxml.create(options.ip) + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, + disk = test_disk) + + ret = cxml.create(server) if not ret: logger.error('Unable to create domain %s' % test_dom) return FAIL - sd_classname = get_typed_class(options.virt, 'SystemDevice') - cs_classname = get_typed_class(options.virt, 'ComputerSystem') + sd_classname = get_typed_class(virt, 'SystemDevice') + cs_classname = get_typed_class(virt, 'ComputerSystem') - devs = assoc.AssociatorNames(options.ip, sd_classname, cs_classname, + devs = assoc.AssociatorNames(server, sd_classname, cs_classname, Name=test_dom, CreationClassName=cs_classname) if devs == None: - logger.error("System association failed") - return FAIL - elif len(devs) == 0: - logger.error("No devices returned") + logger.error("'%s' association failed", sd_classname) + cxml.destroy(server) return FAIL - cn_devid = { - get_typed_class(options.virt, "NetworkPort") : '%s/%s' % (test_dom, test_mac), - get_typed_class(options.virt, "Memory") : '%s/mem' % test_dom, - get_typed_class(options.virt, "LogicalDisk") : '%s/%s' % (test_dom, test_disk), - get_typed_class(options.virt, "Processor") : '%s/%s' % (test_dom, test_cpu-1) - } + if len(devs) == 0: + logger.error("No devices returned") + cxml.destroy(server) + return FAIL - key_list = {'DeviceID' : '', - 'CreationClassName' : '', - 'SystemName' : test_dom, - 'SystemCreationClassname' : cs_classname - } - - for dev_cn in cn_devid.keys(): - for dev in devs: - key_list['CreationClassName'] = dev['CreationClassname'] - key_list['DeviceID'] = dev['DeviceID'] - device = devices.device_of(options.ip, key_list) - if device.CreationClassName != dev_cn: - continue - devid = device.DeviceID + 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)) - _devid = cn_devid[dev_cn] - if devid != _devid: - logger.error("DeviceID `%s` != `%s'" % (devid, _devid)) - status = FAIL + 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)] + + try: + res_pllist = {} + for items in devs: + # The dict has some elements + if len(res_pllist) != 0: + # If the dict already has the key we append the new value + if items.classname in res_pllist.keys(): + list = [] + list = res_pllist[items.classname] + list.append(items['DeviceID']) + res_pllist[items.classname] = list + else: + # If the dict is not empty, but does not yet contain + # items.classname, we create new item + res_pllist[items.classname] = [items['DeviceID']] else: - logger.info("Examined %s" % _devid) - - cxml.destroy(options.ip) - cxml.undefine(options.ip) + # When the dict is empty + res_pllist[items.classname] = [items['DeviceID']] + #Verifying we get all the expected device class info + if Set(exp_pllist.keys()) != Set(res_pllist.keys()): + logger.error("Device Class mismatch") + raise Exception("Expected Device class list: %s \n \t Got: %s" + % (sorted(exp_pllist.keys()), + sorted(res_pllist.keys()))) + + #Verifying that we get only the expected deviceid + #for every device class + for key in exp_pllist.keys(): + if Set(exp_pllist[key]) != Set(res_pllist[key]): + logger.error("DeviceID mismatch") + raise Exception("Expected DeviceID: %s \n \t Got: %s" + % (sorted(exp_pllist[key]), + sorted(res_pllist[key]))) + except Exception, details: + logger.error("Exception %s", details) + status = FAIL + + cxml.destroy(server) return status if __name__ == "__main__":

2 1

[PATCH 0 of 5] Fix up associations to SBLIM host system
by Dan Smith 04 Nov '08

04 Nov '08

This patch set attempts to patch up our associations for the case where the SBLIM providers are installed and we use them for our HostSystem class. Since that class exists in root/cimv2, we have to register our associations there as well, and make sure they provide paths back to the rest of our providers. The convert_sblim_hostsystem() function that I use to do this is a bit of a hack, given that it requires knowledge of how the reference we're passing to all of our factory functions is used. However, I think it's definitely the easiest thing to do right now. Comments are welcome as usual :)

2 9

[PATCH] [TEST] Updating 01_enum_crs.py tc of RedirectionService to work with libvirt-cim provider with no CRS support
by Deepti B. Kalakeri 04 Nov '08

04 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225804941 28800 # Node ID 914e2bbfeb62295a2a0afb976ed5b2a72e38daed # Parent 8118a0e17d219b6886b34176423c45c855f08576 [TEST] Updating 01_enum_crs.py tc of RedirectionService to work with libvirt-cim provider with no CRS support. Updating 01_enum_crs.py tc of RedirectionService to skip the tc which if CRS provider is not present in the libvirt_cim provider when the libvirt_cim_revision < 688. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 8118a0e17d21 -r 914e2bbfeb62 suites/libvirt-cim/cimtest/RedirectionService/01_enum_crs.py --- a/suites/libvirt-cim/cimtest/RedirectionService/01_enum_crs.py Sun Nov 02 19:16:33 2008 -0800 +++ b/suites/libvirt-cim/cimtest/RedirectionService/01_enum_crs.py Tue Nov 04 05:22:21 2008 -0800 @@ -32,19 +32,28 @@ from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from XenKvmLib.classes import get_typed_class from XenKvmLib.const import do_main -from CimTest.ReturnCodes import PASS, FAIL +from CimTest.ReturnCodes import PASS, FAIL, SKIP from XenKvmLib.common_util import get_host_info from XenKvmLib.const import get_provider_version SHAREMODE = 3 REDIRECTION_SER_TYPE = 3 CRS_MAX_SAP_REV = 724 +libvirtcim_hr_crs_changes = 688 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(sup_types) def main(): virt = main.options.virt server = main.options.ip + + # This check is required for libivirt-cim providers which do not have + # CRS changes in it and the CRS provider is available with revision >= 688. + curr_cim_rev, changeset = get_provider_version(virt, server) + if curr_cim_rev < libvirtcim_hr_crs_changes: + logger.info("ConsoleRedirectionService provider not supported, " + "hence skipping the tc ....") + return SKIP status, host_name, host_cn = get_host_info(server, virt) if status != PASS:

1 0