summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-06-28 11:44:23 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-28 11:44:23 +0000
commit105fa8c0d40e241c206e37755f13aebb2e137ebd (patch)
treec06fdba6fbba30a9ffc67f777effadbdec3eefa4 /deploy
parent82d7776efa109d031412baa91e91b3b91bbb06fb (diff)
parent806de12e942711236fc82f860fa100418fcc17ec (diff)
Merge "Add timeout for SCP operations"
Diffstat (limited to 'deploy')
-rw-r--r--deploy/ssh_client.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/deploy/ssh_client.py b/deploy/ssh_client.py
index f6888d52d..24119dbfa 100644
--- a/deploy/ssh_client.py
+++ b/deploy/ssh_client.py
@@ -1,6 +1,7 @@
###############################################################################
# Copyright (c) 2015 Ericsson AB and others.
# szilard.cserey@ericsson.com
+# peter.barabas@ericsson.com
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
@@ -85,14 +86,18 @@ class SSHClient(object):
def scp_get(self, remote, local='.', dir=False):
try:
- with scp.SCPClient(self.client.get_transport(), sanitize=lambda x: x) as _scp:
+ with scp.SCPClient(self.client.get_transport(),
+ sanitize=lambda x: x,
+ socket_timeout=TIMEOUT) as _scp:
_scp.get(remote, local, dir)
except Exception as e:
err(e)
def scp_put(self, local, remote='.', dir=False):
try:
- with scp.SCPClient(self.client.get_transport(), sanitize=lambda x: x) as _scp:
+ with scp.SCPClient(self.client.get_transport(),
+ sanitize=lambda x: x,
+ socket_timeout=TIMEOUT) as _scp:
_scp.put(local, remote, dir)
except Exception as e:
err(e)