Revert "Revert "[swss]: Add default ECMP/LAG hash offset values for T…

…0 and T1…" This reverts commit 3bab55c.
sonic-net · Jul 3, 2024 · 5f60386 · 5f60386
1 parent 0755b0c
commit 5f60386
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/dockers/docker-orchagent/switch.json.j2 b/dockers/docker-orchagent/switch.json.j2
@@ -2,11 +2,15 @@
 {# set default hash seed to 0 #}
 {% set hash_seed = 0 %}
 {% set hash_seed_offset = 0 %}
+{% set ecmp_hash_offset_value = 0 %}
+{% set lag_hash_offset_value = 0 %}
 {% if DEVICE_METADATA.localhost.type %}
 {% if "ToRRouter" in DEVICE_METADATA.localhost.type or DEVICE_METADATA.localhost.type in ["EPMS", "MgmtTsToR"] %}
 {% set hash_seed = 0 %}
 {% elif "LeafRouter" in DEVICE_METADATA.localhost.type %}
 {% set hash_seed = 10 %}
+{% set ecmp_hash_offset_value = 10 %}
+{% set lag_hash_offset_value = 10 %}
 {% elif "SpineRouter" in DEVICE_METADATA.localhost.type %}
 {% set hash_seed = 25 %}
 {% endif %}
@@ -21,6 +25,8 @@
             "ecmp_hash_seed": "{{ hash_seed_value }}",
             "lag_hash_seed": "{{ hash_seed_value }}",
             "fdb_aging_time": "600",
+            "ecmp_hash_offset": "{{ ecmp_hash_offset_value }}",
+            "lag_hash_offset": "{{ lag_hash_offset_value }}",
 {% if DEVICE_METADATA.localhost.type and "LeafRouter" in DEVICE_METADATA.localhost.type %}
             "ordered_ecmp": "true"
 {% else %}

diff --git a/src/sonic-config-engine/tests/sample_output/t0-switch-masic1.json b/src/sonic-config-engine/tests/sample_output/t0-switch-masic1.json
@@ -4,6 +4,8 @@
             "ecmp_hash_seed": "11",
             "lag_hash_seed": "11",
             "fdb_aging_time": "600",
+            "ecmp_hash_offset": "10",
+            "lag_hash_offset": "10",
             "ordered_ecmp": "true"
         },
         "OP": "SET"

diff --git a/src/sonic-config-engine/tests/sample_output/t0-switch-masic3.json b/src/sonic-config-engine/tests/sample_output/t0-switch-masic3.json
@@ -4,6 +4,8 @@
             "ecmp_hash_seed": "13",
             "lag_hash_seed": "13",
             "fdb_aging_time": "600",
+            "ecmp_hash_offset": "10",
+            "lag_hash_offset": "10",
             "ordered_ecmp": "true"
         },
         "OP": "SET"

diff --git a/src/sonic-config-engine/tests/sample_output/t0-switch.json b/src/sonic-config-engine/tests/sample_output/t0-switch.json
@@ -4,6 +4,8 @@
             "ecmp_hash_seed": "0",
             "lag_hash_seed": "0",
             "fdb_aging_time": "600",
+            "ecmp_hash_offset": "0",
+            "lag_hash_offset": "0",
             "ordered_ecmp": "false"
         },
         "OP": "SET"

diff --git a/src/sonic-config-engine/tests/sample_output/t1-switch.json b/src/sonic-config-engine/tests/sample_output/t1-switch.json
@@ -4,6 +4,8 @@
             "ecmp_hash_seed": "10",
             "lag_hash_seed": "10",
             "fdb_aging_time": "600",
+            "ecmp_hash_offset": "10",
+            "lag_hash_offset": "10",
             "ordered_ecmp": "true"
         },
         "OP": "SET"