From 8966cca209900948adcadc2c69ecb6384e6bdfc7 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 26 Oct 2022 11:53:20 -0400 Subject: [PATCH] tests: Speedup test_all_protocol_startup.py by 55 seconds Just make ospf and ospfv3 converge faster with faster hello timers. Signed-off-by: Donald Sharp --- tests/topotests/all_protocol_startup/r1/ospf6d.conf | 1 + tests/topotests/all_protocol_startup/r1/ospfd.conf | 9 +++++++++ .../all_protocol_startup/r1/show_ip_ospf_interface.ref | 4 ++-- .../all_protocol_startup/test_all_protocol_startup.py | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/topotests/all_protocol_startup/r1/ospf6d.conf b/tests/topotests/all_protocol_startup/r1/ospf6d.conf index 2e45186653..33c26501ba 100644 --- a/tests/topotests/all_protocol_startup/r1/ospf6d.conf +++ b/tests/topotests/all_protocol_startup/r1/ospf6d.conf @@ -6,6 +6,7 @@ log file ospf6d.log ! debug ospf6 neighbor ! interface r1-eth4 + ipv6 ospf6 hello-interval 1 ! router ospf6 ospf6 router-id 192.168.0.1 diff --git a/tests/topotests/all_protocol_startup/r1/ospfd.conf b/tests/topotests/all_protocol_startup/r1/ospfd.conf index 188f810f81..61af44a4dd 100644 --- a/tests/topotests/all_protocol_startup/r1/ospfd.conf +++ b/tests/topotests/all_protocol_startup/r1/ospfd.conf @@ -3,6 +3,15 @@ log file ospfd.log ! debug ospf event ! debug ospf zebra ! +! +interface r1-eth0 + ip ospf hello-interval 1 + ip ospf dead-interval 5 +! +interface r1-eth3 + ip ospf hello-interval 1 + ip ospf dead-interval 5 +! router ospf ospf router-id 192.168.0.1 log-adjacency-changes diff --git a/tests/topotests/all_protocol_startup/r1/show_ip_ospf_interface.ref b/tests/topotests/all_protocol_startup/r1/show_ip_ospf_interface.ref index ff85679256..cb63da4715 100644 --- a/tests/topotests/all_protocol_startup/r1/show_ip_ospf_interface.ref +++ b/tests/topotests/all_protocol_startup/r1/show_ip_ospf_interface.ref @@ -7,7 +7,7 @@ r1-eth0 is up Designated Router (ID) 192.168.0.1 Interface Address 192.168.0.1/24 No backup designated router on this network Multicast group memberships: OSPFAllRouters OSPFDesignatedRouters - Timer intervals configured, Hello 10s, Dead 40s, Wait 40s, Retransmit 5 + Timer intervals configured, Hello 1s, Dead 5s, Wait 5s, Retransmit 5 Hello due in XX.XXXs Neighbor Count is 0, Adjacent neighbor count is 0 r1-eth3 is up @@ -19,6 +19,6 @@ r1-eth3 is up Designated Router (ID) 192.168.0.1 Interface Address 192.168.3.1/26 No backup designated router on this network Multicast group memberships: OSPFAllRouters OSPFDesignatedRouters - Timer intervals configured, Hello 10s, Dead 40s, Wait 40s, Retransmit 5 + Timer intervals configured, Hello 1s, Dead 5s, Wait 5s, Retransmit 5 Hello due in XX.XXXs Neighbor Count is 0, Adjacent neighbor count is 0 diff --git a/tests/topotests/all_protocol_startup/test_all_protocol_startup.py b/tests/topotests/all_protocol_startup/test_all_protocol_startup.py index ca8c005f9e..fefc6eccf4 100644 --- a/tests/topotests/all_protocol_startup/test_all_protocol_startup.py +++ b/tests/topotests/all_protocol_startup/test_all_protocol_startup.py @@ -301,7 +301,7 @@ def test_converge_protocols(): print("******************************************\n") # Not really implemented yet - just sleep 60 secs for now - sleep(60) + sleep(5) # Make sure that all daemons are running failures = 0