From b941f9587f9f798f76b686e014912b7d7c08683a Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Tue, 6 Nov 2018 13:48:46 -0200 Subject: [PATCH] bgp-ecmp-topo1: fix some pylint warnings Signed-off-by: Rafael Zalamena --- .../bgp-ecmp-topo1/test_bgp_ecmp_topo1.py | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py b/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py index f6df9a901d..d806226dff 100755 --- a/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py +++ b/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py @@ -48,11 +48,12 @@ from mininet.topo import Topo total_ebgp_peers = 20 ##################################################### -## -## Network Topology Definition -## +# +# Network Topology Definition +# ##################################################### + class BGPECMPTopo1(Topo): "BGP ECMP Topology 1" @@ -63,13 +64,13 @@ class BGPECMPTopo1(Topo): router = tgen.add_router('r1') # Setup Switches - 1 switch per 5 peering routers - for swNum in range(1, (total_ebgp_peers+4)/5 +1): + for swNum in range(1, (total_ebgp_peers + 4) / 5 + 1): switch = tgen.add_switch('s{}'.format(swNum)) switch.add_link(router) # Add 'total_ebgp_peers' number of eBGP ExaBGP neighbors for peerNum in range(1, total_ebgp_peers+1): - swNum = ((peerNum -1) / 5 + 1) + swNum = ((peerNum - 1) / 5 + 1) peer_ip = '10.0.{}.{}'.format(swNum, peerNum + 100) peer_route = 'via 10.0.{}.1'.format(swNum) @@ -81,9 +82,9 @@ class BGPECMPTopo1(Topo): ##################################################### -## -## Tests starting -## +# +# Tests starting +# ##################################################### def setup_module(module): @@ -112,10 +113,12 @@ def setup_module(module): peer.start(peer_dir, env_file) logger.info(pname) + def teardown_module(module): tgen = get_topogen() tgen.stop_topology() + def test_bgp_convergence(): "Test for BGP topology convergence" tgen = get_topogen() @@ -135,8 +138,8 @@ def test_bgp_convergence(): def _output_summary_cmp(router, cmd, data): """ - Runs `cmd` that returns JSON data (normally the command ends with 'json') - and compare with `data` contents. + Runs `cmd` that returns JSON data (normally the command ends + with 'json') and compare with `data` contents. """ output = router.vtysh_cmd(cmd, isjson=True) if 'ipv4Unicast' in output: @@ -153,6 +156,7 @@ def test_bgp_convergence(): assertmsg = 'BGP router network did not converge' assert res is None, assertmsg + def test_bgp_ecmp(): tgen = get_topogen() @@ -175,11 +179,12 @@ def test_bgp_ecmp(): expect['routes'][netkey].append(peer) test_func = functools.partial(topotest.router_json_cmp, - tgen.gears['r1'], 'show ip bgp json', expect) + tgen.gears['r1'], 'show ip bgp json', expect) _, res = topotest.run_and_expect(test_func, None, count=10, wait=0.5) assertmsg = 'expected multipath routes in "show ip bgp" output' assert res is None, assertmsg + if __name__ == '__main__': args = ["-s"] + sys.argv[1:] sys.exit(pytest.main(args)) -- 2.39.5