addressing comments

aristanetworks · Jul 24, 2024 · a6689fe · a6689fe
1 parent 81b0b48
commit a6689fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/python-avd/pyavd/_eos_designs/eos_designs_facts/short_esi.py b/python-avd/pyavd/_eos_designs/eos_designs_facts/short_esi.py
@@ -29,6 +29,10 @@ def _short_esi(self: EosDesignsFacts) -> str:
         """
         short_esi = get(self.shared_utils.switch_data_combined, "short_esi")
         if short_esi == "auto":
+            if self.shared_utils.mlag_role == "secondary":
+                # On the MLAG Secondary use short-esi from MLAG primary
+                if (peer_short_esi := self.shared_utils.mlag_peer_facts._short_esi) is not None:
+                    return peer_short_esi
             esi_seed_1 = "".join(self.shared_utils.uplink_switches[:2])
             esi_seed_2 = "".join(self.shared_utils.uplink_switch_interfaces[:2])
             esi_seed_3 = "".join(default(self.shared_utils.uplink_interfaces, [])[:2])

diff --git a/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py b/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py
@@ -299,11 +299,7 @@ def _get_l2_uplink(
         if uplink_native_vlan := get(self.shared_utils.switch_data_combined, "uplink_native_vlan"):
             uplink["native_vlan"] = uplink_native_vlan
 
-        if self.shared_utils.mlag_role == "secondary":
-            # On the MLAG Secondary use short-esi from MLAG primary
-            if (peer_short_esi := self.shared_utils.mlag_peer_facts._short_esi) is not None:
-                uplink["peer_short_esi"] = peer_short_esi
-        elif self._short_esi is not None:
+        if self._short_esi is not None:
             uplink["peer_short_esi"] = self._short_esi
 
         if self.shared_utils.link_tracking_groups is not None: