[Draft Only - Do Not Merge/Review] SAI VPP UT Harness - Phase 3 by nicholasching · Pull Request #1992 · sonic-net/sonic-sairedis

nicholasching · 2026-07-15T21:05:04Z

Description of PR

Summary:
Fixes # (issue)

Type of change

Approach

What is the motivation for this PR?

Work item tracking

Microsoft ADO (number only):

How did you do it?

How did you verify/test it?

Any platform specific information?

Documentation

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Backend portion of the L3-over-LAG forwarding fix (BVI/bond FDB handling in SwitchVppFdb.cpp). The UT-harness portion (run_test.sh LAG/SVI interface-IP assignment) and the related devdocs are in the harness PR. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

programNeighborHostRoute() left the host-route nexthop sw_if_index at 0, so ip_route_add_del() pinned the neighbor /32//128 host route to VPP's local0 and dropped traffic even though the correct adjacency over the real egress interface existed. Set sw_if_index = ~0 to resolve the egress via hwif_name. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

…test Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

…dog, --relax Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

…ature and restarting backend per group Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

…ugging Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

UT-harness portion of the L3-over-LAG forwarding fix: run_test.sh assigns the DUT-side connected IPs to each LAG (be<N>) and SVI (bvi<vlan>) so routed-to-LAG /SVI traffic forwards in the standalone PTF environment. The backend portion (SwitchVppFdb.cpp) is in the VPP SAI backend PR. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

…SER) - gen_compatibility_matrix.py: prefer defusedxml for parsing PTF JUnit XML (XXE-hardened), with a stdlib fallback; input is our own local test output. - Dockerfile: annotate the root entrypoint with a nosemgrep justification — the --privileged harness must run as root to start VPP/Redis/saiserver and manage veth/AF_PACKET; it is a disposable test container, never a deployed service. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Satisfy tests/swsslogentercheck.sh for static helpers introduced in the neighbor host-route refactor. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Satisfy tests/checkwhitespace.sh (Azure Build amd64 gate). Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

member_hwif_str was loop-scoped while create_vpp_nexthop_entry stored its c_str() and ip_route_add_del_get_stats ran after the loop, leaving dangling pointers in ip_route->nexthop[]. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Deduplicate RIF-to-hwif resolution used when programming multipath routes and single-path route updates. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Add getTapNameFromPortOrLagId for be<N> LCP taps, teach tap_to_hwif_name to map bond taps to BondEthernet<N>, and route vpp_get_hwif_name and vpp_add_del_intf_ip_addr through the shared helpers. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Merge programNeighborHostRoute into addRemoveIpNbr with adjacency and host-route phase flags, and read NO_HOST_ROUTE via SaiCachedObject or SaiDBObject get_attr instead of manual attribute scans. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

mssonicbld · 2026-07-17T13:43:42Z

/azp run

azure-pipelines · 2026-07-17T13:43:55Z

Azure Pipelines: Successfully started running 1 pipeline(s).

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

mssonicbld · 2026-07-17T18:40:50Z

/azp run

azure-pipelines · 2026-07-17T18:41:03Z

Azure Pipelines: Successfully started running 1 pipeline(s).

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

mssonicbld · 2026-07-20T18:22:57Z

/azp run

azure-pipelines · 2026-07-20T18:23:11Z

Azure Pipelines: Successfully started running 1 pipeline(s).

nicholasching · 2026-07-21T15:20:09Z

All tests, including the newly added SAI VPP tests are now passing. This concludes the following features on this draft PR (which will each be given its own branch after #1950, #1951, and #1952 are merged to master):

Fixes to stabilize harness after updating master (merge conflicts, VPP backend, harness, build/compile issues)
Phase 3A, CI integration of SAI VPP UT to sonic-sairedis

I have attached the results of a recent stable build below to checkpoint development:
Github Run: https://github.com/sonic-net/sonic-sairedis/runs/88479909545
Azure Build: https://dev.azure.com/mssonic/build/_build/results?buildId=1170125&view=results

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Copilot

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

mssonicbld · 2026-07-22T00:25:36Z

/azp run

azure-pipelines · 2026-07-22T00:25:48Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-22T18:41:51Z

/azp run

Copilot

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

azure-pipelines · 2026-07-22T18:42:04Z

Azure Pipelines: Successfully started running 1 pipeline(s).

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

mssonicbld · 2026-07-22T18:44:24Z

/azp run

azure-pipelines · 2026-07-22T18:44:38Z

Azure Pipelines: Successfully started running 1 pipeline(s).

nicholasching · 2026-07-22T19:41:45Z

/azpw run

mssonicbld · 2026-07-22T19:41:47Z

⚠️ Notice: /azpw run only runs failed jobs now. If you want to trigger a whole pipline run, please rebase your branch or close and reopen the PR.
💡 Tip: You can also use /azpw retry to retry failed jobs directly.

Retrying failed(or canceled) jobs...

mssonicbld · 2026-07-22T19:41:50Z

Retrying failed(or canceled) stages in build 1172065:

✅Stage BuildAsan:

Job amd64: retried.

nicholasching · 2026-07-22T20:45:24Z

Failure on VPP SAI tests are expected and pass is pending on opencomputeproject/SAI#2321 merge into master.

nicholasching added 30 commits June 23, 2026 07:48

feat: CPU queue parent scheduler node

583e2b9

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: vppProcessEvents sleep tuning

349b040

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: re-apply admin-up after host-interface create

49f0d13

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: LAG-RIF neighbor/route create and LAG member egress-disable

e0c2ea3

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

feat: configuration for 32 ports; phase 1, task 2

77a77e9

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

feat: configuration and run script; phase 1, task 3-4; fails to pass …

b2ee2a3

…test Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: ifmap prefix, IPv6 disable, PortChannel emulation, veth-up watch…

145aec2

…dog, --relax Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: run multiple tests sequentially by grouping tests by config sign…

4cd92d8

…ature and restarting backend per group Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

feat: script to generate compatabilty matrix from test results

2661943

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: add feature development progress context

82ca412

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: add build and usage instructions for UT harness

15776bb

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

chore: add hold when debug enabled to leave container running for deb…

dcc9a8f

…ugging Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: add demo documentation

c36a5f1

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: add coverage by functionality

b882a30

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: minor updates to demo doc

01a0762

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: current dev state, compatibility matrix

c78809e

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: LAG-RIF neighbor/route + egress-disable progress (6-18)

4e1091b

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

feat: harness per-test isolation mode, restart backend between tests

5780b35

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: update to span full width

b34a713

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: neighbor host-route local0 fix progress (6-19)

5cda18e

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: add SWSS_LOG_ENTER to neighbor host-route helpers

cd0392b

Satisfy tests/swsslogentercheck.sh for static helpers introduced in the neighbor host-route refactor. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

chore: strip trailing whitespace in progress-6-10 devdoc

7805b63

Satisfy tests/checkwhitespace.sh (Azure Build amd64 gate). Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: extract resolveNexthopMemberHwif for route NHG members

26b06c6

Deduplicate RIF-to-hwif resolution used when programming multipath routes and single-path route updates. Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: use one VPP build across SAI test stages

6f5bc5b

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

feat: publish reusable VPP SAI CI contract

81d7124

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

nicholasching added 5 commits July 21, 2026 12:51

fix: scope relaxed packet checks to flood tests

e4ddf46

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: preserve JUnit results across test invocations

1072544

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: filter simulated IPv6 startup traffic

cbc2ab2

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: program VPP drop routes for route packet action

425dd6c

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

docs: set strict 30-test Phase 3 baseline

eced8a3

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Copilot AI review requested due to automatic review settings July 22, 2026 00:25

Copilot AI reviewed Jul 22, 2026

Copilot AI review requested due to automatic review settings July 22, 2026 18:41

Copilot AI reviewed Jul 22, 2026

chore: run ARM and Trixie builds in parallel to optimize CI pipeline

1c49515

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

nicholasching force-pushed the sai_vpp_ut_phase3 branch from 6c1c1e3 to 1c49515 Compare July 22, 2026 18:44

Uh oh!

Conversation

nicholasching commented Jul 15, 2026

Description of PR

Type of change

Approach

What is the motivation for this PR?

Work item tracking

How did you do it?

How did you verify/test it?

Any platform specific information?

Documentation

Uh oh!

mssonicbld commented Jul 17, 2026

Uh oh!

azure-pipelines Bot commented Jul 17, 2026

Uh oh!

mssonicbld commented Jul 17, 2026

Uh oh!

azure-pipelines Bot commented Jul 17, 2026

Uh oh!

mssonicbld commented Jul 20, 2026

Uh oh!

azure-pipelines Bot commented Jul 20, 2026

Uh oh!

nicholasching commented Jul 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

nicholasching commented Jul 22, 2026

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

nicholasching commented Jul 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants