Enable SYSTEM_DEFAULTS decap_qos_map via golden config#26496
Open
markx-arista wants to merge 1 commit into
Open
Enable SYSTEM_DEFAULTS decap_qos_map via golden config#26496markx-arista wants to merge 1 commit into
markx-arista wants to merge 1 commit into
Conversation
…den config These HWSKUs use generate_port_qos_map_per_sku in qos.json.j2, which prevents the global dscp_to_tc_map from being set in config_db.json. Without it, Broadcom ipinip decap falls through to SAI's built-in default instead of the intended decap_dscp_to_tc_map from ipinip.json. Setting SYSTEM_DEFAULTS decap_qos_map status to 'enabled' lets ipinip.json.j2 use the SYSTEM_DEFAULTS attribute instead of hardcoded platform checks. Signed-off-by: markxiao <markxiao@arista.com>
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). |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Collaborator
|
This PR has backport request for branch(es): 202511,202605. ---Powered by SONiC BuildBot
|
Collaborator
|
This PR has backport request label(s) for branch(es): 202511,202605, but is missing required test information. Please make sure you tick the tested branch(es) in the Tested branch section and provide test evidence (e.g., 202511: <test result>) in the Test result section as well in your PR description. ---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.
Description of PR
Summary:
Arista-7060X6-64PE-B-C448O16/C512S2 use generate_port_qos_map_per_sku in qos.json.j2, which prevents the global dscp_to_tc_map from being set in config_db.json. Without it, Broadcom ipinip decap falls through to SAI's built-in default instead of the intended decap_dscp_to_tc_map from ipinip.json.
Setting SYSTEM_DEFAULTS decap_qos_map status to 'enabled' lets ipinip.json.j2 use the SYSTEM_DEFAULTS attribute instead of hardcoded platform checks.
Fixes # (issue)
Type of change
Back port request
Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO):
Failure type:
Tested branch
Test result
With golden config enabling decap_qos_map:
Approach
What is the motivation for this PR?
Currently ipinip.json.j2 is having platform checks for enabling/disabling decap entries. We want to prevent having platform checks for simple enable/disable scenarios.
How did you do it?
SYSTEM_DEFAULTS['decap_qos_map']['status'] is added in sonic-net/sonic-buildimage#28588, and enable it for Arista-7060X6-64PE-B-C448O16/C512S2 in sonic-mgmt generate_golden_config_db.py.
How did you verify/test it?
Check config generated from the golden config and ipinip.json
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation