]> git.puffer.fish Git - matthieu/frr.git/commitdiff
topotests/lib: help script writers understand wrong VRF failure
authorLou Berger <lberger@labn.net>
Sat, 1 Dec 2018 17:18:14 +0000 (17:18 +0000)
committerLou Berger <lberger@labn.net>
Sat, 8 Dec 2018 15:43:31 +0000 (10:43 -0500)
Signed-off-by: Lou Berger <lberger@labn.net>
tests/topotests/lib/bgprib.py

index 8ec1511e1031d43193f6aae456f4fa5847c14fbc..5a8103664392f2281a3f7cbcdf31732a013b28b0 100644 (file)
@@ -123,7 +123,16 @@ class BgpRib:
                 return
             luResult(target, True, title, logstr)
        rib = json.loads(ret)
-       table = rib['routes']
+        try:
+           table = rib['routes']
+        # KeyError: 'routes' probably means missing/bad VRF
+        except KeyError as err:
+           if vrf != '':
+                errstr = '-script ERROR: check if wrong vrf (%s)' % (vrf)
+            else:
+                errstr = '-script ERROR: check if vrf missing'
+           luResult(target, False, title + errstr, logstr)
+           return
        for want in wantroutes:
            if not self.routes_include_wanted(table,want,debug):
                luResult(target, False, title, logstr)