[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 4/4] tests: Use query-usernet instead of 'info us
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v6 4/4] tests: Use query-usernet instead of 'info usernet' |
Date: |
Fri, 4 May 2018 15:42:07 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/vm/basevm.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 3a2d508c35..dcfa6597ad 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -101,7 +101,7 @@ class BaseVM(object):
"-o", "StrictHostKeyChecking=no",
"-o", "UserKnownHostsFile=" + os.devnull,
"-o", "ConnectTimeout=1",
- "-p", self.ssh_port, "-i", self._ssh_key_file]
+ "-p", str(self.ssh_port), "-i", self._ssh_key_file]
if interactive:
ssh_cmd += ['-t']
assert not isinstance(cmd, str)
@@ -163,13 +163,13 @@ class BaseVM(object):
raise
atexit.register(self.shutdown)
self._guest = guest
- usernet_info = guest.qmp("human-monitor-command",
- command_line="info usernet")
+ usernet_info = guest.qmp("query-usernet")
self.ssh_port = None
- for l in usernet_info["return"].splitlines():
- fields = l.split()
- if "TCP[HOST_FORWARD]" in fields and "22" in fields:
- self.ssh_port = l.split()[3]
+ for i in usernet_info["return"]:
+ if i.get("id") != "vnet":
+ continue
+ self.ssh_port = i["connections"][0]["src_port"]
+ break
if not self.ssh_port:
raise Exception("Cannot find ssh port from 'info usernet':\n%s" % \
usernet_info)
--
2.14.3
- [Qemu-devel] [PATCH v6 0/4] slirp: Add query-usernet QMP command, Fam Zheng, 2018/05/04
- [Qemu-devel] [PATCH v6 1/4] qapi: Introduce UsernetTcpState, Fam Zheng, 2018/05/04
- [Qemu-devel] [PATCH v6 2/4] slirp: Use QAPI enum to replace TCPS_* macros, Fam Zheng, 2018/05/04
- [Qemu-devel] [PATCH v6 3/4] slirp: Add "query-usernet" QMP command, Fam Zheng, 2018/05/04
- [Qemu-devel] [PATCH v6 4/4] tests: Use query-usernet instead of 'info usernet',
Fam Zheng <=
- Re: [Qemu-devel] [PATCH v6 0/4] slirp: Add query-usernet QMP command, no-reply, 2018/05/04
- Re: [Qemu-devel] [PATCH v6 0/4] slirp: Add query-usernet QMP command, Fam Zheng, 2018/05/15