# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1209349323 25200 # Node ID 72f712cd3ceed863ebfcf9da734128b2553ac553 # Parent 22ed2c7c77e8ff3d96b40f1e0db2a931b5a7c37e [TEST] add branch of proc InstanceID and MB versus KB for memory in VSSD.04 Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 22ed2c7c77e8 -r 72f712cd3cee suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Fri Apr 25 03:20:54 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Sun Apr 27 19:22:03 2008 -0700 @@ -53,6 +53,7 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \ verify_diskrasd_values, verify_memrasd_values +from XenKvmLib.const import CIM_REV sup_types = ['Xen', 'KVM', 'XenFV'] @@ -60,6 +61,8 @@ test_vcpus = 1 test_vcpus = 1 test_mem = 128 test_mac = "00:11:22:33:44:aa" +proc_rev = 531 +mem_rev = 529 def setup_env(): vsxml_info = None @@ -86,6 +89,8 @@ def init_list(virt): "ResourceType" : 3, "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData') } + if CIM_REV < proc_rev: + procrasd['InstanceID'] = '%s/%s' %(test_dom, "0") netrasd = { "InstanceID" : '%s/%s' %(test_dom,test_mac), @@ -109,6 +114,8 @@ def init_list(virt): "VirtualQuantity" : (test_mem * 1024), "CreationClassName": get_typed_class(virt, 'MemResourceAllocationSettingData') } + if CIM_REV < mem_rev: + memrasd['AllocationUnits'] = "MegaBytes" return procrasd, netrasd, diskrasd, memrasd def get_inst_from_list(classname, vssd_list, filter_name, exp_val):