tests: Reduce bgp_l3vpn_to_bgp_direct run time

Reduce run time from ~76 seconds to ~47 seconds by modifying
both bgp and ospf timers to be more aggressive

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

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf
index 2712e54f128e6d86c6975485578ae2950aa3270e..8b885341eb3038bd04134239d3273bc657e6ffdf 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf
@@ -10,6 +10,7 @@ router bgp 5226
    no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5226
    neighbor 192.168.1.1 update-source 192.168.1.2
+   neighbor 192.168.1.1 timers 3 10
    address-family ipv4 unicast
      network 5.1.0.0/24 route-map rm-nh
      network 5.1.1.0/24 route-map rm-nh

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf
index 69305512cb6f085b2622b56855803cb2cce119be..2accaae16388e06bc65a44cab6469ccbe030c690 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf
@@ -10,6 +10,7 @@ router bgp 5226
    no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5226
    neighbor 192.168.1.1 update-source 192.168.1.2
+   neighbor 192.168.1.1 timers 3 10
    address-family ipv4 unicast
      network 5.1.0.0/24 route-map rm-nh
      network 5.1.1.0/24 route-map rm-nh

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf
index 3ad95c3612a60f3b3225775787598b2c4c1340d1..42eff1b9b1735268c9fc96196f986fc6ae417fa6 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf
@@ -10,6 +10,7 @@ router bgp 5226
    no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5226
    neighbor 192.168.1.1 update-source 192.168.1.2
+   neighbor 192.168.1.1 timers 3 10
    address-family ipv4 unicast
      network 5.1.2.0/24 route-map rm-nh
      network 5.1.3.0/24 route-map rm-nh

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf
index 502c4c8b2f4ce09210613c5bdccf11bb3aca0e48..a564da941115a61c9337c15e86827613cddf5314 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf
@@ -11,8 +11,10 @@ router bgp 5226
    neighbor 192.168.1.2 remote-as 5226
    neighbor 192.168.1.2 update-source 192.168.1.1
    neighbor 192.168.1.2 route-reflector-client
+   neighbor 192.168.1.2 timers 3 10
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 1.1.1.1
+   neighbor 2.2.2.2 timers 3 10
 !
    address-family ipv4 unicast
      redistribute vnc-direct

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf
index c5097e214f737f986b278a599119ee99e001eb03..460a8fb0160a63ac320b157015b50496c49e86a5 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ospfd.conf
@@ -6,3 +6,7 @@ router ospf
  network 0.0.0.0/4 area 0
  redistribute static
 !
+int r1-eth0
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf
index 95890f25b9280ba154b884eb854cfc19589c75b1..3167306700926e4dad383173b97b8246b82f3f03 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf
@@ -10,10 +10,13 @@ router bgp 5226
    no bgp ebgp-requires-policy
    neighbor 1.1.1.1 remote-as 5226
    neighbor 1.1.1.1 update-source 2.2.2.2
+   neighbor 1.1.1.1 timers 3 10
    neighbor 3.3.3.3 remote-as 5226
    neighbor 3.3.3.3 update-source 2.2.2.2
+   neighbor 3.3.3.3 timers 3 10
    neighbor 4.4.4.4 remote-as 5226
    neighbor 4.4.4.4 update-source 2.2.2.2
+   neighbor 4.4.4.4 timers 3 10
    address-family ipv4 unicast
      no neighbor 1.1.1.1 activate
      no neighbor 3.3.3.3 activate

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf
index 8678813665013ff81bc167cb2f79e165655c9361..dbed6189c81604a2a755c54691bebe3466450dd0 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ospfd.conf
@@ -5,3 +5,15 @@ router ospf
  router-id 2.2.2.2
  network 0.0.0.0/0 area 0
 !
+int r2-eth0
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
+int r2-eth1
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
+int r2-eth2
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf
index 2f7de073c330db380ac5589d80b11389f5971345..445da08248259d4078a33a3035d26f102f82516d 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf
@@ -11,8 +11,10 @@ router bgp 5226
    neighbor 192.168.1.2 remote-as 5226
    neighbor 192.168.1.2 update-source 192.168.1.2
    neighbor 192.168.1.2 route-reflector-client
+   neighbor 192.168.1.2 timers 3 10
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 3.3.3.3
+   neighbor 2.2.2.2 timers 3 10
 !
    address-family ipv4 unicast
      redistribute vnc-direct

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf
index c7c358f9dc4912fe650b7defe52f51006876ca82..0e64ed6fc59afcf2f4c0f497159c15a4972bb8f5 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ospfd.conf
@@ -7,3 +7,11 @@ router ospf
  network 0.0.0.0/4 area 0
  redistribute static
 !
+int r3-eth0
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
+int r3-eth1
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf
index 720d06dbf1e3b812b77f7de5c22fb977c764debd..194135245093904e64417d387ddf58966779fdbf 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf
@@ -11,8 +11,10 @@ router bgp 5226
    neighbor 192.168.1.2 remote-as 5226
    neighbor 192.168.1.2 update-source 192.168.1.1
    neighbor 192.168.1.2 route-reflector-client
+   neighbor 192.168.1.2 timers 3 10
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 4.4.4.4
+   neighbor 2.2.2.2 timers 3 10
 !
    address-family ipv4 unicast
      redistribute vnc-direct

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf
index 83d09c09a48bbab1e14fa0ae9ff62473a1da4eb0..89e37df479ee99b899ffeb6f5e76358cb8ff79df 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ospfd.conf
@@ -6,3 +6,7 @@ router ospf
  network 0.0.0.0/4 area 0
  redistribute static
 !
+int r4-eth0
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!