HC Test: increase timeout for archiving HC log file

 - add timeout parameter to ssh.scp method
 - increase timeout in "Archive Honeycomb Log" keyword
 - increase timeout for copying ODL client in setup

Change-Id: I9e914d5f439fd14471b10b611efdbb6afada4c6e
Signed-off-by: selias <samelias@cisco.com>

diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py
index 9ac2179..b5e964d 100644 (file)
--- a/resources/libraries/python/honeycomb/HoneycombSetup.py
+++ b/resources/libraries/python/honeycomb/HoneycombSetup.py
@@ -466,7 +466,7 @@ class HoneycombSetup(object):
               "cp -r {src}/*karaf_{odl_name}* {dst}".format(
                   src=src_path, odl_name=odl_name, dst=dst_path)
 
-        ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=120)
+        ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=180)
         if int(ret_code) != 0:
             raise HoneycombError(
                 "Failed to copy ODL client on node {0}".format(node["host"]))

diff --git a/resources/libraries/python/honeycomb/HoneycombUtil.py b/resources/libraries/python/honeycomb/HoneycombUtil.py
index 39c076d..86feb78 100644 (file)
--- a/resources/libraries/python/honeycomb/HoneycombUtil.py
+++ b/resources/libraries/python/honeycomb/HoneycombUtil.py
@@ -453,5 +453,6 @@ class HoneycombUtil(object):
             ssh.scp(
                 ".",
                 "/tmp/honeycomb.log",
-                get=True)
+                get=True,
+                timeout=60)
             ssh.exec_command("rm /tmp/honeycomb.log")

diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py
index ca6d655..5777c32 100644 (file)
--- a/resources/libraries/python/ssh.py
+++ b/resources/libraries/python/ssh.py
@@ -307,7 +307,7 @@ class SSH(object):
         """
         chan.close()
 
-    def scp(self, local_path, remote_path, get=False):
+    def scp(self, local_path, remote_path, get=False, timeout=10):
         """Copy files from local_path to remote_path or vice versa.
 
         connect() method has to be called first!
@@ -317,9 +317,11 @@ class SSH(object):
         :param remote_path: Remote path where to place uploaded file; or
         path to remote file which should be downloaded.
         :param get: scp operation to perform. Default is put.
+        :param timeout: Timeout value in seconds.
         :type local_path: str
         :type remote_path: str
         :type get: bool
+        :type timeout: int
         """
         if not get:
             logger.trace('SCP {0} to {1}:{2}'.format(
@@ -330,7 +332,7 @@ class SSH(object):
                 self._ssh.get_transport().getpeername(), remote_path,
                 local_path))
         # SCPCLient takes a paramiko transport as its only argument
-        scp = SCPClient(self._ssh.get_transport(), socket_timeout=10)
+        scp = SCPClient(self._ssh.get_transport(), socket_timeout=timeout)
         start = time()
         if not get:
             scp.put(local_path, remote_path)