# HG changeset patch # User Deepti B. Kalakeri<deeptik@linux.vnet.ibm.com> # Date 1239182573 25200 # Node ID b52473e2e6d72077d2aaa7bdd0593b9ad24924e8 # Parent fbd3990003091191b34ce74569d07d999b22eb41 [TEST] Updating 06_remote_live_migration.py, 07_remote_offline_migration.py tc to use check_mig_support(). This patch is dependent on Adding check_mig_support() to vsmigration.py. Tested with Xen/KVM with current sources and rpm. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r fbd399000309 -r b52473e2e6d7 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/06_remote_live_migration.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/06_remote_live_migration.py Wed Apr 08 02:05:16 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/06_remote_live_migration.py Wed Apr 08 02:22:53 2009 -0700 @@ -28,14 +28,14 @@ import sys import os -from socket import gethostname, gethostbyaddr +from socket import gethostname from XenKvmLib import vxml from XenKvmLib.xm_virt_util import domain_list, net_list from CimTest.Globals import logger 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 local_remote_migrate +from XenKvmLib.vsmigrations import check_mig_support, local_remote_migrate from XenKvmLib.common_util import poll_for_state_change, create_netpool_conf,\ destroy_netpool @@ -110,12 +110,9 @@ def main(): options = main.options virt = options.virt - s_sysname = gethostbyaddr(options.ip)[0] - t_sysname = gethostbyaddr(options.t_url)[0] - if options.virt == 'KVM' and (t_sysname == s_sysname or \ - t_sysname in s_sysname): - logger.info("Libvirt does not support local migratoin for KVM") - return SKIP + status, s_sysname, t_sysname = check_mig_support(virt, options) + if status != PASS: + return status status = FAIL test_dom = 'VM_frm_' + gethostname() diff -r fbd399000309 -r b52473e2e6d7 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/07_remote_offline_migration.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/07_remote_offline_migration.py Wed Apr 08 02:05:16 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/07_remote_offline_migration.py Wed Apr 08 02:22:53 2009 -0700 @@ -28,14 +28,14 @@ import sys import os -from socket import gethostname, gethostbyaddr +from socket import gethostname from XenKvmLib import vxml from XenKvmLib.xm_virt_util import domain_list, net_list from CimTest.Globals import logger from XenKvmLib.const import do_main, default_network_name -from CimTest.ReturnCodes import PASS, FAIL, SKIP +from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.classes import get_typed_class -from XenKvmLib.vsmigrations import local_remote_migrate +from XenKvmLib.vsmigrations import check_mig_support, local_remote_migrate from XenKvmLib.common_util import poll_for_state_change, create_netpool_conf,\ destroy_netpool @@ -93,12 +93,9 @@ def main(): options = main.options virt = options.virt - s_sysname = gethostbyaddr(options.ip)[0] - t_sysname = gethostbyaddr(options.t_url)[0] - if options.virt == 'KVM' and (t_sysname == s_sysname or \ - t_sysname in s_sysname): - logger.info("Libvirt does not support local migratoin for KVM") - return SKIP + status, s_sysname, t_sysname = check_mig_support(virt, options) + if status != PASS: + return status status = FAIL test_dom = 'VM_frm_' + gethostname()