From e2ccdf0316243a1486109743e3de532cae5f3254 Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Mon, 2 Dec 2019 13:40:33 -0500 Subject: papi: add a per-call _timeout option add the ability to override the default timeout value on a per-call basis. Use: rv = self.vapi.papi.cli_inband(cmd='wait 10', _timeout=15) Type: feature Change-Id: Ia90a58586a1f63e02118599a2a4b7141e5a0b90d Signed-off-by: Paul Vinciguerra --- src/vpp-api/python/vpp_papi/vpp_transport_shmem.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/vpp-api/python/vpp_papi/vpp_transport_shmem.py') diff --git a/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py b/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py index 4e40f2352e4..2563a6e89a8 100644 --- a/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py +++ b/src/vpp-api/python/vpp_papi/vpp_transport_shmem.py @@ -116,12 +116,14 @@ class VppTransport(object): raise VppTransportShmemIOError(1, 'Not connected') return vpp_api.vac_write(bytes(buf), len(buf)) - def read(self): + def read(self, timeout=None): if not self.connected: raise VppTransportShmemIOError(1, 'Not connected') + if timeout is None: + timeout = self.read_timeout mem = ffi.new("char **") size = ffi.new("int *") - rv = vpp_api.vac_read(mem, size, self.read_timeout) + rv = vpp_api.vac_read(mem, size, timeout) if rv: strerror = 'vac_read failed. It is likely that VPP died.' raise VppTransportShmemIOError(rv, strerror) -- cgit 1.2.3-korg