[Libvirt-cim] [PATCH 1 of 2] [TEST] VSSDC, SnapshotService, and SnapshotCap to use do_main from const.py

[Kaitlin Rupert]

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1220559236 25200
# Node ID f1e880a8c064d7eaf332fb195d1af38f66a1fb90
# Parent  d409f1d12edda62db577628693124c268a7d7da4
[TEST] VSSDC, SnapshotService, and SnapshotCap to use do_main from const.py

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

diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py	Wed Sep 03 22:54:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py	Thu Sep 04 13:13:56 2008 -0700
@@ -58,7 +58,8 @@
 from XenKvmLib import assoc
 from XenKvmLib import vxml
 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 FAIL, PASS
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Wed Sep 03 22:54:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py	Thu Sep 04 13:13:56 2008 -0700
@@ -53,7 +53,8 @@
 from XenKvmLib import vxml
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.rasd import InstId_err
-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', 'XenFV', 'KVM', 'LXC']
diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Wed Sep 03 22:54:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py	Thu Sep 04 13:13:56 2008 -0700
@@ -60,7 +60,8 @@
 from XenKvmLib.common_util import try_assoc
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from CimTest.ReturnCodes import PASS, FAIL
-from CimTest.Globals import do_main, logger
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py	Wed Sep 03 22:54:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/04_vssdc_rev_errs.py	Thu Sep 04 13:13:56 2008 -0700
@@ -63,7 +63,8 @@
 from XenKvmLib.common_util import try_assoc
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from CimTest.ReturnCodes import PASS, FAIL
-from CimTest.Globals import do_main, logger
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py	Wed Sep 03 22:54:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py	Thu Sep 04 13:13:56 2008 -0700
@@ -25,7 +25,7 @@
 from XenKvmLib import enumclass
 from CimTest.Globals import CIM_ERROR_ENUMERATE, logger
 from CimTest.ReturnCodes import PASS, FAIL
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.common_util import get_host_info
 
diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py	Wed Sep 03 22:54:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py	Thu Sep 04 13:13:56 2008 -0700
@@ -31,7 +31,7 @@
 from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
 from CimTest.ReturnCodes import PASS
 from XenKvmLib.common_util import try_getinstance
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.common_util import get_host_info
 
diff -r d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py	Wed Sep 03 22:54:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py	Thu Sep 04 13:13:56 2008 -0700
@@ -25,7 +25,7 @@
 from XenKvmLib import enumclass
 from CimTest.Globals import CIM_ERROR_ENUMERATE, logger
 from CimTest.ReturnCodes import PASS, FAIL
-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 d409f1d12edd -r f1e880a8c064 suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py	Wed Sep 03 22:54:35 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py	Thu Sep 04 13:13:56 2008 -0700
@@ -49,7 +49,7 @@
 from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
 from CimTest.ReturnCodes import PASS
 from XenKvmLib.common_util import try_getinstance
-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']