# HG changeset patch # User Zhengang Li <lizg@cn.ibm.com> # Date 1209391870 -28800 # Node ID 17873ab6228cc92c6cd5e92a41b5a19ed312792c # Parent 5ed6cd841f7b65eeea4af7af845c4ebfc2da4cf1 [TEST] Add revision branch for VSMS.02_destroysystem Signed-off-by: Zhengang Li <lizg@cn.ibm.com> diff -r 5ed6cd841f7b -r 17873ab6228c suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Mon Apr 28 17:00:36 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Mon Apr 28 22:11:10 2008 +0800 @@ -25,15 +25,17 @@ import pywbem import pywbem from pywbem.cim_obj import CIMInstanceName from VirtLib import utils -from VirtLib.live import domain_list +from VirtLib.live import domain_list, active_domain_list from XenKvmLib import vsms, vxml from XenKvmLib.classes import get_typed_class +from XenKvmLib.const import CIM_REV from CimTest.Globals import do_main from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV'] default_dom = 'test_domain' +rev = 528 @do_main(sup_types) def main(): @@ -48,8 +50,8 @@ def main(): cs_ref = CIMInstanceName(classname, keybindings = { 'Name':default_dom, 'CreationClassName':classname}) - - list_before = domain_list(options.ip, options.virt) + dl_func = CIM_REV < rev and active_domain_list or domain_list + list_before = dl_func(options.ip, options.virt) status = PASS rc = -1 @@ -61,7 +63,7 @@ def main(): logger.error(details) status = FAIL - list_after = domain_list(options.ip, options.virt) + list_after = dl_func(options.ip, options.virt) status = PASS if default_dom not in list_before: