From 0513ce5642dcf58b21f9b77d6b50e4e9a7a94f04 Mon Sep 17 00:00:00 2001
From: selias <samelias@cisco.com>
Date: Wed, 20 Sep 2017 15:47:39 +0200
Subject: HC Test: Fix intermittent failures of HC startup

 - rework "check Honeycomb startup state" keyword
 - increase timeout value for startup
 - add separators to Honeycomb log file between test suites
 - other minor fixes:
    - remove usused import from NAT suite
    - fix loop in ICMPv6 ND proxy traffic script
    - add teardown to LISP cases
    - update prerequisites for sub-interface SPAN test

Change-Id: I2f714ffc1d2e8435d3abe690d8bd15099e071c9a
Signed-off-by: selias <samelias@cisco.com>
---
 .../libraries/python/honeycomb/HoneycombUtil.py    | 40 ++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

(limited to 'resources/libraries/python/honeycomb/HoneycombUtil.py')

diff --git a/resources/libraries/python/honeycomb/HoneycombUtil.py b/resources/libraries/python/honeycomb/HoneycombUtil.py
index 24f81af7b3..39c076d9c3 100644
--- a/resources/libraries/python/honeycomb/HoneycombUtil.py
+++ b/resources/libraries/python/honeycomb/HoneycombUtil.py
@@ -398,6 +398,41 @@ class HoneycombUtil(object):
         path = base_path + path
         return HTTPRequest.delete(node, path)
 
+    @staticmethod
+    def append_honeycomb_log(node, suite_name):
+        """Append Honeycomb log for the current test suite to the full log.
+
+        :param node: Honeycomb node.
+        :param suite_name: Name of the current test suite. ${SUITE_NAME}
+        variable in robotframework.
+        :type node: dict
+        :type suite_name: str
+        """
+
+        ssh = SSH()
+        ssh.connect(node)
+
+        ssh.exec_command(
+            "echo '{separator}' >> /tmp/honeycomb.log".format(separator="="*80))
+        ssh.exec_command(
+            "echo 'Log for suite: {suite}' >> /tmp/honeycomb.log".format(
+                suite=suite_name))
+        ssh.exec_command(
+            "cat {hc_log} >> /tmp/honeycomb.log".format(
+                hc_log=Const.REMOTE_HC_LOG))
+
+    @staticmethod
+    def clear_honeycomb_log(node):
+        """Delete the Honeycomb log file for the current test suite.
+
+        :param node: Honeycomb node.
+        :type node: dict"""
+
+        ssh = SSH()
+        ssh.connect(node)
+
+        ssh.exec_command("sudo rm {hc_log}".format(hc_log=Const.REMOTE_HC_LOG))
+
     @staticmethod
     def archive_honeycomb_log(node, perf=False):
         """Copy honeycomb log file from DUT node to VIRL for archiving.
@@ -412,10 +447,11 @@ class HoneycombUtil(object):
         ssh.connect(node)
 
         if not perf:
-            cmd = "cp /var/log/honeycomb/honeycomb.log /scratch/"
+            cmd = "cp /tmp/honeycomb.log /scratch/"
             ssh.exec_command_sudo(cmd)
         else:
             ssh.scp(
                 ".",
-                "/var/log/honeycomb/honeycomb.log",
+                "/tmp/honeycomb.log",
                 get=True)
+            ssh.exec_command("rm /tmp/honeycomb.log")
-- 
cgit 1.2.3-korg