Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions test/case/routing/rip_basic/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ def config_target2(target, link, data):
_, R1link = env.ltop.xlate("R1", "link")
_, R2data = env.ltop.xlate("R2", "data")

parallel(config_target1(R1, R1data, R1link),
config_target2(R2, R2link, R2data))
parallel(lambda: config_target1(R1, R1data, R1link),
lambda: config_target2(R2, R2link, R2data))

with test.step("Wait for RIP routes to be exchanged"):
print("Waiting for RIP routes to propagate...")
Expand All @@ -197,6 +197,8 @@ def config_target2(target, link, data):
until(lambda: route.ipv4_route_exist(R2, "192.168.100.1/32", proto="ietf-rip:rip"), attempts=40)
# R2 should learn R1's static route (redistributed)
until(lambda: route.ipv4_route_exist(R2, "192.168.33.1/32", proto="ietf-rip:rip"), attempts=40)
until(lambda: route.ipv4_route_exist(R2, "192.168.10.0/24", proto="ietf-rip:rip"), attempts=40)
until(lambda: route.ipv4_route_exist(R1, "192.168.60.0/24", proto="ietf-rip:rip"), attempts=40)

with test.step("Test connectivity from PC:data1 to R2 loopback via RIP"):
_, hport0 = env.ltop.xlate("PC", "data1")
Expand Down
10 changes: 7 additions & 3 deletions test/case/routing/rip_multihop/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@ def config_r3(target, link, data):
_, R3link = env.ltop.xlate("R3", "link")
_, R3data = env.ltop.xlate("R3", "data")

parallel(config_r1(R1, R1data, R1link),
config_r2(R2, R2west, R2east),
config_r3(R3, R3link, R3data))
parallel(lambda: config_r1(R1, R1data, R1link),
lambda: config_r2(R2, R2west, R2east),
lambda: config_r3(R3, R3link, R3data))

with test.step("Wait for RIP routes to be exchanged"):
print("Waiting for RIP routes to propagate...")
Expand All @@ -264,6 +264,10 @@ def config_r3(target, link, data):
until(lambda: route.ipv4_route_exist(R3, "192.168.22.1/32", proto="ietf-rip:rip"), attempts=40)
# R3 should learn R1's loopback (via R2)
until(lambda: route.ipv4_route_exist(R3, "192.168.11.1/32", proto="ietf-rip:rip"), attempts=40)
until(lambda: route.ipv4_route_exist(R2, "192.168.10.0/24", proto="ietf-rip:rip"), attempts=40)
until(lambda: route.ipv4_route_exist(R3, "192.168.10.0/24", proto="ietf-rip:rip"), attempts=40)
until(lambda: route.ipv4_route_exist(R2, "192.168.70.0/24", proto="ietf-rip:rip"), attempts=40)
until(lambda: route.ipv4_route_exist(R1, "192.168.70.0/24", proto="ietf-rip:rip"), attempts=40)

with test.step("Verify R2 has two RIP neighbors"):
print("Checking R2 has two RIP neighbors...")
Expand Down