diff --git a/libvirt/tests/src/snapshot/revert_disk_external_snap.py b/libvirt/tests/src/snapshot/revert_disk_external_snap.py index 81862705996..41a19ca0bba 100644 --- a/libvirt/tests/src/snapshot/revert_disk_external_snap.py +++ b/libvirt/tests/src/snapshot/revert_disk_external_snap.py @@ -38,9 +38,7 @@ def revert_snap_and_check_files(params, vm, test, snap_name, expected_files): virsh.snapshot_revert(vm.name, snap_name, options=options, **virsh_dargs) - vm.cleanup_serial_console() - vm.create_serial_console() - session = vm.wait_for_serial_login() + session = vm.wait_for_serial_login(recreate_serial_console=True) for file in expected_files: output = session.cmd('ls %s' % file) if file not in output: diff --git a/libvirt/tests/src/snapshot/revert_snapshot_after_xml_updated.py b/libvirt/tests/src/snapshot/revert_snapshot_after_xml_updated.py index cd7d6c5c0fa..448acb42219 100644 --- a/libvirt/tests/src/snapshot/revert_snapshot_after_xml_updated.py +++ b/libvirt/tests/src/snapshot/revert_snapshot_after_xml_updated.py @@ -68,9 +68,7 @@ def check_file_exist(test, vm, params, revert_snap): if not vm.is_alive(): virsh.start(vm_name) - vm.cleanup_serial_console() - vm.create_serial_console() - session = vm.wait_for_serial_login() + session = vm.wait_for_serial_login(recreate_serial_console=True) if revert_snap == "1": file_list = eval(params.get("file_list"))[0:1] diff --git a/provider/interface/check_points.py b/provider/interface/check_points.py index 233263d4385..32985914c52 100644 --- a/provider/interface/check_points.py +++ b/provider/interface/check_points.py @@ -21,9 +21,7 @@ def check_network_accessibility(vm, **kwargs): """ if kwargs.get("recreate_vm_session", "yes") == "yes": logging.debug("Recreating vm session...") - vm.cleanup_serial_console() - vm.create_serial_console() - vm_session = vm.wait_for_serial_login() + vm_session = vm.wait_for_serial_login(recreate_serial_console=True) else: vm_session = vm.session diff --git a/provider/migration/base_steps.py b/provider/migration/base_steps.py index 0840f4865b3..306fc12f57d 100644 --- a/provider/migration/base_steps.py +++ b/provider/migration/base_steps.py @@ -93,9 +93,7 @@ def setup_default(self, use_console=False): if start_vm == "yes" and not self.vm.is_alive(): self.vm.start() if use_console: - self.vm.cleanup_serial_console() - self.vm.create_serial_console() - self.vm.wait_for_serial_login().close() + self.vm.wait_for_serial_login(recreate_serial_console=True).close() else: self.vm.wait_for_login().close() if self.check_cont_ping: @@ -295,9 +293,7 @@ def check_vm_cont_ping(self, check_on_dest=True): self.test.log.debug("Checking the output of %s", self.check_cont_ping_log) if check_on_dest: backup_uri, self.vm.connect_uri = self.vm.connect_uri, dest_uri - self.vm.cleanup_serial_console() - self.vm.create_serial_console() - vm_session = self.vm.wait_for_serial_login(timeout=360) + vm_session = self.vm.wait_for_serial_login(timeout=360, recreate_serial_console=True) vm_session.cmd( "> {0}; sleep 5; grep time= {0}".format(self.check_cont_ping_log)) o = vm_session.cmd_output(f"cat {self.check_cont_ping_log}") diff --git a/provider/migration/migration_base.py b/provider/migration/migration_base.py index ada55c72cac..7a5f39cbdd1 100644 --- a/provider/migration/migration_base.py +++ b/provider/migration/migration_base.py @@ -257,10 +257,8 @@ def poweroff_vm(params): if poweroff_vm_dest: dest_uri = params.get("virsh_migrate_desturi") - migration_obj.vm.cleanup_serial_console() backup_uri, migration_obj.vm.connect_uri = migration_obj.vm.connect_uri, dest_uri - migration_obj.vm.create_serial_console() - remote_vm_session = migration_obj.vm.wait_for_serial_login(timeout=120) + remote_vm_session = migration_obj.vm.wait_for_serial_login(timeout=120, recreate_serial_console=True) remote_vm_session.cmd("poweroff", ignore_all_errors=True) remote_vm_session.close() migration_obj.vm.cleanup_serial_console() @@ -776,9 +774,7 @@ def write_vm_disk_on_dest(params): migration_obj = params.get("migration_obj") backup_uri, migration_obj.vm.connect_uri = migration_obj.vm.connect_uri, desturi - migration_obj.vm.cleanup_serial_console() - migration_obj.vm.create_serial_console() - vm_session = migration_obj.vm.wait_for_serial_login(timeout=120) + vm_session = migration_obj.vm.wait_for_serial_login(timeout=120, recreate_serial_console=True) vm_session.cmd("while true; do echo 'do disk I/O error test' >> /tmp/disk_io_error_test; sleep 1; done &") vm_session.close() migration_obj.vm.connect_uri = backup_uri diff --git a/provider/save/save_base.py b/provider/save/save_base.py index 843df0b416e..1e77975fcd0 100644 --- a/provider/save/save_base.py +++ b/provider/save/save_base.py @@ -18,9 +18,7 @@ def pre_save_setup(vm, serial=False): :return: a tuple of pid of ping and uptime since when """ if serial: - vm.cleanup_serial_console() - vm.create_serial_console() - session = vm.wait_for_serial_login() + session = vm.wait_for_serial_login(recreate_serial_console=True) else: session = vm.wait_for_login() upsince = session.cmd_output('uptime --since').strip() @@ -48,9 +46,7 @@ def post_save_check(vm, pid_ping, upsince, serial=False): :param serial: Whether to use a serial connection """ if serial: - vm.cleanup_serial_console() - vm.create_serial_console() - session = vm.wait_for_serial_login() + session = vm.wait_for_serial_login(recreate_serial_console=True) else: session = vm.wait_for_login() upsince_restore = session.cmd_output('uptime --since').strip()