From 44b74ed5394da158ec5f0a162e09981c7d1eafea Mon Sep 17 00:00:00 2001
From: selias <samelias@cisco.com>
Date: Tue, 3 Oct 2017 10:56:06 +0200
Subject: HC Test: Increase timeout values in HC Setup and Teardown

needed due to recent VIRL slowness

Change-Id: I4cbca94001a7503f1e29c56680fa68a88e6092c6
Signed-off-by: selias <samelias@cisco.com>
---
 resources/libraries/python/honeycomb/HoneycombSetup.py | 4 ++--
 resources/libraries/python/honeycomb/HoneycombUtil.py  | 3 ++-
 resources/libraries/python/ssh.py                      | 6 ++++--
 resources/libraries/robot/honeycomb/honeycomb.robot    | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py
index 2c02a1c80d..6ff7675704 100644
--- a/resources/libraries/python/honeycomb/HoneycombSetup.py
+++ b/resources/libraries/python/honeycomb/HoneycombSetup.py
@@ -464,7 +464,7 @@ class HoneycombSetup(object):
         cmd = "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=60)
+        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"]))
@@ -516,7 +516,7 @@ class HoneycombSetup(object):
         for feature in features:
             cmd += " {0}".format(feature)
 
-        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("Feature install did not succeed.")
diff --git a/resources/libraries/python/honeycomb/HoneycombUtil.py b/resources/libraries/python/honeycomb/HoneycombUtil.py
index 24f81af7b3..0b99555d12 100644
--- a/resources/libraries/python/honeycomb/HoneycombUtil.py
+++ b/resources/libraries/python/honeycomb/HoneycombUtil.py
@@ -418,4 +418,5 @@ class HoneycombUtil(object):
             ssh.scp(
                 ".",
                 "/var/log/honeycomb/honeycomb.log",
-                get=True)
+                get=True,
+                timeout=60)
diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py
index ca6d6556a1..5777c32001 100644
--- 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)
diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index 1b08e3955f..921aeeba07 100644
--- a/resources/libraries/robot/honeycomb/honeycomb.robot
+++ b/resources/libraries/robot/honeycomb/honeycomb.robot
@@ -39,7 +39,7 @@
 | | ...
 | | [Arguments] | @{duts}
 | | Start honeycomb on DUTs | @{duts}
-| | Wait until keyword succeeds | 4min | 16sec
+| | Wait until keyword succeeds | 6min | 16sec
 | | ... | Check honeycomb startup state | @{duts}
 | | Sleep | 5s | Make sure all modules are loaded and ready.
 
@@ -164,11 +164,11 @@
 | | [Arguments] | ${node} | ${odl_name}
 | | Copy ODL Client | ${node} | ${odl_name} | /mnt/common | /tmp
 | | Setup ODL Client | ${node} | /tmp
-| | Wait until keyword succeeds | 2min | 30sec
+| | Wait until keyword succeeds | 3min | 30sec
 | | ... | Install ODL Features | ${node} | /tmp
 | | Wait until keyword succeeds | 4min | 16sec
 | | ... | Mount Honeycomb on ODL | ${node}
-| | Wait until keyword succeeds | 2min | 16sec
+| | Wait until keyword succeeds | 3min | 16sec
 | | ... | Check ODL startup state | ${node}
 | | Wait until keyword succeeds | 2min | 16sec
 | | ... | Check honeycomb startup state | ${node}
-- 
cgit 1.2.3-korg