[Libvirt-cim] [PATCH 3 of 4] [TEST] Update RefProf, RAFP, and ResourcePool to use do_main from const.py

Kaitlin Rupert kaitlin at linux.vnet.ibm.com
Wed Sep 3 00:57:03 UTC 2008


# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1220403380 25200
# Node ID aaaeddcb88f1956a7325d3756615cf08ef40dfcc
# Parent  5ec94788a6cc7a299bb8137ab75f8db373af4424
[TEST] Update RefProf, RAFP, and ResourcePool to use do_main from const.py

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 5ec94788a6cc -r aaaeddcb88f1 suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py
--- a/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py	Tue Sep 02 17:56:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py	Tue Sep 02 17:56:20 2008 -0700
@@ -76,7 +76,7 @@
 from XenKvmLib.common_util import profile_init_list
 from CimTest import Globals
 from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
 from XenKvmLib.common_util import print_field_error
diff -r 5ec94788a6cc -r aaaeddcb88f1 suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py
--- a/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py	Tue Sep 02 17:56:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py	Tue Sep 02 17:56:20 2008 -0700
@@ -56,7 +56,8 @@
 from XenKvmLib import assoc 
 from CimTest import Globals
 from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS
-from CimTest.Globals import do_main, CIM_USER, CIM_PASS
+from CimTest.Globals import CIM_USER, CIM_PASS
+from XenKvmLib.const import do_main
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import FAIL, PASS, SKIP
 from XenKvmLib.common_util import try_assoc
diff -r 5ec94788a6cc -r aaaeddcb88f1 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Tue Sep 02 17:56:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py	Tue Sep 02 17:56:20 2008 -0700
@@ -30,7 +30,8 @@
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.vxml import get_class 
 from CimTest import Globals
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf
 from XenKvmLib.const import default_network_name
diff -r 5ec94788a6cc -r aaaeddcb88f1 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Tue Sep 02 17:56:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py	Tue Sep 02 17:56:20 2008 -0700
@@ -30,7 +30,8 @@
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
 from CimTest import Globals
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib import enumclass
 from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf
diff -r 5ec94788a6cc -r aaaeddcb88f1 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Tue Sep 02 17:56:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py	Tue Sep 02 17:56:20 2008 -0700
@@ -26,7 +26,8 @@
 from XenKvmLib import assoc
 from XenKvmLib.classes import get_typed_class
 from CimTest import Globals
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
diff -r 5ec94788a6cc -r aaaeddcb88f1 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py	Tue Sep 02 17:56:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py	Tue Sep 02 17:56:20 2008 -0700
@@ -26,7 +26,8 @@
 from XenKvmLib import assoc
 from XenKvmLib.classes import get_typed_class
 from CimTest import Globals
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
diff -r 5ec94788a6cc -r aaaeddcb88f1 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Tue Sep 02 17:56:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py	Tue Sep 02 17:56:20 2008 -0700
@@ -52,7 +52,7 @@
 from CimTest import Globals
 from CimTest.Globals import logger, CIM_ERROR_ENUMERATE
 from CimTest.ReturnCodes import PASS, FAIL
-from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.const import do_main, platform_sup
 from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class
 
diff -r 5ec94788a6cc -r aaaeddcb88f1 suites/libvirt-cim/cimtest/ResourcePool/01_enum.py
--- a/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py	Tue Sep 02 17:56:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py	Tue Sep 02 17:56:20 2008 -0700
@@ -31,7 +31,8 @@
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib import vxml
 from CimTest import Globals
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL, SKIP
 from VirtLib.live import net_list
 from XenKvmLib.vsms import RASD_TYPE_PROC, RASD_TYPE_MEM, RASD_TYPE_NET_ETHER, \
diff -r 5ec94788a6cc -r aaaeddcb88f1 suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py
--- a/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py	Tue Sep 02 17:56:18 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py	Tue Sep 02 17:56:20 2008 -0700
@@ -36,7 +36,7 @@
 from distutils.file_util import move_file
 from CimTest.ReturnCodes import PASS, SKIP
 from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
 create_diskpool_file
 




More information about the Libvirt-cim mailing list