aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/ssh.py
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2019-07-09 12:17:09 +0200
committerDave Wallace <dwallacelf@gmail.com>2019-07-12 13:00:49 +0000
commit33fb34665214bbbd0a4b3154169b21c2da01f69b (patch)
tree9ebb70889824451cf8411875159a6fafd70b60ac /resources/libraries/python/ssh.py
parentccfe499e2a27f2caf234ecbb2ec948120810eab6 (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/ssh.py')
-rw-r--r--resources/libraries/python/ssh.py20
1 files changed, 1 insertions, 19 deletions
diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py
index e4ac93fb1b..cee35868e4 100644
--- a/resources/libraries/python/ssh.py
+++ b/resources/libraries/python/ssh.py
@@ -24,31 +24,13 @@ from robot.api import logger
from scp import SCPClient, SCPException
from resources.libraries.python.OptionString import OptionString
+from resources.libraries.python.PythonThree import raise_from
__all__ = ["exec_cmd", "exec_cmd_no_error"]
# TODO: load priv key
-def raise_from(raising, excepted):
- """Function to be replaced by "raise from" in Python 3.
-
- Neither "six" nor "future" offer good enough implementation right now.
- chezsoi.org/lucas/blog/displaying-chained-exceptions-stacktraces-in-python-2
-
- Current implementation just logs excepted error, and raises the new one.
-
- :param raising: The exception to raise.
- :param excepted: The exception we excepted and want to log.
- :type raising: BaseException
- :type excepted: BaseException
- :raises: raising
- """
- logger.error("Excepted: {exc!r}\nRaising: {rai!r}".format(
- exc=excepted, rai=raising))
- raise raising
-
-
class SSHTimeout(Exception):
"""This exception is raised when a timeout occurs."""
pass