Removing unnecessary key from dict.

aristanetworks · Jul 23, 2024 · e0ca9ee · e0ca9ee
1 parent f989793
commit e0ca9ee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/ethernet_interfaces.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/ethernet_interfaces.py
@@ -75,15 +75,15 @@ def ethernet_interfaces(self: AvdStructuredConfigNetworkServices) -> list | None
                                 "flow_tracker": self.shared_utils.get_flow_tracker(l3_interface, "l3_interfaces"),
                             }
 
-                            if get(self._l3_interface_acls, self.shared_utils.hostname):
+                            if self._l3_interface_acls is not None:
                                 interface.update(
                                     {
                                         "access_group_in": get(
-                                            self._l3_interface_acls[self.shared_utils.hostname], f"{interface_name}..ipv4_acl_in..name", separator=".."
-                                        ),
+                                            self._l3_interface_acls, f"{interface_name}..ipv4_acl_in..name", separator=".."
+                                            ),
                                         "access_group_out": get(
-                                            self._l3_interface_acls[self.shared_utils.hostname], f"{interface_name}..ipv4_acl_out..name", separator=".."
-                                        ),
+                                            self._l3_interface_acls, f"{interface_name}..ipv4_acl_out..name", separator=".."
+                                            ),
                                     }
                                 )
 

diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/ip_access_lists.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/ip_access_lists.py
@@ -113,7 +113,7 @@ def ip_access_lists(self: AvdStructuredConfigNetworkServices) -> list | None:
 
         if self._l3_interface_acls:
             l3_interface_acls = self._l3_interface_acls
-            for l3_interface_acl in l3_interface_acls[self.shared_utils.hostname].values():
+            for l3_interface_acl in l3_interface_acls.values():
                 for acl in l3_interface_acl.values():
                     append_if_not_duplicate(ip_access_lists, "name", acl, context="IPv4 Access lists for L3 interface", context_keys=["name"])
 

diff --git a/python-avd/pyavd/_eos_designs/structured_config/network_services/utils.py b/python-avd/pyavd/_eos_designs/structured_config/network_services/utils.py
@@ -689,15 +689,15 @@ def _filtered_internet_exit_policy_types(self: AvdStructuredConfigNetworkService
     @cached_property
     def _l3_interface_acls(self: AvdStructuredConfigNetworkServices):
         """
-        Returns a dict of
-            <hostname> : {
+        Returns a dict of interfaces and acls assigned to the interfaces.
+            {
                 <interface_name>: {
                 "ipv4_acl_in": <generated_ipv4_acl>,
                 "ipv4_acl_out": <generated_ipv4_acl>,
                 }
             }
         Only contains interfaces with ACLs and only the ACLs that are set,
-        so use `get(self._l3_interface_acls, f"{hostname}.{interface_name}..ipv4_acl_in", separator="..")` to get the value.
+        so use `get(self._l3_interface_acls, f"{interface_name}..ipv4_acl_in", separator="..")` to get the value.
         """
 
         if not self.shared_utils.network_services_l3:
@@ -717,21 +717,21 @@ def _l3_interface_acls(self: AvdStructuredConfigNetworkServices):
                         interface_ip = str(ipaddress.ip_interface(interface_ip).ip)
                         node = l3_interface["nodes"][interface_idx]
                         if node == self.shared_utils.hostname:
-                            if node not in l3_interface_acls:
-                                l3_interface_acls[node] = {}
+                            # if node not in l3_interface_acls:
+                            #     l3_interface_acls[node] = {}
                             if ipv4_acl_in is not None:
-                                l3_interface_acls[node].setdefault(interface_name, {})["ipv4_acl_in"] = self.shared_utils.get_ipv4_acl(
+                                l3_interface_acls.setdefault(interface_name, {})["ipv4_acl_in"] = self.shared_utils.get_ipv4_acl(
                                     name=ipv4_acl_in,
                                     interface_name=interface_name,
                                     interface_ip=interface_ip,
                                 )
                             if ipv4_acl_out is not None:
-                                l3_interface_acls[node].setdefault(interface_name, {})["ipv4_acl_out"] = self.shared_utils.get_ipv4_acl(
+                                l3_interface_acls.setdefault(interface_name, {})["ipv4_acl_out"] = self.shared_utils.get_ipv4_acl(
                                     name=ipv4_acl_out,
                                     interface_name=interface_name,
                                     interface_ip=interface_ip,
                                 )
-            return l3_interface_acls
+        return l3_interface_acls
 
     @cached_property
     def _filtered_internet_exit_policies(self: AvdStructuredConfigNetworkServices) -> list: