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>

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
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 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

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
 !

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
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 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

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
 !

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
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 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

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

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
+    # Not really implemented yet - just sleep 11 secs for now
-    sleep(60)
+    sleep(11)
 
     # Make sure that all daemons are still running
     for i in range(1, 4):

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
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 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

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

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
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 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

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
 !

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
+  Sending updates every 5 seconds with +/-50%, next due in XX seconds
-  Timeout after 180 seconds, garbage collect after 120 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

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

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
+    # Not really implemented yet - just sleep 11 secs for now
-    sleep(60)
+    sleep(11)
 
     # Make sure that all daemons are running
     for i in range(1, 4):