All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Eduardo Habkost <eduardo@habkost.net>,
	Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
	Daniel Berrange <berrange@redhat.com>,
	Beraldo Leal <bleal@redhat.com>,
	qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
	Wainer Moschetta <wainersm@redhat.com>,
	Hanna Reitz <hreitz@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>, Cleber Rosa <crosa@redhat.com>,
	John Snow <jsnow@redhat.com>
Subject: [PATCH v3 27/31] python/aqmp: copy qmp docstrings to qemu.aqmp.legacy
Date: Mon, 10 Jan 2022 18:29:06 -0500	[thread overview]
Message-ID: <20220110232910.1923864-28-jsnow@redhat.com> (raw)
In-Reply-To: <20220110232910.1923864-1-jsnow@redhat.com>

Copy the docstrings out of qemu.qmp, adjusting them as necessary to
more accurately reflect the current state of this class.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
---
 python/qemu/aqmp/legacy.py | 110 ++++++++++++++++++++++++++++++++++---
 1 file changed, 102 insertions(+), 8 deletions(-)

diff --git a/python/qemu/aqmp/legacy.py b/python/qemu/aqmp/legacy.py
index 8f38e7d912..6c250cd46a 100644
--- a/python/qemu/aqmp/legacy.py
+++ b/python/qemu/aqmp/legacy.py
@@ -1,9 +1,23 @@
 """
-Sync QMP Wrapper
+(Legacy) Sync QMP Wrapper
 
-This class pretends to be qemu.qmp.QEMUMonitorProtocol.
+This module provides the `QEMUMonitorProtocol` class, which is a
+synchronous wrapper around `QMPClient`.
+
+Its design closely resembles that of the original QEMUMonitorProtocol
+class, originally written by Luiz Capitulino.
 """
 
+# Copyright (C) 2009, 2010, 2021 Red Hat Inc.
+#
+# Authors:
+#  Luiz Capitulino <lcapitulino@redhat.com>
+#  John Snow <jsnow@redhat.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2.
+# See the COPYING file in the top-level directory.
+
+
 import asyncio
 from types import TracebackType
 from typing import (
@@ -39,9 +53,6 @@
 # {} is the QMPReturnValue.
 
 
-# pylint: disable=missing-docstring
-
-
 class QMPBadPortError(QMPError):
     """
     Unable to parse socket address: Port was non-numerical.
@@ -49,6 +60,21 @@ class QMPBadPortError(QMPError):
 
 
 class QEMUMonitorProtocol:
+    """
+    Provide an API to connect to QEMU via QEMU Monitor Protocol (QMP)
+    and then allow to handle commands and events.
+
+    :param address:  QEMU address, can be either a unix socket path (string)
+                     or a tuple in the form ( address, port ) for a TCP
+                     connection
+    :param server:   Deprecated, ignored. (See 'accept')
+    :param nickname: Optional nickname used for logging.
+
+    ..note::
+        No connection is established during `__init__`, this is done by
+        the `connect()` or `accept()` methods.
+    """
+
     def __init__(self, address: SocketAddrT,
                  server: bool = False,  # pylint: disable=unused-argument
                  nickname: Optional[str] = None):
@@ -108,6 +134,12 @@ def parse_address(cls, address: str) -> SocketAddrT:
         return address
 
     def connect(self, negotiate: bool = True) -> Optional[QMPMessage]:
+        """
+        Connect to the QMP Monitor and perform capabilities negotiation.
+
+        :return: QMP greeting dict, or None if negotiate is false
+        :raise ConnectError: on connection errors
+        """
         self._aqmp.await_greeting = negotiate
         self._aqmp.negotiate = negotiate
 
@@ -117,6 +149,16 @@ def connect(self, negotiate: bool = True) -> Optional[QMPMessage]:
         return self._get_greeting()
 
     def accept(self, timeout: Optional[float] = 15.0) -> QMPMessage:
+        """
+        Await connection from QMP Monitor and perform capabilities negotiation.
+
+        :param timeout:
+            timeout in seconds (nonnegative float number, or None).
+            If None, there is no timeout, and this may block forever.
+
+        :return: QMP greeting dict
+        :raise ConnectError: on connection errors
+        """
         self._aqmp.await_greeting = True
         self._aqmp.negotiate = True
 
@@ -130,6 +172,12 @@ def accept(self, timeout: Optional[float] = 15.0) -> QMPMessage:
         return ret
 
     def cmd_obj(self, qmp_cmd: QMPMessage) -> QMPMessage:
+        """
+        Send a QMP command to the QMP Monitor.
+
+        :param qmp_cmd: QMP command to be sent as a Python dict
+        :return: QMP response as a Python dict
+        """
         return dict(
             self._sync(
                 # pylint: disable=protected-access
@@ -148,9 +196,9 @@ def cmd(self, name: str,
         """
         Build a QMP command and send it to the QMP Monitor.
 
-        @param name: command name (string)
-        @param args: command arguments (dict)
-        @param cmd_id: command id (dict, list, string or int)
+        :param name: command name (string)
+        :param args: command arguments (dict)
+        :param cmd_id: command id (dict, list, string or int)
         """
         qmp_cmd: QMPMessage = {'execute': name}
         if args:
@@ -160,6 +208,9 @@ def cmd(self, name: str,
         return self.cmd_obj(qmp_cmd)
 
     def command(self, cmd: str, **kwds: object) -> QMPReturnValue:
+        """
+        Build and send a QMP command to the monitor, report errors if any
+        """
         return self._sync(
             self._aqmp.execute(cmd, kwds),
             self._timeout
@@ -167,6 +218,19 @@ def command(self, cmd: str, **kwds: object) -> QMPReturnValue:
 
     def pull_event(self,
                    wait: Union[bool, float] = False) -> Optional[QMPMessage]:
+        """
+        Pulls a single event.
+
+        :param wait:
+            If False or 0, do not wait. Return None if no events ready.
+            If True, wait forever until the next event.
+            Otherwise, wait for the specified number of seconds.
+
+        :raise asyncio.TimeoutError:
+            When a timeout is requested and the timeout period elapses.
+
+        :return: The first available QMP event, or None.
+        """
         if not wait:
             # wait is False/0: "do not wait, do not except."
             if self._aqmp.events.empty():
@@ -187,6 +251,20 @@ def pull_event(self,
         )
 
     def get_events(self, wait: Union[bool, float] = False) -> List[QMPMessage]:
+        """
+        Get a list of QMP events and clear all pending events.
+
+        :param wait:
+            If False or 0, do not wait. Return None if no events ready.
+            If True, wait until we have at least one event.
+            Otherwise, wait for up to the specified number of seconds for at
+            least one event.
+
+        :raise asyncio.TimeoutError:
+            When a timeout is requested and the timeout period elapses.
+
+        :return: A list of QMP events.
+        """
         events = [dict(x) for x in self._aqmp.events.clear()]
         if events:
             return events
@@ -195,17 +273,33 @@ def get_events(self, wait: Union[bool, float] = False) -> List[QMPMessage]:
         return [event] if event is not None else []
 
     def clear_events(self) -> None:
+        """Clear current list of pending events."""
         self._aqmp.events.clear()
 
     def close(self) -> None:
+        """Close the connection."""
         self._sync(
             self._aqmp.disconnect()
         )
 
     def settimeout(self, timeout: Optional[float]) -> None:
+        """
+        Set the timeout for QMP RPC execution.
+
+        This timeout affects the `cmd`, `cmd_obj`, and `command` methods.
+        The `accept`, `pull_event` and `get_event` methods have their
+        own configurable timeouts.
+
+        :param timeout:
+            timeout in seconds, or None.
+            None will wait indefinitely.
+        """
         self._timeout = timeout
 
     def send_fd_scm(self, fd: int) -> None:
+        """
+        Send a file descriptor to the remote via SCM_RIGHTS.
+        """
         self._aqmp.send_fd_scm(fd)
 
     def __del__(self) -> None:
-- 
2.31.1



  parent reply	other threads:[~2022-01-11  0:02 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-10 23:28 [PATCH v3 00/31] Python: delete synchronous qemu.qmp package John Snow
2022-01-10 23:28 ` [PATCH v3 01/31] python/aqmp: use absolute import statement John Snow
2022-01-10 23:28 ` [PATCH v3 02/31] Python/aqmp: fix type definitions for mypy 0.920 John Snow
2022-01-10 23:28 ` [PATCH v3 03/31] python: update type hints for mypy 0.930 John Snow
2022-01-10 23:28 ` [PATCH v3 04/31] simplebench: Fix Python syntax error (reported by LGTM) John Snow
2022-01-10 23:28 ` [PATCH v3 05/31] python/aqmp: fix docstring typo John Snow
2022-01-12 13:26   ` Beraldo Leal
2022-01-10 23:28 ` [PATCH v3 06/31] python/aqmp: add __del__ method to legacy interface John Snow
2022-01-10 23:28 ` [PATCH v3 07/31] python/aqmp: handle asyncio.TimeoutError on execute() John Snow
2022-01-10 23:28 ` [PATCH v3 08/31] python/aqmp: copy type definitions from qmp John Snow
2022-01-12 13:32   ` Beraldo Leal
2022-01-10 23:28 ` [PATCH v3 09/31] python/aqmp: add SocketAddrT to package root John Snow
2022-01-10 23:28 ` [PATCH v3 10/31] python/aqmp: rename AQMPError to QMPError John Snow
2022-01-12 13:35   ` Beraldo Leal
2022-01-10 23:28 ` [PATCH v3 11/31] python/qemu-ga-client: don't use deprecated CLI syntax in usage comment John Snow
2022-01-10 23:28 ` [PATCH v3 12/31] python/qmp: switch qemu-ga-client to AQMP John Snow
2022-01-10 23:28 ` [PATCH v3 13/31] python/qmp: switch qom tools " John Snow
2022-01-10 23:28 ` [PATCH v3 14/31] python/qmp: switch qmp-shell " John Snow
2022-01-12 13:52   ` Beraldo Leal
2022-01-12 17:35     ` John Snow
2022-01-10 23:28 ` [PATCH v3 15/31] python: move qmp utilities to python/qemu/utils John Snow
2022-01-12 13:55   ` Beraldo Leal
2022-01-10 23:28 ` [PATCH v3 16/31] python: move qmp-shell under the AQMP package John Snow
2022-01-12 13:46   ` Beraldo Leal
2022-01-10 23:28 ` [PATCH v3 17/31] python/machine: permanently switch to AQMP John Snow
2022-01-10 23:28 ` [PATCH v3 18/31] scripts/cpu-x86-uarch-abi: fix CLI parsing John Snow
2022-01-10 23:28 ` [PATCH v3 19/31] scripts/cpu-x86-uarch-abi: switch to AQMP John Snow
2022-01-10 23:28 ` [PATCH v3 20/31] scripts/render-block-graph: " John Snow
2022-01-10 23:29 ` [PATCH v3 21/31] scripts/bench-block-job: " John Snow
2022-01-10 23:29 ` [PATCH v3 22/31] iotests/mirror-top-perms: " John Snow
2022-01-10 23:29 ` [PATCH v3 23/31] iotests: " John Snow
2022-01-14 19:12   ` Eric Blake
2022-01-17 19:32     ` John Snow
2022-01-10 23:29 ` [PATCH v3 24/31] python: temporarily silence pylint duplicate-code warnings John Snow
2022-01-10 23:29 ` [PATCH v3 25/31] python/aqmp: take QMPBadPortError and parse_address from qemu.qmp John Snow
2022-01-10 23:29 ` [PATCH v3 26/31] python/aqmp: fully separate from qmp.QEMUMonitorProtocol John Snow
2022-01-10 23:29 ` John Snow [this message]
2022-01-10 23:29 ` [PATCH v3 28/31] python: remove the old QMP package John Snow
2022-01-10 23:29 ` [PATCH v3 29/31] python: re-enable pylint duplicate-code warnings John Snow
2022-01-10 23:29 ` [PATCH v3 30/31] python: rename qemu.aqmp to qemu.qmp John Snow
2022-01-12 14:21   ` Beraldo Leal
2022-01-10 23:29 ` [PATCH v3 31/31] python: rename 'aqmp-tui' to 'qmp-tui' John Snow
2022-01-12 14:00   ` Beraldo Leal
2022-01-10 23:33 ` [PATCH v3 00/31] Python: delete synchronous qemu.qmp package John Snow
2022-01-12 19:51   ` John Snow
2022-01-21  0:17 ` John Snow

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=20220110232910.1923864-28-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=hreitz@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=vsementsov@virtuozzo.com \
    --cc=wainersm@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.