From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: kchamart@redhat.com, lcapitulino@redhat.com
Subject: Re: [Qemu-devel] [PATCH v2 2/4] scripts: qmp-shell: Expand support for QMP expressions
Date: Wed, 22 Apr 2015 12:41:50 -0400 [thread overview]
Message-ID: <5537CF4E.9030707@redhat.com> (raw)
In-Reply-To: <1429719709-880-3-git-send-email-jsnow@redhat.com>
On 04/22/2015 12:21 PM, John Snow wrote:
> This includes support for [] expressions, single-quotes in
> QMP expressions (which is not strictly a part of JSON), and
> the ability to use "True" or "False" literals instead of
> JSON's lowercased 'true' and 'false' literals.
>
> qmp-shell currently allows you to describe values as
> JSON expressions:
> key={"key":{"key2":"val"}}
>
> But it does not currently support arrays, which are needed
> for serializing and deserializing transactions:
> key=[{"type":"drive-backup","data":{...}}]
>
> qmp-shell also only currently accepts doubly quoted strings
> as-per JSON spec, but QMP allows single quotes.
>
> Lastly, python allows you to utilize "True" or "False" as
> boolean literals, but JSON expects "true" or "false". Expand
> qmp-shell to allow the user to type either, converting to the
> correct type.
>
> As a consequence of the above, the key=val parsing is also improved
> to give better error messages if a key=val token is not provided.
>
> CAVEAT: The parser is still extremely rudimentary and does not
> expect to find spaces in {} nor [] expressions. This patch does
> not improve this functionality.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
> scripts/qmp/qmp-shell | 44 ++++++++++++++++++++++++++++----------------
> 1 file changed, 28 insertions(+), 16 deletions(-)
>
Left a line dangling in my local tree by accident:
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index 4cdcb6c..e7b40eb 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -32,6 +32,7 @@
import qmp
import json
+import ast
import readline
import sys
import pprint
> diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
> index a9632ec..4cdcb6c 100755
> --- a/scripts/qmp/qmp-shell
> +++ b/scripts/qmp/qmp-shell
> @@ -88,23 +88,35 @@ class QMPShell(qmp.QEMUMonitorProtocol):
> # clearing everything as it doesn't seem to matter
> readline.set_completer_delims('')
>
> + def __parse_value(self, val):
> + try:
> + return int(val)
> + except ValueError:
> + pass
> +
> + if val.lower() == 'true':
> + return True
> + if val.lower() == 'false':
> + return False
> + if val.startswith(('{', '[')):
> + try:
> + return json.loads(val)
> + except ValueError:
> + pass
> + try:
> + return ast.literal_eval(val)
> + except SyntaxError:
> + pass
> + return val
> +
> def __cli_expr(self, tokens, parent):
> for arg in tokens:
> - opt = arg.split('=')
> - try:
> - if(len(opt) > 2):
> - opt[1] = '='.join(opt[1:])
> - value = int(opt[1])
> - except ValueError:
> - if opt[1] == 'true':
> - value = True
> - elif opt[1] == 'false':
> - value = False
> - elif opt[1].startswith('{'):
> - value = json.loads(opt[1])
> - else:
> - value = opt[1]
> - optpath = opt[0].split('.')
> + (key, _, val) = arg.partition('=')
> + if not val:
> + raise QMPShellError("Expected a key=value pair, got '%s'" % arg)
> +
> + value = __parse_value(val)
> + optpath = key.split('.')
> curpath = []
> for p in optpath[:-1]:
> curpath.append(p)
> @@ -117,7 +129,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
> if type(parent[optpath[-1]]) is dict:
> raise QMPShellError('Cannot use "%s" as both leaf and non-leaf key' % '.'.join(curpath))
> else:
> - raise QMPShellError('Cannot set "%s" multiple times' % opt[0])
> + raise QMPShellError('Cannot set "%s" multiple times' % key)
> parent[optpath[-1]] = value
>
> def __build_cmd(self, cmdline):
>
next prev parent reply other threads:[~2015-04-22 16:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-22 16:21 [Qemu-devel] [PATCH v2 0/4] scripts: qmp-shell: add transaction support John Snow
2015-04-22 16:21 ` [Qemu-devel] [PATCH v2 1/4] scripts: qmp-shell: refactor helpers John Snow
2015-04-22 16:21 ` [Qemu-devel] [PATCH v2 2/4] scripts: qmp-shell: Expand support for QMP expressions John Snow
2015-04-22 16:41 ` John Snow [this message]
2015-04-22 17:18 ` Eric Blake
2015-04-22 17:25 ` Eric Blake
2015-04-22 17:33 ` John Snow
2015-04-22 16:21 ` [Qemu-devel] [PATCH v2 3/4] scripts: qmp-shell: add transaction subshell John Snow
2015-04-22 16:21 ` [Qemu-devel] [PATCH v2 4/4] scripts: qmp-shell: Add verbose flag John Snow
2015-04-22 19:27 ` [Qemu-devel] [PATCH v2 0/4] scripts: qmp-shell: add transaction support John Snow
2015-04-23 13:11 ` Luiz Capitulino
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=5537CF4E.9030707@redhat.com \
--to=jsnow@redhat.com \
--cc=kchamart@redhat.com \
--cc=lcapitulino@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).