stp: Fix docker-stp image and build templates for PVST - #28624
Open
rdhegde wants to merge 1 commit into
Open
Conversation
Collaborator
|
/azp run Azure.sonic-buildimage |
|
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). |
Did the following changes for docker-stp * Updated the apt-get path to install nftables instead of ebtables since the functionality needed from ebtables in STP docker is not supported anymore * Updated the supervisord.conf to the current format. Did the following build changes * Updated init_cfg.json.j2 to disable STP feature on start when the build includes this feature * Updated stp.service.j2 to use config-setup.service instead of currently unsupported updategraph.service * Added entries for STP in copp_cfg.j2 to punt the packet to control plane. Signed-off-by: Ram Hegde <rhegde@marvell.com>
rdhegde
force-pushed
the
rdhegde-pvst-buildimage
branch
from
July 25, 2026 14:05
df81d30 to
ca2dffa
Compare
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
rdhegde
changed the title
Author
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. |
Author
|
@lguohan the CI for this PR is failing since the PR updates the protected file files/build_templates/init_cfg.json.j2 . |
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
2 participants
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.
Summary
docker-stpto usenftablesinstead ofebtables(requiredfunctionality no longer available in ebtables).
supervisord.confto the current format.init_cfg.json.j2,use
config-setup.serviceinstead of unsupportedupdategraph.serviceinstp.service.j2, and add STP CoPP punt rules incopp_cfg.j2.Motivation
PVST configuration fails when the STP docker image, service startup, and build
templates are out of date. This PR aligns
sonic-buildimagewith the STP/STPMGRand utilities fixes so PVST can be configured and packets are handled correctly
on the control plane.
Changes
docker-stp
ebtableswithnftablesin the image apt install pathsupervisord.confto current supervisord formatBuild / config templates
init_cfg.json.j2: disable STP feature on start when the build includes STPstp.service.j2: depend onconfig-setup.serviceinstead ofupdategraph.service(no longer supported)copp_cfg.j2: add STP entries to punt STP packets to the control planeRelated PRs
Verification
sonic-vsimage with this change setsonic-vs): PVST config applied, statereached STP daemon, protocol converged
Notes for reviewers
with linked PRs above.
docker-stpnftables change is driven by loss of required ebtables support.