From: selias Date: Tue, 7 Feb 2017 12:39:31 +0000 (+0100) Subject: HC Test: Add temporary workaround for VAT issues on Ubuntu14.04 X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=fd66ed704b43574b2dbe25d32fbf5e6575cbe29b HC Test: Add temporary workaround for VAT issues on Ubuntu14.04 Some VAT commands return "error:misc" in addition to their normal JSON output. This causes the JSON parser to complain about extra data. Change-Id: I0da9739f371998dd6e2e6d6f70c1e8a3d82b6350 Signed-off-by: selias --- diff --git a/resources/libraries/python/parsers/JsonParser.py b/resources/libraries/python/parsers/JsonParser.py index 50a920bee0..ad6e1898d0 100644 --- a/resources/libraries/python/parsers/JsonParser.py +++ b/resources/libraries/python/parsers/JsonParser.py @@ -14,6 +14,7 @@ """Used to parse JSON files or JSON data strings to dictionaries""" import json +from os import uname class JsonParser(object): @@ -32,6 +33,23 @@ class JsonParser(object): :return: 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