tests: Reduce rip[ng]-topo1 run time

Reduce rip topo1 run time from ~100 seconds down to ~45 seconds.

1) Reduce very very long sleeps
2) Modify rip timers to be more aggressive in sending data.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/tests/topotests/rip-topo1/r1/rip_status.ref b/tests/topotests/rip-topo1/r1/rip_status.ref
index 30c840e5084e81668e767f4f3c435bae126a0c19..d75fbe85bbb3ae2a3b9445fe8e54632a71ce190c 100644 (file)
--- a/tests/topotests/rip-topo1/r1/rip_status.ref
+++ b/tests/topotests/rip-topo1/r1/rip_status.ref
@@ -1,6 +1,6 @@
 Routing Protocol is "rip"
-  Sending updates every 30 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 seconds
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
+  Timeout after 180 seconds, garbage collect after 5 seconds
   Outgoing update filter list for all interface is not set
   Incoming update filter list for all interface is not set
   Default redistribution metric is 1

diff --git a/tests/topotests/rip-topo1/r1/ripd.conf b/tests/topotests/rip-topo1/r1/ripd.conf
index 70e70d3590b6047deb34753b31ab41446ba830eb..935ec312e5826fa68397c964e6892c94eb2b27e9 100644 (file)
--- a/tests/topotests/rip-topo1/r1/ripd.conf
+++ b/tests/topotests/rip-topo1/r1/ripd.conf
@@ -1,6 +1,7 @@
 log file ripd.log
 !
 router rip
+ timers basic 5 180 5
  version 2
  network 193.1.1.0/26
 !

diff --git a/tests/topotests/rip-topo1/r2/rip_status.ref b/tests/topotests/rip-topo1/r2/rip_status.ref
index b539d321d5d53c66dc9a65747c61a8fc5de1e1ff..da1abd041ad5a9adf3e2d5034c8754b089a2efc4 100644 (file)
--- a/tests/topotests/rip-topo1/r2/rip_status.ref
+++ b/tests/topotests/rip-topo1/r2/rip_status.ref
@@ -1,6 +1,6 @@
 Routing Protocol is "rip"
-  Sending updates every 30 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 seconds
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
+  Timeout after 180 seconds, garbage collect after 5 seconds
   Outgoing update filter list for all interface is not set
   Incoming update filter list for all interface is not set
   Default redistribution metric is 1

diff --git a/tests/topotests/rip-topo1/r2/ripd.conf b/tests/topotests/rip-topo1/r2/ripd.conf
index 179a1ebd0fe937dbb9a217c3e1b2d3e660467ac3..2e94cfa2624265b1897663b72352b4cdb6ce1609 100644 (file)
--- a/tests/topotests/rip-topo1/r2/ripd.conf
+++ b/tests/topotests/rip-topo1/r2/ripd.conf
@@ -3,6 +3,7 @@ log file ripd.log
 !
 router rip
  version 2
+ timers basic 5 180 5
  network 193.1.1.0/26
  network 193.1.2.0/24
 !

diff --git a/tests/topotests/rip-topo1/r3/rip_status.ref b/tests/topotests/rip-topo1/r3/rip_status.ref
index 0e3a4be944b025749a7711c9f3204a49dbfe3a47..040d3c32a1a0a23cb713501382bdb9722447f149 100644 (file)
--- a/tests/topotests/rip-topo1/r3/rip_status.ref
+++ b/tests/topotests/rip-topo1/r3/rip_status.ref
@@ -1,6 +1,6 @@
 Routing Protocol is "rip"
-  Sending updates every 30 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 seconds
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
+  Timeout after 180 seconds, garbage collect after 5 seconds
   Outgoing update filter list for all interface is not set
   Incoming update filter list for all interface is not set
   Default redistribution metric is 1

diff --git a/tests/topotests/rip-topo1/r3/ripd.conf b/tests/topotests/rip-topo1/r3/ripd.conf
index 363b91b33a55aee49c3177588f5ba57b309a001c..e27e67503fe7b16349334257b39cf4025a1fd4b2 100644 (file)
--- a/tests/topotests/rip-topo1/r3/ripd.conf
+++ b/tests/topotests/rip-topo1/r3/ripd.conf
@@ -3,6 +3,7 @@ log file ripd.log
 !
 router rip
  version 2
+ timers basic 5 180 5
  redistribute connected
  redistribute static
  network 193.1.2.0/24

diff --git a/tests/topotests/rip-topo1/test_rip_topo1.py b/tests/topotests/rip-topo1/test_rip_topo1.py
index 7aaaacacfb0b10e00b66ac7bb2a22b1126c3fd98..8f3c25e91043507660de939cde4eec064cc097d0 100755 (executable)
--- a/tests/topotests/rip-topo1/test_rip_topo1.py
+++ b/tests/topotests/rip-topo1/test_rip_topo1.py
@@ -144,7 +144,6 @@ def test_router_running():
 
     print("\n\n** Check if FRR/Quagga is running on each Router node")
     print("******************************************\n")
-    sleep(5)
 
     # Make sure that all daemons are running
     for i in range(1, 4):
@@ -168,8 +167,8 @@ def test_converge_protocols():
     print("\n\n** Waiting for protocols convergence")
     print("******************************************\n")
 
-    # Not really implemented yet - just sleep 60 secs for now
-    sleep(60)
+    # Not really implemented yet - just sleep 11 secs for now
+    sleep(11)
 
     # Make sure that all daemons are still running
     for i in range(1, 4):

diff --git a/tests/topotests/ripng-topo1/r1/ripng_status.ref b/tests/topotests/ripng-topo1/r1/ripng_status.ref
index 48816c1a9b6df4a8951c39499cc8782da774a3c5..e6197f179b238b52c1ccb6e90d0787f109e31127 100644 (file)
--- a/tests/topotests/ripng-topo1/r1/ripng_status.ref
+++ b/tests/topotests/ripng-topo1/r1/ripng_status.ref
@@ -1,6 +1,6 @@
 Routing Protocol is "RIPng"
-  Sending updates every 30 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 seconds
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
+  Timeout after 180 seconds, garbage collect after 5 seconds
   Outgoing update filter list for all interface is not set
   Incoming update filter list for all interface is not set
   Default redistribution metric is 1

diff --git a/tests/topotests/ripng-topo1/r1/ripngd.conf b/tests/topotests/ripng-topo1/r1/ripngd.conf
index 5eb78eafe24b93c447a9111f09d3338cf3bfc47a..dd54c43557fd44106aca30e808d9e79da89675a1 100644 (file)
--- a/tests/topotests/ripng-topo1/r1/ripngd.conf
+++ b/tests/topotests/ripng-topo1/r1/ripngd.conf
@@ -5,6 +5,7 @@ debug ripng packet
 debug ripng zebra
 !
 router ripng
+ timers basic 5 180 5
  network fc00:5::/64
 !
 line vty

diff --git a/tests/topotests/ripng-topo1/r2/ripng_status.ref b/tests/topotests/ripng-topo1/r2/ripng_status.ref
index fddcf63e5b7326823d67e5570da35f0aa4178066..640df9a4a0d75ced7b9c1b1478f2b096be2a416e 100644 (file)
--- a/tests/topotests/ripng-topo1/r2/ripng_status.ref
+++ b/tests/topotests/ripng-topo1/r2/ripng_status.ref
@@ -1,6 +1,6 @@
 Routing Protocol is "RIPng"
-  Sending updates every 30 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 seconds
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
+  Timeout after 180 seconds, garbage collect after 5 seconds
   Outgoing update filter list for all interface is not set
   Incoming update filter list for all interface is not set
   Default redistribution metric is 1

diff --git a/tests/topotests/ripng-topo1/r2/ripngd.conf b/tests/topotests/ripng-topo1/r2/ripngd.conf
index a25a3cd490d70d2784594748a25d95f1f3b45f60..ef2c42195dc5084fb39601448ce84b6245cf3258 100644 (file)
--- a/tests/topotests/ripng-topo1/r2/ripngd.conf
+++ b/tests/topotests/ripng-topo1/r2/ripngd.conf
@@ -5,6 +5,7 @@ debug ripng packet
 debug ripng zebra
 !
 router ripng
+ timers basic 5 180 5
  network fc00:5::/64
  network fc00:6::/62
 !

diff --git a/tests/topotests/ripng-topo1/r3/ripng_status.ref b/tests/topotests/ripng-topo1/r3/ripng_status.ref
index 1a8dabbf5f8e2b4a781e6129290df8a7bc6eaa07..f4bfff0c5944fab118251fe1e83c0d19b12c6e5d 100644 (file)
--- a/tests/topotests/ripng-topo1/r3/ripng_status.ref
+++ b/tests/topotests/ripng-topo1/r3/ripng_status.ref
@@ -1,6 +1,6 @@
 Routing Protocol is "RIPng"
-  Sending updates every 30 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 seconds
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
+  Timeout after 180 seconds, garbage collect after 5 seconds
   Outgoing update filter list for all interface is not set
   Incoming update filter list for all interface is not set
   Default redistribution metric is 1

diff --git a/tests/topotests/ripng-topo1/r3/ripngd.conf b/tests/topotests/ripng-topo1/r3/ripngd.conf
index dfa5700adb1e250ea0af3819edec736d2cccac7c..506eaac442ee7dad771f021e17d4ab99d6ad49c3 100644 (file)
--- a/tests/topotests/ripng-topo1/r3/ripngd.conf
+++ b/tests/topotests/ripng-topo1/r3/ripngd.conf
@@ -5,6 +5,7 @@ debug ripng packet
 debug ripng zebra
 !
 router ripng
+ timers basic 5 180 5
  network fc00:6::/62
  redistribute connected
  redistribute static

diff --git a/tests/topotests/ripng-topo1/test_ripng_topo1.py b/tests/topotests/ripng-topo1/test_ripng_topo1.py
index 145b1a7efe1c774cec33286406f739b470516f21..32b137240cbda76275caff0e62dcf01904271216 100755 (executable)
--- a/tests/topotests/ripng-topo1/test_ripng_topo1.py
+++ b/tests/topotests/ripng-topo1/test_ripng_topo1.py
@@ -145,7 +145,6 @@ def test_router_running():
 
     print("\n\n** Check if FRR/Quagga is running on each Router node")
     print("******************************************\n")
-    sleep(5)
 
     # Starting Routers
     for i in range(1, 4):
@@ -169,8 +168,8 @@ def test_converge_protocols():
     print("\n\n** Waiting for protocols convergence")
     print("******************************************\n")
 
-    # Not really implemented yet - just sleep 60 secs for now
-    sleep(60)
+    # Not really implemented yet - just sleep 11 secs for now
+    sleep(11)
 
     # Make sure that all daemons are running
     for i in range(1, 4):