Skip to content

Commit

Permalink
topotest: update the LDP VPLS test
Browse files Browse the repository at this point in the history
The final test case of this topotest wasn't really testing
anything. Do the following changes to fix this:
* Remove "no link-detect" from the zebra configs so that link down
  failures are detected immediately;
* After shutting down the interface between r1 and r2, wait five
  seconds before testing if the pseudowires reconverged through
  the r3 router.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
  • Loading branch information
rwestphal committed Nov 4, 2019
1 parent a89241b commit c6d345e
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 9 deletions.
3 changes: 0 additions & 3 deletions tests/topotests/ldp-vpls-topo1/r1/zebra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,14 @@ interface lo
!
interface r1-eth0
description to s1
no link-detect
!
interface r1-eth1
description to s4
ip address 10.0.1.1/24
no link-detect
!
interface r1-eth2
description to s5
ip address 10.0.2.1/24
no link-detect
!
ip forwarding
!
Expand Down
3 changes: 0 additions & 3 deletions tests/topotests/ldp-vpls-topo1/r2/zebra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,14 @@ interface lo
!
interface r2-eth0
description to s2
no link-detect
!
interface r2-eth1
description to s4
ip address 10.0.1.2/24
no link-detect
!
interface r2-eth2
description to s6
ip address 10.0.3.2/24
no link-detect
!
ip forwarding
!
Expand Down
3 changes: 0 additions & 3 deletions tests/topotests/ldp-vpls-topo1/r3/zebra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,14 @@ interface lo
!
interface r3-eth0
description to s3
no link-detect
!
interface r3-eth1
description to s5
ip address 10.0.2.3/24
no link-detect
!
interface r3-eth2
description to s6
ip address 10.0.3.3/24
no link-detect
!
ip forwarding
!
Expand Down
1 change: 1 addition & 0 deletions tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ def test_ldp_pseudowires_after_link_down():
# Shut down r1-r2 link */
tgen = get_topogen()
tgen.gears['r1'].peer_link_enable('r1-eth1', False)
topotest.sleep(5, "Waiting for the network to reconverge")

# check if the pseudowire is still up (using an alternate path for nexthop resolution)
for rname in ['r1', 'r2', 'r3']:
Expand Down

0 comments on commit c6d345e

Please sign in to comment.