qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>, "Ed Maste" <emaste@freebsd.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Kamil Rytarowski" <kamil@netbsd.org>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Li-Wen Hsu" <lwhsu@freebsd.org>,
	"Brad Smith" <brad@comstyle.com>
Subject: [Qemu-devel] [PATCH 08/13] tests/vm: serial console support helpers
Date: Wed,  8 May 2019 10:56:40 +0200	[thread overview]
Message-ID: <20190508085645.11595-9-kraxel@redhat.com> (raw)
In-Reply-To: <20190508085645.11595-1-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>
---
 tests/vm/basevm.py | 82 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 9c6bb317ac89..a27d2c72f5f5 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -13,7 +13,9 @@
 
 from __future__ import print_function
 import os
+import re
 import sys
+import socket
 import logging
 import time
 import datetime
@@ -91,8 +93,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", str(vcpus)]
         if kvm_available(self.arch):
@@ -173,6 +174,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:
@@ -195,6 +198,81 @@ 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)
+            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(1024)
+            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
+            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)
+            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.18.1



  parent reply	other threads:[~2019-05-08  9:04 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-08  8:56 [Qemu-devel] [PATCH 00/13] tests/vm: serial console autoinstall, misc fixes Gerd Hoffmann
2019-05-08  8:56 ` [Qemu-devel] [PATCH 01/13] scripts: use git archive in archive-source Gerd Hoffmann
2019-05-08  8:56 ` [Qemu-devel] [PATCH 02/13] tests/vm: send proxy environment variables over ssh Gerd Hoffmann
2019-05-08  8:56 ` [Qemu-devel] [PATCH 03/13] tests/vm: send locale " Gerd Hoffmann
2019-05-09  7:35   ` Thomas Huth
2019-05-09  8:18     ` Gerd Hoffmann
2019-05-08  8:56 ` [Qemu-devel] [PATCH 04/13] tests/vm: use ssh with pty unconditionally Gerd Hoffmann
2019-05-08  8:56 ` [Qemu-devel] [PATCH 05/13] tests/vm: run test builds on snapshot Gerd Hoffmann
2019-05-08  8:56 ` [Qemu-devel] [PATCH 06/13] tests/vm: add vm-boot-{ssh, serial}-<guest> targets Gerd Hoffmann
2019-05-08  8:56 ` [Qemu-devel] [PATCH 07/13] tests/vm: add DEBUG=1 to help text Gerd Hoffmann
2019-05-08  8:56 ` Gerd Hoffmann [this message]
2019-05-08  8:56 ` [Qemu-devel] [PATCH 09/13] tests/vm: openbsd autoinstall, using serial console Gerd Hoffmann
2019-05-08  8:56 ` [Qemu-devel] [PATCH 10/13] tests/vm: freebsd " Gerd Hoffmann
2019-05-08  8:56 ` [Qemu-devel] [PATCH 11/13] tests/vm: netbsd " Gerd Hoffmann
2019-05-08 19:30   ` Kamil Rytarowski
2019-05-09  6:47     ` Gerd Hoffmann
2019-05-09 16:39       ` Richard Henderson
2019-05-09 19:07         ` Kamil Rytarowski
2019-05-09 17:01       ` Kamil Rytarowski
2019-05-08  8:56 ` [Qemu-devel] [PATCH 12/13] tests/vm: fedora " Gerd Hoffmann
2019-05-09 12:00   ` Thomas Huth
2019-05-09 13:10     ` Gerd Hoffmann
2019-05-09 13:23       ` Daniel P. Berrangé
2019-05-08  8:56 ` [Qemu-devel] [PATCH 13/13] tests/vm: ubuntu.i386: apt proxy setup Gerd Hoffmann
2019-05-09 12:12   ` Philippe Mathieu-Daudé
2019-05-09 13:17     ` Gerd Hoffmann
2019-05-09 11:53 ` [Qemu-devel] [PATCH 00/13] tests/vm: serial console autoinstall, misc fixes Thomas Huth
2019-05-09 12:04   ` Philippe Mathieu-Daudé
2019-05-09 12:35     ` Thomas Huth
2019-05-09 13:50   ` Gerd Hoffmann
2019-05-09 13:57     ` Thomas Huth
2019-05-09 19:11       ` Kamil Rytarowski
2019-05-09 18:52 ` Kamil Rytarowski
2019-05-10  4:23   ` Gerd Hoffmann

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=20190508085645.11595-9-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=brad@comstyle.com \
    --cc=emaste@freebsd.org \
    --cc=fam@euphon.net \
    --cc=kamil@netbsd.org \
    --cc=lwhsu@freebsd.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).