Skip to content

Commit 3bab55c

Browse files
authored
Revert "[swss]: Add default ECMP/LAG hash offset values for T0 and T1 (sonic-net#18912…" (sonic-net#19428)
This reverts commit 375ca8b.
1 parent b42fef7 commit 3bab55c

File tree

5 files changed

+0
-14
lines changed

5 files changed

+0
-14
lines changed

dockers/docker-orchagent/switch.json.j2

-6
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22
{# set default hash seed to 0 #}
33
{% set hash_seed = 0 %}
44
{% set hash_seed_offset = 0 %}
5-
{% set ecmp_hash_offset_value = 0 %}
6-
{% set lag_hash_offset_value = 0 %}
75
{% if DEVICE_METADATA.localhost.type %}
86
{% if "ToRRouter" in DEVICE_METADATA.localhost.type or DEVICE_METADATA.localhost.type in ["EPMS", "MgmtTsToR"] %}
97
{% set hash_seed = 0 %}
108
{% elif "LeafRouter" in DEVICE_METADATA.localhost.type %}
119
{% set hash_seed = 10 %}
12-
{% set ecmp_hash_offset_value = 10 %}
13-
{% set lag_hash_offset_value = 10 %}
1410
{% elif "SpineRouter" in DEVICE_METADATA.localhost.type %}
1511
{% set hash_seed = 25 %}
1612
{% endif %}
@@ -25,8 +21,6 @@
2521
"ecmp_hash_seed": "{{ hash_seed_value }}",
2622
"lag_hash_seed": "{{ hash_seed_value }}",
2723
"fdb_aging_time": "600",
28-
"ecmp_hash_offset": "{{ ecmp_hash_offset_value }}",
29-
"lag_hash_offset": "{{ lag_hash_offset_value }}",
3024
{% if DEVICE_METADATA.localhost.type and "LeafRouter" in DEVICE_METADATA.localhost.type %}
3125
"ordered_ecmp": "true"
3226
{% else %}

src/sonic-config-engine/tests/sample_output/t0-switch-masic1.json

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"ecmp_hash_seed": "11",
55
"lag_hash_seed": "11",
66
"fdb_aging_time": "600",
7-
"ecmp_hash_offset": "10",
8-
"lag_hash_offset": "10",
97
"ordered_ecmp": "true"
108
},
119
"OP": "SET"

src/sonic-config-engine/tests/sample_output/t0-switch-masic3.json

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"ecmp_hash_seed": "13",
55
"lag_hash_seed": "13",
66
"fdb_aging_time": "600",
7-
"ecmp_hash_offset": "10",
8-
"lag_hash_offset": "10",
97
"ordered_ecmp": "true"
108
},
119
"OP": "SET"

src/sonic-config-engine/tests/sample_output/t0-switch.json

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"ecmp_hash_seed": "0",
55
"lag_hash_seed": "0",
66
"fdb_aging_time": "600",
7-
"ecmp_hash_offset": "0",
8-
"lag_hash_offset": "0",
97
"ordered_ecmp": "false"
108
},
119
"OP": "SET"

src/sonic-config-engine/tests/sample_output/t1-switch.json

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"ecmp_hash_seed": "10",
55
"lag_hash_seed": "10",
66
"fdb_aging_time": "600",
7-
"ecmp_hash_offset": "10",
8-
"lag_hash_offset": "10",
97
"ordered_ecmp": "true"
108
},
119
"OP": "SET"

0 commit comments

Comments
 (0)