lib: bgprib - get human readable verson of json commands for log

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

diff --git a/tests/topotests/lib/bgprib.py b/tests/topotests/lib/bgprib.py
index de1a1846f4606222388bd0def9529a2cc39bcb43..0a00b5e5a65d2189e5ec6c7ca68cc898ca125e29 100644 (file)
--- a/tests/topotests/lib/bgprib.py
+++ b/tests/topotests/lib/bgprib.py
@@ -71,7 +71,9 @@ 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')
+        #non json form for humans
+       luCommand(target,'vtysh -c "show bgp ipv4 vpn"','.','None','Get VPN RIB (non-json)')
+       ret = luCommand(target,'vtysh -c "show bgp ipv4 vpn json"','.*','None','Get VPN RIB (json)')
         if re.search(r'^\s*$', ret):
             # degenerate case: empty json means no routes
             if len(wantroutes) > 0:
@@ -107,9 +109,12 @@ class BgpRib:
        if (afi != 'ipv4') and (afi != 'ipv6'):
            print "ERROR invalid afi";
 
-       str = 'show bgp %s %s unicast json' % (vrfstr, afi)
+       str = 'show bgp %s %s unicast' % (vrfstr, afi)
+        #non json form for humans
        cmd = 'vtysh -c "%s"' % str
-       ret = luCommand(target,cmd,'.*','None','Get %s %s RIB' % (vrfstr, afi))
+       luCommand(target,cmd,'.','None','Get %s %s RIB (non-json)' % (vrfstr, afi))
+        cmd = 'vtysh -c "%s json"' % str
+       ret = luCommand(target,cmd,'.*','None','Get %s %s RIB (json)' % (vrfstr, afi))
         if re.search(r'^\s*$', ret):
             # degenerate case: empty json means no routes
             if len(wantroutes) > 0: