sai_test config: drop redundant bridge_id, env-gated port bring-up, fix v4/v6 NHG port-list aliasing by nicholasching · Pull Request #2301 · opencomputeproject/SAI

nicholasching · 2026-06-22T19:39:29Z

Context / motivation

Part of the SAIVPP unit-test framework (see PR 1 / our docker-sai-test-vpp/devdocs/, esp. the 6-19 entry). Three independent correctness/robustness fixes in the OCP sai_test config helpers that the suite needs when run against the VPP SAI backend.

What this change does

test/sai_test/config/port_configer.py — drop bridge_id on create_bridge_port. Passing bridge_id to sai_thrift_create_bridge_port caused a create failure in our backend; the default 1Q bridge is used, so the argument is redundant. Removing it lets bridge-port creation succeed.
test/sai_test/config/port_configer.py — env-gated, bounded port bring-up wait. turn_up_and_get_checked_ports() waited per port, serially (retries × sleep) for oper-status UP. On a 32-port topology where oper-status is slow to settle, this is ~60s+ of dead time per common-config build. The wait is now tunable via env (SAI_PORT_UP_RETRIES, SAI_PORT_UP_POLL_INTERVAL, SAI_PORT_UP_SHARED_WAIT) and can poll all ports together in one bounded window. Defaults preserve the original behavior (per-port wait), so real-HW/other OCP consumers are unchanged unless they opt in; only our harness sets the fast values.
test/sai_test/config/route_configer.py — give v4/v6 NHGs independent member_port_indexs. create_nexthop_group_by_nexthops() constructed the v4 and v6 NexthopGroup objects sharing one Python list object for member_port_indexs. A mutation on one group (member remove/re-add tests) then corrupted the other's port list (ValueError: list.remove(x): x not in list). Each group now gets its own list(...) copy. (Latent aliasing bug, independent of any harness specifics.)

Scope / risk

2 files, +64/−25 — test-config helpers only; no change to SAI/backend code or packet semantics.
The port-up change is opt-in via env with original defaults, so it does not alter timing for existing consumers.
The bridge_id removal relies on the default 1Q bridge (already how these tests are used).

Dependencies
None. Related to #2299 and #2300, however, their edits are isolated and each target master.

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

…default option unchanged Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

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

tjchadaga · 2026-06-23T18:03:48Z

/azp run

azure-pipelines · 2026-06-23T18:03:58Z

Azure Pipelines successfully started running 1 pipeline(s).

yue-fred-gao · 2026-06-24T20:30:31Z

        for index, item in enumerate(port_list):
            port_bp = sai_thrift_create_bridge_port(
                self.client,
-                bridge_id=bridge_id,


How will this change affect other platforms? Can this be fixed in vpp platform?

In the SAI spec, SAI_BRIDGE_PORT_ATTR_BRIDGE_ID is not valid for SAI_BRIDGE_PORT_TYPE_PORT.

SAI/inc/saibridge.h

Lines 182 to 190 in 0aba236

/**

* @brief Associated bridge id

*

* @type sai_object_id_t

* @flags MANDATORY_ON_CREATE | CREATE_AND_SET

* @objects SAI_OBJECT_TYPE_BRIDGE

* @condition SAI_BRIDGE_PORT_ATTR_TYPE == SAI_BRIDGE_PORT_TYPE_SUB_PORT or SAI_BRIDGE_PORT_ATTR_TYPE == SAI_BRIDGE_PORT_TYPE_1D_ROUTER or SAI_BRIDGE_PORT_ATTR_TYPE == SAI_BRIDGE_PORT_TYPE_TUNNEL or SAI_BRIDGE_PORT_ATTR_TYPE == SAI_BRIDGE_PORT_TYPE_BRIDGE_PORT_NEXT_HOP_GROUP

*/

SAI_BRIDGE_PORT_ATTR_BRIDGE_ID,

For this type, the bridge port is implicitly associated with the switch’s default 1Q bridge and bridge_id should not be passed on create.

VPP (via saiserver) was using the sonic-sairedis meta, enforcing the @condition above and rejected the extra bridge_id for PORT type. This was causing issues during the tests where create failed at SAI API validation. Since bridge_id should not be included for PORT type according to saibridge.h, I believe VPP's enforcement is correct and the fix would be relevant to other platforms as well; they were likely ignoring the extra attribute before.

got it. I see create_bridge_ports has only one caller and the type is PORT. We can safely remove bridge id.

kcudnik · 2026-07-13T19:22:23Z

/azp run

azure-pipelines · 2026-07-13T19:22:33Z

Azure Pipelines successfully started running 1 pipeline(s).

nicholasching · 2026-07-14T15:44:12Z

Hi @kcudnik, the changes in this PR have been reviewed by @yue-fred-gao and are passing checks. When you have a chance, could you please take a quick look and help us merge into master for upstream feature in sonic-sairedis? Thanks!

…tdevs for standalone benches (#2316) Context / motivation Part of the SAIVPP unit-test framework (see the sonic-sairedis docker-sai-test-vpp harness). When the OCP sai_test T0 suite runs against a SAI backend on a standalone bench with no SONiC control plane, there is no teamd to create PortChannel netdevs and no IntfMgr to assign LAG/SVI interface IPs — which some backends (e.g. the VPP virtual switch) rely on for LAG bring-up and routed-to-LAG/SVI forwarding. This adds an opt-in way for the test setup to emulate that. What this change does test/sai_test/config/simulate_sonic.py (new). Opt-in helper, active only when SIMULATE_SONIC=1; every entry point is a no-op otherwise. test/sai_test/config/lag_configer.py — create_lag(). When enabled, create the PortChannel<N> netdev teamd would provide, before the SAI LAG create. test/sai_test/config/route_configer.py — create_router_interface(). When enabled, assign the connected IPs IntfMgr would set on a LAG or VLAN(SVI) router interface. Vendor-neutral by construction. PortChannel netdevs use generic Linux ip … type bond; LAG RIF IPs use ip addr add. A VLAN SVI has no host-interface netdev to mirror from, so its address is programmed via command templates supplied by the caller (SVI_RIF_SET_IP_CMD / SVI_RIF_PROBE_CMD, with {ifname}/{addr} placeholders) — no backend-specific tooling is hardcoded in sai_test. All interface-name prefixes and address patterns are env-overridable. Scope / risk 3 files (one new module + two setUp-path hooks) — test-config helpers only; no change to SAI/backend code or packet semantics. Fully opt-in with default-off: with SIMULATE_SONIC unset, all entry points no-op, so real-HW and other OCP consumers are unchanged unless they opt in. Dependencies None. Independent of #2299 / #2300 / #2301 (edits different functions); targets master.

nicholasching · 2026-07-14T19:13:30Z

Thank you for your help, @kcudnik!

nicholasching added 3 commits June 22, 2026 11:59

fix: drop bridge_id on create_bridge_port

3749677

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

feat: env-gated parallel port bring-up config option through params, …

635cc30

…default option unchanged Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

fix: v4/v6 NHG member_port_indexs aliasing

3844dde

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

yue-fred-gao reviewed Jun 24, 2026

View reviewed changes

yue-fred-gao approved these changes Jun 26, 2026

View reviewed changes

nicholasching mentioned this pull request Jul 6, 2026

sai_test: add opt-in SIMULATE_SONIC to emulate SONiC teamd/IntfMgr netdevs for standalone benches #2316

Merged

kcudnik merged commit 91e6b86 into opencomputeproject:master Jul 14, 2026
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

sai_test config: drop redundant bridge_id, env-gated port bring-up, fix v4/v6 NHG port-list aliasing#2301

sai_test config: drop redundant bridge_id, env-gated port bring-up, fix v4/v6 NHG port-list aliasing#2301
kcudnik merged 3 commits into
opencomputeproject:masterfrom
nicholasching:sai_vpp_ut_saitest_config

nicholasching commented Jun 22, 2026

Uh oh!

tjchadaga commented Jun 23, 2026

Uh oh!

azure-pipelines Bot commented Jun 23, 2026

Uh oh!

yue-fred-gao Jun 24, 2026

Uh oh!

nicholasching Jun 26, 2026

Uh oh!

yue-fred-gao Jun 26, 2026

Uh oh!

kcudnik commented Jul 13, 2026

Uh oh!

azure-pipelines Bot commented Jul 13, 2026

Uh oh!

nicholasching commented Jul 14, 2026

Uh oh!

Uh oh!

nicholasching commented Jul 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	/**
	* @brief Associated bridge id
	*
	* @type sai_object_id_t
	* @flags MANDATORY_ON_CREATE \| CREATE_AND_SET
	* @objects SAI_OBJECT_TYPE_BRIDGE
	* @condition SAI_BRIDGE_PORT_ATTR_TYPE == SAI_BRIDGE_PORT_TYPE_SUB_PORT or SAI_BRIDGE_PORT_ATTR_TYPE == SAI_BRIDGE_PORT_TYPE_1D_ROUTER or SAI_BRIDGE_PORT_ATTR_TYPE == SAI_BRIDGE_PORT_TYPE_TUNNEL or SAI_BRIDGE_PORT_ATTR_TYPE == SAI_BRIDGE_PORT_TYPE_BRIDGE_PORT_NEXT_HOP_GROUP
	*/
	SAI_BRIDGE_PORT_ATTR_BRIDGE_ID,

Uh oh!

Conversation

nicholasching commented Jun 22, 2026

Uh oh!

tjchadaga commented Jun 23, 2026

Uh oh!

azure-pipelines Bot commented Jun 23, 2026

Uh oh!

yue-fred-gao Jun 24, 2026

Choose a reason for hiding this comment

Uh oh!

nicholasching Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

yue-fred-gao Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

kcudnik commented Jul 13, 2026

Uh oh!

azure-pipelines Bot commented Jul 13, 2026

Uh oh!

nicholasching commented Jul 14, 2026

Uh oh!

Uh oh!

nicholasching commented Jul 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants