Add reduced OSPF timers to BGP integration tests following PR #3303 pattern (#3304)

Copilot · web-flow · commit ac162b90ac3f · 2026-04-10T10:41:31.000+02:00
diff --git a/tests/integration/bgp.multihop/01-global.yml b/tests/integration/bgp.multihop/01-global.yml
@@ -15,6 +15,9 @@ groups:
 defaults.paths.prepend.plugin: [ "topology:../plugin" ]
 plugin: [ ebgp.multihop, bgp.session, adjust_test ]
 
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
 bgp.multihop.sessions:
 - dut:
   pe2:
@@ -36,6 +39,12 @@ links:
 - c1-pe2
 - dut-ce1
 
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 validate:
   ospf:
     description: Check OSPFv2 adjacency with DUT
diff --git a/tests/integration/bgp.multihop/02-vrf.yml b/tests/integration/bgp.multihop/02-vrf.yml
@@ -13,6 +13,9 @@ groups:
 defaults.paths.prepend.plugin: [ "topology:../plugin" ]
 plugin: [ ebgp.multihop, bgp.session, adjust_test ]
 
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
 vrfs:
   tenant:
     links:
@@ -51,6 +54,10 @@ _adjust:
   - validate.ospf6
   - validate.bgp6
   - validate.prefix6
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
 
 validate:
   ospf:
diff --git a/tests/integration/bgp.multihop/x-01-global-ipv4.yml b/tests/integration/bgp.multihop/x-01-global-ipv4.yml
@@ -14,7 +14,11 @@ groups:
     provider: clab
     members: [ pe2, c1 ]
 
-plugin: [ ebgp.multihop, bgp.session ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ ebgp.multihop, bgp.session, adjust_test ]
+
+ospf.timers.hello: 1
+ospf.timers.dead: 3
 
 bgp.multihop.sessions:
 - dut:
@@ -35,6 +39,12 @@ links:
 - dut:
   prefix: beacon
 
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 validate:
   ospf:
     description: Check OSPFv2 adjacency with DUT
diff --git a/tests/integration/bgp.multihop/x-03-localas_ibgp.yml b/tests/integration/bgp.multihop/x-03-localas_ibgp.yml
@@ -23,7 +23,11 @@ groups:
     provider: clab
     members: [ pe2, c1 ]
 
-plugin: [ ebgp.multihop, bgp.session ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ ebgp.multihop, bgp.session, adjust_test ]
+
+ospf.timers.hello: 1
+ospf.timers.dead: 3
 
 bgp.multihop.sessions:
 - dut:
@@ -45,6 +49,12 @@ links:
 - dut:
   prefix: beacon
 
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 validate:
   ospf:
     description: Check OSPFv2 adjacency with DUT
diff --git a/tests/integration/bgp.policy/10-bgp-bandwidth-auto.yml b/tests/integration/bgp.policy/10-bgp-bandwidth-auto.yml
@@ -5,7 +5,8 @@ message: |
 
 defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
-plugin: [ bgp.policy ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ bgp.policy, adjust_test ]
 module: [ bgp, ospf ]
 
 groups:
@@ -24,6 +25,15 @@ nodes:
     bgp.as: 65101
     module: [ bgp ]
 
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 links:
 - dut:
   x1:
diff --git a/tests/integration/bgp.policy/11-bgp-bandwidth-value.yml b/tests/integration/bgp.policy/11-bgp-bandwidth-value.yml
@@ -6,7 +6,8 @@ message: |
 
 defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
-plugin: [ bgp.policy ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ bgp.policy, adjust_test ]
 module: [ bgp, ospf ]
 
 groups:
@@ -25,6 +26,15 @@ nodes:
     bgp.as: 65101
     module: [ bgp ]
 
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 links:
 - dut:
   x1:
diff --git a/tests/integration/bgp.policy/12-bgp-bandwidth-value-out.yml b/tests/integration/bgp.policy/12-bgp-bandwidth-value-out.yml
@@ -6,7 +6,8 @@ message: |
 
 defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
-plugin: [ bgp.policy ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ bgp.policy, adjust_test ]
 module: [ bgp, ospf ]
 
 groups:
@@ -25,6 +26,15 @@ nodes:
     bgp.as: 65101
     module: [ bgp ]
 
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 links:
 - dut:
   x1:
diff --git a/tests/integration/bgp.policy/21-locpref.yml b/tests/integration/bgp.policy/21-locpref.yml
@@ -6,7 +6,8 @@ message: |
 
 defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
 
-plugin: [ bgp.policy ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ bgp.policy, adjust_test ]
 module: [ bgp, ospf ]
 
 groups:
@@ -33,6 +34,15 @@ nodes:
     loopback.ipv4: 172.42.43.1/24
     loopback.ipv6: 2001:db8:cafe:43::1/64
 
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 links:
 - dut:
   x1:
diff --git a/tests/integration/bgp.policy/22-locpref-unnumbered.yml b/tests/integration/bgp.policy/22-locpref-unnumbered.yml
@@ -4,7 +4,8 @@ message: |
   has to set node-wide local preference on prefixes received from X1 and
   neighbor-specific local preference on prefixes received from X2.
 
-plugin: [ bgp.policy ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ bgp.policy, adjust_test ]
 module: [ bgp, ospf ]
 
 defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
@@ -33,6 +34,15 @@ nodes:
     loopback.ipv4: 172.42.43.1/24
     loopback.ipv6: 2001:db8:cafe:43::1/64
 
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 links:
 - dut:
   x1:
diff --git a/tests/integration/bgp.policy/51-weight.yml b/tests/integration/bgp.policy/51-weight.yml
@@ -3,7 +3,8 @@ message: |
   Use this topology to test BGP weights on IPv4 and IPv6 prefixes. DUT has to
   prefer prefixes advertised by X2 (identified by longer AS path).
 
-plugin: [ bgp.policy ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ bgp.policy, adjust_test ]
 module: [ bgp, ospf ]
 
 defaults.sources.extra: [ defaults-ds.yml, ../wait_times.yml, ../warnings.yml ]
@@ -28,6 +29,15 @@ nodes:
     bgp.as: 65101
     module: [ bgp ]
 
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 links:
 - x1:
   x2:
diff --git a/tests/integration/bgp/12-ipv6-ibgp-ebgp.yml b/tests/integration/bgp/12-ipv6-ibgp-ebgp.yml
@@ -4,12 +4,23 @@ message: |
   and next-hop-self on IBGP sessions.
 
 defaults.sources.extra: [ defaults-ipv6.yml, ../wait_times.yml, ../warnings.yml ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ adjust_test ]
 
 module: [ bgp, ospf ]
 
-defaults.bgp.as: 65000
+bgp.as: 65000
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
 defaults.interfaces.mtu: 1500
 
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 groups:
   probes:
     device: frr
diff --git a/tests/integration/bgp/13-ipv6-ibgp-rr.yml b/tests/integration/bgp/13-ipv6-ibgp-rr.yml
@@ -5,6 +5,8 @@ message: |
   reflected route) on IPv6 IBGP sessions.
 
 defaults.sources.extra: [ defaults-ipv6.yml, ../wait_times.yml, ../warnings.yml ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ adjust_test ]
 
 module: [ bgp, ospf ]
 
@@ -14,9 +16,18 @@ groups:
     device: frr
     provider: clab
 
-defaults.bgp.as: 65000
+bgp.as: 65000
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
 defaults.interfaces.mtu: 1500
 
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 nodes:
   dut:
     bgp.rr: True
diff --git a/tests/integration/bgp/14-ipv6-originate.yml b/tests/integration/bgp/14-ipv6-originate.yml
@@ -21,7 +21,10 @@ prefix:
   orig_beacon:
     ipv6: 2001:db8:bad:2::/64
 
-defaults.bgp.as: 65000
+bgp.as: 65000
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
 defaults.interfaces.mtu: 1500
 
 nodes:
@@ -68,6 +71,10 @@ _adjust:
   remove:
   - nodes.dut.bgp.originate
   - validate.orig_ipv6
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
 
 validate:
   s_dut:
diff --git a/tests/integration/bgp/20-dual-stack-activate.yml b/tests/integration/bgp/20-dual-stack-activate.yml
@@ -7,12 +7,23 @@ message: |
   generous activation of address families on the tested device.
 
 defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
+defaults.paths.prepend.plugin: [ "topology:../plugin" ]
+plugin: [ adjust_test ]
 
 module: [ bgp, ospf ]
 
-defaults.bgp.as: 65000
+bgp.as: 65000
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
 defaults.interfaces.mtu: 1500
 
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 addressing:
   loopback:
     ipv6: 2001:db8:1::/48
diff --git a/tests/integration/bgp/30-import-ds-ospf.yml b/tests/integration/bgp/30-import-ds-ospf.yml
@@ -5,7 +5,7 @@ message: |
 
 defaults.interfaces.mtu: 1500
 defaults.paths.prepend.plugin: [ "topology:../plugin" ]
-plugin: [ static_import ]
+plugin: [ static_import, adjust_test ]
 defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
 
 addressing:
@@ -22,6 +22,15 @@ groups:
     provider: clab
     members: [ x1, r2 ]
 
+ospf.timers.hello: 1
+ospf.timers.dead: 3
+
+_adjust:
+- nodes: [ dut ]
+  features: [ ospf.timers ]
+  remove:
+  - nodes:ospf.timers
+
 nodes:
   dut:
     module: [ bgp, ospf, routing ]
diff --git a/tests/integration/bgp/31-import-policy.yml b/tests/integration/bgp/31-import-policy.yml
diff --git a/tests/integration/bgp/bgp.domain.yml b/tests/integration/bgp/bgp.domain.yml
