From patchwork Fri Oct 15 20:52:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 257781 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9FKqnkt021028 for ; Fri, 15 Oct 2010 20:53:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932521Ab0JOUwt (ORCPT ); Fri, 15 Oct 2010 16:52:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38255 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932269Ab0JOUwt (ORCPT ); Fri, 15 Oct 2010 16:52:49 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9FKqm4A009592 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 15 Oct 2010 16:52:48 -0400 Received: from localhost (ovpn-113-101.phx2.redhat.com [10.3.113.101]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9FKqlwQ030858; Fri, 15 Oct 2010 16:52:48 -0400 From: Luiz Capitulino To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, lmr@redhat.com Subject: [PATCH 2/3] QMPMonitor: Introduce the send() method and wrappers Date: Fri, 15 Oct 2010 17:52:33 -0300 Message-Id: <1287175954-19465-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1287175954-19465-1-git-send-email-lcapitulino@redhat.com> References: <1287175954-19465-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 15 Oct 2010 20:53:04 +0000 (UTC) diff --git a/client/tests/kvm/kvm_monitor.py b/client/tests/kvm/kvm_monitor.py index d77af31..63201b4 100644 --- a/client/tests/kvm/kvm_monitor.py +++ b/client/tests/kvm/kvm_monitor.py @@ -604,6 +604,66 @@ class QMPMonitor(Monitor): return self._greeting + def send(self, data, timeout=20): + """ + Send data to the QMP monitor and return its response. + + @param data: Data to send + @param timeout: Time duration to wait for response + @return: QMP success or error response as a dictionary + @raise MonitorLockError: Raised if the lock cannot be acquired + @raise MonitorSendError: Raised if the command cannot be sent + @raise MonitorProtocolError: Raised if no response is received + """ + # XXX: This method is similar to _get_command_output(), we should + # refactor it + if not self._acquire_lock(20): + raise MonitorLockError("Could not acquire exclusive lock to send " + "QMP command '%s'" % cmd) + try: + self._read_objects() + self._socket.sendall(data) + end_time = time.time() + timeout + while time.time() < end_time: + for obj in self._read_objects(): + if isinstance(obj, dict): + if "return" in obj or "error" in obj: + return obj + time.sleep(0.1) + else: + raise MonitorProtocolError("Received no response (data: %s)" + % str(data)) + except socket.error: + raise MonitorSendError("Could not send data '%s'" % str(data)) + finally: + self._lock.release() + + + def cmd_obj(self, cmd_obj, timeout=20): + """ + Take a Python object, transforms it in JSON and send the resulting + string to the QMP monitor. Return the monitor's response. + + @param cmd_obj: Python object to transform in JSON + @param timeout: Time duration to wait for response + @return: QMP success or error response as a dictionary + @note: raise same exceptions as send() + """ + return self.send(json.dumps(cmd_obj) + "\n", timeout) + + def cmd_qmp(self, command, arguments=None, id=None, timeout=20): + """ + Build a QMP command from the passed arguments, return the monitor's + response. + + @param command: QMP command name + @param arguments: Arguments in the form of a Python dictionary + @param id: QMP command id + @return: QMP success or error response as a dictionary + @note: raise same exceptions as send_cmd() + """ + return self.cmd_obj(self._build_cmd(command, arguments, id), timeout) + # Command wrappers # Note: all of the following functions raise exceptions in a similar manner # to cmd() and _get_command_output().