tests: Run python formatter (black) for topotests

Mostly ' => ", whitespace changes.

Using https://github.com/psf/black

Signed-off-by: reformat <reformat@nobody.nobody>

1 files changed, 99 insertions, 82 deletions

diff --git a/tests/topotests/lib/bgprib.py b/tests/topotests/lib/bgprib.py
index 5a81036643..3d92718c78 100644
--- a/tests/topotests/lib/bgprib.py
+++ b/tests/topotests/lib/bgprib.py
@@ -16,14 +16,14 @@
 # with this program; see the file COPYING; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-#  
+#
 # want_rd_routes = [
 #     {'rd':'10:1', 'p':'5.1.0.0/24', 'n':'1.1.1.1'},
 #     {'rd':'10:1', 'p':'5.1.0.0/24', 'n':'1.1.1.1'},
-# 
+#
 #     {'rd':'10:3', 'p':'5.1.0.0/24', 'n':'3.3.3.3'},
 # ]
-# 
+#
 # ribRequireVpnRoutes('r2','Customer routes',want_rd_routes)
 #
 # want_unicast_routes = [
@@ -34,116 +34,133 @@
 # ribRequireUnicastRoutes('r1','ipv4','','Customer routes in default',want_unicast_routes)
 #
 
-from lutil import luCommand,luResult
+from lutil import luCommand, luResult
 import json
 import re
 
 # gpz: get rib in json form and compare against desired routes
 class BgpRib:
-    def routes_include_wanted(self,pfxtbl,want,debug):
-	# helper function to RequireVpnRoutes
-	for pfx in pfxtbl.iterkeys():
-	    if debug:
-		print 'trying pfx ' + pfx
-	    if pfx != want['p']:
-		if debug:
-		    print 'want pfx=' + want['p'] + ', not ' + pfx
-		continue
-	    if debug:
-		print 'have pfx=' + pfx
-	    for r in pfxtbl[pfx]:
-		if debug:
-		    print 'trying route'
-		nexthops = r['nexthops']
-		for nh in nexthops:
-		    if debug:
-			print 'trying nh ' + nh['ip']
-		    if nh['ip'] == want['n']:
-			if debug:
-			    print 'found ' + want['n']
-			return 1
-		    else:
-			if debug:
-			    print 'want nh=' + want['n'] + ', not ' + nh['ip']
-	    if debug:
-		print 'missing route: pfx=' + want['p'] + ', nh=' + want['n']
-	    return 0
+    def routes_include_wanted(self, pfxtbl, want, debug):
+        # helper function to RequireVpnRoutes
+        for pfx in pfxtbl.iterkeys():
+            if debug:
+                print "trying pfx " + pfx
+            if pfx != want["p"]:
+                if debug:
+                    print "want pfx=" + want["p"] + ", not " + pfx
+                continue
+            if debug:
+                print "have pfx=" + pfx
+            for r in pfxtbl[pfx]:
+                if debug:
+                    print "trying route"
+                nexthops = r["nexthops"]
+                for nh in nexthops:
+                    if debug:
+                        print "trying nh " + nh["ip"]
+                    if nh["ip"] == want["n"]:
+                        if debug:
+                            print "found " + want["n"]
+                        return 1
+                    else:
+                        if debug:
+                            print "want nh=" + want["n"] + ", not " + nh["ip"]
+            if debug:
+                print "missing route: pfx=" + want["p"] + ", nh=" + want["n"]
+            return 0
 
     def RequireVpnRoutes(self, target, title, wantroutes, debug=0):
-	import json
+        import json
+
         logstr = "RequireVpnRoutes " + str(wantroutes)
-        #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):
+        # 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:
                 luResult(target, False, title, logstr)
                 return
             luResult(target, True, title, logstr)
-	rib = json.loads(ret)
-	rds = rib['routes']['routeDistinguishers']
-	for want in wantroutes:
-	    found = 0
-	    if debug:
-		print "want rd " + want['rd']
-	    for rd in rds.iterkeys():
-		if rd != want['rd']:
-		    continue
-		if debug:
-		    print "found rd " + rd
-		table = rds[rd]
-		if self.routes_include_wanted(table,want,debug):
-		    found = 1
-		    break
-	    if not found:
-		luResult(target, False, title, logstr)
-		return
-	luResult(target, True, title, logstr)
+        rib = json.loads(ret)
+        rds = rib["routes"]["routeDistinguishers"]
+        for want in wantroutes:
+            found = 0
+            if debug:
+                print "want rd " + want["rd"]
+            for rd in rds.iterkeys():
+                if rd != want["rd"]:
+                    continue
+                if debug:
+                    print "found rd " + rd
+                table = rds[rd]
+                if self.routes_include_wanted(table, want, debug):
+                    found = 1
+                    break
+            if not found:
+                luResult(target, False, title, logstr)
+                return
+        luResult(target, True, title, logstr)
 
-    def RequireUnicastRoutes(self,target,afi,vrf,title,wantroutes,debug=0):
+    def RequireUnicastRoutes(self, target, afi, vrf, title, wantroutes, debug=0):
         logstr = "RequireVpnRoutes " + str(wantroutes)
-	vrfstr = ''
-	if vrf != '':
-	    vrfstr = 'vrf %s' % (vrf)
+        vrfstr = ""
+        if vrf != "":
+            vrfstr = "vrf %s" % (vrf)
 
-	if (afi != 'ipv4') and (afi != 'ipv6'):
-	    print "ERROR invalid afi";
+        if (afi != "ipv4") and (afi != "ipv6"):
+            print "ERROR invalid afi"
 
-	cmdstr = 'show bgp %s %s unicast' % (vrfstr, afi)
-        #non json form for humans
-	cmd = 'vtysh -c "%s"' % cmdstr
-	luCommand(target,cmd,'.','None','Get %s %s RIB (non-json)' % (vrfstr, afi))
+        cmdstr = "show bgp %s %s unicast" % (vrfstr, afi)
+        # non json form for humans
+        cmd = 'vtysh -c "%s"' % cmdstr
+        luCommand(target, cmd, ".", "None", "Get %s %s RIB (non-json)" % (vrfstr, afi))
         cmd = 'vtysh -c "%s json"' % cmdstr
-	ret = luCommand(target,cmd,'.*','None','Get %s %s RIB (json)' % (vrfstr, afi))
-        if re.search(r'^\s*$', ret):
+        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:
                 luResult(target, False, title, logstr)
                 return
             luResult(target, True, title, logstr)
-	rib = json.loads(ret)
+        rib = json.loads(ret)
         try:
-	    table = rib['routes']
-        # KeyError: 'routes' probably means missing/bad VRF
+            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)
+            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)
-		return
-	luResult(target, True, title, logstr)
+                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)
+                return
+        luResult(target, True, title, logstr)
 
 
-BgpRib=BgpRib()
+BgpRib = BgpRib()
+
 
 def bgpribRequireVpnRoutes(target, title, wantroutes, debug=0):
     BgpRib.RequireVpnRoutes(target, title, wantroutes, debug)
 
+
 def bgpribRequireUnicastRoutes(target, afi, vrf, title, wantroutes, debug=0):
     BgpRib.RequireUnicastRoutes(target, afi, vrf, title, wantroutes, debug)