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

cherry-picking diff between #3628 and #3561

Browse Source 
Revert "Configure buffer profile to all ports (#3561)" (#3628)
Configure buffer profile to all ports (#3561)

This reverts commit 8861cbe98e.

Signed-off-by: Wenda Ni <wenni@microsoft.com>
This commit is contained in:
Wenda Ni 2019-10-04 11:20:57 -07:00 committed by Ying Xie
parent d6d389d7a1
commit 8788f4f783
2 changed files with 529 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
files/build_templates/buffers_config.j2
View File

@ -131,7 +131,8 @@ def
{{ defs.generate_pg_profils(port_names_active) }}
{% else %}
"BUFFER_PG": {
"{{ port_names_active }}|0": {
{% for port in PORT_ACTIVE %}
"{{ port }}|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}{% if not loop.last %},{% endif %}
@ -143,13 +144,18 @@ def
{{ defs.generate_queue_buffers(port_names_active) }}
{% else %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|3-4": {
{% for port in PORT_ACTIVE %}
"{{ port }}|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"{{ port_names_active }}|0-2": {
{% endfor %}
{% for port in PORT_ACTIVE %}
"{{ port }}|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"{{ port_names_active }}|5-6": {
{% endfor %}
{% for port in PORT_ACTIVE %}
"{{ port }}|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}{% if not loop.last %},{% endif %}

522
src/sonic-config-engine/tests/sample_output/buffers-dell6100.json
View File

@ -105,16 +105,532 @@
}
},
"BUFFER_PG": {
"Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|0": {
"Ethernet0|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet1|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet4|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet5|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet6|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet7|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet8|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet9|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet10|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet11|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet12|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet13|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet14|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet15|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet16|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet17|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet20|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet21|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet22|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet23|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet24|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet25|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet26|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet27|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet28|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet29|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet30|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet31|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet32|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet36|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet37|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet38|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet39|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet40|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet41|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet42|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet48|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet52|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet53|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet54|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet55|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet56|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet57|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet58|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}
},
"BUFFER_QUEUE": {
"Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|3-4": {
"Ethernet0|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|0-2": {
"Ethernet1|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet4|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet5|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet6|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet7|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet8|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet9|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet10|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet11|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet12|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet13|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet14|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet15|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet16|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet17|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet20|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet21|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet22|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet23|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet24|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet25|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet26|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet27|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet28|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet29|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet30|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet31|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet32|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet36|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet37|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet38|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet39|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet40|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet41|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet42|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet48|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet52|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet53|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet54|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet55|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet56|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet57|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet58|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet0|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet1|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet4|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet5|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet6|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet7|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet8|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet9|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet10|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet11|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet12|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet13|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet14|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet15|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet16|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet17|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet20|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet21|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet22|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet23|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet24|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet25|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet26|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet27|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet28|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet29|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet30|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet31|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet32|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet36|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet37|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet38|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet39|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet40|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet41|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet42|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet48|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet52|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet53|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet54|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet55|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet56|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet57|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet58|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet0|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet1|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet4|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet5|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet6|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet7|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet8|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet9|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet10|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet11|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet12|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet13|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet14|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet15|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet16|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet17|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet20|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet21|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet22|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet23|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet24|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet25|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet26|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet27|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet28|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet29|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet30|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet31|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet32|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet36|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet37|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet38|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet39|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet40|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet41|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet42|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet48|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet52|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet53|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet54|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet55|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet56|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet57|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet58|5-6": {