diff options
author | Vratko Polak <vrpolak@cisco.com> | 2019-07-09 12:17:09 +0200 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2019-07-12 13:00:49 +0000 |
commit | 33fb34665214bbbd0a4b3154169b21c2da01f69b (patch) | |
tree | 9ebb70889824451cf8411875159a6fafd70b60ac /resources/libraries/python/telemetry | |
parent | ccfe499e2a27f2caf234ecbb2ec948120810eab6 (diff) |
PapiExecutor always verifies
Do not support returning unverified replies anymore.
Basically, ".get_replies().verify_replies()" is now just ".get_replies()".
This allows fairly large simplifications both at call sites
and in PapiExecutor.py
+ Rename get_dumps to get_details.
+ Introduce get_reply and get_sw_if_index.
+ Rename variables holding get_*() value,
+ e.g. get_stats() value is stored to variable named "stats".
+ Rename "item" of subsequent loop to hint the type instead.
+ Rename "details" function argument to "verbose".
+ Process reply details in place, instead of building new list.
- Except hybrid blocks which can return both list or single item.
- Except human readable text building blocks.
+ Rename most similar names to sw_if_index.
- Except "vpp_sw_index" and some function names.
+ Use single run_cli_cmd from PapiExecutor.
+ Do not chain methods over multiple lines.
+ Small space gain is not worth readability loss.
+ Include minor code and docstrings improvement.
+ Add some TODOs.
Change-Id: Ib2110a3d2101a74d5837baab3a58dc46aafc6ce3
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/python/telemetry')
-rw-r--r-- | resources/libraries/python/telemetry/SPAN.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/resources/libraries/python/telemetry/SPAN.py b/resources/libraries/python/telemetry/SPAN.py index c282c6160b..2033525f55 100644 --- a/resources/libraries/python/telemetry/SPAN.py +++ b/resources/libraries/python/telemetry/SPAN.py @@ -37,14 +37,14 @@ class SPAN(object): source/destination interface pair. :rtype: list of dict """ + cmd = "sw_interface_span_dump" args = dict( is_l2=1 if is_l2 else 0 ) with PapiExecutor(node) as papi_exec: - dump = papi_exec.add("sw_interface_span_dump", **args). \ - get_dump().reply[0]["api_reply"] + details = papi_exec.add(cmd, **args).get_details() - return dump + return details @staticmethod def vpp_get_span_configuration_by_interface(node, dst_interface, @@ -71,9 +71,8 @@ class SPAN(object): node, dst_interface, "sw_if_index") src_interfaces = [] for item in data: - if item["sw_interface_span_details"]["sw_if_index_to"] == dst_int: - src_interfaces.append( - item["sw_interface_span_details"]["sw_if_index_from"]) + if item["sw_if_index_to"] == dst_int: + src_interfaces.append(item["sw_if_index_from"]) if ret_format != "sw_if_index": src_interfaces = [ |