Skip to content

fix(vpp): backport VLAN member punt support to 202605 - #2046

Closed
auspham wants to merge 1 commit into
sonic-net:202605from
auspham:austinpham/backport-pr-1981-202605
Closed

auspham wants to merge 1 commit into
sonic-net:202605from
auspham:austinpham/backport-pr-1981-202605

Conversation

@auspham

@auspham auspham commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Description of PR

Summary:
Conflict-resolved backport of #1981 to the 202605 branch. This preserves VLAN member-interface punt support for ARP, LLDP, LACP, and DHCP while adapting the changes to the older branch's VPP API registration and sub-port implementations.

Fixes # (not applicable - backport of #1981)

Type of change

  • Bug fix
  • New feature
  • Refactor / cleanup
  • Documentation update
  • Test improvement

Approach

What is the motivation for this PR?

The 202605 VPP virtual-switch branch needs the control-plane punt behavior introduced by #1981 for tagged and untagged VLAN members.

Work item tracking
  • Microsoft ADO (number only): N/A

How did you do it?

Resolved the cherry-pick conflicts semantically against 202605. The backport keeps the branch's existing API handler layout and interface mapping, adds only the classify and vlib registrations required by #1981, preserves the branch's existing refresh behavior for sub-port router interfaces, and excludes unrelated newer-master sFlow, BFD TOS, bridge tracking, and LAG changes.

How did you verify/test it?

  • Ran git diff --check HEAD^ HEAD.
  • Confirmed no conflict markers remain in the changed files.
  • Reviewed the final five-file delta against source commit cfe265dece50de9b98d3cc57b4e76316f3683c9d and origin/202605.
  • A local VPP compile was not available because this host lacks the required VPP development headers and autotools; no dependencies were added.

Any platform specific information?

This change is specific to the VPP virtual-switch implementation under vslib/vpp.

Documentation

No documentation changes are required for this branch backport.

Signed-off-by: Austin (Ngoc Thang) Pham <austinpham@microsoft.com>
@mssonicbld

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@azure-pipelines

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

@auspham

auspham commented Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

202605 functional validation:

@lolyu

lolyu commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Hi @auspham, we don't need to backport vpp changes into 202605

@yue-fred-gao

Copy link
Copy Markdown
Contributor

Hi @auspham, we don't need to backport vpp changes into 202605

agreed. If t0-vpp is enabled in 202605, we should disable it.

@auspham auspham closed this Aug 20, 2026
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.

5 participants