Add Qemu Monitor Support
v2 cover Add Qemu Monitor Support
Version 2!
I figured out that I was saving the monitor_dumper in the wrong class, so moved where it's saved into the OESSHTarget code, it still needs to be created in the OEQemuTarget since that's where the runner is available.
Currently we interact with the JSON (which is new to me) interface of qmp and right now the write/read is just raw with no JSON dump, that might be why I am seeing the erros after the first one. I did try an empty run_monitor("") between commands, but that did not help. The run_monitor() may need to be reworked to deal with JSON.
Also, I still have the static port of 4444 for the telnet/cli version of the monitor and the possible race for the generated port as I have not found a solution for that yet.
Sau!
The output goes into files as follows:
::::::::::::::
tmp/log/runtime-hostdump/202011101608_qmp/unknown_00_qemu_monitor ::::::::::::::
'{"execute":"status"}\n'
{"timestamp": {"seconds": 1605053296, "microseconds": 645339}, "event": "NIC_RX_FILTER _CHANGED", "data": {"path": "/machine/peripheral-anon/device[0]/virtio-backend"}} ::::::::::::::
tmp/log/runtime-hostdump/202011101608_qmp/unknown_01_qemu_monitor ::::::::::::::
'{"execute":"query-status"}\n'
{"error": {"class": "GenericError", "desc": "QMP input must be a JSON object"}} ::::::::::::::
tmp/log/runtime-hostdump/202011101608_qmp/unknown_02_qemu_monitor ::::::::::::::
'{"execute":"query-block"}\n'
{"error": {"class": "GenericError", "desc": "QMP input must be a JSON object"}}
Saul Wold (1):
qemurunner: add support for qmp cmds
meta/classes/testimage.bbclass | 7 ++++ meta/lib/oeqa/core/target/qemu.py | 6 +++ meta/lib/oeqa/core/target/ssh.py | 22 ++++++++-- meta/lib/oeqa/targetcontrol.py | 5 +++ meta/lib/oeqa/utils/dump.py | 20 +++++++++ meta/lib/oeqa/utils/qemurunner.py | 70 ++++++++++++++++++++++++++++++- 6 files changed, 126 insertions(+), 4 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/1 qemurunner: add support for qmp cmds
This adds support for the Qemu Machine Protocol [0] extending the current dump process for Host and Target. The commands are added in the testimage.bbclass.
Currently, we setup qemu to stall until qmp gets connected and sends the initialization and continue commands, this works correctly.
With this version, the monitor_dumper is created in OEQemuTarget but then set in OESSHTarget as that's where we get the SSH failure happens. Python's @property is used to create a setter/getter type of setup in OESSHTarget to get overridden by OEQemuTarget.
By default the data is currently dumped to files for each command in TMPDIR/log/runtime-hostdump/<date>_qmp/unknown_<seq>_qemu_monitor
Current Issue, the first command succeeds, but the following commands seem to fail. I think it's something to do with JSON and quoting. I think the next step is to try and use JSON (which I am not super familiare with).
[0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt
--- meta/classes/testimage.bbclass | 7 ++++ meta/lib/oeqa/core/target/qemu.py | 6 +++ meta/lib/oeqa/core/target/ssh.py | 22 ++++++++-- meta/lib/oeqa/targetcontrol.py | 5 +++ meta/lib/oeqa/utils/dump.py | 20 +++++++++ meta/lib/oeqa/utils/qemurunner.py | 70 ++++++++++++++++++++++++++++++- 6 files changed, 126 insertions(+), 4 deletions(-)
meta/classes/testimage.bbclass +7 -0
@@ -127,6 +127,12 @@ testimage_dump_host () { netstat -an } +testimage_dump_monitor () { + '{"execute":"status"}\n' + '{"execute":"query-status"}\n' + '{"execute":"query-block"}\n' +} + python do_testimage() { testimage_main(d) }
@@ -319,6 +325,7 @@ def testimage_main(d): target_kwargs['powercontrol_extra_args'] = d.getVar("TEST_POWERCONTROL_EXTRA_ARGS") or "" target_kwargs['serialcontrol_cmd'] = d.getVar("TEST_SERIALCONTROL_CMD") or None target_kwargs['serialcontrol_extra_args'] = d.getVar("TEST_SERIALCONTROL_EXTRA_ARGS") or "" + target_kwargs['testimage_dump_monitor'] = d.getVar("testimage_dump_monitor") or "" target_kwargs['testimage_dump_target'] = d.getVar("testimage_dump_target") or "" def export_ssh_agent(d):
meta/lib/oeqa/core/target/qemu.py +6 -0
@@ -12,6 +12,7 @@ from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner +from oeqa.utils.dump import MonitorDumper from oeqa.utils.dump import TargetDumper supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
@@ -43,6 +44,11 @@ class OEQemuTarget(OESSHTarget): dump_host_cmds=dump_host_cmds, logger=logger, serial_ports=serial_ports, boot_patterns = boot_patterns, use_ovmf=ovmf) + dump_monitor_cmds = kwargs.get("testimage_dump_monitor") + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) + if self.monitor_dumper: + self.monitor_dumper.create_dir("qmp") + dump_target_cmds = kwargs.get("testimage_dump_target") self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) self.target_dumper.create_dir("qemu")
meta/lib/oeqa/core/target/ssh.py +19 -3
@@ -43,6 +43,7 @@ class OESSHTarget(OETarget): if port: self.ssh = self.ssh + [ '-p', port ] self.scp = self.scp + [ '-P', port ] + self._monitor_dumper = None def start(self, **kwargs): pass
@@ -50,11 +51,20 @@ class OESSHTarget(OETarget): def stop(self, **kwargs): pass + @property + def monitor_dumper(self): + return self._monitor_dumper + + @monitor_dumper.setter + def monitor_dumper(self, dumper): + self._monitor_dumper = dumper + self.monitor_dumper.dump_monitor() + def _run(self, command, timeout=None, ignore_status=True): """ Runs command in target using SSHProcess. """ - self.logger.debug("[Running]$ %s" % " ".join(command)) + self.logger.debug("sgw-[Running]$ %s" % " ".join(command)) starttime = time.time() status, output = SSHCall(command, self.logger, timeout)
@@ -87,9 +97,15 @@ class OESSHTarget(OETarget): processTimeout = self.timeout status, output = self._run(sshCmd, processTimeout, True) - self.logger.debug('Command: %s\nOutput: %s\n' % (command, output)) - if (status == 255) and (('No route to host') in output): + self.logger.debug('Command: %s\nStatus: %d Output: %s\n' % (command, status, output)) +# if (status == 255) and (('No route to host') in output): + # for testing right now + if self.monitor_dumper: + self.monitor_dumper.dump_monitor() + if status == 255: self.target_dumper.dump_target() + if self.monitor_dumper: + self.monitor_dumper.dump_monitor() return (status, output) def copyTo(self, localSrc, remoteDst):
meta/lib/oeqa/targetcontrol.py +5 -0
@@ -17,6 +17,7 @@ from oeqa.utils.sshcontrol import SSHControl from oeqa.utils.qemurunner import QemuRunner from oeqa.utils.qemutinyrunner import QemuTinyRunner from oeqa.utils.dump import TargetDumper +from oeqa.utils.dump import MonitorDumper from oeqa.controllers.testtargetloader import TestTargetLoader from abc import ABCMeta, abstractmethod
@@ -108,6 +109,7 @@ class QemuTarget(BaseTarget): self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) dump_target_cmds = d.getVar("testimage_dump_target") dump_host_cmds = d.getVar("testimage_dump_host") + dump_monitor_cmds = d.getVar("testimage_dump_monitor") dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") if not dump_dir: dump_dir = os.path.join(d.getVar('LOG_DIR'), 'runtime-hostdump')
@@ -147,6 +149,9 @@ class QemuTarget(BaseTarget): serial_ports = len(d.getVar("SERIAL_CONSOLES").split())) self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) + self.logger.debug("sgw monitor: %s" % self.monitor_dumper) + def deploy(self): bb.utils.mkdirhier(self.testdir)
meta/lib/oeqa/utils/dump.py +20 -0
@@ -96,3 +96,23 @@ class TargetDumper(BaseDumper): except: print("Tried to dump info from target but " "serial console failed") + print("Failed CMD: %s" % (cmd)) + +class MonitorDumper(BaseDumper): + """ Class to get dumps via the Qemu Monitor, it only works with QemuRunner """ + + def __init__(self, cmds, parent_dir, runner): + super(MonitorDumper, self).__init__(cmds, parent_dir) + self.runner = runner + + def dump_monitor(self, dump_dir=""): + if dump_dir: + self.dump_dir = dump_dir + for cmd in self.cmds: + try: + output = self.runner.run_monitor(cmd) + self._write_dump("qemu_monitor", (cmd + "\n" + output)) + except: + print("Failed to dump montor data") + print("Failed CMD: %s" % (cmd)) +
meta/lib/oeqa/utils/qemurunner.py +69 -1
128 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [OE-core] [WIP v2 1/1] qemurunner: add support for qmp cmds
Quoted 13 lines · Saul Wold
This adds support for the Qemu Machine Protocol [0] extending the current dump process for Host and Target. The commands are added in the testimage.bbclass.
Currently, we setup qemu to stall until qmp gets connected and sends the initialization and continue commands, this works correctly.
With this version, the
monitor_dumperis created in OEQemuTarget but then set in OESSHTarget as that's where we get the SSH failure happens. Python's @property is used to create a setter/getter type of setup in OESSHTarget to get overridden by OEQemuTarget.
Quoted 7 lines
By default the data is currently dumped to files for each command in TMPDIR/log/runtime-hostdump/<date>_qmp/unknown_<seq>_qemu_monitor
Current Issue, the first command succeeds, but the following commands seem to fail. I think it's something to do with JSON and quoting. I think the next step is to try and use JSON (which I am not super familiare with).
One thing that might help with that is letting python encode the strings for you (JSON is *really* picky about syntax):
import json
s = json.dumps({"execute": "status"}) + "\n"
This effectively lets you write the commands in python dictionaries (which will by syntax checked by the interpreter) and know they will be encoded into correct JSON.
Quoted 316 lines
[0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt
Signed-off-by Saul Wold <[email protected]>--- meta/classes/testimage.bbclass | 7 ++++ meta/lib/oeqa/core/target/qemu.py | 6 +++ meta/lib/oeqa/core/target/ssh.py | 22 ++++++++-- meta/lib/oeqa/targetcontrol.py | 5 +++ meta/lib/oeqa/utils/dump.py | 20 +++++++++ meta/lib/oeqa/utils/qemurunner.py | 70 ++++++++++++++++++++++++++++++- 6 files changed, 126 insertions(+), 4 deletions(-)meta/classes/testimage.bbclass +7
-0@@ -127,6 +127,12 @@ testimage_dump_host () { netstat -an } +testimage_dump_monitor () { + '{"execute":"status"}\n' + '{"execute":"query-status"}\n' + '{"execute":"query-block"}\n' +} + python do_testimage() { testimage_main(d) }@@ -319,6 +325,7 @@ def testimage_main(d): target_kwargs['powercontrol_extra_args'] = d.getVar("TEST_POWERCONTROL_EXTRA_ARGS") or "" target_kwargs['serialcontrol_cmd'] = d.getVar("TEST_SERIALCONTROL_CMD") or None target_kwargs['serialcontrol_extra_args'] = d.getVar("TEST_SERIALCONTROL_EXTRA_ARGS") or "" + target_kwargs['testimage_dump_monitor'] = d.getVar("testimage_dump_monitor") or "" target_kwargs['testimage_dump_target'] = d.getVar("testimage_dump_target") or "" def export_ssh_agent(d):meta/lib/oeqa/core/target/qemu.py +6
-0@@ -12,6 +12,7 @@ from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner +from oeqa.utils.dump import MonitorDumper from oeqa.utils.dump import TargetDumper supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']@@ -43,6 +44,11 @@ class OEQemuTarget(OESSHTarget): dump_host_cmds=dump_host_cmds, logger=logger, serial_ports=serial_ports, boot_patterns = boot_patterns, use_ovmf=ovmf) + dump_monitor_cmds = kwargs.get("testimage_dump_monitor") + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) + if self.monitor_dumper: + self.monitor_dumper.create_dir("qmp") + dump_target_cmds = kwargs.get("testimage_dump_target") self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) self.target_dumper.create_dir("qemu")meta/lib/oeqa/core/target/ssh.py +19
-3@@ -43,6 +43,7 @@ class OESSHTarget(OETarget): if port: self.ssh = self.ssh + [ '-p', port ] self.scp = self.scp + [ '-P', port ] + self._monitor_dumper = None def start(self, **kwargs): pass@@ -50,11 +51,20 @@ class OESSHTarget(OETarget): def stop(self, **kwargs): pass + @property + def monitor_dumper(self): + return self._monitor_dumper + + @monitor_dumper.setter + def monitor_dumper(self, dumper): + self._monitor_dumper = dumper + self.monitor_dumper.dump_monitor() + def _run(self, command, timeout=None, ignore_status=True): """ Runs command in target using SSHProcess. """ - self.logger.debug("[Running]$ %s" % " ".join(command)) + self.logger.debug("sgw-[Running]$ %s" % " ".join(command)) starttime = time.time() status, output = SSHCall(command, self.logger, timeout)@@ -87,9 +97,15 @@ class OESSHTarget(OETarget): processTimeout = self.timeout status, output = self._run(sshCmd, processTimeout, True) - self.logger.debug('Command: %s\nOutput: %s\n' % (command, output)) - if (status == 255) and (('No route to host') in output): + self.logger.debug('Command: %s\nStatus: %d Output: %s\n' % (command, status, output)) +# if (status == 255) and (('No route to host') in output): + # for testing right now + if self.monitor_dumper: + self.monitor_dumper.dump_monitor() + if status == 255: self.target_dumper.dump_target() + if self.monitor_dumper: + self.monitor_dumper.dump_monitor() return (status, output) def copyTo(self, localSrc, remoteDst):meta/lib/oeqa/targetcontrol.py +5
-0@@ -17,6 +17,7 @@ from oeqa.utils.sshcontrol import SSHControl from oeqa.utils.qemurunner import QemuRunner from oeqa.utils.qemutinyrunner import QemuTinyRunner from oeqa.utils.dump import TargetDumper +from oeqa.utils.dump import MonitorDumper from oeqa.controllers.testtargetloader import TestTargetLoader from abc import ABCMeta, abstractmethod@@ -108,6 +109,7 @@ class QemuTarget(BaseTarget): self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) dump_target_cmds = d.getVar("testimage_dump_target") dump_host_cmds = d.getVar("testimage_dump_host") + dump_monitor_cmds = d.getVar("testimage_dump_monitor") dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") if not dump_dir: dump_dir = os.path.join(d.getVar('LOG_DIR'), 'runtime-hostdump')@@ -147,6 +149,9 @@ class QemuTarget(BaseTarget): serial_ports = len(d.getVar("SERIAL_CONSOLES").split())) self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) + self.logger.debug("sgw monitor: %s" % self.monitor_dumper) + def deploy(self): bb.utils.mkdirhier(self.testdir)meta/lib/oeqa/utils/dump.py +20
-0@@ -96,3 +96,23 @@ class TargetDumper(BaseDumper): except: print("Tried to dump info from target but " "serial console failed") + print("Failed CMD: %s" % (cmd)) + +class MonitorDumper(BaseDumper): + """ Class to get dumps via the Qemu Monitor, it only works with QemuRunner """ + + def __init__(self, cmds, parent_dir, runner): + super(MonitorDumper, self).__init__(cmds, parent_dir) + self.runner = runner + + def dump_monitor(self, dump_dir=""): + if dump_dir: + self.dump_dir = dump_dir + for cmd in self.cmds: + try: + output = self.runner.run_monitor(cmd) + self._write_dump("qemu_monitor", (cmd + "\n" + output)) + except: + print("Failed to dump montor data") + print("Failed CMD: %s" % (cmd)) +meta/lib/oeqa/utils/qemurunner.py +69
-1@@ -20,6 +20,7 @@ import string import threading import codecs import logging +from contextlib import closing from oeqa.utils.dump import HostDumper from collections import defaultdict@@ -84,6 +85,12 @@ class QemuRunner: default_boot_patterns['send_login_user'] = 'root\n' default_boot_patterns['search_login_succeeded'] = r"root@[a-zA-Z0-9\-]+:~#" default_boot_patterns['search_cmd_finished'] = r"[a-zA-Z0-9]+@[a-zA-Z0-9\-]+:~#" + monitor_cmds = defaultdict(str) + monitor_cmds['qmp_cap'] = '{"execute":"qmp_capabilities","arguments":{"enable":["oob"]}}\n' + monitor_cmds['cont'] = '{"execute":"cont"}\n' + monitor_cmds['quit'] = '{"execute":"quit"}\n' + monitor_cmds['preconfig'] = '{"execute":"x-exit-preconfig"}\n' + self.monitor_cmds = monitor_cmds # Only override patterns that were set e.g. login user TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" for pattern in accepted_patterns:@@ -168,10 +175,17 @@ class QemuRunner: return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, env=env) def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None, env = None): + # Find a free socket port that can be used by the QEMU Monitor console + with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s: + s.bind(('', 0)) + s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + qmp_port = s.getsockname()[1] + try: if self.serial_ports >= 2: self.threadsock, threadport = self.create_socket() self.server_socket, self.serverport = self.create_socket() + except socket.error as msg: self.logger.error("Failed to create listening socket: %s" % msg[1]) return False@@ -185,6 +199,9 @@ class QemuRunner: if os.path.exists(self.qemu_pidfile): os.remove(self.qemu_pidfile) self.qemuparams = 'bootparams="{0}" qemuparams="-pidfile {1}"'.format(bootparams, self.qemu_pidfile) + qemuparams += ' -S -qmp tcp:localhost:%s,server,wait' % (qmp_port) + qemuparams += ' -monitor tcp:localhost:4444,server,nowait' + if qemuparams: self.qemuparams = self.qemuparams[:-1] + " " + qemuparams + " " + '\"'@@ -250,6 +267,28 @@ class QemuRunner: if self.runqemu_exited: return False + + # Create the client socket for the QEMU Monitor Control Socket + # This will allow us to read status from Qemu if the the process + # is still alive + try: + self.monitor_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.monitor_socket.connect(("127.0.0.1", qmp_port)) + self.monitor_socket.setblocking(False) + + except socket.error as msg: + self.logger.error("Failed to connect qemu monitor socket: %s" % msg[1]) + return False + + # Run an empty command to get the initial connection details, then + # send the qmp_capabilities command, this is required to initialize + # the monitor console + mon_output = self.run_monitor("") + self.logger.debug("Monitor: %s" % mon_output) + mon_output = self.run_monitor(self.monitor_cmds['qmp_cap'], timeout=120) + self.logger.debug("Monitor: %s" % mon_output) + mon_output = self.run_monitor(self.monitor_cmds['cont'], timeout=120) + self.logger.debug("Monitor: %s" % mon_output) if not self.is_alive(): self.logger.error("Qemu pid didn't appear in %s seconds (%s)" %@@ -338,6 +377,7 @@ class QemuRunner: reachedlogin = False stopread = False qemusock = None + monsock = None bootlog = b'' data = b'' while time.time() < endtime and not stopread:@@ -376,7 +416,6 @@ class QemuRunner: sock.close() stopread = True - if not reachedlogin: if time.time() >= endtime: self.logger.warning("Target didn't reach login banner in %d seconds (%s)" %@@ -437,6 +476,9 @@ class QemuRunner: self.runqemu.stdout.close() self.runqemu_exited = True + if hasattr(self, 'monitor_socket') and self.monitor_socket: + self.monitor_socket.close() + self.monitor_socket = None if hasattr(self, 'server_socket') and self.server_socket: self.server_socket.close() self.server_socket = None@@ -495,6 +537,32 @@ class QemuRunner: return True return False + def run_monitor(self, command, timeout=60): + data = '' + self.monitor_socket.sendall(command.encode('utf-8')) + start = time.time() + end = start + timeout + while True: + now = time.time() + if now >= end: + data += "<<< run_monitor(): command timed out after %d seconds without output >>>\r\n\r\n" % timeout + break + try: + sread, _, _ = select.select([self.monitor_socket],[],[], end - now) + except InterruptedError: + continue + if sread: + answer = self.monitor_socket.recv(1024) + if answer: + data += answer.decode('utf-8') + if data.rfind('\r\n') != -1: + break; + else: + raise Exception("No data on monitor socket") + + if data: + return (str(data)) + def run_serial(self, command, raw=False, timeout=60): # We assume target system have echo to get command status if not raw:
Re: [OE-core] [WIP v2 1/1] qemurunner: add support for qmp cmds
In reply to Saul WoldQuoted 205 lines · Saul Wold
This adds support for the Qemu Machine Protocol [0] extending the current dump process for Host and Target. The commands are added in the testimage.bbclass.
Currently, we setup qemu to stall until qmp gets connected and sends the initialization and continue commands, this works correctly.
With this version, the
monitor_dumperis created in OEQemuTarget but then set in OESSHTarget as that's where we get the SSH failure happens. Python's @property is used to create a setter/getter type of setup in OESSHTarget to get overridden by OEQemuTarget.By default the data is currently dumped to files for each command in TMPDIR/log/runtime-hostdump/<date>_qmp/unknown_<seq>_qemu_monitor
Current Issue, the first command succeeds, but the following commands seem to fail. I think it's something to do with JSON and quoting. I think the next step is to try and use JSON (which I am not super familiare with).
[0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt
Signed-off-by Saul Wold <[email protected]>--- meta/classes/testimage.bbclass | 7 ++++ meta/lib/oeqa/core/target/qemu.py | 6 +++ meta/lib/oeqa/core/target/ssh.py | 22 ++++++++-- meta/lib/oeqa/targetcontrol.py | 5 +++ meta/lib/oeqa/utils/dump.py | 20 +++++++++ meta/lib/oeqa/utils/qemurunner.py | 70 ++++++++++++++++++++++++++++++- 6 files changed, 126 insertions(+), 4 deletions(-)meta/classes/testimage.bbclass +7
-0@@ -127,6 +127,12 @@ testimage_dump_host () { netstat -an } +testimage_dump_monitor () { + '{"execute":"status"}\n' + '{"execute":"query-status"}\n' + '{"execute":"query-block"}\n' +} + python do_testimage() { testimage_main(d) }@@ -319,6 +325,7 @@ def testimage_main(d): target_kwargs['powercontrol_extra_args'] = d.getVar("TEST_POWERCONTROL_EXTRA_ARGS") or "" target_kwargs['serialcontrol_cmd'] = d.getVar("TEST_SERIALCONTROL_CMD") or None target_kwargs['serialcontrol_extra_args'] = d.getVar("TEST_SERIALCONTROL_EXTRA_ARGS") or "" + target_kwargs['testimage_dump_monitor'] = d.getVar("testimage_dump_monitor") or "" target_kwargs['testimage_dump_target'] = d.getVar("testimage_dump_target") or "" def export_ssh_agent(d):meta/lib/oeqa/core/target/qemu.py +6
-0@@ -12,6 +12,7 @@ from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner +from oeqa.utils.dump import MonitorDumper from oeqa.utils.dump import TargetDumper supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']@@ -43,6 +44,11 @@ class OEQemuTarget(OESSHTarget): dump_host_cmds=dump_host_cmds, logger=logger, serial_ports=serial_ports, boot_patterns = boot_patterns, use_ovmf=ovmf) + dump_monitor_cmds = kwargs.get("testimage_dump_monitor") + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) + if self.monitor_dumper: + self.monitor_dumper.create_dir("qmp") + dump_target_cmds = kwargs.get("testimage_dump_target") self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) self.target_dumper.create_dir("qemu")meta/lib/oeqa/core/target/ssh.py +19
-3@@ -43,6 +43,7 @@ class OESSHTarget(OETarget): if port: self.ssh = self.ssh + [ '-p', port ] self.scp = self.scp + [ '-P', port ] + self._monitor_dumper = None def start(self, **kwargs): pass@@ -50,11 +51,20 @@ class OESSHTarget(OETarget): def stop(self, **kwargs): pass + @property + def monitor_dumper(self): + return self._monitor_dumper + + @monitor_dumper.setter + def monitor_dumper(self, dumper): + self._monitor_dumper = dumper + self.monitor_dumper.dump_monitor() + def _run(self, command, timeout=None, ignore_status=True): """ Runs command in target using SSHProcess. """ - self.logger.debug("[Running]$ %s" % " ".join(command)) + self.logger.debug("sgw-[Running]$ %s" % " ".join(command)) starttime = time.time() status, output = SSHCall(command, self.logger, timeout)@@ -87,9 +97,15 @@ class OESSHTarget(OETarget): processTimeout = self.timeout status, output = self._run(sshCmd, processTimeout, True) - self.logger.debug('Command: %s\nOutput: %s\n' % (command, output)) - if (status == 255) and (('No route to host') in output): + self.logger.debug('Command: %s\nStatus: %d Output: %s\n' % (command, status, output)) +# if (status == 255) and (('No route to host') in output): + # for testing right now + if self.monitor_dumper: + self.monitor_dumper.dump_monitor() + if status == 255: self.target_dumper.dump_target() + if self.monitor_dumper: + self.monitor_dumper.dump_monitor() return (status, output) def copyTo(self, localSrc, remoteDst):meta/lib/oeqa/targetcontrol.py +5
-0@@ -17,6 +17,7 @@ from oeqa.utils.sshcontrol import SSHControl from oeqa.utils.qemurunner import QemuRunner from oeqa.utils.qemutinyrunner import QemuTinyRunner from oeqa.utils.dump import TargetDumper +from oeqa.utils.dump import MonitorDumper from oeqa.controllers.testtargetloader import TestTargetLoader from abc import ABCMeta, abstractmethod@@ -108,6 +109,7 @@ class QemuTarget(BaseTarget): self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) dump_target_cmds = d.getVar("testimage_dump_target") dump_host_cmds = d.getVar("testimage_dump_host") + dump_monitor_cmds = d.getVar("testimage_dump_monitor") dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") if not dump_dir: dump_dir = os.path.join(d.getVar('LOG_DIR'), 'runtime-hostdump')@@ -147,6 +149,9 @@ class QemuTarget(BaseTarget): serial_ports = len(d.getVar("SERIAL_CONSOLES").split())) self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) + self.logger.debug("sgw monitor: %s" % self.monitor_dumper) + def deploy(self): bb.utils.mkdirhier(self.testdir)meta/lib/oeqa/utils/dump.py +20
-0@@ -96,3 +96,23 @@ class TargetDumper(BaseDumper): except: print("Tried to dump info from target but " "serial console failed") + print("Failed CMD: %s" % (cmd)) + +class MonitorDumper(BaseDumper): + """ Class to get dumps via the Qemu Monitor, it only works with QemuRunner """ + + def __init__(self, cmds, parent_dir, runner): + super(MonitorDumper, self).__init__(cmds, parent_dir) + self.runner = runner + + def dump_monitor(self, dump_dir=""): + if dump_dir: + self.dump_dir = dump_dir + for cmd in self.cmds: + try: + output = self.runner.run_monitor(cmd) + self._write_dump("qemu_monitor", (cmd + "\n" + output)) + except: + print("Failed to dump montor data") + print("Failed CMD: %s" % (cmd)) +meta/lib/oeqa/utils/qemurunner.py +1
-0@@ -20,6 +20,7 @@ import string import threading import codecs import logging +from contextlib import closing from oeqa.utils.dump import HostDumper from collections import defaultdict
meta/lib/oeqa/utils/qemurunner.py class QemuRunner: · line 92
Quoted 8 lines
meta/lib/oeqa/utils/qemurunner.py +5
-0@@ -84,6 +85,12 @@ class QemuRunner: default_boot_patterns['send_login_user'] = 'root\n' default_boot_patterns['search_login_succeeded'] = r"root@[a-zA-Z0-9\-]+:~#" default_boot_patterns['search_cmd_finished'] = r"[a-zA-Z0-9]+@[a-zA-Z0-9\-]+:~#" + monitor_cmds = defaultdict(str) + monitor_cmds['qmp_cap'] = '{"execute":"qmp_capabilities","arguments":{"enable":["oob"]}}\n' + monitor_cmds['cont'] = '{"execute":"cont"}\n' + monitor_cmds['quit'] = '{"execute":"quit"}\n' + monitor_cmds['preconfig'] = '{"execute":"x-exit-preconfig"}\n'
It's not quit clear to me the purpose of pre-encoding these messages?
Quoted 88 lines
meta/lib/oeqa/utils/qemurunner.py +37
-1+ self.monitor_cmds = monitor_cmds # Only override patterns that were set e.g. login user TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" for pattern in accepted_patterns:@@ -168,10 +175,17 @@ class QemuRunner: return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, env=env) def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None, env = None): + # Find a free socket port that can be used by the QEMU Monitor console + with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s: + s.bind(('', 0)) + s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + qmp_port = s.getsockname()[1] + try: if self.serial_ports >= 2: self.threadsock, threadport = self.create_socket() self.server_socket, self.serverport = self.create_socket() + except socket.error as msg: self.logger.error("Failed to create listening socket: %s" % msg[1]) return False@@ -185,6 +199,9 @@ class QemuRunner: if os.path.exists(self.qemu_pidfile): os.remove(self.qemu_pidfile) self.qemuparams = 'bootparams="{0}" qemuparams="-pidfile {1}"'.format(bootparams, self.qemu_pidfile) + qemuparams += ' -S -qmp tcp:localhost:%s,server,wait' % (qmp_port) + qemuparams += ' -monitor tcp:localhost:4444,server,nowait' + if qemuparams: self.qemuparams = self.qemuparams[:-1] + " " + qemuparams + " " + '\"'@@ -250,6 +267,28 @@ class QemuRunner: if self.runqemu_exited: return False + + # Create the client socket for the QEMU Monitor Control Socket + # This will allow us to read status from Qemu if the the process + # is still alive + try: + self.monitor_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.monitor_socket.connect(("127.0.0.1", qmp_port)) + self.monitor_socket.setblocking(False) + + except socket.error as msg: + self.logger.error("Failed to connect qemu monitor socket: %s" % msg[1]) + return False + + # Run an empty command to get the initial connection details, then + # send the qmp_capabilities command, this is required to initialize + # the monitor console + mon_output = self.run_monitor("") + self.logger.debug("Monitor: %s" % mon_output) + mon_output = self.run_monitor(self.monitor_cmds['qmp_cap'], timeout=120) + self.logger.debug("Monitor: %s" % mon_output) + mon_output = self.run_monitor(self.monitor_cmds['cont'], timeout=120) + self.logger.debug("Monitor: %s" % mon_output) if not self.is_alive(): self.logger.error("Qemu pid didn't appear in %s seconds (%s)" %@@ -338,6 +377,7 @@ class QemuRunner: reachedlogin = False stopread = False qemusock = None + monsock = None bootlog = b'' data = b'' while time.time() < endtime and not stopread:@@ -376,7 +416,6 @@ class QemuRunner: sock.close() stopread = True - if not reachedlogin: if time.time() >= endtime: self.logger.warning("Target didn't reach login banner in %d seconds (%s)" %@@ -437,6 +476,9 @@ class QemuRunner: self.runqemu.stdout.close() self.runqemu_exited = True + if hasattr(self, 'monitor_socket') and self.monitor_socket: + self.monitor_socket.close() + self.monitor_socket = None if hasattr(self, 'server_socket') and self.server_socket: self.server_socket.close() self.server_socket = None
meta/lib/oeqa/utils/qemurunner.py class QemuRunner: · line 540
Quoted 4 lines
meta/lib/oeqa/utils/qemurunner.py +1
-0@@ -495,6 +537,32 @@ class QemuRunner: return True return False + def run_monitor(self, command, timeout=60):
From an API perspective, I would probably make this function take in a python object (not a string) and then do:
self.monitor_socket.sendall((json.dumps(command) + "\n")).encode("utf-8"))
...
return json.loads(data.decode("utf-8"))
If you want to be *extra* convenient, you could even do something like:
def run_monitor(self, command, arguments, id=None, timeout=60):
c = {"execute": command, "arguments": arguments}
if id is not None:
c["id"] = id
self.monitor_socket.sendall((json.dumps(c) + "\n")).encode("utf-8"))
Quoted 8 lines
meta/lib/oeqa/utils/qemurunner.py +8
-0+ data = '' + self.monitor_socket.sendall(command.encode('utf-8')) + start = time.time() + end = start + timeout + while True: + now = time.time() + if now >= end: + data += "<<< run_monitor(): command timed out after %d seconds without output >>>\r\n\r\n" % timeout
meta/lib/oeqa/utils/qemurunner.py class QemuRunner: · line 558
Quoted 10 lines
meta/lib/oeqa/utils/qemurunner.py +10
-0+ break + try: + sread, _, _ = select.select([self.monitor_socket],[],[], end - now) + except InterruptedError: + continue + if sread: + answer = self.monitor_socket.recv(1024) + if answer: + data += answer.decode('utf-8') + if data.rfind('\r\n') != -1:
It's possible you will miss events or get a partial invalid response if you get more than one message from the server, since data doesn't persist beyond the execution of this function.
Quoted 13 lines
meta/lib/oeqa/utils/qemurunner.py +7
-0+ break; + else: + raise Exception("No data on monitor socket") + + if data: + return (str(data)) + def run_serial(self, command, raw=False, timeout=60): # We assume target system have echo to get command status if not raw:
PATCH 1/1 qemurunner.py: qemu as client
In reply to Saul Wold--- meta/lib/oeqa/core/target/ssh.py | 9 ++-- meta/lib/oeqa/runtime/cases/network.py | 28 +++++++++++ meta/lib/oeqa/runtime/files/kill_net | 5 ++ meta/lib/oeqa/targetcontrol.py | 3 ++ meta/lib/oeqa/utils/dump.py | 22 ++++++++ meta/lib/oeqa/utils/qemurunner.py | 70 +++++++++++++++++++++++++- 6 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 meta/lib/oeqa/runtime/cases/network.py create mode 100644 meta/lib/oeqa/runtime/files/kill_net
meta/lib/oeqa/core/target/ssh.py +6 -3
@@ -54,7 +54,7 @@ class OESSHTarget(OETarget): """ Runs command in target using SSHProcess. """ - self.logger.debug("[Running]$ %s" % " ".join(command)) + self.logger.debug("sgw-[Running]$ %s" % " ".join(command)) starttime = time.time() status, output = SSHCall(command, self.logger, timeout)
@@ -77,6 +77,7 @@ class OESSHTarget(OETarget): 0: No timeout, runs until return. """ targetCmd = 'export PATH=/usr/sbin:/sbin:/usr/bin:/bin; %s' % command + self.ip = "192.168.7.5" sshCmd = self.ssh + [self.ip, targetCmd] if timeout:
@@ -87,8 +88,10 @@ class OESSHTarget(OETarget): processTimeout = self.timeout status, output = self._run(sshCmd, processTimeout, True) - self.logger.debug('Command: %s\nOutput: %s\n' % (command, output)) - if (status == 255) and (('No route to host') in output): + self.logger.debug('Command: %s\nStatus: %d Output: %s\n' % (command, status, output)) +# if (status == 255) and (('No route to host') in output): + if status == 255: + self.target_dumper.dump_target() self.target_dumper.dump_target() return (status, output)
meta/lib/oeqa/runtime/cases/network.py new file +28 -0
@@ -0,0 +1,28 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.runtime.decorator.package import OEHasPackage + +class NetworkTest(OERuntimeTestCase): + + @classmethod + def setUp(cls): + src = os.path.join(cls.tc.runtime_files_dir, 'kill_net') + dst = '/home/root/kill_net' + cls.tc.target.copyTo(src, dst) + + + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_network_check(self): + (status, output) = self.target.run('/sbin/ip a') + msg = 'Failed to run "ip a". Output: %s' % output + self.assertEqual(status, 0, msg=msg) + + @OETestDepends(['network.NetworkTest.test_network_check']) + def test_run_kill_net(self): + (status, output) = self.target.run('/bin/bash /home/root/kill_net > results 2>&1 &') + msg = 'Failed to run "kill_net". Output: %s' % output + self.assertEqual(status, 0, msg=msg)
meta/lib/oeqa/runtime/files/kill_net new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/bash + +ip a +sleep 1 +ip link set eth0 down
meta/lib/oeqa/targetcontrol.py +3 -0
@@ -17,6 +17,7 @@ from oeqa.utils.sshcontrol import SSHControl from oeqa.utils.qemurunner import QemuRunner from oeqa.utils.qemutinyrunner import QemuTinyRunner from oeqa.utils.dump import TargetDumper +from oeqa.utils.dump import MonitorDumper from oeqa.controllers.testtargetloader import TestTargetLoader from abc import ABCMeta, abstractmethod
@@ -108,6 +109,7 @@ class QemuTarget(BaseTarget): self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) dump_target_cmds = d.getVar("testimage_dump_target") dump_host_cmds = d.getVar("testimage_dump_host") + dump_monitor_cmds = ['{"execute":"query-status"}\n', '{"execute":"query-status"}\n'] dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") if not dump_dir: dump_dir = os.path.join(d.getVar('LOG_DIR'), 'runtime-hostdump')
@@ -147,6 +149,7 @@ class QemuTarget(BaseTarget): serial_ports = len(d.getVar("SERIAL_CONSOLES").split())) self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) def deploy(self): bb.utils.mkdirhier(self.testdir)
meta/lib/oeqa/utils/dump.py +22 -0
@@ -96,3 +96,25 @@ class TargetDumper(BaseDumper): except: print("Tried to dump info from target but " "serial console failed") + print("Failed CMD: %s" % (cmd)) + +class MonitorDumper(BaseDumper): + """ Class to get dumps via the Qemu Monitor, it only works with QemuRunner """ + + def __init__(self, cmds, parent_dir, runner): + super(MonitorDumper, self).__init__(cmds, parent_dir) + self.runner = runner + + def dump_monitor(self, dump_dir=""): + if dump_dir: + self.dump_dir = dump_dir + for cmd in self.cmds: + try: + print("dump_target: %s" % cmd) + output = self.runner.run_monitor(cmd) + print("result: %s" % (output)) + self._write_dump(cmd.split()[0], output) + except: + print("Failed to dump montor data") + print("Failed CMD: %s" % (cmd)) +
meta/lib/oeqa/utils/qemurunner.py +69 -1
128 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 1/1 qemurunner: add support for qmp cmds
In reply to Saul WoldThis adds support for the Qemu Machine Protocol [0] extending the current dump process for Host and Target. The commands are added in the testimage.bbclass.
Currently, we setup qemu to stall until qmp gets connected and sends the initialization and continue commands, this works correctly.
With this version, the monitor_dumper is created in OEQemuTarget but then set in OESSHTarget as that's where we get the SSH failure happens. Python's @property is used to create a setter/getter type of setup in OESSHTarget to get overridden by OEQemuTarget.
By default the data is currently dumped to files for each command in TMPDIR/log/runtime-hostdump/<date>_qmp/unknown_<seq>_qemu_monitor
Current Issue, the first command succeeds, but the following commands seem to fail. I think it's something to do with JSON and quoting. I think the next step is to try and use JSON (which I am not super familiare with).
[0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt
--- meta/classes/testimage.bbclass | 7 ++++ meta/lib/oeqa/core/target/qemu.py | 6 +++ meta/lib/oeqa/core/target/ssh.py | 22 ++++++++-- meta/lib/oeqa/targetcontrol.py | 5 +++ meta/lib/oeqa/utils/dump.py | 20 +++++++++ meta/lib/oeqa/utils/qemurunner.py | 70 ++++++++++++++++++++++++++++++- 6 files changed, 126 insertions(+), 4 deletions(-)
meta/classes/testimage.bbclass +7 -0
@@ -127,6 +127,12 @@ testimage_dump_host () { netstat -an } +testimage_dump_monitor () { + '{"execute":"status"}\n' + '{"execute":"query-status"}\n' + '{"execute":"query-block"}\n' +} + python do_testimage() { testimage_main(d) }
@@ -319,6 +325,7 @@ def testimage_main(d): target_kwargs['powercontrol_extra_args'] = d.getVar("TEST_POWERCONTROL_EXTRA_ARGS") or "" target_kwargs['serialcontrol_cmd'] = d.getVar("TEST_SERIALCONTROL_CMD") or None target_kwargs['serialcontrol_extra_args'] = d.getVar("TEST_SERIALCONTROL_EXTRA_ARGS") or "" + target_kwargs['testimage_dump_monitor'] = d.getVar("testimage_dump_monitor") or "" target_kwargs['testimage_dump_target'] = d.getVar("testimage_dump_target") or "" def export_ssh_agent(d):
meta/lib/oeqa/core/target/qemu.py +6 -0
@@ -12,6 +12,7 @@ from collections import defaultdict from .ssh import OESSHTarget from oeqa.utils.qemurunner import QemuRunner +from oeqa.utils.dump import MonitorDumper from oeqa.utils.dump import TargetDumper supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
@@ -43,6 +44,11 @@ class OEQemuTarget(OESSHTarget): dump_host_cmds=dump_host_cmds, logger=logger, serial_ports=serial_ports, boot_patterns = boot_patterns, use_ovmf=ovmf) + dump_monitor_cmds = kwargs.get("testimage_dump_monitor") + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) + if self.monitor_dumper: + self.monitor_dumper.create_dir("qmp") + dump_target_cmds = kwargs.get("testimage_dump_target") self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) self.target_dumper.create_dir("qemu")
meta/lib/oeqa/core/target/ssh.py +19 -3
@@ -43,6 +43,7 @@ class OESSHTarget(OETarget): if port: self.ssh = self.ssh + [ '-p', port ] self.scp = self.scp + [ '-P', port ] + self._monitor_dumper = None def start(self, **kwargs): pass
@@ -50,11 +51,20 @@ class OESSHTarget(OETarget): def stop(self, **kwargs): pass + @property + def monitor_dumper(self): + return self._monitor_dumper + + @monitor_dumper.setter + def monitor_dumper(self, dumper): + self._monitor_dumper = dumper + self.monitor_dumper.dump_monitor() + def _run(self, command, timeout=None, ignore_status=True): """ Runs command in target using SSHProcess. """ - self.logger.debug("[Running]$ %s" % " ".join(command)) + self.logger.debug("sgw-[Running]$ %s" % " ".join(command)) starttime = time.time() status, output = SSHCall(command, self.logger, timeout)
@@ -87,9 +97,15 @@ class OESSHTarget(OETarget): processTimeout = self.timeout status, output = self._run(sshCmd, processTimeout, True) - self.logger.debug('Command: %s\nOutput: %s\n' % (command, output)) - if (status == 255) and (('No route to host') in output): + self.logger.debug('Command: %s\nStatus: %d Output: %s\n' % (command, status, output)) +# if (status == 255) and (('No route to host') in output): + # for testing right now + if self.monitor_dumper: + self.monitor_dumper.dump_monitor() + if status == 255: self.target_dumper.dump_target() + if self.monitor_dumper: + self.monitor_dumper.dump_monitor() return (status, output) def copyTo(self, localSrc, remoteDst):
meta/lib/oeqa/targetcontrol.py +5 -0
@@ -17,6 +17,7 @@ from oeqa.utils.sshcontrol import SSHControl from oeqa.utils.qemurunner import QemuRunner from oeqa.utils.qemutinyrunner import QemuTinyRunner from oeqa.utils.dump import TargetDumper +from oeqa.utils.dump import MonitorDumper from oeqa.controllers.testtargetloader import TestTargetLoader from abc import ABCMeta, abstractmethod
@@ -108,6 +109,7 @@ class QemuTarget(BaseTarget): self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) dump_target_cmds = d.getVar("testimage_dump_target") dump_host_cmds = d.getVar("testimage_dump_host") + dump_monitor_cmds = d.getVar("testimage_dump_monitor") dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") if not dump_dir: dump_dir = os.path.join(d.getVar('LOG_DIR'), 'runtime-hostdump')
@@ -147,6 +149,9 @@ class QemuTarget(BaseTarget): serial_ports = len(d.getVar("SERIAL_CONSOLES").split())) self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) + self.logger.debug("sgw monitor: %s" % self.monitor_dumper) + def deploy(self): bb.utils.mkdirhier(self.testdir)
meta/lib/oeqa/utils/dump.py +20 -0
@@ -96,3 +96,23 @@ class TargetDumper(BaseDumper): except: print("Tried to dump info from target but " "serial console failed") + print("Failed CMD: %s" % (cmd)) + +class MonitorDumper(BaseDumper): + """ Class to get dumps via the Qemu Monitor, it only works with QemuRunner """ + + def __init__(self, cmds, parent_dir, runner): + super(MonitorDumper, self).__init__(cmds, parent_dir) + self.runner = runner + + def dump_monitor(self, dump_dir=""): + if dump_dir: + self.dump_dir = dump_dir + for cmd in self.cmds: + try: + output = self.runner.run_monitor(cmd) + self._write_dump("qemu_monitor", (cmd + "\n" + output)) + except: + print("Failed to dump montor data") + print("Failed CMD: %s" % (cmd)) +
meta/lib/oeqa/utils/qemurunner.py +69 -1
128 lines not on this page · raw message
Signature · 1 line
2.25.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core] [PATCH] [WIP] qemurunner.py: qemu as client
Oops, need to double check what 000* is going to actual send, please ignore this and the following older qemu_runner patch.
Sau!
Quoted 295 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>--- meta/lib/oeqa/core/target/ssh.py | 9 ++-- meta/lib/oeqa/runtime/cases/network.py | 28 +++++++++++ meta/lib/oeqa/runtime/files/kill_net | 5 ++ meta/lib/oeqa/targetcontrol.py | 3 ++ meta/lib/oeqa/utils/dump.py | 22 ++++++++ meta/lib/oeqa/utils/qemurunner.py | 70 +++++++++++++++++++++++++- 6 files changed, 133 insertions(+), 4 deletions(-)create mode 100644
meta/lib/oeqa/runtime/cases/network.pycreate mode 100644 meta/lib/oeqa/runtime/files/kill_netmeta/lib/oeqa/core/target/ssh.py +6
-3@@ -54,7 +54,7 @@ class OESSHTarget(OETarget): """ Runs command in target using SSHProcess. """ - self.logger.debug("[Running]$ %s" % " ".join(command)) + self.logger.debug("sgw-[Running]$ %s" % " ".join(command)) starttime = time.time() status, output = SSHCall(command, self.logger, timeout)@@ -77,6 +77,7 @@ class OESSHTarget(OETarget): 0: No timeout, runs until return. """ targetCmd = 'export PATH=/usr/sbin:/sbin:/usr/bin:/bin; %s' % command + self.ip = "192.168.7.5" sshCmd = self.ssh + [self.ip, targetCmd] if timeout:@@ -87,8 +88,10 @@ class OESSHTarget(OETarget): processTimeout = self.timeout status, output = self._run(sshCmd, processTimeout, True) - self.logger.debug('Command: %s\nOutput: %s\n' % (command, output)) - if (status == 255) and (('No route to host') in output): + self.logger.debug('Command: %s\nStatus: %d Output: %s\n' % (command, status, output)) +# if (status == 255) and (('No route to host') in output): + if status == 255: + self.target_dumper.dump_target() self.target_dumper.dump_target() return (status, output)meta/lib/oeqa/runtime/cases/network.py new file +28
-0@@ -0,0 +1,28 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.runtime.decorator.package import OEHasPackage + +class NetworkTest(OERuntimeTestCase): + + @classmethod + def setUp(cls): + src = os.path.join(cls.tc.runtime_files_dir, 'kill_net') + dst = '/home/root/kill_net' + cls.tc.target.copyTo(src, dst) + + + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_network_check(self): + (status, output) = self.target.run('/sbin/ip a') + msg = 'Failed to run "ip a". Output: %s' % output + self.assertEqual(status, 0, msg=msg) + + @OETestDepends(['network.NetworkTest.test_network_check']) + def test_run_kill_net(self): + (status, output) = self.target.run('/bin/bash /home/root/kill_net > results 2>&1 &') + msg = 'Failed to run "kill_net". Output: %s' % output + self.assertEqual(status, 0, msg=msg)meta/lib/oeqa/runtime/files/kill_net new file +5
-0@@ -0,0 +1,5 @@ +#!/bin/bash + +ip a +sleep 1 +ip link set eth0 downmeta/lib/oeqa/targetcontrol.py +3
-0@@ -17,6 +17,7 @@ from oeqa.utils.sshcontrol import SSHControl from oeqa.utils.qemurunner import QemuRunner from oeqa.utils.qemutinyrunner import QemuTinyRunner from oeqa.utils.dump import TargetDumper +from oeqa.utils.dump import MonitorDumper from oeqa.controllers.testtargetloader import TestTargetLoader from abc import ABCMeta, abstractmethod@@ -108,6 +109,7 @@ class QemuTarget(BaseTarget): self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) dump_target_cmds = d.getVar("testimage_dump_target") dump_host_cmds = d.getVar("testimage_dump_host") + dump_monitor_cmds = ['{"execute":"query-status"}\n', '{"execute":"query-status"}\n'] dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") if not dump_dir: dump_dir = os.path.join(d.getVar('LOG_DIR'), 'runtime-hostdump')@@ -147,6 +149,7 @@ class QemuTarget(BaseTarget): serial_ports = len(d.getVar("SERIAL_CONSOLES").split())) self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) + self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) def deploy(self): bb.utils.mkdirhier(self.testdir)meta/lib/oeqa/utils/dump.py +22
-0@@ -96,3 +96,25 @@ class TargetDumper(BaseDumper): except: print("Tried to dump info from target but " "serial console failed") + print("Failed CMD: %s" % (cmd)) + +class MonitorDumper(BaseDumper): + """ Class to get dumps via the Qemu Monitor, it only works with QemuRunner """ + + def __init__(self, cmds, parent_dir, runner): + super(MonitorDumper, self).__init__(cmds, parent_dir) + self.runner = runner + + def dump_monitor(self, dump_dir=""): + if dump_dir: + self.dump_dir = dump_dir + for cmd in self.cmds: + try: + print("dump_target: %s" % cmd) + output = self.runner.run_monitor(cmd) + print("result: %s" % (output)) + self._write_dump(cmd.split()[0], output) + except: + print("Failed to dump montor data") + print("Failed CMD: %s" % (cmd)) +meta/lib/oeqa/utils/qemurunner.py +69
-1@@ -20,6 +20,7 @@ import string import threading import codecs import logging +from contextlib import closing from oeqa.utils.dump import HostDumper from collections import defaultdict@@ -84,6 +85,12 @@ class QemuRunner: default_boot_patterns['send_login_user'] = 'root\n' default_boot_patterns['search_login_succeeded'] = r"root@[a-zA-Z0-9\-]+:~#" default_boot_patterns['search_cmd_finished'] = r"[a-zA-Z0-9]+@[a-zA-Z0-9\-]+:~#" + monitor_cmds = defaultdict(str) + monitor_cmds['qmp_cap'] = '{"execute":"qmp_capabilities","arguments":{"enable":["oob"]}}\n' + monitor_cmds['cont'] = '{"execute":"cont"}\n' + monitor_cmds['quit'] = '{"execute":"quit"}\n' + monitor_cmds['preconfig'] = '{"execute":"x-exit-preconfig"}\n' + self.monitor_cmds = monitor_cmds # Only override patterns that were set e.g. login user TESTIMAGE_BOOT_PATTERNS[send_login_user] = "webserver\n" for pattern in accepted_patterns:@@ -168,10 +175,17 @@ class QemuRunner: return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, env=env) def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None, env = None): + # Find a free socket port that can be used by the QEMU Monitor console + with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s: + s.bind(('', 0)) + s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + qmp_port = s.getsockname()[1] + try: if self.serial_ports >= 2: self.threadsock, threadport = self.create_socket() self.server_socket, self.serverport = self.create_socket() + except socket.error as msg: self.logger.error("Failed to create listening socket: %s" % msg[1]) return False@@ -185,6 +199,9 @@ class QemuRunner: if os.path.exists(self.qemu_pidfile): os.remove(self.qemu_pidfile) self.qemuparams = 'bootparams="{0}" qemuparams="-pidfile {1}"'.format(bootparams, self.qemu_pidfile) + qemuparams += ' -S -qmp tcp:localhost:%s,server,wait' % (qmp_port) + qemuparams += ' -monitor tcp:localhost:4444,server,nowait' + if qemuparams: self.qemuparams = self.qemuparams[:-1] + " " + qemuparams + " " + '\"'@@ -250,6 +267,28 @@ class QemuRunner: if self.runqemu_exited: return False + + # Create the client socket for the QEMU Monitor Control Socket + # This will allow us to read status from Qemu if the the process + # is still alive + try: + self.monitor_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.monitor_socket.connect(("127.0.0.1", qmp_port)) + self.monitor_socket.setblocking(False) + + except socket.error as msg: + self.logger.error("Failed to connect qemu monitor socket: %s" % msg[1]) + return False + + # Run an empty command to get the initial connection details, then + # send the qmp_capabilities command, this is required to initialize + # the monitor console + mon_output = self.run_monitor("") + self.logger.debug("Monitor: %s" % mon_output) + mon_output = self.run_monitor(self.monitor_cmds['qmp_cap'], timeout=120) + self.logger.debug("Monitor: %s" % mon_output) + mon_output = self.run_monitor(self.monitor_cmds['cont'], timeout=120) + self.logger.debug("Monitor: %s" % mon_output) if not self.is_alive(): self.logger.error("Qemu pid didn't appear in %s seconds (%s)" %@@ -338,6 +377,7 @@ class QemuRunner: reachedlogin = False stopread = False qemusock = None + monsock = None bootlog = b'' data = b'' while time.time() < endtime and not stopread:@@ -376,7 +416,6 @@ class QemuRunner: sock.close() stopread = True - if not reachedlogin: if time.time() >= endtime: self.logger.warning("Target didn't reach login banner in %d seconds (%s)" %@@ -437,6 +476,9 @@ class QemuRunner: self.runqemu.stdout.close() self.runqemu_exited = True + if hasattr(self, 'monitor_socket') and self.monitor_socket: + self.monitor_socket.close() + self.monitor_socket = None if hasattr(self, 'server_socket') and self.server_socket: self.server_socket.close() self.server_socket = None@@ -495,6 +537,32 @@ class QemuRunner: return True return False + def run_monitor(self, command, timeout=60): + data = '' + self.monitor_socket.sendall(command.encode('utf-8')) + start = time.time() + end = start + timeout + while True: + now = time.time() + if now >= end: + data += "<<< run_monitor(): command timed out after %d seconds without output >>>\r\n\r\n" % timeout + break + try: + sread, _, _ = select.select([self.monitor_socket],[],[], end - now) + except InterruptedError: + continue + if sread: + answer = self.monitor_socket.recv(1024) + if answer: + data += answer.decode('utf-8') + if data.rfind('\r\n') != -1: + break; + else: + raise Exception("No data on monitor socket") + + if data: + return (str(data)) + def run_serial(self, command, raw=False, timeout=60): # We assume target system have echo to get command status if not raw:
Signature · 1 line
Sau!