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

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

Browse Source 
This reverts commit 8861cbe98e.
This commit is contained in:
Wenda Ni 2019-10-18 09:14:39 -07:00 committed by lguohan
parent 60a7f4d653
commit be52977aca
2 changed files with 4 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/build_templates/buffers_config.j2
View File

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

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

@ -111,12 +111,6 @@
"Ethernet1|0": { "Ethernet1|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}, },
"Ethernet2|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet3|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet4|0": { "Ethernet4|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}, },
@ -159,12 +153,6 @@
"Ethernet17|0": { "Ethernet17|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}, },
"Ethernet18|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet19|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet20|0": { "Ethernet20|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}, },
@ -204,15 +192,6 @@
"Ethernet32|0": { "Ethernet32|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}, },
"Ethernet33|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet34|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet35|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet36|0": { "Ethernet36|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}, },
@ -234,33 +213,9 @@
"Ethernet42|0": { "Ethernet42|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}, },
"Ethernet43|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet44|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet45|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet46|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet47|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet48|0": { "Ethernet48|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}, },
"Ethernet49|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet50|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet51|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet52|0": { "Ethernet52|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}, },
@ -281,21 +236,6 @@
}, },
"Ethernet58|0": { "Ethernet58|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet59|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet60|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet61|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet62|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet63|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
} }
}, },
@ -306,12 +246,6 @@
"Ethernet1|3-4": { "Ethernet1|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
"Ethernet2|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet3|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet4|3-4": { "Ethernet4|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
@ -354,12 +288,6 @@
"Ethernet17|3-4": { "Ethernet17|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
"Ethernet18|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet19|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet20|3-4": { "Ethernet20|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
@ -399,15 +327,6 @@
"Ethernet32|3-4": { "Ethernet32|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
"Ethernet33|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet34|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet35|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet36|3-4": { "Ethernet36|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
@ -429,33 +348,9 @@
"Ethernet42|3-4": { "Ethernet42|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
"Ethernet43|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet44|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet45|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet46|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet47|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet48|3-4": { "Ethernet48|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
"Ethernet49|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet50|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet51|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet52|3-4": { "Ethernet52|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
@ -477,33 +372,12 @@
"Ethernet58|3-4": { "Ethernet58|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]" "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
}, },
"Ethernet59|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet60|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet61|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet62|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet63|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"Ethernet0|0-2": { "Ethernet0|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet1|0-2": { "Ethernet1|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet2|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet3|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet4|0-2": { "Ethernet4|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
@ -546,12 +420,6 @@
"Ethernet17|0-2": { "Ethernet17|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet18|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet19|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet20|0-2": { "Ethernet20|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
@ -591,15 +459,6 @@
"Ethernet32|0-2": { "Ethernet32|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet33|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet34|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet35|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet36|0-2": { "Ethernet36|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
@ -621,33 +480,9 @@
"Ethernet42|0-2": { "Ethernet42|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet43|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet44|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet45|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet46|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet47|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet48|0-2": { "Ethernet48|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet49|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet50|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet51|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet52|0-2": { "Ethernet52|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
@ -669,33 +504,12 @@
"Ethernet58|0-2": { "Ethernet58|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet59|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet60|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet61|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet62|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet63|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet0|5-6": { "Ethernet0|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet1|5-6": { "Ethernet1|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet2|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet3|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet4|5-6": { "Ethernet4|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
@ -738,12 +552,6 @@
"Ethernet17|5-6": { "Ethernet17|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet18|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet19|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet20|5-6": { "Ethernet20|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
@ -783,15 +591,6 @@
"Ethernet32|5-6": { "Ethernet32|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet33|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet34|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet35|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet36|5-6": { "Ethernet36|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
@ -813,33 +612,9 @@
"Ethernet42|5-6": { "Ethernet42|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet43|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet44|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet45|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet46|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet47|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet48|5-6": { "Ethernet48|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
"Ethernet49|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet50|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet51|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet52|5-6": { "Ethernet52|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}, },
@ -860,21 +635,6 @@
}, },
"Ethernet58|5-6": { "Ethernet58|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]" "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet59|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet60|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet61|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet62|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"Ethernet63|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
} }
} }
} }