[Libvirt-cim] [PATCH 4 of 4] [TEST] 08 - Remove cleanup_guest_netpool() def and call it from vsmigration.py

[Kaitlin Rupert]

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1242946256 25200
# Node ID 6495a6ca36878b10e7bb57eae53eb6a943d8b4d1
# Parent  4e7716bd2775599cdafd858d7875924669c41766
[TEST] 08 - Remove cleanup_guest_netpool() def and call it from vsmigration.py

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

diff -r 4e7716bd2775 -r 6495a6ca3687 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/08_remote_restart_resume_migration.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/08_remote_restart_resume_migration.py	Thu May 21 15:50:56 2009 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/08_remote_restart_resume_migration.py	Thu May 21 15:50:56 2009 -0700
@@ -35,9 +35,9 @@
 from XenKvmLib.const import do_main, default_network_name
 from CimTest.ReturnCodes import PASS, FAIL, SKIP
 from XenKvmLib.classes import get_typed_class
-from XenKvmLib.vsmigrations import check_mig_support, local_remote_migrate
-from XenKvmLib.common_util import poll_for_state_change, create_netpool_conf,\
-                                  destroy_netpool
+from XenKvmLib.vsmigrations import check_mig_support, local_remote_migrate, \
+                                   cleanup_guest_netpool
+from XenKvmLib.common_util import poll_for_state_change, create_netpool_conf
 
 sup_types = ['KVM', 'Xen']
 
@@ -168,13 +168,7 @@
         cleanup_guest(virt, cxml, test_dom, t_sysname, s_sysname)
         status = FAIL
 
-    # clean the networkpool created on the remote machine
-    target_net_list = net_list(t_sysname, virt)
-    if target_net_list != None and net_pool_name in target_net_list:
-        ret_value = destroy_netpool(t_sysname, virt, net_pool_name)
-        if ret_value != PASS:
-            logger.info("Unable to destroy networkpool '%s' on '%s'",
-                         net_pool_name, t_sysname)
+    cleanup_guest_netpool(virt, cxml, test_dom, t_sysname, s_sysname)
 
     if status_restart != PASS or status_resume != PASS:
         status = FAIL