From: Lou Berger <lberger@labn.net>
Date: Sat, 1 Dec 2018 17:18:14 +0000 (+0000)
Subject: topotests/lib: help script writers understand wrong VRF failure
X-Git-Tag: frr-7.1-dev~115^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=90892d35e1b6904f06cdbbde8b9f937bf89f4f4a;p=matthieu%2Ffrr.git

topotests/lib: help script writers understand wrong VRF failure

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/tests/topotests/lib/bgprib.py b/tests/topotests/lib/bgprib.py
index 8ec1511e10..5a81036643 100644
--- a/tests/topotests/lib/bgprib.py
+++ b/tests/topotests/lib/bgprib.py
@@ -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)