# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1217512627 25200 # Node ID 75b131d1d9bf499d5da56c8ff66327d32f026a7f # Parent 6cc6d0b3dbbacba5eaa5faf9e7cbef1fb24f4f78 [TEST] Fixing the tc 08_modifyresource.py and updating the others to accomdate the AllocationUnits field changes. The changes are tested with KVM, Xen , XenFV on the current sources. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 6cc6d0b3dbba -r 75b131d1d9bf suites/libvirt-cim/cimtest/RASD/04_disk_rasd_size.py --- a/suites/libvirt-cim/cimtest/RASD/04_disk_rasd_size.py Thu Jul 31 06:52:50 2008 -0700 +++ b/suites/libvirt-cim/cimtest/RASD/04_disk_rasd_size.py Thu Jul 31 06:57:07 2008 -0700 @@ -78,7 +78,7 @@ drasd = drasd_class("hda", temp, default_dom) mrasd_class = vsms.get_masd_class(options.virt) - mrasd = mrasd_class(32, default_dom) + mrasd = mrasd_class(32, "MegaBytes", default_dom) params = { "vssd" : vssd.mof(), diff -r 6cc6d0b3dbba -r 75b131d1d9bf suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py Thu Jul 31 06:52:50 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py Thu Jul 31 06:57:07 2008 -0700 @@ -41,6 +41,7 @@ cpu = 2 ncpu = 1 nmem = 256 +munits = "Megabytes" def cleanup_env(ip, virt, cxml, net_name): destroy_netpool(ip, virt, net_name) @@ -68,7 +69,9 @@ mac=cxml.xml_get_net_mac(), name=default_dom, virt_net=net_name) - masd = vsms.get_masd_class(options.virt)(megabytes=nmem, name=default_dom) + masd = vsms.get_masd_class(options.virt)(megabytes=nmem, + mallocunits=munits, + name=default_dom) pasd = vsms.get_pasd_class(options.virt)(vcpu=ncpu, name=default_dom) status = FAIL diff -r 6cc6d0b3dbba -r 75b131d1d9bf suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py Thu Jul 31 06:52:50 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py Thu Jul 31 06:57:07 2008 -0700 @@ -47,9 +47,8 @@ def try_define(options, vssd, units, value): mrasd_class = vsms.get_masd_class(options.virt) - mrasd = mrasd_class(None, default_dom) + mrasd = mrasd_class(None, units, default_dom) - mrasd.AllocationUnits = units mrasd.VirtualQuantity = value params = {