diff -r fa608cfd2be3 -r c778e1b632af
suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py
--- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Thu May 15 06:07:17 2008
-0700
+++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Thu May 15 06:33:07 2008
-0700
@@ -179,7 +179,7 @@ def get_assocname_info(server, cn, an, q
status = FAIL
if status != PASS:
- cleanup_restore()
+ cleanup_restore(server, virt='Xen')
test_domain_function(test_dom, server, "destroy")
return status, assoc_info
@@ -221,7 +221,7 @@ def verify_eafp_values(server, in_pllist
except Exception, detail:
logger.error(CIM_ERROR_ASSOCIATORS, an)
logger.error("Exception: %s", detail)
- cleanup_restore()
+ cleanup_restore(server, virt='Xen')
status = FAIL
return status
@@ -229,7 +229,7 @@ def main():
def main():
options= main.options
server = options.ip
-
+ virt=options.virt
# Get the host info
status, host_name, classname = get_host_info(server)
if status != PASS:
@@ -256,14 +256,14 @@ def main():
status = setup_env(server)
if status != PASS:
- cleanup_restore()
+ cleanup_restore(server, vir=tvirt)
This should be virt = virst.
test_domain_function(test_dom, server, cmd =
"destroy")
return status
in_pllist = pool_init_list(pool)
status = verify_eafp_values(server, in_pllist)
ret = test_domain_function(test_dom, server, cmd = "destroy")
- cleanup_restore()
+ cleanup_restore(server, virt=virt)
return status
if __name__ == "__main__":
sys.exit(main())
--
Kaitlin Rupert
IBM Linux Technology Center
kaitlin(a)linux.vnet.ibm.com