7:57 p.m.
New subject: [PATCH 1 of 4] [TEST] Update LD, Mem, and NP to use do_main from const.py
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1220403376 25200
# Node ID 11dadfddf7c9a508405bc4eea09a01106b4db981
# Parent 90ff66d2baee23319d29727d61fa9cf5d8f64f27
[TEST] Update LD, Mem, and NP to use do_main from const.py
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py
--- a/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Fri Aug 29 13:26:12 2008 -0700
+++ b/suites/libvirt-cim/cimtest/LogicalDisk/01_disk.py Tue Sep 02 17:56:16 2008 -0700
@@ -30,7 +30,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
SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV']
diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py
--- a/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Fri Aug 29 13:26:12 2008 -0700
+++ b/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Tue Sep 02 17:56:16 2008 -0700
@@ -27,7 +27,8 @@
import pywbem
from VirtLib import live
from XenKvmLib import devices
-from CimTest.Globals import logger, do_main, CIM_ERROR_ENUMERATE
+from CimTest.Globals import logger, CIM_ERROR_ENUMERATE
+from XenKvmLib.const import do_main
from CimTest.ReturnCodes import PASS, FAIL, SKIP
sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
diff -r 90ff66d2baee -r 11dadfddf7c9
suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py
--- a/suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py Fri Aug 29 13:26:12 2008
-0700
+++ b/suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py Tue Sep 02 17:56:16 2008
-0700
@@ -131,8 +131,9 @@
from XenKvmLib.classes import get_typed_class
from XenKvmLib.vxml import XenXML, KVMXML, get_class
from CimTest.ReturnCodes import PASS, FAIL
-from CimTest.Globals import logger, CIM_USER, do_main
-from CimTest.Globals import CIM_PASS, CIM_NS, CIM_ERROR_GETINSTANCE
+from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, \
+ CIM_ERROR_GETINSTANCE
+from XenKvmLib.const import do_main
sup_types = ['Xen', 'KVM', 'XenFV']
diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/Memory/01_memory.py
--- a/suites/libvirt-cim/cimtest/Memory/01_memory.py Fri Aug 29 13:26:12 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py Tue Sep 02 17:56:16 2008 -0700
@@ -30,7 +30,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
sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/Memory/02_defgetmem.py
--- a/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py Fri Aug 29 13:26:12 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py Tue Sep 02 17:56:16 2008 -0700
@@ -32,7 +32,8 @@
from XenKvmLib.test_doms import undefine_test_domain
from XenKvmLib.common_util import create_using_definesystem
from XenKvmLib.devices import get_dom_mem_inst
-from CimTest.Globals import logger, do_main
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
default_dom = "domu"
diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py
--- a/suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py Fri Aug 29 13:26:12 2008 -0700
+++ b/suites/libvirt-cim/cimtest/Memory/03_mem_gi_errs.py Tue Sep 02 17:56:16 2008 -0700
@@ -130,8 +130,8 @@
from XenKvmLib.vxml import XenXML, KVMXML, get_class
from XenKvmLib.classes import get_typed_class
from CimTest.ReturnCodes import PASS, FAIL
-from CimTest.Globals import logger, CIM_USER, do_main
-from CimTest.Globals import CIM_PASS, CIM_NS
+from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
+from XenKvmLib.const import do_main
sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
diff -r 90ff66d2baee -r 11dadfddf7c9 suites/libvirt-cim/cimtest/NetworkPort/01_netport.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Fri Aug 29 13:26:12 2008 -0700
+++ b/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Tue Sep 02 17:56:16 2008 -0700
@@ -37,7 +37,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, XFAIL_RC
from XenKvmLib.const import get_provider_version
diff -r 90ff66d2baee -r 11dadfddf7c9
suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py Fri Aug 29 13:26:12 2008
-0700
+++ b/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py Tue Sep 02 17:56:16 2008
-0700
@@ -33,7 +33,8 @@
from XenKvmLib.classes import get_typed_class
from XenKvmLib.vxml import XenXML, KVMXML, LXCXML, get_class
from CimTest.ReturnCodes import PASS, SKIP
-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']
diff -r 90ff66d2baee -r 11dadfddf7c9
suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py Fri Aug 29 13:26:12 2008
-0700
+++ b/suites/libvirt-cim/cimtest/NetworkPort/03_user_netport.py Tue Sep 02 17:56:16 2008
-0700
@@ -31,7 +31,7 @@
from XenKvmLib import devices
from XenKvmLib.vxml import KVMXML
from CimTest.Globals import logger
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
from CimTest.ReturnCodes import PASS, FAIL
sup_types = ['KVM']
7:57 p.m.
New subject: [PATCH 2 of 4] [TEST] Update Proc, Prof, and RASD to use do_main in const.py
# HG changeset patch
# User Kaitlin Rupert <karupert(a)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(a)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
7:57 p.m.
New subject: [PATCH 3 of 4] [TEST] Update RefProf, RAFP, and ResourcePool to use do_main from const.py
# HG changeset patch
# User Kaitlin Rupert <karupert(a)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(a)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
7:57 p.m.
New subject: [PATCH 4 of 4] [TEST] Update ResPoolConfCap and ResPoolConfService to use do_main from const.py
# HG changeset patch
# User Kaitlin Rupert <karupert(a)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(a)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
12:52 a.m.
New subject: [PATCH 0 of 4] More updates to switch do_main to the do_main in const.py
+1 from me for this patch set.
Best,
Regards
Daisy (运国莲)
VSM Team, China Systems & Technology Labs (CSTL)
E-mail: yunguol(a)cn.ibm.com
TEL: (86)-21-60922403
Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203
Kaitlin Rupert <kaitlin(a)linux.vnet.ibm.com>
Sent by: libvirt-cim-bounces(a)redhat.com
2008-09-03 08:57
Please respond to
List for discussion and development of libvirt CIM
<libvirt-cim(a)redhat.com>
To
libvirt-cim(a)redhat.com
cc
Subject
[Libvirt-cim] [PATCH 0 of 4] More updates to switch do_main to the do_main
in const.py
_______________________________________________
Libvirt-cim mailing list
Libvirt-cim(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvirt-cim
5805
days inactive
5805
days old
5 comments
2 participants
participants (2)
-
Guo Lian Yun -
Kaitlin Rupert