Fix VLAN member tagging_mode updates for existing members - #4771
Draft
johanna-nexthop wants to merge 4 commits into
Draft
Fix VLAN member tagging_mode updates for existing members#4771johanna-nexthop wants to merge 4 commits into
johanna-nexthop wants to merge 4 commits into
Conversation
Signed-off-by: Johanna <johanna@nexthop.ai>
Collaborator
|
/azp run |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
johanna-nexthop
force-pushed
the
fix-vlan-member-tagging-mode-updates
branch
from
July 20, 2026 17:46
a5cc8b8 to
824cce6
Compare
Collaborator
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Signed-off-by: Johanna Jegan <johanna@nexthop.ai>
johanna-nexthop
force-pushed
the
fix-vlan-member-tagging-mode-updates
branch
from
July 20, 2026 21:57
824cce6 to
582a155
Compare
Collaborator
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Signed-off-by: Johanna Jegan <johanna@nexthop.ai>
johanna-nexthop
force-pushed
the
fix-vlan-member-tagging-mode-updates
branch
from
July 20, 2026 23:25
0ac64dc to
1d4fe62
Compare
Collaborator
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Collaborator
|
Hi, there are workflow run(s) waiting for approval, you may be first-time contributor. I will notify maintainers to help approve once PR is approved. Thanks! ---Powered by SONiC BuildBot
|
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.
What I did
This change fixes VLAN member
tagging_modeupdates for ports that are already members of a VLAN.Previously, duplicate VLAN member entries were treated as no-ops in both vlanmgrd and PortsOrch, which prevented valid
tagging_modeupdates from being applied to existing members. This PR changes that behavior so an existing VLAN member is only skipped when the requestedtagging_modealready matches the applied state.The update includes:
vlanmgrdnow stores and checkstagging_modeinSTATE_DB, so it can distinguish a true duplicate from a legitimate mode change, including after restart.PortsOrchnow handles existing VLAN members by applying atagging_modeupdate instead of always treating them as duplicates.SAI_VLAN_MEMBER_ATTR_VLAN_TAGGING_MODE, the implementation falls back to remove-and-recreate of the VLAN member object while reusing the bridge port.Makefile.am.Why I did it
Updating the
tagging_modeof an existing VLAN member should be handled as a real configuration change, not ignored as a duplicate.Without this fix:
tagging_modeupdates can be dropped because the existing member is treated as already programmedThis change ensures VLAN member mode updates are applied correctly, tracked persistently, and handled safely during replay and replacement.
How I verified it
tagging_modeupdates.vlanmgrdmock/unit test coverage and wired it intotests/mock_tests/Makefile.am.Details if related