From dfddd55cbf32a9eb5e41d770da680b9b32b68b47 Mon Sep 17 00:00:00 2001 From: ganglv <88995770+ganglyu@users.noreply.github.com> Date: Tue, 21 Dec 2021 03:15:39 +0800 Subject: [PATCH 1/2] [yang]: Add constraint for pfcwd (#9513) #### Why I did it POLL_INTERVAL cannot be set if any of the detection/restoration times in this table is less than the POLL_INTERVAL. #### How I did it Add "must" constraint to make sure detection/restoration times are greater than POLL_INTERVAL. #### How to verify it Use apply-patch command to update POLL_INTERVAL. Build sonic-yang-model. --- .../tests/yang_model_tests/tests/pfc.json | 8 + .../yang_model_tests/tests_config/pfc.json | 138 +++++++++++++++++- .../yang-models/sonic-pfcwd.yang | 6 + 3 files changed, 150 insertions(+), 2 deletions(-) diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/pfc.json b/src/sonic-yang-models/tests/yang_model_tests/tests/pfc.json index 4405075aeefc..0f8b4d0289c2 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/pfc.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/pfc.json @@ -31,6 +31,10 @@ "desc": "PFC_WDOG_WITH_WRONG_DETECTION_TIME_HIGH_VALUE", "eStr": "range" }, + "PFC_WDOG_WITH_INVALID_DETECTION_TIME": { + "desc": "PFC_WDOG_WITH_INVALID_DETECTION_TIME", + "eStr": ["detection_time must be greater than or equal to POLL_INTERVAL"] + }, "PFC_WDOG_WITH_WRONG_RESTORATION_TIME_LOW_VALUE": { "desc": "PFC_WDOG_WITH_WRONG_RESTORATION_TIME_LOW_VALUE", "eStr": "range" @@ -38,5 +42,9 @@ "PFC_WDOG_WITH_WRONG_RESTORATION_TIME_HIGH_VALUE": { "desc": "PFC_WDOG_WITH_WRONG_RESTORATION_TIME_HIGH_VALUE", "eStr": "range" + }, + "PFC_WDOG_WITH_INVALID_RESTORATION_TIME": { + "desc": "PFC_WDOG_WITH_INVALID_RESTORATION_TIME", + "eStr": ["restoration_time must be greater than or equal to POLL_INTERVAL"] } } diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/pfc.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/pfc.json index 8c31d6dd98ed..f493701384e9 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/pfc.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/pfc.json @@ -105,36 +105,102 @@ } }, "PFC_WDOG_WITH_CORRECT_POLL_INTERVAL_VALUE": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet4", + "lanes": "65", + "mtu": "9000", + "name": "Ethernet4", + "tpid": "0x8100", + "speed": "25000" + } + ] + } + }, "sonic-pfcwd:sonic-pfcwd": { "sonic-pfcwd:PFC_WD": { "PFC_WD_LIST": [ { "ifname": "GLOBAL", "POLL_INTERVAL": 101 + }, + { + "ifname": "Ethernet4", + "action": "drop", + "detection_time": 101, + "restoration_time": 3000 } ] } } }, "PFC_WDOG_WITH_WRONG_POLL_INTERVAL_LOW_VALUE": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet4", + "lanes": "65", + "mtu": "9000", + "name": "Ethernet4", + "tpid": "0x8100", + "speed": "25000" + } + ] + } + }, "sonic-pfcwd:sonic-pfcwd": { "sonic-pfcwd:PFC_WD": { "PFC_WD_LIST": [ { "ifname": "GLOBAL", "POLL_INTERVAL":99 + }, + { + "ifname": "Ethernet4", + "action": "drop", + "detection_time": 100, + "restoration_time": 3000 } ] } } }, "PFC_WDOG_WITH_WRONG_POLL_INTERVAL_HIGH_VALUE": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet4", + "lanes": "65", + "mtu": "9000", + "name": "Ethernet4", + "tpid": "0x8100", + "speed": "25000" + } + ] + } + }, "sonic-pfcwd:sonic-pfcwd": { "sonic-pfcwd:PFC_WD": { "PFC_WD_LIST": [ { "ifname": "GLOBAL", "POLL_INTERVAL": 3001 + }, + { + "ifname": "Ethernet4", + "action": "drop", + "detection_time": 3001, + "restoration_time": 3001 } ] } @@ -160,7 +226,7 @@ "PFC_WD_LIST": [ { "ifname": "Ethernet4", - "action": "wrong", + "action": "drop", "detection_time": 5001, "restoration_time": 3000 } @@ -168,6 +234,40 @@ } } }, + "PFC_WDOG_WITH_INVALID_DETECTION_TIME": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet4", + "lanes": "65", + "mtu": "9000", + "name": "Ethernet4", + "tpid": "0x8100", + "speed": "25000" + } + ] + } + }, + "sonic-pfcwd:sonic-pfcwd": { + "sonic-pfcwd:PFC_WD": { + "PFC_WD_LIST": [ + { + "ifname": "GLOBAL", + "POLL_INTERVAL": 1000 + }, + { + "ifname": "Ethernet4", + "action": "drop", + "detection_time": 999, + "restoration_time": 1000 + } + ] + } + } + }, "PFC_WDOG_WITH_WRONG_RESTORATION_TIME_LOW_VALUE": { "sonic-pfcwd:sonic-pfcwd": { "sonic-pfcwd:PFC_WD": { @@ -188,12 +288,46 @@ "PFC_WD_LIST": [ { "ifname": "Ethernet4", - "action": "wrong", + "action": "drop", "detection_time": 60001, "restoration_time": 3000 } ] } } + }, + "PFC_WDOG_WITH_INVALID_RESTORATION_TIME": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet4", + "lanes": "65", + "mtu": "9000", + "name": "Ethernet4", + "tpid": "0x8100", + "speed": "25000" + } + ] + } + }, + "sonic-pfcwd:sonic-pfcwd": { + "sonic-pfcwd:PFC_WD": { + "PFC_WD_LIST": [ + { + "ifname": "GLOBAL", + "POLL_INTERVAL": 1000 + }, + { + "ifname": "Ethernet4", + "action": "drop", + "detection_time": 1000, + "restoration_time": 999 + } + ] + } + } } } diff --git a/src/sonic-yang-models/yang-models/sonic-pfcwd.yang b/src/sonic-yang-models/yang-models/sonic-pfcwd.yang index beebf51965df..4ea0ffb8537f 100644 --- a/src/sonic-yang-models/yang-models/sonic-pfcwd.yang +++ b/src/sonic-yang-models/yang-models/sonic-pfcwd.yang @@ -51,6 +51,9 @@ module sonic-pfcwd { } leaf detection_time { must "../ifname != 'GLOBAL'"; + must "(not(boolean(current()/../../PFC_WD_LIST[ifname='GLOBAL'])) or (current() >= current()/../../PFC_WD_LIST[ifname='GLOBAL']/POLL_INTERVAL))" { + error-message "detection_time must be greater than or equal to POLL_INTERVAL"; + } type uint32 { range 100..5000; } @@ -59,6 +62,9 @@ module sonic-pfcwd { } leaf restoration_time { must "../ifname != 'GLOBAL'"; + must "(not(boolean(current()/../../PFC_WD_LIST[ifname='GLOBAL'])) or (current() >= current()/../../PFC_WD_LIST[ifname='GLOBAL']/POLL_INTERVAL))" { + error-message "restoration_time must be greater than or equal to POLL_INTERVAL"; + } type uint32 { range 100..60000; } From 34be53a22e9482780ad1298a6dd8792693190ae6 Mon Sep 17 00:00:00 2001 From: Stephen Sun <5379172+stephenxs@users.noreply.github.com> Date: Tue, 21 Dec 2021 05:31:45 +0800 Subject: [PATCH 2/2] Fix typo and missing files in SN3800 and SN4600C's buffer templates (#9537) Why I did it Fix typo and missing files in SN3800 and SN4600C's buffer templates How I did it ingress_lossless_xoff_size => ingress_lossless_pool_xoff add missing files for SN4600C-D100C12S2 How to verify it Deploy the fix and verify whether the device can be up. Signed-off-by: Stephen Sun --- .../buffers_defaults_t0.j2 | 2 +- .../buffers_defaults_t1.j2 | 2 +- .../buffers_defaults_t0.j2 | 2 +- .../buffers_defaults_t1.j2 | 2 +- .../buffers_default_objects.j2 | 1 + .../buffers_defaults_t0.j2 | 101 ++--------------- .../buffers_defaults_t1.j2 | 103 ++---------------- .../buffers_defaults_t0.j2 | 2 +- .../buffers_defaults_t1.j2 | 2 +- .../buffers_defaults_t0.j2 | 2 +- .../buffers_defaults_t1.j2 | 2 +- 11 files changed, 29 insertions(+), 192 deletions(-) create mode 120000 device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_default_objects.j2 diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2 index fa9a1c4d1049..88a9cc20732e 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t0.j2 @@ -16,7 +16,7 @@ #} {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '20664320' %} -{% set ingress_lossless_xoff_size = '3321856' %} +{% set ingress_lossless_pool_xoff = '3321856' %} {% set egress_lossless_pool_size = '34287552' %} {% set egress_lossy_pool_size = '20664320' %} diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2 index eb2094ddfed6..0e805a09a933 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/buffers_defaults_t1.j2 @@ -16,7 +16,7 @@ #} {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '19601408' %} -{% set ingress_lossless_xoff_size = '4384768' %} +{% set ingress_lossless_pool_xoff = '4384768' %} {% set egress_lossless_pool_size = '34287552' %} {% set egress_lossy_pool_size = '19601408' %} diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 index 75d516771771..a66a404bb2c2 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 @@ -16,7 +16,7 @@ #} {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '49905664' %} -{% set ingress_lossless_xoff_size = '3702784' %} +{% set ingress_lossless_pool_xoff = '3702784' %} {% set egress_lossless_pool_size = '60817392' %} {% set egress_lossy_pool_size = '49905664' %} diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 index bc0f20966944..d77d5cc1f136 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 @@ -16,7 +16,7 @@ #} {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '48332800' %} -{% set ingress_lossless_xoff_size = '5275648' %} +{% set ingress_lossless_pool_xoff = '5275648' %} {% set egress_lossless_pool_size = '60817392' %} {% set egress_lossy_pool_size = '48332800' %} diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_default_objects.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_default_objects.j2 new file mode 120000 index 000000000000..c01aebb7ae12 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_default_objects.j2 @@ -0,0 +1 @@ +../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2 \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2 index fb4cff886aa8..c4fdce6ef4cf 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t0.j2 @@ -17,105 +17,22 @@ {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '44566528' %} -{% set ingress_lossless_xoff_size = '3614720' %} +{% set ingress_lossless_pool_xoff = '3614720' %} {% set egress_lossless_pool_size = '60817392' %} {% set egress_lossy_pool_size = '44566528' %} -{%- 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)) %}{%- endif %} - {%- endfor %} +{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %} +{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }} {%- endmacro %} -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - {%- if dynamic_mode is not defined %} - "size": "{{ ingress_lossless_pool_size }}", - "xoff": "{{ ingress_lossless_xoff_size }}", - {%- endif %} - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "{{ egress_lossless_pool_size }}", - "type": "egress", - "mode": "dynamic" - }, - "egress_lossy_pool": { - {%- if dynamic_mode is not defined %} - "size": "{{ egress_lossy_pool_size }}", - {%- endif %} - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossless_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"7" - }, - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "dynamic_th":"7" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"9216", - "dynamic_th":"7" - }, - "q_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"0", - "dynamic_th":"3" - } - }, +{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %} +{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }} {%- endmacro %} -{%- macro generate_profile_lists(port_names) %} - "BUFFER_PORT_INGRESS_PROFILE_LIST": { -{% for port in port_names.split(',') %} - "{{ port }}": { - "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, - "BUFFER_PORT_EGRESS_PROFILE_LIST": { -{% for port in port_names.split(',') %} - "{{ port }}": { - "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - } +{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %} +{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }} {%- endmacro %} -{%- macro generate_queue_buffers(port_names) %} - "BUFFER_QUEUE": { -{% for port in port_names.split(',') %} - "{{ port }}|3-4": { - "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" - }, -{% endfor %} -{% for port in port_names.split(',') %} - "{{ port }}|0-2": { - "profile" : "[BUFFER_PROFILE|q_lossy_profile]" - }, -{% endfor %} -{% for port in port_names.split(',') %} - "{{ port }}|5-6": { - "profile" : "[BUFFER_PROFILE|q_lossy_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - } +{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %} +{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }} {%- endmacro %} diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2 index f4cd4b4b47d9..278172ce12fd 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_defaults_t1.j2 @@ -17,105 +17,24 @@ {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '43794432' %} -{% set ingress_lossless_xoff_size = '4386816' %} +{% set ingress_lossless_pool_xoff = '4386816' %} {% set egress_lossless_pool_size = '60817392' %} {% set egress_lossy_pool_size = '43794432' %} -{%- 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)) %}{%- endif %} - {%- endfor %} -{%- endmacro %} +{% import 'buffers_defaults_objects.j2' as defs with context %} -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - {%- if dynamic_mode is not defined %} - "size": "{{ ingress_lossless_pool_size }}", - "xoff": "{{ ingress_lossless_xoff_size }}", - {%- endif %} - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "{{ egress_lossless_pool_size }}", - "type": "egress", - "mode": "dynamic" - }, - "egress_lossy_pool": { - {%- if dynamic_mode is not defined %} - "size": "{{ egress_lossy_pool_size }}", - {%- endif %} - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossless_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"7" - }, - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "dynamic_th":"7" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"9216", - "dynamic_th":"7" - }, - "q_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"0", - "dynamic_th":"3" - } - }, +{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %} +{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }} {%- endmacro %} -{%- macro generate_profile_lists(port_names) %} - "BUFFER_PORT_INGRESS_PROFILE_LIST": { -{% for port in port_names.split(',') %} - "{{ port }}": { - "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - }, - "BUFFER_PORT_EGRESS_PROFILE_LIST": { -{% for port in port_names.split(',') %} - "{{ port }}": { - "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" - }{% if not loop.last %},{% endif %} - -{% endfor %} - } +{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %} +{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }} {%- endmacro %} -{%- macro generate_queue_buffers(port_names) %} - "BUFFER_QUEUE": { -{% for port in port_names.split(',') %} - "{{ port }}|3-4": { - "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" - }, -{% endfor %} -{% for port in port_names.split(',') %} - "{{ port }}|0-2": { - "profile" : "[BUFFER_PROFILE|q_lossy_profile]" - }, -{% endfor %} -{% for port in port_names.split(',') %} - "{{ port }}|5-6": { - "profile" : "[BUFFER_PROFILE|q_lossy_profile]" - }{% if not loop.last %},{% endif %} +{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %} +{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }} +{%- endmacro %} -{% endfor %} - } +{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %} +{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }} {%- endmacro %} diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2 index 16d56b62cd5f..eede5087d0f6 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t0.j2 @@ -16,7 +16,7 @@ #} {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '43827200' %} -{% set ingress_lossless_xoff_size = '3702784' %} +{% set ingress_lossless_pool_xoff = '3702784' %} {% set egress_lossless_pool_size = '60817392' %} {% set egress_lossy_pool_size = '43827200' %} diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2 index 34faa886e253..317d1a56994f 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/buffers_defaults_t1.j2 @@ -16,7 +16,7 @@ #} {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '43048960' %} -{% set ingress_lossless_xoff_size = '4481024' %} +{% set ingress_lossless_pool_xoff = '4481024' %} {% set egress_lossless_pool_size = '60817392' %} {% set egress_lossy_pool_size = '43048960' %} diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2 index 09138bb9bf7f..87d8bda4c55f 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t0.j2 @@ -16,7 +16,7 @@ #} {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '47398912' %} -{% set ingress_lossless_xoff_size = '3604480' %} +{% set ingress_lossless_pool_xoff = '3604480' %} {% set egress_lossless_pool_size = '60817392' %} {% set egress_lossy_pool_size = '47398912' %} diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2 index ea9038f3ea5e..6cf1904e30c7 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/buffers_defaults_t1.j2 @@ -16,7 +16,7 @@ #} {% set default_cable = '5m' %} {% set ingress_lossless_pool_size = '46587904' %} -{% set ingress_lossless_xoff_size = '4415488' %} +{% set ingress_lossless_pool_xoff = '4415488' %} {% set egress_lossless_pool_size = '60817392' %} {% set egress_lossy_pool_size = '46587904' %}