tests: Reduce run time of bgp_l3vpn_to_bgp_vrf

Reduces run time of the bgp_l3vpn_to_bgp_vrf topotests
from ~118 seconds to ~87 seconds by reducing hello timers
in bgp and ospf

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

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
index b81cd33c4f0ca2f716fbf9a7270c0ec6baa42137..6e6b9edde2da21cf0808ab24ea02e25aa03e88f1 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
@@ -12,6 +12,7 @@ router bgp 5227
    no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5227
    neighbor 192.168.1.1 update-source 192.168.1.2
+   neighbor 192.168.1.1 timers 3 10
    address-family ipv4 unicast
      network 99.0.0.1/32
      network 5.1.0.0/24 route-map rm-nh

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
index f18e5b852e07c415c2010f9ff728f93bb0471288..618acabd9f0fceae18fb88394a81207f628426d6 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
@@ -12,6 +12,7 @@ router bgp 5227
    no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5227
    neighbor 192.168.1.1 update-source 192.168.1.2
+   neighbor 192.168.1.1 timers 3 10
    address-family ipv4 unicast
      network 99.0.0.2/32
      network 5.1.0.0/24 route-map rm-nh

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
index 54a09335889953342f3531356a0dfac2ed8591d8..85c5973e6f3f4a60fcb271c24efe9a14611695d2 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
@@ -12,6 +12,7 @@ router bgp 5227
    no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5227
    neighbor 192.168.1.1 update-source 192.168.1.2
+   neighbor 192.168.1.1 timers 3 10
    address-family ipv4 unicast
      network 99.0.0.3/32
      network 5.1.2.0/24 route-map rm-nh

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
index 5289628480d2168264395d1f8d2293e3bf1627c7..6a5075a0002adcf8df0e19bff7552ec450400d01 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
@@ -12,6 +12,7 @@ router bgp 5228 vrf ce4-cust2
    no bgp ebgp-requires-policy
    neighbor 192.168.2.1 remote-as 5228
    neighbor 192.168.2.1 update-source 192.168.2.2
+   neighbor 192.168.2.1 timers 3 10
    address-family ipv4 unicast
      network 99.0.0.4/32
      network 5.4.2.0/24 route-map rm-nh

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
index 5da53ae1e7c3506c08ab5ea83091cdb241403930..8d42cfc0d89c9c6dde2768ae2f339352999b1bed 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
@@ -18,6 +18,7 @@ router bgp 5226
    no bgp ebgp-requires-policy
    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
      no neighbor 2.2.2.2 activate
@@ -35,6 +36,7 @@ router bgp 5227 vrf r1-cust1
 
    neighbor 192.168.1.2 remote-as 5227
    neighbor 192.168.1.2 update-source 192.168.1.1
+   neighbor 192.168.1.2 timers 3 10
 
    address-family ipv4 unicast
      neighbor 192.168.1.2 activate

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ospfd.conf
index c5097e214f737f986b278a599119ee99e001eb03..460a8fb0160a63ac320b157015b50496c49e86a5 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/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_vrf/r2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf
index e4a6b8e32c8f55f769f9613998df7e0bf088cc6d..7b42b770b54ed227f65d0906856891eacbca884f 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf
@@ -12,10 +12,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_vrf/r2/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ospfd.conf
index 8678813665013ff81bc167cb2f79e165655c9361..dbed6189c81604a2a755c54691bebe3466450dd0 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/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_vrf/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
index a861469c7abe183e4819d5e1241b19cf9dbddd0b..6c9640eea025b785794f6e16e0c77abf4cbf4268 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
@@ -13,6 +13,7 @@ router bgp 5226
    no bgp ebgp-requires-policy
    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
      no neighbor 2.2.2.2 activate
@@ -29,6 +30,7 @@ router bgp 5227 vrf r3-cust1
 
    neighbor 192.168.1.2 remote-as 5227
    neighbor 192.168.1.2 update-source 192.168.1.1
+   neighbor 192.168.1.2 timers 3 10
 
    address-family ipv4 unicast
      neighbor 192.168.1.2 activate

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ospfd.conf
index c7c358f9dc4912fe650b7defe52f51006876ca82..0e64ed6fc59afcf2f4c0f497159c15a4972bb8f5 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/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_vrf/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
index 480f95954e792771665dd5cee04745a148e75f26..ca9e62717259c89b613a9ab10ac835db2e057c7e 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
@@ -16,6 +16,7 @@ router bgp 5226
    no bgp ebgp-requires-policy
    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
      no neighbor 2.2.2.2 activate
@@ -32,6 +33,7 @@ router bgp 5227 vrf r4-cust1
 
    neighbor 192.168.1.2 remote-as 5227
    neighbor 192.168.1.2 update-source 192.168.1.1
+   neighbor 192.168.1.2 timers 3 10
 
    address-family ipv4 unicast
      neighbor 192.168.1.2 activate
@@ -52,6 +54,7 @@ router bgp 5228 vrf r4-cust2
 
    neighbor 192.168.2.2 remote-as 5228
    neighbor 192.168.2.2 update-source 192.168.2.1
+   neighbor 192.168.2.2 timers 3 10
 
    address-family ipv4 unicast
      neighbor 192.168.2.2 activate

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ospfd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ospfd.conf
index 83d09c09a48bbab1e14fa0ae9ff62473a1da4eb0..89e37df479ee99b899ffeb6f5e76358cb8ff79df 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ospfd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/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
+!