From: Fam Zheng Date: Fri, 30 Jan 2015 02:49:45 +0000 (+0800) Subject: qemu-iotests: Allow caller to disable underscore convertion for qmp X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~344^2~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df89d112279779609d50db93b024ed71f0402854;p=sdk%2Femulator%2Fqemu.git qemu-iotests: Allow caller to disable underscore convertion for qmp QMP command "block_set_io_throttle" expects underscores in parameters instead of dashes: {iops,bps}_{rd,wr,max}. Add optional argument conv_keys (defaults to True, backward compatible), it will be used in IO throttling test case. Reviewed-by: Benoit Canet Signed-off-by: Fam Zheng Reviewed-by: Max Reitz Message-id: 1422586186-9925-5-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi --- diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 85cb9a5..1402854 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -185,11 +185,14 @@ class VM(object): self._popen = None underscore_to_dash = string.maketrans('_', '-') - def qmp(self, cmd, **args): + def qmp(self, cmd, conv_keys=True, **args): '''Invoke a QMP command and return the result dict''' qmp_args = dict() for k in args.keys(): - qmp_args[k.translate(self.underscore_to_dash)] = args[k] + if conv_keys: + qmp_args[k.translate(self.underscore_to_dash)] = args[k] + else: + qmp_args[k] = args[k] return self._qmp.cmd(cmd, args=qmp_args)