X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVatExecutor.py;h=fd1d8db2320a2bbb51369c248b424fd7babfa653;hp=9851d93edd7d3e8eec16922594688c0293aec193;hb=87ec18ad91a63e7925005057ccbb7a7570347376;hpb=6afd4834db96cab257352bf02449e9e526198f96

diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py
index 9851d93edd..fd1d8db232 100644
--- a/resources/libraries/python/VatExecutor.py
+++ b/resources/libraries/python/VatExecutor.py
@@ -183,6 +183,21 @@ class VatTerminal(object):
                                                           self.__VAT_PROMPT)
         logger.debug("VAT output: {}".format(out))
         if self.json:
+            obj_start = out.find('{')
+            obj_end = out.rfind('}')
+            array_start = out.find('[')
+            array_end = out.rfind(']')
+
+            if -1 == obj_start and -1 == array_start:
+                raise RuntimeError("No JSON data.")
+
+            if obj_start < array_start or -1 == array_start:
+                start = obj_start
+                end = obj_end + 1
+            else:
+                start = array_start
+                end = array_end + 1
+            out = out[start:end]
             json_out = json.loads(out)
             return json_out
         else: