Fix(eos_designs): Faulty MLAG config generated when missing platform …

…info (#3583) Co-authored-by: Claus Holbech <[email protected]>
aristanetworks · Feb 3, 2024 · 6e05a1b · 6e05a1b
1 parent 8353d8c
commit 6e05a1b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1B.cfg b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG_ODD_ID_L3LEAF1B.cfg
@@ -95,8 +95,6 @@ mlag configuration
    local-interface Vlan4094
    peer-address 10.10.255.2
    peer-link Port-Channel5
-   reload-delay mlag 300
-   reload-delay non-mlag 330
 !
 route-map RM-CONN-2-BGP permit 10
    match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY

diff --git a/.../avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml b/.../avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG_ODD_ID_L3LEAF1B.yml
@@ -147,8 +147,6 @@ mlag_configuration:
   local_interface: Vlan4094
   peer_address: 10.10.255.2
   peer_link: Port-Channel5
-  reload_delay_mlag: '300'
-  reload_delay_non_mlag: '330'
 route_maps:
 - name: RM-MLAG-PEER-IN
   sequence_numbers:

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/MLAG_ODD_ID_L3LEAF1B.yml b/...s/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/MLAG_ODD_ID_L3LEAF1B.yml
@@ -0,0 +1,5 @@
+---
+platform_settings:
+  - platforms: ['default']
+    feature_support:
+      queue_monitor_length_notify: false
diff --git a/ansible_collections/arista/avd/roles/eos_designs/python_modules/mlag/avdstructuredconfig.py b/ansible_collections/arista/avd/roles/eos_designs/python_modules/mlag/avdstructuredconfig.py
@@ -216,14 +216,13 @@ def mlag_configuration(self):
         """
         Return Structured Config for MLAG Configuration
         """
-
         mlag_configuration = {
             "domain_id": get(self.shared_utils.switch_data_combined, "mlag_domain_id", default=self.shared_utils.group),
             "local_interface": f"Vlan{self.shared_utils.mlag_peer_vlan}",
             "peer_address": self.shared_utils.mlag_peer_ip,
             "peer_link": f"Port-Channel{self.shared_utils.mlag_port_channel_id}",
-            "reload_delay_mlag": str(get(self.shared_utils.platform_settings, "reload_delay.mlag")),
-            "reload_delay_non_mlag": str(get(self.shared_utils.platform_settings, "reload_delay.non_mlag")),
+            "reload_delay_mlag": str(get(self.shared_utils.platform_settings, "reload_delay.mlag", default="")) or None,
+            "reload_delay_non_mlag": str(get(self.shared_utils.platform_settings, "reload_delay.non_mlag", default="")) or None,
         }
         if (
             get(self.shared_utils.switch_data_combined, "mlag_dual_primary_detection", default=False) is True