tests: Speedup ospf_sr_topo1 by over 100 seconds

Add some basic timer operations to speed up convergence.

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

diff --git a/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf
index 94dba7c0615be8dfa0a72bdbba7d4f86f54d8d5e..6a12ae5011782bbe217c7920e339015aed4ab83d 100644 (file)
--- a/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf
@@ -12,6 +12,8 @@ interface lo
 !
 interface eth-sw1
  ip ospf network broadcast
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 router ospf
  ospf router-id 1.1.1.1

diff --git a/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf
index b47e788062559cf752ab02e54a16a0e0e87fbac8..adf4d0923548d1750f5536b09462ec3c15242e00 100644 (file)
--- a/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf
@@ -12,12 +12,18 @@ interface lo
 !
 interface eth-sw1
  ip ospf network broadcast
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt4-1
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt4-2
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 router ospf
  ospf router-id 2.2.2.2

diff --git a/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf
index 238d82ff97924a8d90d9c340d5b7923fd8eb9a11..c45c1069fb09509f7d4a5ea5c6d1761eaafe984e 100644 (file)
--- a/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf
@@ -12,12 +12,18 @@ interface lo
 !
 interface eth-sw1
  ip ospf network broadcast
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt5-1
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt5-2
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 router ospf
  ospf router-id 3.3.3.3

diff --git a/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf
index b12e0729ad8f02fe1a6f674c411373f666db6049..9853ce64cf90c92fca74ca0a0601ff714c89ba9b 100644 (file)
--- a/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf
@@ -12,15 +12,23 @@ interface lo
 !
 interface eth-rt2-1
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt2-2
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt5
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt6
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 router ospf
  ospf router-id 4.4.4.4

diff --git a/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf
index 4e7b24c03aa4293664fabc2b0a3b79c1f29d4f2f..e6a755c43083f1e31969b27a1cbb359004cf7119 100644 (file)
--- a/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf
@@ -12,15 +12,23 @@ interface lo
 !
 interface eth-rt3-1
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt3-2
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt4
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt6
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 router ospf
  ospf router-id 5.5.5.5

diff --git a/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf
index c6d07d169e1bf40f5750eb77fd4b52491b1e2c16..1ec71e445451757defa842465e4211c32ad8469b 100644 (file)
--- a/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf
@@ -12,9 +12,13 @@ interface lo
 !
 interface eth-rt4
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 interface eth-rt5
  ip ospf network point-to-point
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
 !
 router ospf
  ospf router-id 6.6.6.6