fixing eos_designs code

aristanetworks · Oct 17, 2024 · a3d5cbf · a3d5cbf
1 parent 3555b48
commit a3d5cbf
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 24 deletions.
diff --git a/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-L2LEAF1A.yml b/...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-L2LEAF1A.yml
@@ -105,7 +105,8 @@ ethernet_interfaces:
   switchport:
     enabled: true
   link_tracking_groups:
-  - name: l2leaf-server02
+    names:
+    - l2leaf-server02
     direction: downstream
 port_channel_interfaces:
 - name: Port-Channel1
@@ -117,7 +118,8 @@ port_channel_interfaces:
       allowed_vlan: '310'
   shutdown: false
   link_tracking_groups:
-  - name: l2leaf-server02
+    names:
+    - l2leaf-server02
     direction: upstream
 vlans:
 - id: 310

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml
@@ -181,7 +181,8 @@ ethernet_interfaces:
   switchport:
     enabled: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: upstream
   ip_address: 10.10.101.1/31
 - name: Ethernet10
@@ -436,7 +437,8 @@ port_channel_interfaces:
   description: server01_ES1_PortChanne1
   shutdown: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
   switchport:
     enabled: true
@@ -450,7 +452,8 @@ port_channel_interfaces:
   description: server03_AUTO_ESI_Auto-ESI PortChannel
   shutdown: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
   switchport:
     enabled: true
@@ -464,7 +467,8 @@ port_channel_interfaces:
   description: server04_AUTO_ESI_Profile_Auto-ESI PortChannel from profile
   shutdown: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
   switchport:
     enabled: true
@@ -478,7 +482,8 @@ port_channel_interfaces:
   description: server05_AUTO_ESI_Profile_Override_Auto-ESI PortChannel overridden on server
   shutdown: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
   switchport:
     enabled: true

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml
@@ -181,7 +181,8 @@ ethernet_interfaces:
   switchport:
     enabled: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: upstream
   ip_address: 10.10.101.3/31
 - name: Ethernet10
@@ -436,7 +437,8 @@ port_channel_interfaces:
   description: server01_ES1_PortChanne1
   shutdown: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
   switchport:
     enabled: true
@@ -450,7 +452,8 @@ port_channel_interfaces:
   description: server03_AUTO_ESI_Auto-ESI PortChannel
   shutdown: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
   switchport:
     enabled: true
@@ -464,7 +467,8 @@ port_channel_interfaces:
   description: server04_AUTO_ESI_Profile_Auto-ESI PortChannel from profile
   shutdown: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
   switchport:
     enabled: true
@@ -478,7 +482,8 @@ port_channel_interfaces:
   description: server05_AUTO_ESI_Profile_Override_Auto-ESI PortChannel overridden on server
   shutdown: false
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
   switchport:
     enabled: true

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml
@@ -207,7 +207,8 @@ ethernet_interfaces:
   switchport:
     enabled: false
   link_tracking_groups:
-  - name: Eth-conn-to-router
+    names:
+    - Eth-conn-to-router
     direction: upstream
   ip_address: 10.10.101.5/31
 - name: Ethernet2
@@ -231,7 +232,8 @@ ethernet_interfaces:
     mode: access
     access_vlan: '310'
   link_tracking_groups:
-  - name: Eth-conn-to-router
+    names:
+    - Eth-conn-to-router
     direction: downstream
 port_channel_interfaces:
 - name: Port-Channel2

diff --git a/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/connected_endpoints.yml b/...a/avd/molecule/eos_designs_unit_tests/intended/structured_configs/connected_endpoints.yml
@@ -236,7 +236,8 @@ ethernet_interfaces:
     phone:
       vlan: 321
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
 - name: Ethernet16
   peer: INDIVIDUAL_2_TRUNK_PHONE
@@ -254,7 +255,8 @@ ethernet_interfaces:
     phone:
       vlan: 321
   link_tracking_groups:
-  - name: LT_GROUP1
+    names:
+    - LT_GROUP1
     direction: downstream
 port_channel_interfaces:
 - name: Port-Channel1

diff --git a/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py b/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py
@@ -205,7 +205,11 @@ def _get_p2p_uplink(self: EosDesignsFacts, uplink_index: int, uplink_interface:
             uplink["peer_ip_address"] = self.shared_utils.ip_addressing.p2p_uplinks_peer_ip(uplink_index)
 
         if self.shared_utils.link_tracking_groups is not None:
-            uplink["link_tracking_groups"] = [{"name": lt_group["name"], "direction": "upstream"} for lt_group in self.shared_utils.link_tracking_groups]
+            uplink["link_tracking_groups"] = {
+                "names": [lt_group["name"] for lt_group in self.shared_utils.link_tracking_groups],
+                "direction": "upstream",
+            }
+
         if self.shared_utils.uplink_structured_config is not None:
             uplink["structured_config"] = self.shared_utils.uplink_structured_config
 
@@ -291,7 +295,10 @@ def _get_l2_uplink(
             uplink["peer_short_esi"] = self._short_esi
 
         if self.shared_utils.link_tracking_groups is not None:
-            uplink["link_tracking_groups"] = [{"name": lt_group["name"], "direction": "upstream"} for lt_group in self.shared_utils.link_tracking_groups]
+            uplink["link_tracking_groups"] = {
+                "names": [lt_group["name"] for lt_group in self.shared_utils.link_tracking_groups],
+                "direction": "upstream",
+            }
 
         if not self.shared_utils.network_services_l2:
             # This child device does not support VLANs, so we tell the peer to enable portfast

diff --git a/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/utils.py b/python-avd/pyavd/_eos_designs/structured_config/connected_endpoints/utils.py
@@ -192,12 +192,10 @@ def _get_adapter_link_tracking_groups(self: AvdStructuredConfigConnectedEndpoint
         if self.shared_utils.link_tracking_groups is None or get(adapter, "link_tracking.enabled") is not True:
             return None
 
-        return [
-            {
-                "name": get(adapter, "link_tracking.name", default=self.shared_utils.link_tracking_groups[0]["name"]),
-                "direction": "downstream",
-            },
-        ]
+        return {
+            "names": [get(adapter, "link_tracking.name", default=self.shared_utils.link_tracking_groups[0]["name"])],
+            "direction": "downstream",
+        }
 
     def _get_adapter_ptp(self: AvdStructuredConfigConnectedEndpoints, adapter: dict) -> dict | None:
         """Return ptp for one adapter."""