Skip to content

Commit ed8ed0f

Browse files
committed
fix migration with bridge interface be more stable
no sleep after case running would make bridge clean and host get ip process be more stable Signed-off-by: nanli <[email protected]>
1 parent 16c893d commit ed8ed0f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

libvirt/tests/src/virtual_network/migrate/migrate_with_bridge_type_interface.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import aexpect.remote
1010
import re
1111
import os
12+
import time
1213

1314
from virttest import utils_net
1415
from virttest import virsh
@@ -147,7 +148,6 @@ def run_test():
147148
vm.cleanup_serial_console()
148149
vm.create_serial_console()
149150
vm_session_after_mig = vm.wait_for_serial_login(timeout=240)
150-
vm_session_after_mig.cmd("dhclient -r; dhclient", timeout=120)
151151

152152
test.log.info("TEST_STEP: Testing guest ping to outside")
153153
ips = {"outside_ip": outside_ip}
@@ -193,6 +193,8 @@ def teardown_test():
193193
network_dict, is_del=True, remote_args=remote_virsh_dargs
194194
)
195195
libvirt_network.create_or_del_network(network_dict, is_del=True)
196+
# Add some waiting time to make host connection stable after clean bridge.
197+
time.sleep(5)
196198
migration_obj.cleanup_connection()
197199

198200
server_ip = params["server_ip"] = params.get("migrate_dest_host")
@@ -233,7 +235,7 @@ def teardown_test():
233235
new_xml = vm_xml.VMXML.new_from_inactive_dumpxml(vm_name)
234236

235237
remote_session = aexpect.remote.remote_login(
236-
"ssh", server_ip, "22", server_user, server_pwd, r"[$#%]"
238+
"ssh", server_ip, "22", server_user, server_pwd, '#',
237239
)
238240
remote_host_iface = params.get("remote_host_iface")
239241
if not remote_host_iface:

0 commit comments

Comments
 (0)