[Libvirt-cim] [PATCH 4 of 4] [TEST] Update ResPoolConfCap and ResPoolConfService to use do_main from const.py

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


# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1220403383 25200
# Node ID 58896395abd6636bd5a2f594ee32678080212432
# Parent  aaaeddcb88f1956a7325d3756615cf08ef40dfcc
[TEST] Update ResPoolConfCap and ResPoolConfService to use do_main from const.py

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

diff -r aaaeddcb88f1 -r 58896395abd6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py	Tue Sep 02 17:56:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py	Tue Sep 02 17:56:23 2008 -0700
@@ -24,7 +24,7 @@
 import sys
 from XenKvmLib import enumclass
 from CimTest import Globals
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
diff -r aaaeddcb88f1 -r 58896395abd6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py	Tue Sep 02 17:56:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py	Tue Sep 02 17:56:23 2008 -0700
@@ -50,7 +50,7 @@
 from XenKvmLib import assoc
 from XenKvmLib.classes import get_typed_class
 from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.common_util import try_getinstance
 
diff -r aaaeddcb88f1 -r 58896395abd6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py	Tue Sep 02 17:56:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py	Tue Sep 02 17:56:23 2008 -0700
@@ -28,7 +28,7 @@
 from CimTest import Globals
 from CimTest.ReturnCodes import PASS, FAIL
 from CimTest.Globals import logger
-from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.const import do_main
 from XenKvmLib.classes import get_typed_class
 
 platform_sup = ['Xen', 'XenFV', 'LXC', 'KVM']
diff -r aaaeddcb88f1 -r 58896395abd6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py	Tue Sep 02 17:56:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py	Tue Sep 02 17:56:23 2008 -0700
@@ -31,7 +31,7 @@
 from XenKvmLib import assoc
 from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
 from XenKvmLib.common_util import get_host_info, try_getinstance
-from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.const import do_main
 from XenKvmLib.classes import get_typed_class
 
 platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC']
diff -r aaaeddcb88f1 -r 58896395abd6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/03_CreateResourcePool.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/03_CreateResourcePool.py	Tue Sep 02 17:56:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/03_CreateResourcePool.py	Tue Sep 02 17:56:23 2008 -0700
@@ -43,7 +43,7 @@
 from XenKvmLib import rpcs_service
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import FAIL, PASS
-from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.const import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
 
 cim_errno  = pywbem.CIM_ERR_NOT_SUPPORTED
diff -r aaaeddcb88f1 -r 58896395abd6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py	Tue Sep 02 17:56:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py	Tue Sep 02 17:56:23 2008 -0700
@@ -52,7 +52,7 @@
 from XenKvmLib import rpcs_service
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import FAIL, PASS
-from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.const import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
 
 cim_errno  = pywbem.CIM_ERR_NOT_SUPPORTED
diff -r aaaeddcb88f1 -r 58896395abd6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/05_AddResourcesToResourcePool.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/05_AddResourcesToResourcePool.py	Tue Sep 02 17:56:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/05_AddResourcesToResourcePool.py	Tue Sep 02 17:56:23 2008 -0700
@@ -50,7 +50,7 @@
 from XenKvmLib import rpcs_service
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import FAIL, PASS, XFAIL_RC
-from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.const import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
 
 cim_errno  = pywbem.CIM_ERR_FAILED
diff -r aaaeddcb88f1 -r 58896395abd6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/06_RemoveResourcesFromResourcePool.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/06_RemoveResourcesFromResourcePool.py	Tue Sep 02 17:56:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/06_RemoveResourcesFromResourcePool.py	Tue Sep 02 17:56:23 2008 -0700
@@ -50,7 +50,7 @@
 from XenKvmLib import rpcs_service
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import FAIL, PASS
-from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.const import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
 
 cim_errno  = pywbem.CIM_ERR_NOT_SUPPORTED
diff -r aaaeddcb88f1 -r 58896395abd6 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py	Tue Sep 02 17:56:20 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py	Tue Sep 02 17:56:23 2008 -0700
@@ -46,7 +46,7 @@
 from XenKvmLib import rpcs_service
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import FAIL, PASS
-from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.const import do_main, platform_sup
 from XenKvmLib.classes import get_typed_class
 
 cim_errno  = pywbem.CIM_ERR_NOT_SUPPORTED




More information about the Libvirt-cim mailing list