# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1228273337 28800 # Node ID 03f56f4d1b8d46e20c03817a0f791a821c51bfdd # Parent 70ecd9e8867cc277b31f4703e73b5dba7ad53128 [TEST] Convert define() to use cim_define() Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 70ecd9e8867c -r 03f56f4d1b8d suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Mon Dec 01 22:15:38 2008 -0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Tue Dec 02 19:02:17 2008 -0800 @@ -48,7 +48,7 @@ enabState = 0 cxml = vxml.get_class(options.virt)(test_dom) - cxml.define(options.ip) + cxml.cim_define(options.ip) ret = cxml.start(options.ip) if not ret : diff -r 70ecd9e8867c -r 03f56f4d1b8d suites/libvirt-cim/cimtest/ComputerSystem/42_cs_gi_errs.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/42_cs_gi_errs.py Mon Dec 01 22:15:38 2008 -0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/42_cs_gi_errs.py Tue Dec 02 19:02:17 2008 -0800 @@ -102,7 +102,7 @@ inst_ccname = classname = get_typed_class(options.virt, 'ComputerSystem') inst_name = 'ETdomain' cxml = vxml.get_class(options.virt)(inst_name) - ret = cxml.define(options.ip) + ret = cxml.cim_define(options.ip) if not ret: logger.error(VIRSH_ERROR_DEFINE % inst_name) return FAIL diff -r 70ecd9e8867c -r 03f56f4d1b8d suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Mon Dec 01 22:15:38 2008 -0800 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Tue Dec 02 19:02:17 2008 -0800 @@ -185,7 +185,7 @@ vsxml = virt_type (test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk) - ret = vsxml.define(options.ip) + ret = vsxml.cim_define(options.ip) if not ret: logger.error("Failed to define the dom: %s", test_dom) return FAIL diff -r 70ecd9e8867c -r 03f56f4d1b8d suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Mon Dec 01 22:15:38 2008 -0800 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Tue Dec 02 19:02:17 2008 -0800 @@ -502,7 +502,7 @@ disk = test_disk) bridge = vsxml.set_vbridge(options.ip, default_network_name) - ret = vsxml.define(options.ip) + ret = vsxml.cim_define(options.ip) if not ret: logger.error("Failed to define the dom: %s", test_dom) return FAIL diff -r 70ecd9e8867c -r 03f56f4d1b8d suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py --- a/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py Mon Dec 01 22:15:38 2008 -0800 +++ b/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py Tue Dec 02 19:02:17 2008 -0800 @@ -92,7 +92,7 @@ else: test_dom = "qemu" vsxml = get_class(options.virt)(test_dom) - ret = vsxml.define(options.ip) + ret = vsxml.cim_define(options.ip) if not ret: logger.error("Failed to Define the dom: %s", test_dom) return FAIL diff -r 70ecd9e8867c -r 03f56f4d1b8d suites/libvirt-cim/cimtest/HostedDependency/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Mon Dec 01 22:15:38 2008 -0800 +++ b/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Tue Dec 02 19:02:17 2008 -0800 @@ -72,7 +72,7 @@ cxml = virtxml(test_dom) else: cxml = virtxml(test_dom, mac = test_mac) - ret = cxml.define(server) + ret = cxml.cim_define(server) if not ret: logger.error("Failed to define the dom: %s", test_dom) status = FAIL diff -r 70ecd9e8867c -r 03f56f4d1b8d suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py --- a/suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py Mon Dec 01 22:15:38 2008 -0800 +++ b/suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py Tue Dec 02 19:02:17 2008 -0800 @@ -177,7 +177,7 @@ # Getting the VS list and deleting the test_dom if it already exists. destroy_and_undefine_all(options.ip) vsxml = get_class(options.virt)(test_dom, test_mem) - ret = vsxml.define(options.ip) + ret = vsxml.cim_define(options.ip) if not ret: logger.error("Failed to Create the dom: %s", test_dom) return FAIL