tests: tweak timers to avoid frequent failures on slow CI hardware

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
(cherry picked from commit ad7a1f9487edc75fbfaf932e929a008c8bcbc4f9)

diff --git a/tests/topotests/ospf_metric_propagation/r1/frr.conf b/tests/topotests/ospf_metric_propagation/r1/frr.conf
index 85230494dd15a8289be48a4777035ba03bc0b96f..4966e6a9da1bb1dfbf876418711bd068ee2fc66b 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r1/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r1/frr.conf
@@ -8,18 +8,18 @@ interface r1-eth0
  ip address 10.0.1.1/24
  ip ospf cost 100
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface r1-eth1 vrf blue
  ip address 10.0.10.1/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 !
 interface r1-eth2 vrf green
  ip address 10.0.91.1/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 !
 router ospf

diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-1.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-1.json
index 4f1ced81fb7b66d9eaa9546bac349acea85ce763..2392b40fa9859f9de50de24e84363ca3ae4eef9d 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-1.json
+++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-1.json
@@ -2,32 +2,15 @@
   "10.0.94.0/24":[
     {
       "prefix":"10.0.94.0/24",
-      "prefixLen":24,
       "protocol":"bgp",
       "vrfName":"green",
-      "selected":true,
-      "destSelected":true,
-      "distance":20,
       "metric":34,
       "installed":true,
-      "table":12,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
-      "nexthopGroupId":"*",
-      "installedNexthopGroupId":"*",
-      "uptime":"*",
       "nexthops":[
         {
-          "flags":3,
-          "fib":true,
           "ip":"10.0.10.5",
-          "afi":"ipv4",
           "interfaceName":"r1-eth1",
-          "vrf":"blue",
-          "active":true,
-          "weight":1
+          "vrf":"blue"
         }
       ]
     }

diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-2.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-2.json
index 882d3ca4f09b8e44ca075a5be3c21a9681da603d..9a3d3d87b75f414b7c9ea82e0e200ff367bc6594 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-2.json
+++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-2.json
@@ -2,32 +2,15 @@
   "10.0.94.0/24":[
     {
       "prefix":"10.0.94.0/24",
-      "prefixLen":24,
       "protocol":"bgp",
       "vrfName":"green",
-      "selected":true,
-      "destSelected":true,
-      "distance":20,
       "metric":136,
       "installed":true,
-      "table":12,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
-      "nexthopGroupId":"*",
-      "installedNexthopGroupId":"*",
-      "uptime":"*",
       "nexthops":[
         {
-          "flags":3,
-          "fib":true,
           "ip":"10.0.1.2",
-          "afi":"ipv4",
           "interfaceName":"r1-eth0",
-          "vrf":"default",
-          "active":true,
-          "weight":1
+          "vrf":"default"
         }
       ]
     }

diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-3.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-3.json
index cd528459ab23a56b5982c996fb7719e7b848306a..5f0331f3cd5bf85fd7f8a859f98ffbe287f0e587 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-3.json
+++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-3.json
@@ -2,32 +2,15 @@
   "10.0.94.0/24":[
     {
       "prefix":"10.0.94.0/24",
-      "prefixLen":24,
       "protocol":"bgp",
       "vrfName":"green",
-      "selected":true,
-      "destSelected":true,
-      "distance":20,
       "metric":1138,
       "installed":true,
-      "table":12,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
-      "nexthopGroupId":"*",
-      "installedNexthopGroupId":"*",
-      "uptime":"*",
       "nexthops":[
         {
-          "flags":3,
-          "fib":true,
           "ip":"10.0.1.2",
-          "afi":"ipv4",
           "interfaceName":"r1-eth0",
-          "vrf":"default",
-          "active":true,
-          "weight":1
+          "vrf":"default"
         }
       ]
     }

diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-4.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-4.json
index 133f37549e160120883fd25c90258664ef82e7a5..f312291e8627b70474a64db3fd554b7d383a4bf8 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-4.json
+++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-4.json
@@ -2,32 +2,15 @@
   "10.0.94.0/24":[
     {
       "prefix":"10.0.94.0/24",
-      "prefixLen":24,
       "protocol":"bgp",
       "vrfName":"green",
-      "selected":true,
-      "destSelected":true,
-      "distance":20,
       "metric":1218,
       "installed":true,
-      "table":12,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
-      "nexthopGroupId":"*",
-      "installedNexthopGroupId":"*",
-      "uptime":"*",
       "nexthops":[
         {
-          "flags":3,
-          "fib":true,
           "ip":"10.0.1.2",
-          "afi":"ipv4",
           "interfaceName":"r1-eth0",
-          "vrf":"default",
-          "active":true,
-          "weight":1
+          "vrf":"default"
         }
       ]
     }

diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-5.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-5.json
index 5d8050902144ab299811a9d42aa2ab9c2b26e4c9..e88c0371743c5bcb992f7d28ce5dbd15eefddcb3 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-5.json
+++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-5.json
@@ -2,32 +2,15 @@
   "10.0.94.0/24":[
     {
       "prefix":"10.0.94.0/24",
-      "prefixLen":24,
       "protocol":"bgp",
       "vrfName":"green",
-      "selected":true,
-      "destSelected":true,
-      "distance":20,
       "metric":238,
       "installed":true,
-      "table":12,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
-      "nexthopGroupId":"*",
-      "installedNexthopGroupId":"*",
-      "uptime":"*",
       "nexthops":[
         {
-          "flags":3,
-          "fib":true,
           "ip":"10.0.1.2",
-          "afi":"ipv4",
           "interfaceName":"r1-eth0",
-          "vrf":"default",
-          "active":true,
-          "weight":1
+          "vrf":"default"
         }
       ]
     }

diff --git a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-6.json b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-6.json
index 1b59707b98f2c27af6e94f4e45c8e3dd015e83a9..f1fec860a9d3a368f81f6ffcdf93fe365c30d24c 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r1/show_ip_route-6.json
+++ b/tests/topotests/ospf_metric_propagation/r1/show_ip_route-6.json
@@ -2,32 +2,15 @@
   "10.0.94.0/24":[
     {
       "prefix":"10.0.94.0/24",
-      "prefixLen":24,
       "protocol":"bgp",
       "vrfName":"green",
-      "selected":true,
-      "destSelected":true,
-      "distance":20,
       "metric":136,
       "installed":true,
-      "table":12,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
-      "nexthopGroupId":"*",
-      "installedNexthopGroupId":"*",
-      "uptime":"*",
       "nexthops":[
         {
-          "flags":3,
-          "fib":true,
           "ip":"10.0.10.5",
-          "afi":"ipv4",
           "interfaceName":"r1-eth1",
-          "vrf":"blue",
-          "active":true,
-          "weight":1
+          "vrf":"blue"
         }
       ]
     }

diff --git a/tests/topotests/ospf_metric_propagation/r2/frr.conf b/tests/topotests/ospf_metric_propagation/r2/frr.conf
index e67a374ff552d535614e39d415c955dca71b4e87..0ac5001b1b996e922f7345cab0d6d004492e5d93 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r2/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r2/frr.conf
@@ -8,18 +8,18 @@ interface r2-eth0
  ip address 10.0.1.2/24
  ip ospf cost 100
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface r2-eth1 vrf blue
  ip address 10.0.20.2/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface r2-eth2 vrf green
  ip address 10.0.70.2/24
  ip ospf cost 1000
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 router ospf
   ospf router-id 10.0.255.2

diff --git a/tests/topotests/ospf_metric_propagation/r3/frr.conf b/tests/topotests/ospf_metric_propagation/r3/frr.conf
index 175851d42763f8c0168d82ea7dbffe9e77ba2955..0859173f7971c2e741bbef8eff618010348eeaea 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r3/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r3/frr.conf
@@ -8,18 +8,18 @@ interface r3-eth0
  ip address 10.0.3.3/24
  ip ospf cost 100
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface r3-eth1 vrf blue
  ip address 10.0.30.3/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface r3-eth2 vrf green
  ip address 10.0.80.3/24
  ip ospf cost 1000
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 router ospf
   ospf router-id 10.0.255.3

diff --git a/tests/topotests/ospf_metric_propagation/r4/frr.conf b/tests/topotests/ospf_metric_propagation/r4/frr.conf
index 70a47e34fa679631b1668d6db768eeb526055e5c..743da272727f71de4d5a8762210388e51a44ddf5 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/r4/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/r4/frr.conf
@@ -8,17 +8,17 @@ interface r4-eth0
  ip address 10.0.3.4/24
  ip ospf cost 100
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface r4-eth1 vrf blue
  ip address 10.0.40.4/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface r4-eth2 vrf green
  ip address 10.0.94.4/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 router ospf
   ospf router-id 10.0.255.4

diff --git a/tests/topotests/ospf_metric_propagation/ra/frr.conf b/tests/topotests/ospf_metric_propagation/ra/frr.conf
index 7be9e5c33e904fd7239b773c8be268ab3ecbeae1..2434faeabc97a07c131cc0cec8c6d1af76ee5a7f 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/ra/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/ra/frr.conf
@@ -7,17 +7,17 @@ ip forwarding
 interface ra-eth0
  ip address 10.0.50.5/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface ra-eth1
  ip address 10.0.10.5/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface ra-eth2
  ip address 10.0.20.5/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 router ospf
   ospf router-id 10.0.255.5

diff --git a/tests/topotests/ospf_metric_propagation/rb/frr.conf b/tests/topotests/ospf_metric_propagation/rb/frr.conf
index a7dbf82278ceec9c852d667d5966723806240c63..b83532a8405a22a5557f063679828ed069ad85b9 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/rb/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/rb/frr.conf
@@ -7,17 +7,17 @@ ip forwarding
 interface rb-eth0
  ip address 10.0.50.6/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface rb-eth1
  ip address 10.0.30.6/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface rb-eth2
  ip address 10.0.40.6/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 router ospf
   ospf router-id 10.0.255.6

diff --git a/tests/topotests/ospf_metric_propagation/rc/frr.conf b/tests/topotests/ospf_metric_propagation/rc/frr.conf
index f5a2ed7c4f179b0870584e739486b3e61f49fa92..dd8077c3949f1130fab83920825474d711b63270 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/rc/frr.conf
+++ b/tests/topotests/ospf_metric_propagation/rc/frr.conf
@@ -7,12 +7,12 @@ ip forwarding
 interface rc-eth0
  ip address 10.0.70.7/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 interface rc-eth1
  ip address 10.0.80.7/24
  ip ospf hello-interval 1
- ip ospf dead-interval 30
+ ip ospf dead-interval 40
 !
 router ospf
   ospf router-id 10.0.255.7

diff --git a/tests/topotests/ospf_metric_propagation/test_ospf_metric_propagation.py b/tests/topotests/ospf_metric_propagation/test_ospf_metric_propagation.py
index 085eb1f9c123c26955d3c1a93153d007b61123a7..ea962651766e14444961ba46bc0e0c19ee83f84d 100644 (file)
--- a/tests/topotests/ospf_metric_propagation/test_ospf_metric_propagation.py
+++ b/tests/topotests/ospf_metric_propagation/test_ospf_metric_propagation.py
@@ -283,7 +283,7 @@ def test_link_1_2_3_4_down():
     assert result is None, assertmsg
 
 
-def test_link_1_2_4_down():
+def test_link_1_2_4_down_3_up():
     "Test path R1 -> R2 -> Rc -> R3  -> R4"
     tgen = get_topogen()
 
@@ -305,7 +305,7 @@ def test_link_1_2_4_down():
     assert result is None, assertmsg
 
 
-def test_link_1_4_down():
+def test_link_1_4_down_2_up():
     "Test path R1 -> R2 -> Ra -> Rb -> R3  -> R4"
     tgen = get_topogen()
 
@@ -321,13 +321,13 @@ def test_link_1_4_down():
     test_func = partial(
         topotest.router_json_cmp, r1, "show ip route vrf green 10.0.94.2 json", expected
     )
-    _, result = topotest.run_and_expect(test_func, None, count=60, wait=1)
+    _, result = topotest.run_and_expect(test_func, None, count=120, wait=2)
 
     assertmsg = "r1 JSON output mismatches"
     assert result is None, assertmsg
 
 
-def test_link_4_down():
+def test_link_4_down_1_up():
     "Test path R1 -> Ra -> Rb -> R3  -> R4"
     tgen = get_topogen()
 
@@ -343,7 +343,7 @@ def test_link_4_down():
     test_func = partial(
         topotest.router_json_cmp, r1, "show ip route vrf green 10.0.94.2 json", expected
     )
-    _, result = topotest.run_and_expect(test_func, None, count=60, wait=1)
+    _, result = topotest.run_and_expect(test_func, None, count=120, wait=2)
 
     assertmsg = "r1 JSON output mismatches"
     assert result is None, assertmsg
@@ -365,7 +365,7 @@ def test_link_1_2_3_4_up():
     test_func = partial(
         topotest.router_json_cmp, r1, "show ip route vrf green 10.0.94.2 json", expected
     )
-    _, result = topotest.run_and_expect(test_func, None, count=60, wait=1)
+    _, result = topotest.run_and_expect(test_func, None, count=120, wait=2)
 
     assertmsg = "r1 JSON output mismatches"
     assert result is None, assertmsg