X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fhoneycomb%2FHoneycombUtil.py;h=22a7e7ef1e791049fb18b1e5d12afd149f4e7390;hb=4f70ebf481d496f91d2b1ec27361c9898b19c451;hp=644cf62c431e4b3918678b7cff6581da07ad5f3a;hpb=c37f394a29165f839c3032e7f9485e35fb3307f2;p=csit.git

diff --git a/resources/libraries/python/honeycomb/HoneycombUtil.py b/resources/libraries/python/honeycomb/HoneycombUtil.py
index 644cf62c43..22a7e7ef1e 100644
--- a/resources/libraries/python/honeycomb/HoneycombUtil.py
+++ b/resources/libraries/python/honeycomb/HoneycombUtil.py
@@ -27,7 +27,8 @@ from enum import Enum, unique
 
 from robot.api import logger
 
-from resources.libraries.python.HTTPRequest import HTTPRequest
+from resources.libraries.python.ssh import SSH
+from resources.libraries.python.HTTPRequest import HTTPRequest, HTTPCodes
 from resources.libraries.python.constants import Constants as Const
 
 
@@ -86,7 +87,6 @@ class HoneycombError(Exception):
         self._msg = "{0}: {1}".format(self.__class__.__name__, msg)
         self._details = details
         if enable_logging:
-            logger.error(self._msg)
             logger.debug(self._details)
 
     def __repr__(self):
@@ -285,24 +285,30 @@ class HoneycombUtil(object):
         return origin_data
 
     @staticmethod
-    def get_honeycomb_data(node, url_file):
+    def get_honeycomb_data(node, url_file, path=""):
         """Retrieve data from Honeycomb according to given URL.
 
         :param node: Honeycomb node.
         :param url_file: URL file. The argument contains only the name of file
         without extension, not the full path.
+        :param path: Path which is added to the base path to identify the data.
         :type node: dict
         :type url_file: str
+        :type path: str
         :return: Status code and content of response.
         :rtype tuple
         """
 
-        path = HoneycombUtil.read_path_from_url_file(url_file)
+        base_path = HoneycombUtil.read_path_from_url_file(url_file)
+        path = base_path + path
         status_code, resp = HTTPRequest.get(node, path)
-        return status_code, loads(resp)
+        (status_node, response) = status_code, loads(resp)
+        if status_code != HTTPCodes.OK:
+            HoneycombUtil.read_log_tail(node)
+        return status_code, response
 
     @staticmethod
-    def put_honeycomb_data(node, url_file, data,
+    def put_honeycomb_data(node, url_file, data, path="",
                            data_representation=DataRepresentation.JSON):
         """Send configuration data using PUT request and return the status code
         and response content.
@@ -311,10 +317,12 @@ class HoneycombUtil(object):
         :param url_file: URL file. The argument contains only the name of file
         without extension, not the full path.
         :param data: Configuration data to be sent to Honeycomb.
+        :param path: Path which is added to the base path to identify the data.
         :param data_representation: How the data is represented.
         :type node: dict
         :type url_file: str
         :type data: dict, str
+        :type path: str
         :type data_representation: DataRepresentation
         :return: Status code and content of response.
         :rtype: tuple
@@ -330,9 +338,17 @@ class HoneycombUtil(object):
         if data_representation == DataRepresentation.JSON:
             data = dumps(data)
 
-        path = HoneycombUtil.read_path_from_url_file(url_file)
-        return HTTPRequest.put(node=node, path=path, headers=header,
-                               payload=data)
+        logger.trace(data)
+
+        base_path = HoneycombUtil.read_path_from_url_file(url_file)
+        path = base_path + path
+        logger.trace(path)
+        (status_code, response) = HTTPRequest.put(
+            node=node, path=path, headers=header, payload=data)
+
+        if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED):
+            HoneycombUtil.read_log_tail(node)
+        return status_code, response
 
     @staticmethod
     def post_honeycomb_data(node, url_file, data=None,
@@ -367,21 +383,57 @@ class HoneycombUtil(object):
             data = dumps(data)
 
         path = HoneycombUtil.read_path_from_url_file(url_file)
-        return HTTPRequest.post(node=node, path=path, headers=header,
-                                payload=data, timeout=timeout)
+        (status_code, response) = HTTPRequest.post(
+            node=node, path=path, headers=header, payload=data, timeout=timeout)
+
+        if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED):
+            HoneycombUtil.read_log_tail(node)
+        return status_code, response
 
     @staticmethod
-    def delete_honeycomb_data(node, url_file):
+    def delete_honeycomb_data(node, url_file, path=""):
         """Delete data from Honeycomb according to given URL.
 
         :param node: Honeycomb node.
         :param url_file: URL file. The argument contains only the name of file
         without extension, not the full path.
+        :param path: Path which is added to the base path to identify the data.
         :type node: dict
         :type url_file: str
+        :type path: str
         :return: Status code and content of response.
         :rtype tuple
         """
 
-        path = HoneycombUtil.read_path_from_url_file(url_file)
-        return HTTPRequest.delete(node, path)
+        base_path = HoneycombUtil.read_path_from_url_file(url_file)
+        path = base_path + path
+        (status_code, response) = HTTPRequest.delete(node, path)
+
+        if status_code != HTTPCodes.OK:
+            HoneycombUtil.read_log_tail(node)
+        return status_code, response
+
+    @staticmethod
+    def read_log_tail(node, lines=120):
+        """Read  the last N lines of the Honeycomb log file and print them
+        to robot log.
+
+        :param node: Honeycomb node.
+        :param lines: Number of lines to read.
+        :type node: dict
+        :type lines: int
+        :return: Last N log lines.
+        :rtype: str
+        """
+
+        logger.trace(
+            "HTTP request failed, "
+            "obtaining last {0} lines of Honeycomb log...".format(lines))
+
+        ssh = SSH()
+        ssh.connect(node)
+        cmd = "tail -n {0} /var/log/honeycomb/honeycomb.log".format(lines)
+        # ssh also logs the reply on trace level
+        (_, stdout, _) = ssh.exec_command(cmd, timeout=30)
+
+        return stdout