lib/bgprib.py: handle empty json results gracefully

[mirror_frr.git] / tests / topotests / lib / bgprib.py

diff --git a/tests/topotests/lib/bgprib.py b/tests/topotests/lib/bgprib.py
index 9bd038e675b680e7160b95a2b6e9fb0034297a71..b6fcd91794ec27427eaf0dedaf4b118009249c4e 100644 (file)
--- a/tests/topotests/lib/bgprib.py
+++ b/tests/topotests/lib/bgprib.py
@@ -20,6 +20,7 @@
 
 from lutil import luCommand,luResult
 import json
+import re
 
 # gpz: get rib in json form and compare against desired routes
 class BgpRib:
@@ -55,6 +56,12 @@ class BgpRib:
     def RequireVpnRoutes(self, target, title, wantroutes, debug=0):
        import json
        ret = luCommand(target,'vtysh -c "show bgp ipv4 vpn json"','.*','None','Get VPN RIB')
+        if re.search(r'^\s*$', ret):
+            # degenerate case: empty json means no routes
+            if len(wantroutes) > 0:
+                luResult(target, False, title)
+                return
+            luResult(target, True, title)
        rib = json.loads(ret)
        rds = rib['routes']['routeDistinguishers']
        for want in wantroutes:
@@ -87,6 +94,12 @@ class BgpRib:
        str = 'show bgp %s %s unicast json' % (vrfstr, afi)
        cmd = 'vtysh -c "%s"' % str
        ret = luCommand(target,cmd,'.*','None','Get %s %s RIB' % (vrfstr, afi))
+        if re.search(r'^\s*$', ret):
+            # degenerate case: empty json means no routes
+            if len(wantroutes) > 0:
+                luResult(target, False, title)
+                return
+            luResult(target, True, title)
        rib = json.loads(ret)
        table = rib['routes']
        for want in wantroutes: