[Libvirt-cim] [PATCH] [TEST] #2 Add branch to VSMS/14_define_sys_disk.py to fix Caption settings in DiskRASD

[yunguol at cn.ibm.com]

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1237786756 25200
# Node ID 57f08f1c7a1a8b7c9068e1bf0e76368bb92ead26
# Parent  5bafbcfb09fd3fb9c4cf532488c92d9ddefc663c
[TEST] #2 Add branch to VSMS/14_define_sys_disk.py to fix Caption settings in DiskRASD


Updates from 1 to 2:
Set rasd['VirtualDevice'] value by xvda or hda instead of KVM_default_disk_dev or Xen_default_disk_dev

Tested for Xen, XenFV, KVM with current sources and rpm
Signed-off-by: Guolian Yun<yunguol at cn.ibm.com>

diff -r 5bafbcfb09fd -r 57f08f1c7a1a suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py	Wed Mar 18 06:41:56 2009 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py	Sun Mar 22 22:39:16 2009 -0700
@@ -35,14 +35,14 @@
 from CimTest.ReturnCodes import FAIL, PASS
 from XenKvmLib.classes import get_typed_class, inst_to_mof
 from XenKvmLib.rasd import get_default_rasds
-from XenKvmLib.const import do_main, _image_dir, f9_changeset, \
-                            KVM_default_disk_dev, get_provider_version
+from XenKvmLib.const import do_main, _image_dir, get_provider_version
 from XenKvmLib.vxml import get_class
 from XenKvmLib.common_util import parse_instance_id
 from XenKvmLib.enumclass import EnumInstances
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
 test_dom = 'rstest_disk_domain'
+libvirt_cim_dasd_caption = 707
 
 def make_long_disk_path(ip):
     path = os.path.join(_image_dir, 'cimtest_large_image')
@@ -64,14 +64,19 @@
 
     rasd_list = {} 
 
+    if virt == 'Xen':
+        test_disk = 'xvda'
+    else:
+        test_disk = 'hda'
+
     for rasd in rasds:
         if rasd.classname == drasd_cn:
-            if disk_type != "" and rasd['Caption'] != disk_type:
+            curr_cim_rev, changeset = get_provider_version(virt, ip)
+            if disk_type != "" and rasd['Caption'] != disk_type and \
+               curr_cim_rev >= libvirt_cim_dasd_caption:
                 continue
             rasd['Address'] = addr
-            curr_cim_rev, changeset = get_provider_version(virt, ip)
-            if changeset == f9_changeset and virt == 'KVM':
-                    rasd['VirtualDevice'] = KVM_default_disk_dev
+            rasd['VirtualDevice'] = test_disk
         rasd_list[rasd.classname] = inst_to_mof(rasd)
 
     return rasd_list