]> git.puffer.fish Git - mirror/frr.git/commitdiff
topogen: handle JSON decode failures
authorRafael Zalamena <rzalamena@gmail.com>
Thu, 13 Jul 2017 11:43:32 +0000 (08:43 -0300)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 28 Nov 2018 01:22:11 +0000 (20:22 -0500)
Instead of raise()ing, return a empty dictionary.

tests/topotests/lib/topogen.py

index 758ebcf2bfb6ed420bf552fbf59d2ef51c74dfed..ad8dd813c2a6857c2b14addb90b69c509c8c75ea 100644 (file)
@@ -645,7 +645,11 @@ class TopoRouter(TopoGear):
         if isjson is False:
             return output
 
-        return json.loads(output)
+        try:
+            return json.loads(output)
+        except ValueError:
+            logger.warning('vtysh_cmd: failed to convert json output')
+            return {}
 
     def vtysh_multicmd(self, commands, pretty_output=True):
         """