Skip to content

Add reduced OSPF timers to remaining BGP integration tests#3304

Merged
ipspace merged 1 commit intodevfrom
copilot/3303-modify-bgp-integration-tests
Apr 10, 2026
Merged

Add reduced OSPF timers to remaining BGP integration tests#3304
ipspace merged 1 commit intodevfrom
copilot/3303-modify-bgp-integration-tests

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 9, 2026

Following PR #3303 as a template, this PR adds reduced OSPF timers (ospf.timers.hello: 1, ospf.timers.dead: 3) to all remaining BGP integration tests that use OSPF (where ospf appears in the topology or node module list).

The pattern applied to each file:

  • Add defaults.paths.prepend.plugin: [ "topology:../plugin" ] (where not already present)
  • Add adjust_test to the plugin list (where not already present)
  • Add ospf.timers.hello: 1 and ospf.timers.dead: 3 at topology level
  • Add an _adjust entry that removes nodes:ospf.timers for devices that don't support the ospf.timers feature

Files changed:

  • bgp.multihop/01-global.yml
  • bgp.multihop/02-vrf.yml
  • bgp.multihop/x-01-global-ipv4.yml
  • bgp.multihop/x-03-localas_ibgp.yml
  • bgp.policy/10-bgp-bandwidth-auto.yml
  • bgp.policy/11-bgp-bandwidth-value.yml
  • bgp.policy/12-bgp-bandwidth-value-out.yml
  • bgp.policy/21-locpref.yml
  • bgp.policy/22-locpref-unnumbered.yml
  • bgp.policy/51-weight.yml
  • bgp/12-ipv6-ibgp-ebgp.yml
  • bgp/13-ipv6-ibgp-rr.yml
  • bgp/14-ipv6-originate.yml
  • bgp/20-dual-stack-activate.yml
  • bgp/30-import-ds-ospf.yml
  • bgp/31-import-policy.yml
  • bgp/bgp.domain.yml

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the remaining BGP integration test topologies that run OSPF to use reduced OSPF hello/dead timers (1/3 seconds) to speed up convergence, following the established pattern from PR #3303. The change is gated with the adjust_test plugin so devices lacking the ospf.timers feature have the per-node timers removed.

Changes:

  • Add defaults.paths.prepend.plugin and adjust_test plugin where needed so tests can conditionally remove unsupported attributes.
  • Set topology-level ospf.timers.hello: 1 and ospf.timers.dead: 3 across the remaining OSPF-using BGP tests.
  • Add _adjust blocks to remove nodes:ospf.timers when the DUT (or relevant node) lacks features: [ ospf.timers ].

Reviewed changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated no comments.

Show a summary per file
File Description
tests/integration/bgp/bgp.domain.yml Enable reduced OSPF timers and gate them with adjust_test for unsupported devices.
tests/integration/bgp/31-import-policy.yml Add reduced OSPF timers + _adjust gating; add plugin path + adjust_test.
tests/integration/bgp/30-import-ds-ospf.yml Add adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp/20-dual-stack-activate.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp/14-ipv6-originate.yml Add reduced OSPF timers and feature-gated removal.
tests/integration/bgp/13-ipv6-ibgp-rr.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp/12-ipv6-ibgp-ebgp.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp.policy/51-weight.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp.policy/22-locpref-unnumbered.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp.policy/21-locpref.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp.policy/12-bgp-bandwidth-value-out.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp.policy/11-bgp-bandwidth-value.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp.policy/10-bgp-bandwidth-auto.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp.multihop/x-03-localas_ibgp.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp.multihop/x-01-global-ipv4.yml Add plugin path + adjust_test, reduced OSPF timers, and feature-gated removal.
tests/integration/bgp.multihop/02-vrf.yml Add reduced OSPF timers and feature-gated removal.
tests/integration/bgp.multihop/01-global.yml Add reduced OSPF timers and feature-gated removal.

@ipspace ipspace merged commit ac162b9 into dev Apr 10, 2026
15 checks passed
@ipspace ipspace deleted the copilot/3303-modify-bgp-integration-tests branch April 10, 2026 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants