diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2019-07-18 14:35:17 +0200 |
|---|---|---|
| committer | Vratko Polak <vrpolak@cisco.com> | 2019-07-18 13:07:54 +0000 |
| commit | 0041c421296a43247ba18ea03c83759fed27c751 (patch) | |
| tree | a9807d9bf0cebc8eb2dd6e0fd0b227b879025044 /resources | |
| parent | 264cb0e232ae9569c71fd6c7b21864447350ea0e (diff) | |
Papi socket: except more errors to insert err_msg
Change-Id: Ided91ee2b47dafb6aad83091126294d79f67aeac
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/PapiExecutor.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py index 0a009b3720..77732c7b05 100644 --- a/resources/libraries/python/PapiExecutor.py +++ b/resources/libraries/python/PapiExecutor.py @@ -468,16 +468,20 @@ class PapiSocketExecutor(object): api_name = command["api_name"] papi_fn = getattr(vpp_instance.api, api_name) try: - reply = papi_fn(**command["api_args"]) - except IOError as err: - # Ocassionally an error happens, try reconnect. - logger.warn("Reconnect after error: {err!r}".format(err=err)) - self.vpp_instance.disconnect() - # Testing showes immediate reconnect fails. - time.sleep(1) - self.vpp_instance.connect_sync("csit_socket") - logger.trace("Reconnected.") - reply = papi_fn(**command["api_args"]) + try: + reply = papi_fn(**command["api_args"]) + except IOError as err: + # Ocassionally an error happens, try reconnect. + logger.warn("Reconnect after error: {err!r}".format( + err=err)) + self.vpp_instance.disconnect() + # Testing showes immediate reconnect fails. + time.sleep(1) + self.vpp_instance.connect_sync("csit_socket") + logger.trace("Reconnected.") + reply = papi_fn(**command["api_args"]) + except (AttributeError, IOError) as err: + raise_from(AssertionError(err_msg), err, level="INFO") # *_dump commands return list of objects, convert, ordinary reply. if not isinstance(reply, list): reply = [reply] |