diff options
| author |   George Paraskevopoulos <geopar@intracom-telecom.com> | 2017-03-23 18:31:26 +0200 |
|---|---|---|
| committer | George Paraskevopoulos <geopar@intracom-telecom.com> | 2017-03-23 18:43:17 +0200 |
| commit | a29b00a4839a7079bf881420f85168dad202a814 (patch) | |
| tree | 6c034753b57ed162823e6dfcba88bae30efc106f | |
| parent | 11590f3fdf57ad7526de743d9723eb90ba462d68 (diff) | |
Add timeout in releng.ssh_utils
Change-Id: If9c7ba05946b995affd061dea2f531a0642650c2
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
| -rw-r--r-- | modules/opnfv/utils/ssh_utils.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/modules/opnfv/utils/ssh_utils.py b/modules/opnfv/utils/ssh_utils.py index d17f5ae81..cbc62c75d 100644 --- a/modules/opnfv/utils/ssh_utils.py +++ b/modules/opnfv/utils/ssh_utils.py @@ -15,6 +15,7 @@ import paramiko from opnfv.utils import opnfv_logger as logger logger = logger.Logger("SSH utils").getLogger() +SSH_TIMEOUT = 60 def get_ssh_client(hostname, @@ -40,11 +41,13 @@ def get_ssh_client(hostname, client.load_system_host_keys() client.connect(hostname, username=username, - pkey=key) + pkey=key, + timeout=SSH_TIMEOUT) else: client.connect(hostname, username=username, - password=password) + password=password, + timeout=SSH_TIMEOUT) return client except Exception as e: @@ -96,7 +99,8 @@ class ProxyHopClient(paramiko.SSHClient): self.proxy_ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) self.proxy_ssh.connect(jh_ip, username=jh_user, - password=jh_pass) + password=jh_pass, + timeout=SSH_TIMEOUT) self.proxy_transport = self.proxy_ssh.get_transport() def connect(self, hostname, port=22, username='root', password=None, @@ -126,7 +130,8 @@ class ProxyHopClient(paramiko.SSHClient): super(ProxyHopClient, self).connect(hostname, username=username, pkey=proxy_key, - sock=self.proxy_channel) + sock=self.proxy_channel, + timeout=timeout) os.remove(self.local_ssh_key) except Exception as e: logger.error(e) |