# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1224577871 25200 # Node ID c1ab00fe5a8fbc2483d4baa2eb436d9842f311be # Parent f35b3e65944d83f758656717a903eee38b7d5b19 [TEST] Updating the tc to use cim_define(). Tested with Xen, XenFV, KVM with current sources without sblim-base-provider. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Sun Oct 19 19:28:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Tue Oct 21 01:31:11 2008 -0700 @@ -44,7 +44,7 @@ def main(): status = FAIL cxml = vxml.get_class(options.virt)(test_dom) - rc = cxml.define(options.ip) + rc = cxml.cim_define(options.ip) if not rc: Globals.logger.error(VIRSH_ERROR_DEFINE % test_dom) return status diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Sun Oct 19 19:28:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Tue Oct 21 01:31:11 2008 -0700 @@ -69,7 +69,7 @@ def main(): #Define a VS try: - ret = cxml.define(options.ip) + ret = cxml.cim_define(options.ip) if not ret : logger.error("ERROR: VS %s was not defined" % test_dom) return status diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Sun Oct 19 19:28:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Tue Oct 21 01:31:11 2008 -0700 @@ -135,7 +135,7 @@ def main(): keys['DiskResourceAllocationSettingData'] = "%s/%s" % (test_dom, vdisk) keys['NetResourceAllocationSettingData'] = "%s/%s" % (test_dom, vmac) - ret = cxml.define(options.ip) + ret = cxml.cim_define(options.ip) if not ret: logger.error("Failed to define the dom: %s", test_dom) return FAIL diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Sun Oct 19 19:28:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Tue Oct 21 01:31:11 2008 -0700 @@ -85,7 +85,7 @@ def setup_env(server, virt="Xen"): mac = test_mac, disk = test_disk) - ret = vsxml_info.define(server) + ret = vsxml_info.cim_define(server) if not ret: logger.error("Failed to define the dom: %s", test_dom) status = FAIL diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Sun Oct 19 19:28:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Tue Oct 21 01:31:11 2008 -0700 @@ -225,7 +225,7 @@ def main(): vsxml = virt_type(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk, ntype="network") - ret = vsxml.define(server) + ret = vsxml.cim_define(server) if not ret: logger.error("Failed to define the dom: '%s'", test_dom) return FAIL diff -r f35b3e65944d -r c1ab00fe5a8f suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py --- a/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Sun Oct 19 19:28:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Tue Oct 21 01:31:11 2008 -0700 @@ -45,7 +45,7 @@ def main(): test_dev = 'hda' vsxml = get_class(options.virt)(test_dom, disk=test_dev) - vsxml.define(options.ip) + vsxml.cim_define(options.ip) devid = "%s/%s" % (test_dom, test_dev) key_list = { 'DeviceID' : devid,