[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/17] python/aqmp: fully separate from qmp.QEMUMonitorProtocol
From: |
John Snow |
Subject: |
[PULL 11/17] python/aqmp: fully separate from qmp.QEMUMonitorProtocol |
Date: |
Thu, 21 Apr 2022 11:15:54 -0400 |
After this patch, qemu.aqmp.legacy.QEMUMonitorProtocol no longer
inherits from qemu.qmp.QEMUMonitorProtocol. To do this, several
inherited methods need to be explicitly re-defined.
(Licensing: This is copying and modifying GPLv2-only code into a
GPLv2-only file.)
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Message-id: 20220330172812.3427355-4-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/aqmp/legacy.py | 37 +++++++++++++++++++++++++++++++------
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/python/qemu/aqmp/legacy.py b/python/qemu/aqmp/legacy.py
index f0262749491..10c7c99c4f0 100644
--- a/python/qemu/aqmp/legacy.py
+++ b/python/qemu/aqmp/legacy.py
@@ -16,18 +16,18 @@
#
import asyncio
+from types import TracebackType
from typing import (
Any,
Awaitable,
Dict,
List,
Optional,
+ Type,
TypeVar,
Union,
)
-import qemu.qmp
-
from .error import QMPError
from .protocol import Runstate, SocketAddrT
from .qmp_client import QMPClient
@@ -59,12 +59,11 @@ class QMPBadPortError(QMPError):
"""
-class QEMUMonitorProtocol(qemu.qmp.QEMUMonitorProtocol):
+class QEMUMonitorProtocol:
def __init__(self, address: SocketAddrT,
server: bool = False,
nickname: Optional[str] = None):
- # pylint: disable=super-init-not-called
self._aqmp = QMPClient(nickname)
self._aloop = asyncio.get_event_loop()
self._address = address
@@ -88,7 +87,18 @@ def _get_greeting(self) -> Optional[QMPMessage]:
return self._aqmp.greeting._asdict()
return None
- # __enter__ and __exit__ need no changes
+ def __enter__(self: _T) -> _T:
+ # Implement context manager enter function.
+ return self
+
+ def __exit__(self,
+ # pylint: disable=duplicate-code
+ # see https://github.com/PyCQA/pylint/issues/3619
+ exc_type: Optional[Type[BaseException]],
+ exc_val: Optional[BaseException],
+ exc_tb: Optional[TracebackType]) -> None:
+ # Implement context manager exit function.
+ self.close()
@classmethod
def parse_address(cls, address: str) -> SocketAddrT:
@@ -142,7 +152,22 @@ def cmd_obj(self, qmp_cmd: QMPMessage) -> QMPMessage:
)
)
- # Default impl of cmd() delegates to cmd_obj
+ def cmd(self, name: str,
+ args: Optional[Dict[str, object]] = None,
+ cmd_id: Optional[object] = None) -> QMPMessage:
+ """
+ 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)
+ """
+ qmp_cmd: QMPMessage = {'execute': name}
+ if args:
+ qmp_cmd['arguments'] = args
+ if cmd_id:
+ qmp_cmd['id'] = cmd_id
+ return self.cmd_obj(qmp_cmd)
def command(self, cmd: str, **kwds: object) -> QMPReturnValue:
return self._sync(
--
2.34.1
- [PULL 00/17] Python patches, John Snow, 2022/04/21
- [PULL 02/17] scripts/bench-block-job: switch to AQMP, John Snow, 2022/04/21
- [PULL 07/17] python/qmp-shell: relicense as LGPLv2+, John Snow, 2022/04/21
- [PULL 05/17] python/aqmp: add explicit GPLv2 license to legacy.py, John Snow, 2022/04/21
- [PULL 03/17] iotests/mirror-top-perms: switch to AQMP, John Snow, 2022/04/21
- [PULL 08/17] python/aqmp-tui: relicense as LGPLv2+, John Snow, 2022/04/21
- [PULL 06/17] python/aqmp: relicense as LGPLv2+, John Snow, 2022/04/21
- [PULL 12/17] python/aqmp: copy qmp docstrings to qemu.aqmp.legacy, John Snow, 2022/04/21
- [PULL 10/17] python/aqmp: take QMPBadPortError and parse_address from qemu.qmp, John Snow, 2022/04/21
- [PULL 11/17] python/aqmp: fully separate from qmp.QEMUMonitorProtocol,
John Snow <=
- [PULL 14/17] python: re-enable pylint duplicate-code warnings, John Snow, 2022/04/21
- [PULL 17/17] python/qmp: remove pylint workaround from legacy.py, John Snow, 2022/04/21
- [PULL 13/17] python: remove the old QMP package, John Snow, 2022/04/21
- [PULL 01/17] python/machine: permanently switch to AQMP, John Snow, 2022/04/21
- [PULL 04/17] iotests: switch to AQMP, John Snow, 2022/04/21
- [PULL 16/17] python: rename 'aqmp-tui' to 'qmp-tui', John Snow, 2022/04/21
- [PULL 09/17] python: temporarily silence pylint duplicate-code warnings, John Snow, 2022/04/21
- [PULL 15/17] python: rename qemu.aqmp to qemu.qmp, John Snow, 2022/04/21
- Re: [PULL 00/17] Python patches, Richard Henderson, 2022/04/21