matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Mellanox buffers profile to use single pool for lossless (#1101)

Browse Source 
Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
This commit is contained in:
Andriy Moroz 2017-11-04 01:31:02 +02:00 committed by Ying Xie
parent ca214b947c
commit 4e1fb6850f
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dockers/docker-orchagent/msn27xx.32ports.buffers.json.j2
View File

@ -4,14 +4,6 @@
{%- if port_names_list.append(port) %}{% endif %} {%- if port_names_list.append(port) %}{% endif %}
{% endfor %} {% endfor %}
{% set port_names = port_names_list | join(',') %} {% set port_names = port_names_list | join(',') %}
{
"BUFFER_POOL_TABLE:ingress_lossless_pool": {
"size": "3024486",
"type": "ingress",
"mode": "dynamic"
},
"OP": "SET"
},
{ {
"BUFFER_POOL_TABLE:ingress_lossy_pool": { "BUFFER_POOL_TABLE:ingress_lossy_pool": {
"size": "6422528", "size": "6422528",
@ -106,6 +98,7 @@
}, },
{# The following template part is for variable PG profile configuration #} {# The following template part is for variable PG profile configuration #}
{% set non_pg_lossless_pool_size = 866726 %}
{% set pg_range = '3-4' %} {% set pg_range = '3-4' %}
{# Lists of supported speed and cable length #} {# Lists of supported speed and cable length #}
{% set supported_speed = [10000, 25000, 40000, 50000, 100000] %} {% set supported_speed = [10000, 25000, 40000, 50000, 100000] %}
@ -239,7 +232,7 @@
{%- set profile_config = pg_profiles[profile_name] %} {%- set profile_config = pg_profiles[profile_name] %}
{ {
"BUFFER_PROFILE_TABLE:{{ profile_name }}": { "BUFFER_PROFILE_TABLE:{{ profile_name }}": {
"pool":"[BUFFER_POOL_TABLE:ingress_lossless_pg_pool]", "pool":"[BUFFER_POOL_TABLE:ingress_lossless_pool]",
"xon":"{{ profile_config['xon'] }}", "xon":"{{ profile_config['xon'] }}",
"xoff":"{{ profile_config['xoff'] }}", "xoff":"{{ profile_config['xoff'] }}",
"size":"{{ profile_config['size'] }}", "size":"{{ profile_config['size'] }}",
@ -249,10 +242,10 @@
}, },
{% endfor -%} {% endfor -%}
{# Pool declaration #} {# Lossless pool declaration #}
{ {
"BUFFER_POOL_TABLE:ingress_lossless_pg_pool": { "BUFFER_POOL_TABLE:ingress_lossless_pool": {
"size": "{{ ingress_lossless_pg_pool_size | sum }}", "size": "{{ ingress_lossless_pg_pool_size | sum + non_pg_lossless_pool_size }}",
"type": "ingress", "type": "ingress",
"mode": "dynamic" "mode": "dynamic"
}, },

14
src/sonic-config-engine/tests/sample_output/msn27.32ports.json
View File

@ -1,12 +1,4 @@
[ [
{
"BUFFER_POOL_TABLE:ingress_lossless_pool": {
"size": "3024486",
"type": "ingress",
"mode": "dynamic"
},
"OP": "SET"
},
{ {
"BUFFER_POOL_TABLE:ingress_lossy_pool": { "BUFFER_POOL_TABLE:ingress_lossy_pool": {
"size": "6422528", "size": "6422528",
@ -297,7 +289,7 @@
{ {
"BUFFER_PROFILE_TABLE:pg_lossless_40G_300m_profile": { "BUFFER_PROFILE_TABLE:pg_lossless_40G_300m_profile": {
"pool":"[BUFFER_POOL_TABLE:ingress_lossless_pg_pool]", "pool":"[BUFFER_POOL_TABLE:ingress_lossless_pool]",
"xon":"18432", "xon":"18432",
"xoff":"75776", "xoff":"75776",
"size":"94208", "size":"94208",
@ -306,8 +298,8 @@
"OP": "SET" "OP": "SET"
}, },
{ {
"BUFFER_POOL_TABLE:ingress_lossless_pg_pool": { "BUFFER_POOL_TABLE:ingress_lossless_pool": {
"size": "3014656", "size": "3881382",
"type": "ingress", "type": "ingress",
"mode": "dynamic" "mode": "dynamic"
}, },