Unify qos json by using qos_config.j2 template #2023
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,166 +1,10 @@ | ||
| {%- set pfc_to_pg_map = true %} | ||
|
|
||
| {%- macro generate_port_lists(PORT_ALL) %} | ||
| {# Generate list of ports #} | ||
| {% for port_idx in range(0, 32) %} | ||
| {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} | ||
| {% endfor %} | ||
| {%- endmacro %} | ||
|
There was a problem hiding this comment. why not use PORT? sonic-cfggen -d -v PORT There was a problem hiding this comment. It is using PORT as higher precedence. https://github.com/Azure/sonic-buildimage/pull/2023/files#diff-786c596a58cef95307fd598ac8204e35R3 This is a layer underneath PORT that provides the default port name and index in case PORT is not defined. This logic exists before unification, and is inherited here. |
||
|
|
||
| {%- include 'qos_config.j2' %} | ||
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,148 +1,8 @@ | ||
| {%- macro generate_port_lists(PORT_ALL) %} | ||
| {# Generate list of ports #} | ||
| {% for port_idx in range(0, 32) %} | ||
| {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} | ||
| {% endfor %} | ||
| {%- endmacro %} | ||
|
There was a problem hiding this comment. I'd suggest to make the generate_port_lists macro the same for all platforms.We can introduce port range, port_multiplier and exception ports as parameters. It will be more readable. There was a problem hiding this comment. this has been removed completely. |
||
|
|
||
| {%- include 'qos_config.j2' %} | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some of the files do not have this line, {%- set pfc_to_pg_map = true %}
for example, the qos.json.j2 for arista 7050 qx32 do no have, why?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it is better to hide it from the user since it is asic specific