[Libvirt-cim] [PATCH] [TEST] Convert define() to use cim_define() for other tc

yunguol at cn.ibm.com yunguol at cn.ibm.com
Wed Dec 3 05:29:45 UTC 2008


# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1228282179 28800
# Node ID fd9b6294d6a044c2b0e45526a364a13adaa68e73
# Parent  70ecd9e8867cc277b31f4703e73b5dba7ad53128
[TEST] Convert define() to use cim_define() for other tc

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

diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py	Tue Dec 02 21:29:39 2008 -0800
@@ -245,7 +245,7 @@
     test_mac = "00:11:22:33:44:55"
    
     vsxml = get_class(options.virt)(test_dom, mac=test_mac)
-    ret = vsxml.define(options.ip)
+    ret = vsxml.cim_define(options.ip)
     if ret != 1:
         logger.error("Define domain failed!")
         return SKIP
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py	Tue Dec 02 21:29:39 2008 -0800
@@ -43,7 +43,7 @@
 def main():
     options = main.options
     cxml = KVMXML(test_dom, mac = test_mac, ntype='user')
-    ret = cxml.define(options.ip)
+    ret = cxml.cim_define(options.ip)
     if not ret:
         logger.error('Unable to define domain %s' % test_dom)
         return FAIL
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/Processor/01_processor.py
--- a/suites/libvirt-cim/cimtest/Processor/01_processor.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/Processor/01_processor.py	Tue Dec 02 21:29:39 2008 -0800
@@ -44,7 +44,7 @@
     options = main.options
     status = PASS
     vsxml = get_class(options.virt)(test_dom, vcpus=test_vcpus)
-    vsxml.define(options.ip)
+    vsxml.cim_define(options.ip)
     vsxml.start(options.ip)
 
     # Processor instance enumerate need the domain to be active
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py
--- a/suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py	Tue Dec 02 21:29:39 2008 -0800
@@ -179,7 +179,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, vcpus=test_vcpus)
-    vsxml.define(options.ip)
+    vsxml.cim_define(options.ip)
     ret = vsxml.start(options.ip)
     if not ret:
         logger.error("Failed to Create the dom: %s", test_dom)
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py
--- a/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py	Tue Dec 02 21:29:39 2008 -0800
@@ -144,7 +144,7 @@
                                 disk = test_disk)
         bridge = vsxml.set_vbridge(server, default_network_name)
     try:
-        ret = vsxml.define(options.ip)
+        ret = vsxml.cim_define(options.ip)
         if not ret:
             logger.error("Failed to Define the domain: %s", test_dom)
             return FAIL 
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Tue Dec 02 21:29:39 2008 -0800
@@ -58,7 +58,7 @@
                         mac = test_mac, disk = test_disk,
                         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 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/VSSD/01_enum.py
--- a/suites/libvirt-cim/cimtest/VSSD/01_enum.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/VSSD/01_enum.py	Tue Dec 02 21:29:39 2008 -0800
@@ -47,7 +47,7 @@
 
     destroy_and_undefine_all(options.ip)
     vsxml = get_class(options.virt)(test_dom)
-    ret = vsxml.define(options.ip)
+    ret = vsxml.cim_define(options.ip)
     if not ret :
         logger.error("error while create of VS")
         status = FAIL
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py
--- a/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py	Tue Dec 02 21:29:39 2008 -0800
@@ -92,7 +92,7 @@
     else:
         VSType = options.virt
     vsxml = get_class(options.virt)(test_dom)
-    ret = vsxml.define(options.ip)
+    ret = vsxml.cim_define(options.ip)
     if not ret :
         logger.error("error while define of VS")
         return FAIL
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py	Tue Dec 02 21:29:39 2008 -0800
@@ -45,7 +45,7 @@
     
     service = vsms.get_vsms_class(options.virt)(options.ip)
     cxml = vxml.get_class(options.virt)(default_dom)
-    ret = cxml.define(options.ip)
+    ret = cxml.cim_define(options.ip)
     if not ret:
         logger.error("Failed to define the dom: %s", default_dom)
         return FAIL
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/06_addresource.py	Tue Dec 02 21:29:39 2008 -0800
@@ -99,7 +99,7 @@
         #Each time through, define guest using a default XML
         cxml.undefine(options.ip)
         cxml = vxml.get_class(options.virt)(default_dom)
-        ret = cxml.define(options.ip)
+        ret = cxml.cim_define(options.ip)
         if not ret:
             logger.error("Failed to define the dom: %s", default_dom)
             cleanup_env(options.ip, options.virt, cxml, net_name)
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/07_addresource_neg.py	Tue Dec 02 21:29:39 2008 -0800
@@ -53,7 +53,7 @@
     status = PASS
     rc = -1
     try:
-        cxml.define(options.ip)
+        cxml.cim_define(options.ip)
         bad_inst = 'instance of what ever { dd = 3; //\ ]&'
         ret = service.AddResourceSettings(AffectedConfiguration=vssd_ref, 
                                     ResourceSettings=[bad_inst])
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py	Tue Dec 02 21:29:39 2008 -0800
@@ -75,7 +75,7 @@
         #Each time through, define guest using a default XML
         cxml.undefine(options.ip)
         cxml = vxml.get_class(options.virt)(default_dom, vcpus=cpu)
-        ret = cxml.define(options.ip)
+        ret = cxml.cim_define(options.ip)
         if not ret:
             logger.error("Failed to define the dom: %s", default_dom)
             cleanup_env(options.ip, options.virt, cxml)
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py	Tue Dec 02 21:29:39 2008 -0800
@@ -44,7 +44,7 @@
     try:
         virt_xml = vxml.get_class(virt)
         cxml = virt_xml(guest_name)
-        cxml.define(ip)
+        cxml.cim_define(ip)
     except Exception:
         logger.error("Error define domain %s" % guest_name)
         cxml.undefine(ip)
diff -r 70ecd9e8867c -r fd9b6294d6a0 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py	Mon Dec 01 22:15:38 2008 -0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py	Tue Dec 02 21:29:39 2008 -0800
@@ -131,7 +131,7 @@
     else:
         cxml = virt_xml(test_dom, vcpus = test_vcpus, \
                         mac = test_mac, disk = test_disk)
-    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 




More information about the Libvirt-cim mailing list