[Libvirt-cim] [PATCH 2 of 4] [TEST] Update Proc, Prof, and RASD to use do_main in const.py

[Kaitlin Rupert]

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1220403378 25200
# Node ID 5ec94788a6cc7a299bb8137ab75f8db373af4424
# Parent  11dadfddf7c9a508405bc4eea09a01106b4db981
[TEST] Update Proc, Prof, and RASD to use do_main in const.py

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

diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/Processor/01_processor.py
--- a/suites/libvirt-cim/cimtest/Processor/01_processor.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Processor/01_processor.py	Tue Sep 02 17:56:18 2008 -0700
@@ -31,7 +31,7 @@
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.vxml import XenXML, KVMXML, get_class
 from CimTest.Globals import logger
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
 SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV']
diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/Processor/02_definesys_get_procs.py
--- a/suites/libvirt-cim/cimtest/Processor/02_definesys_get_procs.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Processor/02_definesys_get_procs.py	Tue Sep 02 17:56:18 2008 -0700
@@ -38,7 +38,8 @@
 from XenKvmLib.test_doms import undefine_test_domain 
 from XenKvmLib.common_util import create_using_definesystem 
 from XenKvmLib.devices import get_dom_proc_insts
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
 sup_types = ['Xen', 'KVM', 'XenFV']
diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py
--- a/suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py	Tue Sep 02 17:56:18 2008 -0700
@@ -130,9 +130,8 @@
 from XenKvmLib.vxml import get_class
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from CimTest.ReturnCodes import PASS, FAIL
-from CimTest.Globals import logger, CIM_USER
-from CimTest.Globals import CIM_PASS, CIM_NS
-from CimTest.Globals import do_main
+from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
+from XenKvmLib.const import do_main
 
 sup_types = ['Xen', 'KVM', 'XenFV']
 
diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/Profile/01_enum.py
--- a/suites/libvirt-cim/cimtest/Profile/01_enum.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Profile/01_enum.py	Tue Sep 02 17:56:18 2008 -0700
@@ -30,7 +30,8 @@
 from XenKvmLib import enumclass
 from XenKvmLib.classes import get_typed_class
 from CimTest import Globals
-from CimTest.Globals import do_main, logger
+from CimTest.Globals import logger, CIM_ERROR_ENUMERATE
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
@@ -53,7 +54,7 @@
         key_list = ["InstanceID"]
         proflist = enumclass.enumerate(options.ip, cn, key_list, options.virt)
     except Exception, detail:
-        logger.error(Globals.CIM_ERROR_ENUMERATE, get_typed_class(options.virt,
+        logger.error(CIM_ERROR_ENUMERATE, get_typed_class(options.virt,
                      cn))
         logger.error("Exception: %s", detail)
         status = FAIL
diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py
--- a/suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py	Tue Sep 02 17:56:18 2008 -0700
@@ -44,7 +44,7 @@
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from CimTest import Globals 
 from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORNAMES 
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.classes import get_typed_class
 
diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/Profile/03_rprofile_gi_errs.py
--- a/suites/libvirt-cim/cimtest/Profile/03_rprofile_gi_errs.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Profile/03_rprofile_gi_errs.py	Tue Sep 02 17:56:18 2008 -0700
@@ -55,7 +55,7 @@
 from XenKvmLib.common_util import try_getinstance
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest import Globals
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
 
diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py
--- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py	Tue Sep 02 17:56:18 2008 -0700
@@ -48,7 +48,7 @@
 
 import sys
 from CimTest import Globals
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib import assoc
 from XenKvmLib import vxml 
diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/RASD/02_enum.py
--- a/suites/libvirt-cim/cimtest/RASD/02_enum.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py	Tue Sep 02 17:56:18 2008 -0700
@@ -29,12 +29,12 @@
 
 import sys
 from XenKvmLib import enumclass
-from CimTest.Globals import do_main, CIM_ERROR_ENUMERATE
+from CimTest.Globals import logger, CIM_ERROR_ENUMERATE
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib import rasd 
-from CimTest.Globals import logger
+from XenKvmLib.const import do_main 
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib import rasd
 from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \
diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py
--- a/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py	Tue Sep 02 17:56:18 2008 -0700
@@ -56,7 +56,7 @@
 import pywbem
 from XenKvmLib import assoc
 from XenKvmLib.common_util import try_getinstance
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
diff -r 11dadfddf7c9 -r 5ec94788a6cc suites/libvirt-cim/cimtest/RASD/04_disk_rasd_size.py
--- a/suites/libvirt-cim/cimtest/RASD/04_disk_rasd_size.py	Tue Sep 02 17:56:16 2008 -0700
+++ b/suites/libvirt-cim/cimtest/RASD/04_disk_rasd_size.py	Tue Sep 02 17:56:18 2008 -0700
@@ -26,7 +26,7 @@
 import sys
 
 from CimTest.ReturnCodes import FAIL, PASS
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from CimTest.Globals import logger
 from VirtLib import utils
 from XenKvmLib.test_doms import undefine_test_domain