X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fhoneycomb%2FHoneycombUtil.py;h=8f1392c9729ff5342f8a9f1d20daa16c1e6624d2;hb=56a9ea7e421100594d8be68c0ff15236f5c50a6e;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..8f1392c972 100644 --- a/resources/libraries/python/honeycomb/HoneycombUtil.py +++ b/resources/libraries/python/honeycomb/HoneycombUtil.py @@ -285,24 +285,27 @@ 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) @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 +314,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,7 +335,10 @@ class HoneycombUtil(object): if data_representation == DataRepresentation.JSON: data = dumps(data) - path = HoneycombUtil.read_path_from_url_file(url_file) + logger.trace(data) + + base_path = HoneycombUtil.read_path_from_url_file(url_file) + path = base_path + path return HTTPRequest.put(node=node, path=path, headers=header, payload=data) @@ -371,17 +379,20 @@ class HoneycombUtil(object): payload=data, timeout=timeout) @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) + base_path = HoneycombUtil.read_path_from_url_file(url_file) + path = base_path + path return HTTPRequest.delete(node, path)