bgp-ecmp-topo1: fix some pylint warnings

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2018-11-06 13:48:46 -02:00 committed by Donald Sharp
parent 47bbb80ad2
commit b941f9587f

View File

@ -48,11 +48,12 @@ from mininet.topo import Topo
total_ebgp_peers = 20 total_ebgp_peers = 20
##################################################### #####################################################
## #
## Network Topology Definition # Network Topology Definition
## #
##################################################### #####################################################
class BGPECMPTopo1(Topo): class BGPECMPTopo1(Topo):
"BGP ECMP Topology 1" "BGP ECMP Topology 1"
@ -81,9 +82,9 @@ class BGPECMPTopo1(Topo):
##################################################### #####################################################
## #
## Tests starting # Tests starting
## #
##################################################### #####################################################
def setup_module(module): def setup_module(module):
@ -112,10 +113,12 @@ def setup_module(module):
peer.start(peer_dir, env_file) peer.start(peer_dir, env_file)
logger.info(pname) logger.info(pname)
def teardown_module(module): def teardown_module(module):
tgen = get_topogen() tgen = get_topogen()
tgen.stop_topology() tgen.stop_topology()
def test_bgp_convergence(): def test_bgp_convergence():
"Test for BGP topology convergence" "Test for BGP topology convergence"
tgen = get_topogen() tgen = get_topogen()
@ -135,8 +138,8 @@ def test_bgp_convergence():
def _output_summary_cmp(router, cmd, data): def _output_summary_cmp(router, cmd, data):
""" """
Runs `cmd` that returns JSON data (normally the command ends with 'json') Runs `cmd` that returns JSON data (normally the command ends
and compare with `data` contents. with 'json') and compare with `data` contents.
""" """
output = router.vtysh_cmd(cmd, isjson=True) output = router.vtysh_cmd(cmd, isjson=True)
if 'ipv4Unicast' in output: if 'ipv4Unicast' in output:
@ -153,6 +156,7 @@ def test_bgp_convergence():
assertmsg = 'BGP router network did not converge' assertmsg = 'BGP router network did not converge'
assert res is None, assertmsg assert res is None, assertmsg
def test_bgp_ecmp(): def test_bgp_ecmp():
tgen = get_topogen() tgen = get_topogen()
@ -180,6 +184,7 @@ def test_bgp_ecmp():
assertmsg = 'expected multipath routes in "show ip bgp" output' assertmsg = 'expected multipath routes in "show ip bgp" output'
assert res is None, assertmsg assert res is None, assertmsg
if __name__ == '__main__': if __name__ == '__main__':
args = ["-s"] + sys.argv[1:] args = ["-s"] + sys.argv[1:]
sys.exit(pytest.main(args)) sys.exit(pytest.main(args))