X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fparsers%2FJsonParser.py;h=2c8e62ffe33f4b3859be95076eebfa4060a296f5;hp=50a920bee09c3c76eac92a361a62ec7f4ef02421;hb=4c6fe5602edcbd9857a846e5b13a21d5c671a2c8;hpb=8c12ff59f1a5e750151f5eb0e806dcc80e91c3c2 diff --git a/resources/libraries/python/parsers/JsonParser.py b/resources/libraries/python/parsers/JsonParser.py index 50a920bee0..2c8e62ffe3 100644 --- a/resources/libraries/python/parsers/JsonParser.py +++ b/resources/libraries/python/parsers/JsonParser.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -14,6 +14,7 @@ """Used to parse JSON files or JSON data strings to dictionaries""" import json +from os import uname class JsonParser(object): @@ -29,9 +30,26 @@ class JsonParser(object): :param json_data: Data in JSON format. :type json_data: str - :return: JSON data parsed as python list. + :returns: JSON data parsed as python list. :rtype: list """ + if "4.2.0-42-generic" in uname(): + # TODO: remove ugly workaround + # On Ubuntu14.04 the VAT console returns "error:misc" even after + # some commands execute correctly. This causes problems + # with parsing JSON data. + known_errors = ["sw_interface_dump error: Misc", + "lisp_eid_table_dump error: Misc", + "show_lisp_status error: Misc", + "lisp_map_resolver_dump error: Misc", + "show_lisp_pitr error: Misc", + "snat_static_mapping_dump error: Misc", + ] + for item in known_errors: + if item in json_data: + json_data = json_data.replace(item, "") + print("Removing API error: *{0}* " + "from JSON output.".format(item)) parsed_data = json.loads(json_data) return parsed_data @@ -44,7 +62,7 @@ class JsonParser(object): :param json_file: File with JSON type data. :type json_file: str - :return: JSON data parsed as python list. + :returns: JSON data parsed as python list. :rtype: list """ input_data = open(json_file).read()