[Libvirt-cim] [PATCH] [TEST] Update Graphics RASD tests to handle new InstanceIDs

# HG changeset patch # User Chip Vincent <cvincent(a)us.ibm.com&gt; # Date 1305740945 14400 # Node ID d6951b8799a80d0e5b3639b6f75da405c32a9a77 # Parent 4c8e0c673d796ae7a5e17ee771d935e449b77bce [TEST] Update Graphics RASD tests to handle new InstanceIDs Graphics RASDs now include support for serial/consoel devices, which includes support for unqiue InstanceIDs. This patch updates the test to look for <vm_name>/vnc where is used to just look for graphics. NOTE: VirtualSystemManagementService/13_refconfig_additional_devs.py fails due to a problem in libvirt-cim. Seperate patch to follow shortly. Signed-off-by: Chip Vincent <cvincent(a)us.ibm.com&gt; diff --git a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py +++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py @@ -147,7 +147,7 @@ curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) if curr_cim_rev >= input_graphics_pool_rev: keys['InputResourceAllocationSettingData'] = input_device - keys['GraphicsResourceAllocationSettingData'] = "%s/graphics" % test_dom + keys['GraphicsResourceAllocationSettingData'] = "%s/vnc" % test_dom ret = cxml.cim_define(options.ip) if not ret: diff --git a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py @@ -144,7 +144,7 @@ display = { 'SystemName' : test_dom, 'CreationClassName' : display_inst, - 'DeviceID' : "%s/%s" % (test_dom, "graphics"), + 'DeviceID' : "%s/%s" % (test_dom, "vnc"), } point = { diff --git a/suites/libvirt-cim/cimtest/KVMRedirectionSAP/02_ipv6_support.py b/suites/libvirt-cim/cimtest/KVMRedirectionSAP/02_ipv6_support.py --- a/suites/libvirt-cim/cimtest/KVMRedirectionSAP/02_ipv6_support.py +++ b/suites/libvirt-cim/cimtest/KVMRedirectionSAP/02_ipv6_support.py @@ -92,7 +92,7 @@ if not ret: raise Exception("Failed to define the dom: %s" % test_dom) - devid = "%s/%s" % (test_dom, 'graphics') + devid = "%s/%s" % (test_dom, 'vnc') vnc = get_typed_class(virt, "DisplayController") key_list = { 'DeviceID' : devid, 'CreationClassName' : vnc, diff --git a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py @@ -118,7 +118,7 @@ curr_cim_rev, changeset = get_provider_version(virt, server) if curr_cim_rev >= input_graphics_pool_rev: graphics_cn = get_typed_class(virt, "DisplayController") - exp_pllist[graphics_cn] = ['%s/graphics' % test_dom] + exp_pllist[graphics_cn] = ['%s/vnc' % test_dom] try: diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py @@ -49,7 +49,7 @@ classname, len(rasd_list)) return FAIL - inst_id = "%s/graphics" % default_dom + inst_id = "%s/vnc" % default_dom for rasd in rasd_list: # Verify the Password for the domain is set if rasd['InstanceID'] == inst_id: diff --git a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py @@ -100,7 +100,7 @@ rlist.append(input) rlist.append(graphics) prop_list[input] = "%s/%s" % (test_dom, input_device) - prop_list[graphics] = "%s/%s" % (test_dom, "graphics") + prop_list[graphics] = "%s/%s" % (test_dom, "vnc") if virt == 'LXC': prop_list = {rlist[1] : "%s/%s" % (test_dom, "mem")} diff --git a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py @@ -95,7 +95,7 @@ "disk_rasd" : '%s/%s' %(test_dom, test_disk), "mem_rasd" : '%s/%s' %(test_dom, "mem"), "input_rasd": '%s/%s' %(test_dom, input_device), - "grap_rasd" : '%s/%s' %(test_dom, "graphics") + "grap_rasd" : '%s/%s' %(test_dom, "vnc") } diff --git a/suites/libvirt-cim/lib/XenKvmLib/rasd.py b/suites/libvirt-cim/lib/XenKvmLib/rasd.py --- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py +++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py @@ -110,7 +110,7 @@ "VirtualQuantity" : (t_mem * 1024), }, dc_cn : { - "InstanceID" : "%s/%s" %(t_dom, "graphics") + "InstanceID" : "%s/%s" %(t_dom, "vnc") }, pd_cn : { "InstanceID" : point_device