Enable/Disable Order ECMP feature. (#9651)

Updated Jinja2 Template in switch.json.j2 for enabling/disabling Order ECMP feature based on device role. Changes as per design: sonic-net/SONiC#896
sonic-net · Jan 7, 2022 · 6c50732 · 6c50732
1 parent bdfe89c
commit 6c50732
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/dockers/docker-orchagent/switch.json.j2 b/dockers/docker-orchagent/switch.json.j2
@@ -20,7 +20,12 @@
         "SWITCH_TABLE:switch": {
             "ecmp_hash_seed": "{{ hash_seed_value }}",
             "lag_hash_seed": "{{ hash_seed_value }}",
-            "fdb_aging_time": "600"
+            "fdb_aging_time": "600",
+{% if DEVICE_METADATA.localhost.type and "LeafRouter" in DEVICE_METADATA.localhost.type %}
+            "ordered_ecmp": "true"
+{% else %}
+            "ordered_ecmp": "false"
+{% endif %}
         },
         "OP": "SET"
     }

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
@@ -3,7 +3,8 @@
         "SWITCH_TABLE:switch": {
             "ecmp_hash_seed": "11",
             "lag_hash_seed": "11",
-            "fdb_aging_time": "600"
+            "fdb_aging_time": "600",
+            "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
@@ -3,7 +3,8 @@
         "SWITCH_TABLE:switch": {
             "ecmp_hash_seed": "13",
             "lag_hash_seed": "13",
-            "fdb_aging_time": "600"
+            "fdb_aging_time": "600",
+            "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
@@ -3,7 +3,8 @@
         "SWITCH_TABLE:switch": {
             "ecmp_hash_seed": "0",
             "lag_hash_seed": "0",
-            "fdb_aging_time": "600"
+            "fdb_aging_time": "600",
+            "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
@@ -3,7 +3,8 @@
         "SWITCH_TABLE:switch": {
             "ecmp_hash_seed": "10",
             "lag_hash_seed": "10",
-            "fdb_aging_time": "600"
+            "fdb_aging_time": "600",
+            "ordered_ecmp": "true"
         },
         "OP": "SET"
     }