Skip to content

Commit

Permalink
Revert "Revert "Update default cable len to 0m for TD2"" (#8354)
Browse files Browse the repository at this point in the history
* Update default cable len to 0m for TD2 (#8298)
* Update sonic-cfggen tests with the correct cable len

Signed-off-by: Neetha John <nejo@microsoft.com>

As part of the buffer reclamation efforts for TD2, setting the default cable len to 0m which means unused ports will have a cable len of 0m.

Why I did it
To align with the changes in sonic-net/sonic-swss#1830

How to verify it
- With the default cable len set to 0m and the associated changes in swss, CABLE_LENGTH table had '0m' set for unused ports and accordingly more space was reserved for the shared pool
- Cfggen tests passed with the cable len update
  • Loading branch information
neethajohn authored and qiluo-msft committed Aug 7, 2021
1 parent 7be487b commit 66c8934
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set default_cable = '300m' %}
{%- set default_cable = '0m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set default_cable = '300m' %}
{%- set default_cable = '0m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set default_cable = '300m' %}
{%- set default_cable = '0m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set default_cable = '300m' %}
{%- set default_cable = '0m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set default_cable = '300m' %}
{%- set default_cable = '0m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set default_cable = '300m' %}
{%- set default_cable = '0m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set default_cable = '300m' %}
{%- set default_cable = '0m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set default_cable = '300m' %}
{%- set default_cable = '0m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{%- set default_cable = '300m' %}
{%- set default_cable = '0m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
4 changes: 2 additions & 2 deletions src/sonic-config-engine/tests/test_multinpu_cfggen.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,14 +393,14 @@ def test_buffers_multi_asic_template(self):
output['CABLE_LENGTH'],
{
'AZURE': {
'Ethernet8': '300m',
'Ethernet8': '0m',
'Ethernet0': '300m',
'Ethernet4': '300m',
'Ethernet-BP4': '5m',
'Ethernet-BP0': '5m',
'Ethernet-BP12': '5m',
'Ethernet-BP8': '5m',
'Ethernet12': '300m'
'Ethernet12': '0m'
}
}
)
Expand Down

0 comments on commit 66c8934

Please sign in to comment.