# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1208857706 -19800 # Node ID cc4b76d02e85e970d3df8c837dbe5722132b568d # Parent dcfad1d986ec429fd63475ecd53382117e55ad72 [TEST] Updating 04_forward_vsmsdata.py tc in SettingsDefineCapabilities 1) To support KVM and XenFV 2) To adapt to the new infrastructure changes Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r dcfad1d986ec -r cc4b76d02e85 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py Tue Apr 22 15:16:28 2008 +0530 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/04_forward_vsmsdata.py Tue Apr 22 15:18:26 2008 +0530 @@ -20,7 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # This tc is used to verify the Classname and InstanceID of -# Xen_SettingsDefineCapabilities association with Xen_VirtualSystemMigrationSettingData +# Xen_SettingsDefineCapabilities association with +# Xen_VirtualSystemMigrationSettingData # Command # ------- # wbemcli ai -ac Xen_SettingsDefineCapabilities \ @@ -35,35 +36,33 @@ # Date : 05-03-2008 import sys -from VirtLib import utils from XenKvmLib import assoc -from CimTest.Globals import CIM_ERROR_ASSOCIATORS, logger, do_main +from CimTest.Globals import CIM_ERROR_ASSOCIATORS, logger from CimTest.ReturnCodes import PASS, FAIL - -sup_types = ['Xen'] +from CimTest.Globals import do_main, platform_sup +from XenKvmLib.classes import get_typed_class def print_error(fieldname, ret_value, exp_value): logger.error("%s Mismatch", fieldname) logger.error("Returned %s instead of %s", ret_value, exp_value) -@do_main(sup_types) +@do_main(platform_sup) def main(): - (options, args) = parser.parse_args() - if not options.ip: - parser.print_help() - return 1 + options = main.options status = PASS server = options.ip - an = 'Xen_SettingsDefineCapabilities' - cn = 'Xen_VirtualSystemMigrationSettingData' - qcn = 'Xen_VirtualSystemMigrationCapabilities' + + an = get_typed_class(options.virt, 'SettingsDefineCapabilities') + cn = get_typed_class(options.virt, 'VirtualSystemMigrationSettingData') + qcn = get_typed_class(options.virt, 'VirtualSystemMigrationCapabilities') instid = 'MigrationSettingData' try: assoc_info = assoc.Associators(server, \ an, \ cn, \ - InstanceID = instid) + InstanceID = instid, \ + virt=options.virt) if len(assoc_info) != 1: logger.error("%s returned %i %s objects", an, len(assoc_info), qcn) return FAIL @@ -72,7 +71,8 @@ def main(): print_error('Classname', verify_assoc.classname, qcn) status = FAIL if verify_assoc['InstanceID'] != 'MigrationCapabilities': - print_error('InstanceID', verify_assoc['InstanceID'], 'MigrationCapabilities') + print_error('InstanceID', verify_assoc['InstanceID'], + 'MigrationCapabilities') status = FAIL except Exception, detail: logger.error(CIM_ERROR_ASSOCIATORS, an)