[Libvirt-cim] [PATCH 2 of 4] [TEST] Update SysDev, VSMC, and VSSD to use do_main from const.py

[Kaitlin Rupert]

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1220461445 25200
# Node ID d4f9f0c09fa74998b7d0ef53526ebebaac0b10f7
# Parent  7cbf05c0d3dda38ad6d6120f25cc1e5568b6689f
[TEST] Update SysDev, VSMC, and VSSD to use do_main from const.py

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

diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/SystemDevice/01_forward.py
--- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py	Wed Sep 03 10:04:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py	Wed Sep 03 10:04:05 2008 -0700
@@ -30,7 +30,8 @@
 from XenKvmLib import vxml
 from XenKvmLib import devices
 from XenKvmLib.classes import get_typed_class
-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', 'LXC']
diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py
--- a/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py	Wed Sep 03 10:04:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py	Wed Sep 03 10:04:05 2008 -0700
@@ -30,7 +30,8 @@
 from XenKvmLib import computersystem
 from XenKvmLib import assoc
 from XenKvmLib import devices
-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', 'LXC']
diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py
--- a/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py	Wed Sep 03 10:04:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py	Wed Sep 03 10:04:05 2008 -0700
@@ -36,7 +36,8 @@
 from XenKvmLib import assoc
 from XenKvmLib import devices
 from XenKvmLib.classes import get_typed_class
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest import Globals
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
 
diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VSSD/01_enum.py
--- a/suites/libvirt-cim/cimtest/VSSD/01_enum.py	Wed Sep 03 10:04:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VSSD/01_enum.py	Wed Sep 03 10:04:05 2008 -0700
@@ -31,7 +31,8 @@
 from XenKvmLib import enumclass
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.vxml import get_class
-from CimTest.Globals import do_main, platform_sup, logger
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
 platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VSSD/02_bootldr.py
--- a/suites/libvirt-cim/cimtest/VSSD/02_bootldr.py	Wed Sep 03 10:04:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VSSD/02_bootldr.py	Wed Sep 03 10:04:05 2008 -0700
@@ -32,7 +32,8 @@
 from VirtLib.live import bootloader
 from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all
 from XenKvmLib.test_xml import testxml_bl
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 
 sup_types = ['Xen']
 test_dom = "dom"
diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py
--- a/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py	Wed Sep 03 10:04:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VSSD/03_vssd_gi_errs.py	Wed Sep 03 10:04:05 2008 -0700
@@ -51,8 +51,8 @@
 import sys
 import pywbem
 from CimTest.ReturnCodes import PASS, FAIL
-from CimTest.Globals import logger, do_main, platform_sup
-from CimTest.Globals import CIM_PASS, CIM_NS, CIM_USER
+from XenKvmLib.const import do_main
+from CimTest.Globals import CIM_PASS, CIM_NS, CIM_USER, logger
 from XenKvmLib import assoc
 from XenKvmLib.vxml import get_class
 from XenKvmLib.common_util import try_getinstance
diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py
--- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Wed Sep 03 10:04:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py	Wed Sep 03 10:04:05 2008 -0700
@@ -44,8 +44,8 @@
 import sys
 import XenKvmLib
 from XenKvmLib import enumclass
-from CimTest.Globals import do_main, CIM_ERROR_ASSOCIATORS, CIM_ERROR_ENUMERATE
-from CimTest.Globals import logger
+from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS, CIM_ERROR_ENUMERATE
+from XenKvmLib.const import do_main 
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib import assoc
diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py	Wed Sep 03 10:04:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/01_enum.py	Wed Sep 03 10:04:05 2008 -0700
@@ -25,7 +25,7 @@
 import sys
 from XenKvmLib import enumclass
 from CimTest import Globals
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from XenKvmLib.classes import get_typed_class
 
 sup_types=['Xen', 'KVM', 'XenFV', 'LXC']
diff -r 7cbf05c0d3dd -r d4f9f0c09fa7 suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py	Wed Sep 03 10:04:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementCapabilities/02_vsmcap_gi_errs.py	Wed Sep 03 10:04:05 2008 -0700
@@ -56,7 +56,8 @@
 from XenKvmLib.common_util import try_getinstance
 from XenKvmLib.classes import get_typed_class
 from CimTest.ReturnCodes import PASS, FAIL
-from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main
+from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
+from XenKvmLib.const import do_main
 
 sup_types=['Xen', 'KVM', 'XenFV', 'LXC']