annet 0.16.29__tar.gz → 0.16.30__tar.gz

{annet-0.16.29/annet.egg-info → annet-0.16.30}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: annet
-Version: 0.16.29
+Version: 0.16.30
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -24,3 +24,9 @@ Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
 Requires-Dist: annetbox[sync]>=0.1.10; extra == "netbox"
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{annet-0.16.29 → annet-0.16.30}/annet/adapters/file/provider.py

@@ -102,6 +102,9 @@ class Device(DeviceCls, DumpableView):
     def add_subif(self, interface: str, subif: int) -> Interface:
         raise NotImplementedError
 
+    def find_interface(self, name: str) -> Optional[Interface]:
+        raise NotImplementedError
+
     def neighbours_fqdns(self) -> list[str]:
         return []
 

{annet-0.16.29 → annet-0.16.30}/annet/adapters/netbox/common/models.py

@@ -281,3 +281,9 @@ class NetboxDevice(Entity):
         )
         self.interfaces.append(target_port)
         return target_port
+
+    def find_interface(self, name: str) -> Optional[Interface]:
+        for iface in self.interfaces:
+            if iface.name == name:
+                return iface
+        return None

{annet-0.16.29 → annet-0.16.30}/annet/annlib/netdev/devdb/data/devdb.json

@@ -116,6 +116,7 @@
     "PC.Whitebox.Edgecore": "[Ee]dge-?[Cc]ore",
     "PC.Whitebox.Edgecore.AS": "AS",
     "PC.Whitebox.Edgecore.AS9736": "AS9736",
+    "PC.Whitebox.Edgecore.AS9817": "AS9817",
     "PC.Whitebox.NVIDIA": "NVIDIA",
     "PC.Whitebox.NVIDIA.SN": " SN",
     "PC.Whitebox.NVIDIA.SN.SN5400": " SN5400",

{annet-0.16.29 → annet-0.16.30}/annet/bgp_models.py

@@ -286,13 +286,30 @@ def _used_policies(peer: Union[Peer, PeerGroup]) -> Iterable[str]:
         yield peer.export_policy
 
 
+def _used_redistribute_policies(opts: Union[GlobalOptions, VrfOptions]) -> Iterable[str]:
+    for red in opts.ipv4_unicast.redistributes:
+        if red.policy:
+            yield red.policy
+    for red in opts.ipv6_unicast.redistributes:
+        if red.policy:
+            yield red.policy
+    for red in opts.ipv4_labeled_unicast.redistributes:
+        if red.policy:
+            yield red.policy
+    for red in opts.ipv6_labeled_unicast.redistributes:
+        if red.policy:
+            yield red.policy
+
+
 def extract_policies(config: BgpConfig) -> Sequence[str]:
     result: list[str] = []
     for vrf in config.global_options.vrf.values():
         for group in vrf.groups:
             result.extend(_used_policies(group))
+        result.extend(_used_redistribute_policies(vrf))
     for group in config.global_options.groups:
         result.extend(_used_policies(group))
     for peer in config.peers:
         result.extend(_used_policies(peer))
+    result.extend(_used_redistribute_policies(config.global_options))
     return result

{annet-0.16.29 → annet-0.16.30}/annet/mesh/executor.py

@@ -124,12 +124,20 @@ class MeshExecutor:
         # we merge them according to remote fqdn
         neighbor_peers: dict[PeerKey, Pair] = {}
         # TODO batch resolve
-        for rule in self._registry.lookup_direct(device.fqdn, device.neighbours_fqdns):
+        rules = self._registry.lookup_direct(device.fqdn, device.neighbours_fqdns)
+        fqdns = {
+            rule.name_right if rule.direct_order else rule.name_left
+            for rule in rules
+        }
+        neigbors = {
+            d.fqdn: d for d in self._storage.make_devices(list(fqdns))
+        }
+        for rule in rules:
             handler_name = self._handler_name(rule.handler)
             if rule.direct_order:
-                neighbor_device = self._storage.make_devices([rule.name_right])[0]
+                neighbor_device = neigbors[rule.name_right]
             else:
-                neighbor_device = self._storage.make_devices([rule.name_left])[0]
+                neighbor_device = neigbors[rule.name_left]
             all_connected_ports = [
                 (p1.name, p2.name)
                 for p1, p2 in self._storage.search_connections(device, neighbor_device)
@@ -200,17 +208,26 @@ class MeshExecutor:
         # we can have multiple rules for the same pair
         # we merge them according to remote fqdn
         connected_peers: dict[PeerKey, Pair] = {}
-        for rule in self._registry.lookup_indirect(device.fqdn, all_fqdns):
+
+        rules = self._registry.lookup_indirect(device.fqdn, all_fqdns)
+        fqdns = {
+            rule.name_right if rule.direct_order else rule.name_left
+            for rule in rules
+        }
+        connected_devices = {
+            d.fqdn: d for d in self._storage.make_devices(list(fqdns))
+        }
+        for rule in rules:
             session = MeshSession()
             handler_name = self._handler_name(rule.handler)
             logger.debug("Running indirect handler: %s", handler_name)
             if rule.direct_order:
-                connected_device = self._storage.make_devices([rule.name_right])[0]
+                connected_device = connected_devices[rule.name_right]
                 peer_device = IndirectPeer(rule.match_left, device)
                 peer_connected = IndirectPeer(rule.match_right, connected_device)
                 rule.handler(peer_device, peer_connected, session)
             else:
-                connected_device = self._storage.make_devices([rule.name_left])[0]
+                connected_device = connected_devices[rule.name_left]
                 peer_connected = IndirectPeer(rule.match_left, connected_device)
                 peer_device = IndirectPeer(rule.match_right, device)
                 rule.handler(peer_connected, peer_device, session)
@@ -265,7 +282,7 @@ class MeshExecutor:
     def _to_bgp_global(self, global_options: GlobalOptionsDTO) -> GlobalOptions:
         return to_bgp_global_options(global_options)
 
-    def _apply_interface_changes(
+    def _apply_direct_interface_changes(
             self, device: Device, neighbor: Device, ports: list[str], changes: InterfaceChanges,
     ) -> str:
         # filter ports according to processed in pair
@@ -299,6 +316,24 @@ class MeshExecutor:
         target_interface.add_addr(changes.addr, changes.vrf)
         return target_interface.name
 
+    def _apply_indirect_interface_changes(
+            self, device: Device, neighbor: Device, ifname: Optional[str], changes: InterfaceChanges,
+    ) -> Optional[str]:
+        if changes.lag is not None:
+            raise ValueError("LAG creation unsupported for indirect peers")
+        elif changes.subif is not None:
+            target_interface = device.add_subif(ifname, changes.subif)
+        elif changes.svi is not None:
+            target_interface = device.add_svi(changes.svi)
+        elif not ifname:
+            return None
+        else:
+            target_interface = device.find_interface(ifname)
+            if not target_interface:
+                raise ValueError(f"Interface {ifname} not found for device {device.fqdn}")
+        target_interface.add_addr(changes.addr, changes.vrf)
+        return target_interface.name
+
     def _apply_virtual_interface_changes(self, device: Device, local: VirtualLocalDTO) -> str:
         return device.add_svi(local.svi).name  # we check if SVI configured in execute method
 
@@ -308,8 +343,9 @@ class MeshExecutor:
         global_options = self._to_bgp_global(self._execute_globals(device))
 
         peers = []
+        target_interface: Optional[str]
         for direct_pair in self._execute_direct(device):
-            target_interface = self._apply_interface_changes(
+            target_interface = self._apply_direct_interface_changes(
                 device,
                 direct_pair.device,
                 direct_pair.ports,
@@ -325,7 +361,13 @@ class MeshExecutor:
             peers.append(self._virtual_to_bgp_peer(virtual_pair, target_interface))
 
         for connected_pair in self._execute_indirect(device, all_fqdns):
-            peers.append(self._to_bgp_peer(connected_pair, None))
+            target_interface = self._apply_indirect_interface_changes(
+                device,
+                connected_pair.device,
+                getattr(connected_pair.local, "ifname", None),
+                to_interface_changes(connected_pair.local),
+            )
+            peers.append(self._to_bgp_peer(connected_pair, target_interface))
 
         return BgpConfig(
             global_options=global_options,

{annet-0.16.29 → annet-0.16.30}/annet/mesh/peer_models.py

@@ -95,6 +95,10 @@ class IndirectPeerDTO(MeshSession, _OptionsDTO):
     description: str
     update_source: str
 
+    ifname: Optional[str]
+    subif: int
+    svi: Optional[int]
+
 
 class VirtualLocalDTO(_OptionsDTO):
     asnum: int

{annet-0.16.29 → annet-0.16.30}/annet/rpl_generators/community.py

@@ -164,7 +164,7 @@ class CommunityListGenerator(PartialGenerator, ABC):
                 yield self._huawei_community_filter(10, community_list, " ".join(members))
             elif community_list.logic == CommunityLogic.OR:
                 for i, member in enumerate(members):
-                    member_id = (i + 1) * 10 + 5
+                    member_id = (i + 1) * 10
                     yield self._huawei_community_filter(member_id, community_list, member)
             else:
                 raise NotImplementedError(f"Community logic {community_list.logic} is not implemented for huawei")

{annet-0.16.29 → annet-0.16.30}/annet/storage.py

@@ -168,6 +168,10 @@ class Device(Protocol):
         """Add sub interface or return existing one"""
         raise NotImplementedError
 
+    @abc.abstractmethod
+    def find_interface(self, name: str) -> Optional[Interface]:
+        raise NotImplementedError
+
 
 def get_storage() -> tuple[StorageProvider, Dict[str, Any]]:
     connectors = storage_connector.get_all()

{annet-0.16.29 → annet-0.16.30/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: annet
-Version: 0.16.29
+Version: 0.16.30
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -24,3 +24,9 @@ Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
 Requires-Dist: annetbox[sync]>=0.1.10; extra == "netbox"
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary