From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH v1 10/17] tests/vm: serial console support helpers
Date: Wed, 19 Jun 2019 20:40:14 +0100 [thread overview]
Message-ID: <20190619194021.8240-11-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190619194021.8240-1-alex.bennee@linaro.org>
From: Gerd Hoffmann <kraxel@redhat.com>
Add a bunch of helpers to talk to the guest using the
serial console.
Also drop the hard-coded -serial parameter for the vm
so QEMUMachine.set_console() actually works.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190617043858.8290-7-kraxel@redhat.com>
[AJB: added tags]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/vm/basevm.py | 86 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 83 insertions(+), 3 deletions(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index f27178f3c7..592a344773 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -2,10 +2,11 @@
#
# VM testing base class
#
-# Copyright 2017 Red Hat Inc.
+# Copyright 2017-2019 Red Hat Inc.
#
# Authors:
# Fam Zheng <famz@redhat.com>
+# Gerd Hoffmann <kraxel@redhat.com>
#
# This code is licensed under the GPL version 2 or later. See
# the COPYING file in the top-level directory.
@@ -13,7 +14,9 @@
from __future__ import print_function
import os
+import re
import sys
+import socket
import logging
import time
import datetime
@@ -79,8 +82,7 @@ class BaseVM(object):
"-cpu", "max",
"-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22",
"-device", "virtio-net-pci,netdev=vnet",
- "-vnc", "127.0.0.1:0,to=20",
- "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out")]
+ "-vnc", "127.0.0.1:0,to=20"]
if vcpus and vcpus > 1:
self._args += ["-smp", "%d" % vcpus]
if kvm_available(self.arch):
@@ -162,6 +164,8 @@ class BaseVM(object):
logging.debug("QEMU args: %s", " ".join(args))
qemu_bin = os.environ.get("QEMU", "qemu-system-" + self.arch)
guest = QEMUMachine(binary=qemu_bin, args=args)
+ guest.set_machine('pc')
+ guest.set_console()
try:
guest.launch()
except:
@@ -184,6 +188,82 @@ class BaseVM(object):
raise Exception("Cannot find ssh port from 'info usernet':\n%s" % \
usernet_info)
+ def console_init(self, timeout = 120):
+ vm = self._guest
+ vm.console_socket.settimeout(timeout)
+
+ def console_log(self, text):
+ for line in re.split("[\r\n]", text):
+ # filter out terminal escape sequences
+ line = re.sub("\x1b\[[0-9;?]*[a-zA-Z]", "", line)
+ line = re.sub("\x1b\([0-9;?]*[a-zA-Z]", "", line)
+ # replace unprintable chars
+ line = re.sub("\x1b", "<esc>", line)
+ line = re.sub("[\x00-\x1f]", ".", line)
+ line = re.sub("[\x80-\xff]", ".", line)
+ if line == "":
+ continue
+ # log console line
+ sys.stderr.write("con recv: %s\n" % line)
+
+ def console_wait(self, expect):
+ vm = self._guest
+ output = ""
+ while True:
+ try:
+ chars = vm.console_socket.recv(1)
+ except socket.timeout:
+ sys.stderr.write("console: *** read timeout ***\n")
+ sys.stderr.write("console: waiting for: '%s'\n" % expect)
+ sys.stderr.write("console: line buffer:\n")
+ sys.stderr.write("\n")
+ self.console_log(output.rstrip())
+ sys.stderr.write("\n")
+ raise
+ output += chars.decode("latin1")
+ if expect in output:
+ break
+ if "\r" in output or "\n" in output:
+ lines = re.split("[\r\n]", output)
+ output = lines.pop()
+ if self.debug:
+ self.console_log("\n".join(lines))
+ if self.debug:
+ self.console_log(output)
+
+ def console_send(self, command):
+ vm = self._guest
+ if self.debug:
+ logline = re.sub("\n", "<enter>", command)
+ logline = re.sub("[\x00-\x1f]", ".", logline)
+ sys.stderr.write("con send: %s\n" % logline)
+ for char in list(command):
+ vm.console_socket.send(char.encode("utf-8"))
+ time.sleep(0.01)
+
+ def console_wait_send(self, wait, command):
+ self.console_wait(wait)
+ self.console_send(command)
+
+ def console_ssh_init(self, prompt, user, pw):
+ sshkey_cmd = "echo '%s' > .ssh/authorized_keys\n" % SSH_PUB_KEY.rstrip()
+ self.console_wait_send("login:", "%s\n" % user)
+ self.console_wait_send("Password:", "%s\n" % pw)
+ self.console_wait_send(prompt, "mkdir .ssh\n")
+ self.console_wait_send(prompt, sshkey_cmd)
+ self.console_wait_send(prompt, "chmod 755 .ssh\n")
+ self.console_wait_send(prompt, "chmod 644 .ssh/authorized_keys\n")
+
+ def console_sshd_config(self, prompt):
+ self.console_wait(prompt)
+ self.console_send("echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config\n")
+ for var in self.envvars:
+ self.console_wait(prompt)
+ self.console_send("echo 'AcceptEnv %s' >> /etc/ssh/sshd_config\n" % var)
+
+ def print_step(self, text):
+ sys.stderr.write("### %s ...\n" % text)
+
def wait_ssh(self, seconds=300):
starttime = datetime.datetime.now()
endtime = starttime + datetime.timedelta(seconds=seconds)
--
2.20.1
next prev parent reply other threads:[~2019-06-19 19:42 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 19:40 [Qemu-devel] [PATCH v1 00/17] testing/next (Travis fixes, more tests/vm) Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 01/17] tests/vm: avoid extra compressed image copy Alex Bennée
2019-06-20 11:07 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 02/17] tests/vm: avoid image presence check and removal Alex Bennée
2019-06-20 10:29 ` Philippe Mathieu-Daudé
2019-06-20 11:07 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 03/17] tests/vm: pin ubuntu.i386 image Alex Bennée
2019-06-20 10:31 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 04/17] tests/vm: add source repos on ubuntu.i386 Alex Bennée
2019-06-20 11:06 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 05/17] tests/vm: send proxy environment variables over ssh Alex Bennée
2019-06-20 10:38 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 06/17] tests/vm: use ssh with pty unconditionally Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 07/17] tests/vm: run test builds on snapshot Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 08/17] tests/vm: proper guest shutdown Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 09/17] tests/vm: add vm-boot-{ssh, serial}-<guest> targets Alex Bennée
2019-06-19 19:40 ` Alex Bennée [this message]
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 11/17] tests/vm: openbsd autoinstall, using serial console Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 12/17] tests/vm: freebsd " Alex Bennée
2019-06-20 10:39 ` Philippe Mathieu-Daudé
2019-06-20 11:01 ` Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 13/17] tests/vm: netbsd " Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 14/17] tests/vm: fedora " Alex Bennée
2019-06-20 10:36 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 15/17] tests/vm: ubuntu.i386: apt proxy setup Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 16/17] .travis.yml: default the --disable-system build to --static Alex Bennée
2019-06-20 10:37 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 17/17] .travis.yml: force a brew update for MacOS builds Alex Bennée
2019-06-20 10:37 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190619194021.8240-11-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=kraxel@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).