# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1208138597 25200 # Node ID ede68ec5664dd564fe55ae9a90243d6e53465003 # Parent 137e5079c73fcbfc70e6654cee0b3c3eb3c6acd2 [TEST].2# update processor id to reflect recent provider changes Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 137e5079c73f -r ede68ec5664d suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Fri Apr 11 16:58:23 2008 +0530 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Sun Apr 13 19:03:17 2008 -0700 @@ -99,7 +99,7 @@ def try_assoc(conn, exp_ret, dev_dom_nam diskid = "%s/%s" % (dev_dom_name, test_disk) memid = "%s/mem" % dev_dom_name netid = "%s/%s" % (dev_dom_name, test_mac) - procid = "%s/%s" % (dev_dom_name, 0) + procid = "%s/proc" % dev_dom_name lelist = { get_typed_class(virt, "LogicalDisk") : diskid, \ diff -r 137e5079c73f -r ede68ec5664d suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Fri Apr 11 16:58:23 2008 +0530 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Sun Apr 13 19:03:17 2008 -0700 @@ -79,7 +79,7 @@ def init_list(vsxml, virt="Xen"): rasd_values = { proc_cn : { - "InstanceID" : '%s/%s' %(test_dom,0), + "InstanceID" : '%s/%s' %(test_dom, "proc"), "ResourceType" : 3, }, disk_cn : { diff -r 137e5079c73f -r ede68ec5664d suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py --- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Fri Apr 11 16:58:23 2008 +0530 +++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Sun Apr 13 19:03:17 2008 -0700 @@ -74,7 +74,7 @@ def init_list(xml, disk, virt="Xen"): Creating the lists that will be used for comparisons. """ procrasd = { - "InstanceID" : '%s/%s' %(test_dom,0),\ + "InstanceID" : '%s/%s' %(test_dom, "proc"),\ "ResourceType" : 3,\ "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData') } diff -r 137e5079c73f -r ede68ec5664d suites/libvirt-cim/cimtest/RASD/02_enum.py --- a/suites/libvirt-cim/cimtest/RASD/02_enum.py Fri Apr 11 16:58:23 2008 +0530 +++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py Sun Apr 13 19:03:17 2008 -0700 @@ -51,7 +51,7 @@ def init_list(virt="Xen"): Creating the lists that will be used for comparisons. """ procrasd = { - "InstanceID" : '%s/%s' %(test_dom,0),\ + "InstanceID" : '%s/%s' %(test_dom, "proc"),\ "ResourceType" : 3,\ "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData') } diff -r 137e5079c73f -r ede68ec5664d suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Fri Apr 11 16:58:23 2008 +0530 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Sun Apr 13 19:03:17 2008 -0700 @@ -82,7 +82,7 @@ def main(): 'LogicalDisk' : test_disk, 'Memory' : 'mem', 'NetworkPort' : test_mac, - 'Processor' : test_vcpus -1 } + 'Processor' : 'proc' } devlist = {} logelelst = {} diff -r 137e5079c73f -r ede68ec5664d suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Fri Apr 11 16:58:23 2008 +0530 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Sun Apr 13 19:03:17 2008 -0700 @@ -186,13 +186,13 @@ def main(): global rasd_devid rasd_devid = { - 'ProcResourceAllocationSettingData' : '%s/%s' % (test_dom, test_vcpus-1), + 'ProcResourceAllocationSettingData' : '%s/%s' % (test_dom, 'proc'), 'NetResourceAllocationSettingData' : '%s/%s' % (test_dom, test_mac), 'DiskResourceAllocationSettingData' : '%s/%s' % (test_dom, test_disk), 'MemResourceAllocationSettingData' : '%s/%s' % (test_dom, 'mem')} global dev_devid dev_devid = { - 'Processor' : '%s/%s' % (test_dom, test_vcpus-1), + 'Processor' : '%s/%s' % (test_dom, 'proc'), 'NetworkPort' : '%s/%s' % (test_dom, test_mac), 'LogicalDisk' : '%s/%s' % (test_dom, test_disk), 'Memory' : '%s/%s' % (test_dom, 'mem')} diff -r 137e5079c73f -r ede68ec5664d suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Fri Apr 11 16:58:23 2008 +0530 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Sun Apr 13 19:03:17 2008 -0700 @@ -232,7 +232,7 @@ def main(): get_typed_class(options.virt, 'LogicalDisk') : test_disk, get_typed_class(options.virt, 'Memory') : 'mem', get_typed_class(options.virt, 'NetworkPort') : test_mac, - get_typed_class(options.virt, 'Processor') : test_vcpus - 1 + get_typed_class(options.virt, 'Processor') : 'proc' } tc_scen = [ diff -r 137e5079c73f -r ede68ec5664d suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Fri Apr 11 16:58:23 2008 +0530 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Sun Apr 13 19:03:17 2008 -0700 @@ -74,7 +74,7 @@ def main(): 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) + get_typed_class(options.virt, "Processor") : '%s/proc' % test_dom } key_list = {'DeviceID' : '', diff -r 137e5079c73f -r ede68ec5664d suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Fri Apr 11 16:58:23 2008 +0530 +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Sun Apr 13 19:03:17 2008 -0700 @@ -82,7 +82,7 @@ def init_list(virt): Creating the lists that will be used for comparisons. """ procrasd = { - "InstanceID" : '%s/%s' %(test_dom,0), + "InstanceID" : '%s/%s' %(test_dom, "proc"), "ResourceType" : 3, "CreationClassName": get_typed_class(virt, 'ProcResourceAllocationSettingData') }