Repository navigation
[Nexthop][fboss2-dev] Add integration tests for IpInIpTunnel DSCP/ECN modes and termination type - #1811
Open
abhinav-nexthop wants to merge 2 commits into
Open
[Nexthop][fboss2-dev] Add integration tests for IpInIpTunnel DSCP/ECN modes and termination type#1811abhinav-nexthop wants to merge 2 commits into
abhinav-nexthop wants to merge 2 commits into
Conversation
This was referenced Oct 19, 2026
abhinav-nexthop
marked this pull request as ready for review
October 19, 2026 08:56
Open
2 tasks done
Contributor
|
@joseph5wu has imported this pull request. If you are a Meta employee, you can view this in D131621314. |
joseph5wu
requested changes
Nov 13, 2026
abhinav-nexthop
force-pushed
the
tunnel-ip-in-ip-attrs
branch
from
November 13, 2026 18:49
38a1926 to
5e2c34c
Compare
|
@abhinav-nexthop has updated the pull request. You must reimport the pull request before landing. |
This branch has not been deployed
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
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.
Pre-submission checklist
Add integration tests for IpInIpTunnel.dscpMode and ecnMode
Summary
Adds
TunnelIpInIpTest.DecapDscpMode,TunnelIpInIpTest.EncapDscpModeandTunnelIpInIpTest.DecapEcnMode, coveringIpInIpTunnel.dscpModeandIpInIpTunnel.ecnModeas written by:Only modes that
SaiTunnelManager::addTunnelprograms into the SAI tunnel aretested:
EncapDscpModefor encap andDecapDscpModefor decap; the other direction is pinned to uniform.DecapEcnMode(pipe ->COPY_FROM_OUTER).
Encap
ecn-modeis not tested: the IP-in-IP tunnel never setsEncapEcnMode,and for encap tunnels the decap attributes are hard-coded, so the configured
value never reaches SAI.
All three tests share a fixture helper,
checkTunnelMode(direction, mode),which creates the tunnel with the mode set to pipe (the agent default is
uniform) and checks:
show hw-object IPTUNNEL) has the expectedattribute set, and for DSCP the other direction left at uniform
The cleanup runs from a scope guard, so a failed check still leaves the switch
as it was found. Tomahawk6 has no SAI tunnel support, so the tunnel suite does
not apply there.
Add integration test for IpInIpTunnel.tunnelTermType
Summary
Adds
TunnelIpInIpTest.DecapTerminationType, coveringIpInIpTunnel.tunnelTermTypeas written by:The agent defaults to P2MP, so the test creates a decap tunnel with
termination-type p2p(plus the source a P2P term matches on) and checks:tunnelTermTypeis P2P in the running config and in switch stateshow hw-object IPTUNNEL) is P2P (Type: 0) and matches both the destination and the outer source; a P2MP term has no sourceThe hw-object reading and the tunnel/VLAN cleanup move into two fixture helpers,
saiTunnelObjects(prefix)anddeleteTunnelAndUnderlay(...), which this test reuses. The cleanup runs from a scope guard, so a failed check still leaves the switch as it was found. Tomahawk6 has no SAI tunnel support, so the tunnel suite does not apply there.Test Plan