From: Jose Lausuch Date: Mon, 27 Mar 2017 12:50:07 +0000 (+0000) Subject: Merge "Monkey patch paramiko _custom_start_client" X-Git-Tag: danube.1.0~61 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2a8f4bd6f17802d530a9578e612bb8e951aa7353;hp=1d715c681a1216b7b91f05a779df6e34b2179cef;p=releng.git Merge "Monkey patch paramiko _custom_start_client" --- diff --git a/modules/opnfv/utils/ssh_utils.py b/modules/opnfv/utils/ssh_utils.py index cbc62c75d..4c5ff5c1b 100644 --- a/modules/opnfv/utils/ssh_utils.py +++ b/modules/opnfv/utils/ssh_utils.py @@ -17,6 +17,26 @@ from opnfv.utils import opnfv_logger as logger logger = logger.Logger("SSH utils").getLogger() SSH_TIMEOUT = 60 +''' Monkey Patch paramiko _custom_start_client ''' +# We are using paramiko 2.1.1 and in the CI in the SFC +# test we are facing this issue: +# https://github.com/robotframework/SSHLibrary/issues/158 +# The fix was merged in paramiko 2.1.3 in this PR: +# https://github.com/robotframework/SSHLibrary/pull/159/files +# Until we upgrade we can use this monkey patch to work +# around the issue + + +def _custom_start_client(self, *args, **kwargs): + self.banner_timeout = 45 + self._orig_start_client(*args, **kwargs) + + +paramiko.transport.Transport._orig_start_client = \ + paramiko.transport.Transport.start_client +paramiko.transport.Transport.start_client = _custom_start_client +''' Monkey Patch paramiko _custom_start_client ''' + def get_ssh_client(hostname, username,