annet 0.16.28__py3-none-any.whl → 0.16.30__py3-none-any.whl

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/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/annlib/netdev/devdb/data/devdb.json

@@ -70,8 +70,8 @@
     "Huawei.EI": "-EI(-|$)",
     "Huawei.HI": "-HI(-|$)",
     "Huawei.SI": "-SI(-|$)",
-    "Huawei.OptiXtrans": " OptiXtrans|DC",
-    "Huawei.OptiXtrans.DC": " DC",
+    "Huawei.OptiXtrans": " (OptiXtrans|DC\\d\\d\\d)",
+    "Huawei.OptiXtrans.DC": " DC\\d\\d\\d",
     "Huawei.OptiXtrans.DC.DC908": " DC908",
 
     "Juniper": "^[Jj]uniper",
@@ -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/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/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/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/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/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.28.dist-info → annet-0.16.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: annet
-Version: 0.16.28
+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.28.dist-info → annet-0.16.30.dist-info}/RECORD

@@ -1,7 +1,7 @@
 annet/__init__.py,sha256=W8kkZ3Axu-6VJwgQ0cn4UeOVNy6jab0cqgHKLQny1D0,2141
 annet/annet.py,sha256=TMdEuM7GJQ4TjRVmuK3bCTZN-21lxjQ9sXqEdILUuBk,725
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
-annet/bgp_models.py,sha256=pju2KImDhBxU3lkyvP5TfeYuWztYj4i8OfcZqCX3xVY,8823
+annet/bgp_models.py,sha256=5FnXMeIbZJIQRdUk6Jf2f3YlkQSLAgmBH8bq2o94MUM,9457
 annet/cli.py,sha256=hDpjIr3w47lgQ_CvCQS1SXFDK-SJrf5slbT__5u6GIA,12342
 annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
 annet/connectors.py,sha256=-Lghz3PtWCBU8Ohrp0KKQcmm1AUZtN0EnOaZ6IQgCQI,5105
@@ -17,7 +17,7 @@ annet/output.py,sha256=FYMcWCc43-b51KsCiKnXPZHawhgWNoVtY9gRqw__Ce0,7473
 annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
-annet/storage.py,sha256=eAHEvPbRuKDUJdnkzSrHmW_lBJS3Y0g93Y2VJ4qzifQ,3941
+annet/storage.py,sha256=44f2aHNFOsQMSJwFvGxyu26oRcs3QmS24TKivcfPlxU,4064
 annet/tabparser.py,sha256=rRzfZSurR5P1eSdVWXMjABvV4PX83NRRQY0CzwabExw,1242
 annet/text_term_format.py,sha256=CHb6viv45vmYl-SK1A1vyPHGhaEni6jVybBusaQnct8,2813
 annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
@@ -27,13 +27,13 @@ annet/adapters/fetchers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 annet/adapters/fetchers/stub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/fetchers/stub/fetcher.py,sha256=bJGNJcvjrxSa4d8gly6NkaRcxoK57zbZhzkW5vq278I,656
 annet/adapters/file/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/file/provider.py,sha256=hfeHHJ4aeTT8p_K5Wj_euwjf0Y1Ir9Qijup6J9wk5RM,6555
+annet/adapters/file/provider.py,sha256=KyHuA5w9E4T3Lxeko8b5M7jRmu7yhTJVLqLkas4ue1A,6654
 annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/provider.py,sha256=3IrfZ6CfCxf-lTnJlIC2TQ8M_rDxOB_B7HGXZ92vAgA,1643
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/client.py,sha256=PaxHG4W9H8_uunIwMBNYkLq4eQJYoO6p6gY-ciQs7Nc,2563
 annet/adapters/netbox/common/manufacturer.py,sha256=1kmw3YzitXwOh4zitsWfZda4CQiMr4CnAxkUkUm_z3A,1678
-annet/adapters/netbox/common/models.py,sha256=JAAtbUB6UOzA3-VF5Fa33XktgKC3C2csareTZnHyqd0,7177
+annet/adapters/netbox/common/models.py,sha256=E-w1ptCpcrJcdAENcgJjXF-sVhUu2_7fZPNaDuhYnuw,7364
 annet/adapters/netbox/common/query.py,sha256=ziUFM7cUEbEIf3k1szTll4aO-OCUa-2Ogxbebi7Tegs,646
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
 annet/adapters/netbox/common/storage_opts.py,sha256=5tt6wxUUJTIzNbOVXMnYBwZedNAIqYlve3YWl6GdbZM,1197
@@ -55,7 +55,7 @@ annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/db.py,sha256=fI_u5aya4l61mbYSjj4JwlVfi3s7obt2jqERSuXGRUI,1634
 annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm58tmMWVU,892
-annet/annlib/netdev/devdb/data/devdb.json,sha256=OM3FLBUGPJ_d97Q3hnavj51CoWlilJsoJLkHSzE-nPg,6127
+annet/annlib/netdev/devdb/data/devdb.json,sha256=Zt9pj6h2clMi0i26bGVsx0gqQl8vCSk6iLajIYWeKX4,6192
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=rIlyvnA3uM8bB_7oq1nS2KDxTp6dQh2hz-FbNhYIpOU,4630
 annet/annlib/netdev/views/hardware.py,sha256=3JCZLH7deIHhCguwPJTUX-WDvWjG_xt6BdSEZSO6zkQ,4226
@@ -84,10 +84,10 @@ annet/generators/common/initial.py,sha256=qYBxXFhyOPy34cxc6hsIXseod-lYCmmbuNHpM0
 annet/mesh/__init__.py,sha256=lcgdnBIxc2MAN7Er1bcErEKPqrjWO4uIp_1FldMXTYg,557
 annet/mesh/basemodel.py,sha256=TXVINzmvKlyxiVcIdOaoewY_c4TvuMstluqfzlbNmPU,4859
 annet/mesh/device_models.py,sha256=YcL6_vGjnt67BTovN8Eq38U5wGcbJDhqiq8613WpYtQ,3381
-annet/mesh/executor.py,sha256=vJaw6cGwOkCQDABK1mkYk67BPAeWArpTHA9jNKtJDc0,14684
+annet/mesh/executor.py,sha256=V5GR_m9T6hVWR5sFY-x4JkS0LpI6UH5Q7HxuhC8KXFE,16299
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
 annet/mesh/models_converter.py,sha256=3q2zs7K8S3pfYSUKKRdtl5CJGbeg4TtYxofAVs_MBsk,3085
-annet/mesh/peer_models.py,sha256=KgVHXzoLfYweBVDCGDeEA8CuPvaTDe-4kreXyZOLQzM,2670
+annet/mesh/peer_models.py,sha256=uD3h7HWl9_zNdBlQqZCMcjCnzjr8dTbSFqc8216JDu0,2735
 annet/mesh/port_processor.py,sha256=RHiMS5W8qoDkTKiarQ748bcr8bNx4g_R4Y4vZg2k4TU,478
 annet/mesh/registry.py,sha256=VvZKZ5ujGcRXvWFP051rr2KoXI8OrTivkhpTOrUm33A,9087
 annet/rpl/__init__.py,sha256=0kcIktE3AmS0rlm9xzVDf53xk08OeZXgD-6ZLCt_KCs,731
@@ -100,7 +100,7 @@ annet/rpl/routemap.py,sha256=SIyk73OzPp2oH_XwrDv2xczuY2Zt1VsJmB0TT5r7F5g,2593
 annet/rpl/statement_builder.py,sha256=sVGOYsCV0s_SFQUy2WtUyQqKy5H4MOfmRCJWGj-UOJ4,9403
 annet/rpl_generators/__init__.py,sha256=ZLWs-flcpyIbdhxSDfNt-ORDrLe8ins25sWdXTWeUoA,748
 annet/rpl_generators/aspath.py,sha256=kZakwPLfGGiXu9fC6I1z-pvy7Fe-4dy93_-lYcx39_4,2038
-annet/rpl_generators/community.py,sha256=8HxeUS2i015lXP7NxVW5EIbFjpg4mdljfQrOIUENtmk,11500
+annet/rpl_generators/community.py,sha256=SWpaOvoQUNISuRm41-IvGPFmntvgFv9ee4zegsMyeo0,11496
 annet/rpl_generators/cumulus_frr.py,sha256=yMxm264PZq8MnSYQ2jmLv2CSa2Jl2ais_7XBTXKowj0,20053
 annet/rpl_generators/entities.py,sha256=052ggNCGbEE-m--MdzLJhJ-1ch6IxDsL6xnMH0OHgtg,1491
 annet/rpl_generators/execute.py,sha256=wS6e6fwcPWywsHB0gBMqZ17eF0s4YOBgDgwPB_cr5Rw,431
@@ -175,10 +175,10 @@ annet_generators/rpl_example/generator.py,sha256=zndIGfV4ZlTxPgAGYs7bMQvTc_tYScO
 annet_generators/rpl_example/items.py,sha256=Ez1RF5YhcXNCusBmeApIjRL3rBlMazNZd29Gpw1_IsA,766
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-0.16.28.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.28.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.28.dist-info/METADATA,sha256=-EflTMHVXM8VDk6NwmYp-DZl-Fzn624B5HNp_JuoIwU,729
-annet-0.16.28.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-annet-0.16.28.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.28.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.28.dist-info/RECORD,,
+annet-0.16.30.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.30.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.30.dist-info/METADATA,sha256=HEQle9FUcien2kzE20RedAMAzPAfatx1Hw852aelJiA,854
+annet-0.16.30.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+annet-0.16.30.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.30.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.30.dist-info/RECORD,,

{annet-0.16.28.dist-info → annet-0.16.30.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any