Use common wait times in EVPN integration tests #2996
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also: rename tested device to DUT wherever feasible
There was a problem hiding this comment.
Pull request overview
This PR standardizes wait times across EVPN integration tests by introducing a common wait_times.yml configuration file and consistently renames the device under test to "DUT" throughout the test suite.
- Adds centralized wait time constants to replace hardcoded values
- Renames test devices (s1, spine, rr) to the standard "DUT" nomenclature
- Adds a new wait time for vjunos-switch ping_irb operations
Reviewed changes
Copilot reviewed 16 out of 16 changed files in this pull request and generated 11 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/integration/wait_times.yml | Adds vjunos-switch.ping_irb wait time constant (40s) |
| tests/integration/evpn/01-vxlan-bridging.yml | Replaces hardcoded wait times with constants, renames s1 to dut |
| tests/integration/evpn/02-vxlan-asymmetric-irb.yml | Replaces hardcoded wait times with constants, renames s1 to dut |
| tests/integration/evpn/03-vxlan-symmetric-irb.yml | Replaces hardcoded wait times with constants, renames s1 to dut |
| tests/integration/evpn/04-vxlan-central-routing.yml | Replaces hardcoded wait times with constants, adds validation steps |
| tests/integration/evpn/05-vxlan-l3only.yml | Replaces hardcoded wait times with constants, renames s1 to dut, adds validation steps |
| tests/integration/evpn/06-vxlan-bridging-vlan-bundle.yml | Replaces hardcoded wait times with constants, renames s1 to dut |
| tests/integration/evpn/10-vxlan-rr.yml | Replaces hardcoded wait times with constants, renames rr (route reflector) to dut |
| tests/integration/evpn/11-vxlan-ebgp.yml | Replaces hardcoded wait times with constants, renames spine to dut |
| tests/integration/evpn/12-vxlan-ibgp-ebgp.yml | Replaces hardcoded wait times with constants |
| tests/integration/evpn/13-vxlan-ebgp-allowas.yml | Replaces hardcoded wait times with constants, renames l1 to dut, adds validation steps |
| tests/integration/evpn/14-vxlan-ebgp-ebgp.yml | Replaces hardcoded wait times with constants, corrects validation descriptions |
| tests/integration/evpn/15-vxlan-ebgp-unnumbered.yml | Adds validation steps for EBGP session and EVPN address family |
| tests/integration/evpn/21-bgp-ce-router.yml | Replaces hardcoded wait times with constants, renames s1 to dut, adds OSPF validation |
| tests/integration/evpn/22-ospf-ce-router.yml | Replaces hardcoded wait times with constants, renames s1 to dut |
| tests/integration/evpn/30-cs-bridging.yml | Replaces hardcoded wait times with constants |
ipspace
added a commit
that referenced
this pull request
Jan 3, 2026
| description: Check IBGP sessions S1-S2 | ||
| wait: 30 | ||
| wait: ibgp_session | ||
| wait_msg: Waiting for IBGP sessions to start |
There was a problem hiding this comment.
Typo in wait message: "IGBP" should be "IBGP"
| cisco8000v.ping_long: 15 # ... and even to populate the routing tables | ||
| vjunos-router.ping_irb: 90 # ... and so does vjunos-router | ||
| vjunos-switch.ping_irb: 40 # ... and so does vjunos-switch | ||
| vjunos-router.ping_irb: 90 # ... and vjunos-router |
There was a problem hiding this comment.
Inconsistent comment style: line 61 says "and so does vjunos-switch" while line 62 says "and vjunos-router". For consistency, line 62 should say "and so does vjunos-router"
Suggested change
| vjunos-router.ping_irb: 90 # ... and vjunos-router | |
| vjunos-router.ping_irb: 90 # ... and so does vjunos-router |
| description: Check IBGP adjacencies with spine | ||
| wait: ibgp_session | ||
| nodes: [ l2 ] | ||
| wait_msg: Waiting for IGBP session |
There was a problem hiding this comment.
Typo in wait message: "IGBP" should be "IBGP"
Suggested change
| wait_msg: Waiting for IGBP session | |
| wait_msg: Waiting for IBGP session |
| description: Check IBGP adjacencies with DUT | ||
| wait: ibgp_session | ||
| nodes: [ s2 ] | ||
| wait_msg: Waiting for IGBP session |
There was a problem hiding this comment.
Typo in wait message: "IGBP" should be "IBGP"
Suggested change
| wait_msg: Waiting for IGBP session | |
| wait_msg: Waiting for IBGP session |
| wait: 30 | ||
| description: Check IBGP sessions S2-DUT | ||
| wait: ibgp_session | ||
| wait_msg: Waiting for IBGP sessions to start |
There was a problem hiding this comment.
Typo in wait message: "IGBP" should be "IBGP"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also: rename tested device to DUT wherever feasible