[Libvirt-cim] [PATCH] [TEST] using cim_define() for some tests to fix caching problem

[yunguol at cn.ibm.com]

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1220942661 25200
# Node ID aaa44481faee136c0ced9d400860d1eb1002df31
# Parent  8abcd820b6b37e5fbe8ccc30734cefa908dfab78
[TEST] using cim_define() for some tests to fix caching problem

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 8abcd820b6b3 -r aaa44481faee suites/libvirt-cim/cimtest/Memory/01_memory.py
--- a/suites/libvirt-cim/cimtest/Memory/01_memory.py	Fri Sep 05 02:47:24 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py	Mon Sep 08 23:44:21 2008 -0700
@@ -42,7 +42,7 @@ def main():
     options = main.options
     
     vsxml = get_class(options.virt)(test_dom, mem)
-    vsxml.define(options.ip)
+    vsxml.cim_define(options.ip)
     alloc_mem = int(vsxml.xml_get_mem())
     
     devid = "%s/mem" % test_dom
diff -r 8abcd820b6b3 -r aaa44481faee suites/libvirt-cim/cimtest/NetworkPort/01_netport.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py	Fri Sep 05 02:47:24 2008 -0700
+++ b/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py	Mon Sep 08 23:44:21 2008 -0700
@@ -64,7 +64,7 @@ def main():
     options = main.options
     
     vsxml = get_class(options.virt)(test_dom, mac=test_mac)
-    vsxml.define(options.ip)
+    vsxml.cim_define(options.ip)
 
     devid = "%s/%s" % (test_dom, test_mac)
     key_list = { 'DeviceID' : devid,
diff -r 8abcd820b6b3 -r aaa44481faee suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py	Fri Sep 05 02:47:24 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py	Mon Sep 08 23:44:21 2008 -0700
@@ -137,7 +137,7 @@ def main():
                      ]
 
     try:
-        ret = vsxml.define(server)
+        ret = vsxml.cim_define(server)
         if not ret:
             logger.error("Failed to Define the domain: %s", test_dom)
             return FAIL 
diff -r 8abcd820b6b3 -r aaa44481faee suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Fri Sep 05 02:47:24 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Mon Sep 08 23:44:21 2008 -0700
@@ -63,7 +63,7 @@ def setup_env(server, virt):
                         ntype='network', net_name = test_npool)
     
     try:
-        ret = vsxml.define(server)
+        ret = vsxml.cim_define(server)
         if not ret:
             logger.error("Failed to Define the domain: %s", test_dom)
             return FAIL, vsxml, test_disk
diff -r 8abcd820b6b3 -r aaa44481faee suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Fri Sep 05 02:47:24 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Mon Sep 08 23:44:21 2008 -0700
@@ -105,7 +105,7 @@ def setup_env(server, virt, nettype='net
 
     vsxml_info = modify_net_name(server, virt, nettype, vsxml_info)
 
-    ret = vsxml_info.define(server)
+    ret = vsxml_info.cim_define(server)
     if not ret:
         Globals.logger.error("Failed to define the dom '%s' for '%s' type"
                              " interface", test_dom, nettype)