annet 0.16.36__py3-none-any.whl → 0.16.37__py3-none-any.whl

annet/adapters/netbox/common/models.py

@@ -192,20 +192,25 @@ class NetboxDevice(Entity):
     breed: str
 
     interfaces: List[Interface]
-    neighbours: Optional[List["NetboxDevice"]]
+
+    @property
+    def neighbors(self) -> List["Entity"]:
+        return [
+            endpoint.device
+            for iface in self.interfaces
+            if iface.connected_endpoints
+            for endpoint in iface.connected_endpoints
+            if endpoint.device
+        ]
 
     # compat
     @property
     def neighbours_fqdns(self) -> list[str]:
-        if not self.neighbours:
-            return []
-        return [dev.fqdn for dev in self.neighbours]
+        return [dev.name for dev in self.neighbors]
 
     @property
     def neighbours_ids(self):
-        if not self.neighbours:
-            return []
-        return [dev.id for dev in self.neighbours]
+        return [dev.id for dev in self.neighbors]
 
     def __hash__(self):
         return hash((self.id, type(self)))

annet/adapters/netbox/common/storage_opts.py

@@ -5,16 +5,25 @@ DEFAULT_URL = "http://localhost"
 
 
 class NetboxStorageOpts:
-    def __init__(self, url: str, token: str, insecure: bool = False, exact_host_filter: bool = False):
+    def __init__(
+            self,
+            url: str,
+            token: str,
+            insecure: bool = False,
+            exact_host_filter: bool = False,
+            threads: int = 1,
+    ):
         self.url = url
         self.token = token
         self.insecure = insecure
         self.exact_host_filter = exact_host_filter
+        self.threads = threads
 
     @classmethod
     def parse_params(cls, conf_params: Optional[dict[str, str]], cli_opts: Any):
         url = os.getenv("NETBOX_URL") or conf_params.get("url") or DEFAULT_URL
         token = os.getenv("NETBOX_TOKEN", "").strip() or conf_params.get("token") or ""
+        threads = os.getenv("NETBOX_CLIENT_THREADS", "").strip() or conf_params.get("threads") or "1"
         insecure = False
         if insecure_env := os.getenv("NETBOX_INSECURE", "").lower():
             insecure = insecure_env in ("true", "1", "t")
@@ -24,4 +33,10 @@ class NetboxStorageOpts:
             exact_host_filter = exact_host_filter_env in ("true", "1", "t")
         else:
             exact_host_filter = bool(conf_params.get("exact_host_filter") or False)
-        return cls(url=url, token=token, insecure=insecure, exact_host_filter=exact_host_filter)
+        return cls(
+            url=url,
+            token=token,
+            insecure=insecure,
+            exact_host_filter=exact_host_filter,
+            threads=int(threads),
+        )

annet/adapters/netbox/v37/storage.py

@@ -24,7 +24,6 @@ logger = getLogger(__name__)
 @impl_converter(recipe=[
     link(P[api_models.Device].name, P[models.NetboxDevice].hostname),
     link(P[api_models.Device].name, P[models.NetboxDevice].fqdn),
-    link_constant(P[models.NetboxDevice].neighbours, value=None),
 ])
 def extend_device_base(
         device: api_models.Device,
@@ -39,7 +38,6 @@ def extend_device_base(
 def extend_device(
         device: api_models.Device,
         interfaces: List[models.Interface],
-        neighbours: Optional[List[models.NetboxDevice]],
         storage: Storage,
 ) -> models.NetboxDevice:
     platform_name: str = ""
@@ -64,7 +62,6 @@ def extend_device(
         hw=hw,
         storage=storage,
     )
-    res.neighbours = neighbours
     return res
 
 
@@ -91,6 +88,7 @@ class NetboxStorageV37(Storage):
         url = ""
         token = ""
         self.exact_host_filter = False
+        threads = 1
         if opts:
             if opts.insecure:
                 ctx = ssl.create_default_context()
@@ -98,8 +96,10 @@ class NetboxStorageV37(Storage):
                 ctx.verify_mode = ssl.CERT_NONE
             url = opts.url
             token = opts.token
+            threads = opts.threads
             self.exact_host_filter = opts.exact_host_filter
-        self.netbox = NetboxV37(url=url, token=token, ssl_context=ctx)
+
+        self.netbox = NetboxV37(url=url, token=token, ssl_context=ctx, threads=threads)
         self._all_fqdns: Optional[list[str]] = None
         self._id_devices: dict[int, models.NetboxDevice] = {}
         self._name_devices: dict[str, models.NetboxDevice] = {}
@@ -174,7 +174,6 @@ class NetboxStorageV37(Storage):
             device.id: extend_device(
                 device=device,
                 interfaces=[],
-                neighbours=[],
                 storage=self,
             )
             for device in self._load_devices(query)
@@ -186,16 +185,8 @@ class NetboxStorageV37(Storage):
             self._record_device(device)
 
         interfaces = self._load_interfaces(list(device_ids))
-        neighbours = {x.id: x for x in self._load_neighbours(interfaces)}
-        neighbours_seen: dict[str, set] = defaultdict(set)
-
         for interface in interfaces:
             device_ids[interface.device.id].interfaces.append(interface)
-            for e in interface.connected_endpoints or []:
-                neighbour = neighbours[e.device.id]
-                if neighbour.id not in neighbours_seen[interface.device.id]:
-                    neighbours_seen[interface.device.id].add(neighbour.id)
-                    device_ids[interface.device.id].neighbours.append(neighbour)
 
         return list(device_ids.values())
 
@@ -233,8 +224,7 @@ class NetboxStorageV37(Storage):
             extended_ifaces[ip.assigned_object_id].ip_addresses.append(ip)
         return list(extended_ifaces.values())
 
-    def _load_interfaces(self, device_ids: List[int]) -> List[
-        models.Interface]:
+    def _load_interfaces(self, device_ids: List[int]) -> List[models.Interface]:
         interfaces = self.netbox.dcim_all_interfaces(device_id=device_ids)
         return self._extend_interfaces(interfaces.results)
 
@@ -242,25 +232,6 @@ class NetboxStorageV37(Storage):
         interfaces = self.netbox.dcim_all_interfaces_by_id(id=ids)
         return self._extend_interfaces(interfaces.results)
 
-    def _load_neighbours(self, interfaces: List[models.Interface]) -> List[models.NetboxDevice]:
-        endpoints = [e for i in interfaces for e in i.connected_endpoints or []]
-        remote_interfaces_ids = [e.id for e in endpoints]
-        neighbours_ids = [e.device.id for e in endpoints]
-        neighbours_ifaces_dics = defaultdict(list)
-        # load only the connected interface to speed things up
-        for iface in self._load_interfaces_by_id(remote_interfaces_ids):
-            neighbours_ifaces_dics[iface.device.id].append(iface)
-        neighbours = []
-        for neighbour in self.netbox.dcim_all_devices_by_id(id=neighbours_ids).results:
-            extended_neighbour = extend_device(
-                device=neighbour,
-                storage=self,
-                interfaces=neighbours_ifaces_dics[neighbour.id],
-                neighbours=None,  # do not load recursively
-            )
-            neighbours.append(extended_neighbour)
-        return neighbours
-
     def get_device(
             self, obj_id, preload_neighbors=False, use_mesh=None,
             **kwargs,
@@ -270,13 +241,11 @@ class NetboxStorageV37(Storage):
 
         device = self.netbox.dcim_device(obj_id)
         interfaces = self._load_interfaces([device.id])
-        neighbours = self._load_neighbours(interfaces)
 
         res = extend_device(
             device=device,
             storage=self,
             interfaces=interfaces,
-            neighbours=neighbours,
         )
         self._record_device(res)
         return res

annet/bgp_models.py

@@ -182,6 +182,7 @@ class PeerGroup:
     internal_name: str = ""
     description: str = ""
     update_source: str = ""
+    peer_filter: str = ""
     import_policy: str = ""
     export_policy: str = ""
 

annet/mesh/executor.py

@@ -132,30 +132,30 @@ class MeshExecutor:
         # we can have multiple rules for the same pair
         # we merge them according to remote fqdn
         neighbor_peers: dict[PeerKey, Pair] = {}
-        # TODO batch resolve
         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 = {
+        logger.debug("Loading neighbor devices: %s", fqdns)
+        neighbors = {
             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:
-                if rule.name_right not in neigbors:
-                    print(list(neigbors), flush=True)
+                if rule.name_right not in neighbors:
                     raise ValueError(
-                        f"Device `{device.fqdn}` has no neighbor `{rule.name_right}` required for `{handler_name}`. {list(neigbors)}",
+                        f"Device `{device.fqdn}` has no neighbor `{rule.name_right}` "
+                        f"required for `{handler_name}`. {list(neighbors)}",
                     )
-                neighbor_device = neigbors[rule.name_right]
+                neighbor_device = neighbors[rule.name_right]
             else:
-                if rule.name_left not in neigbors:
+                if rule.name_left not in neighbors:
                     raise ValueError(
                         f"Device `{device.fqdn}` has no neighbor `{rule.name_left}` required for `{handler_name}`",
                     )
-                neighbor_device = neigbors[rule.name_left]
+                neighbor_device = neighbors[rule.name_left]
             all_connected_ports = [
                 (p1.name, p2.name)
                 for p1, p2 in self._storage.search_connections(device, neighbor_device)
@@ -238,6 +238,7 @@ class MeshExecutor:
             rule.name_right if rule.direct_order else rule.name_left
             for rule in rules
         }
+        logger.debug("Loading indirect connected devices: %s", fqdns)
         connected_devices = {
             d.fqdn: d for d in self._storage.make_devices(list(fqdns))
         }

annet/mesh/peer_models.py

@@ -126,6 +126,7 @@ class MeshPeerGroup(_OptionsDTO):
     internal_name: str
     update_source: str
     description: str
+    peer_filter: str
 
     import_policy: str
     export_policy: str

annet/rpl_generators/prefix_lists.py

@@ -110,7 +110,9 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
     def acl_arista(self, _):
         return r"""
         ip prefix-list
+            seq
         ipv6 prefix-list
+            seq
         """
 
     def _arista_prefix_list(
@@ -120,20 +122,18 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
             match: PrefixMatchValue,
             plist: IpPrefixList,
     ) -> Iterable[Sequence[str]]:
-        for i, prefix in enumerate(plist.members):
-            addr_mask = ip_interface(prefix)
-            yield (
-                prefix_type,
-                "prefix-list",
-                name,
-                f"seq {i * 5 + 5}",
-                "permit",
-                addr_mask.with_prefixlen,
-            ) + (
-                ("ge", str(match.greater_equal)) if match.greater_equal is not None else ()
-            ) + (
-                ("le", str(match.less_equal)) if match.less_equal is not None else ()
-            )
+        with self.block(prefix_type, "prefix-list", name):
+            for i, prefix in enumerate(plist.members):
+                addr_mask = ip_interface(prefix)
+                yield (
+                    f"seq {i * 10 + 10}",
+                    "permit",
+                    addr_mask.with_prefixlen,
+                ) + (
+                    ("ge", str(match.greater_equal)) if match.greater_equal is not None else ()
+                ) + (
+                    ("le", str(match.less_equal)) if match.less_equal is not None else ()
+                )
 
     def run_arista(self, device: Any):
         policies = self.get_policies(device)

{annet-0.16.36.dist-info → annet-0.16.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 0.16.36
+Version: 0.16.37
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -23,7 +23,7 @@ Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.1.12; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.2.0; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: provides-extra

{annet-0.16.36.dist-info → annet-0.16.37.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=no4Ud2EsjYvcoiwNs17wjWDlrBPPg0Me24x0zsNIXWA,9639
+annet/bgp_models.py,sha256=NBPbMWwzo4uWFslrpE4blQO1k4CxJqeleRBDhDg9Rd0,9665
 annet/cli.py,sha256=hDpjIr3w47lgQ_CvCQS1SXFDK-SJrf5slbT__5u6GIA,12342
 annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
 annet/connectors.py,sha256=-Lghz3PtWCBU8Ohrp0KKQcmm1AUZtN0EnOaZ6IQgCQI,5105
@@ -33,14 +33,14 @@ annet/adapters/netbox/provider.py,sha256=3IrfZ6CfCxf-lTnJlIC2TQ8M_rDxOB_B7HGXZ92
 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=Y9kqU13q6fwYu0_HiotUKAy7OHFZngkC2s3s4IDAbDg,1745
-annet/adapters/netbox/common/models.py,sha256=oqmFF1SbsehgQlMdWVAX_m8m39nCQ31Ycz-fcLLtXpQ,7436
+annet/adapters/netbox/common/models.py,sha256=cnNf2oB_BDRz4ZYkHpib1qPxwY1iREJMiWlg8T0lORY,7559
 annet/adapters/netbox/common/query.py,sha256=mv5WlU6gGge8gUYwloXDXEABmfP5teYyq8DyBtGdFkw,1761
 annet/adapters/netbox/common/status_client.py,sha256=XXx0glomaBaglmkUEy6YtFOxQQkHb59CDA0h1I-IhxM,592
-annet/adapters/netbox/common/storage_opts.py,sha256=5tt6wxUUJTIzNbOVXMnYBwZedNAIqYlve3YWl6GdbZM,1197
+annet/adapters/netbox/common/storage_opts.py,sha256=wfv1spElomwgVYMCgGth3SWVF0RsRgtUgq9GpFL9hJs,1520
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/v24/storage.py,sha256=THI592VLx3ehixsPZQ1Ko3mYIAZQbnDY-toIziqBbL8,6005
 annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/v37/storage.py,sha256=JUXAt4l2mgE6G3L2JGyvK065Ybqof5R20ixqJ1s_dCU,12770
+annet/adapters/netbox/v37/storage.py,sha256=PYT2qffMVVkeIlBYg_Msj6u-68rVv1UlA9-5plioRUM,11094
 annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
 annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=MZ6eQAU3cadQp8KaSE6uAYFtcfMDCIe_eNuVROnYkCk,4496
@@ -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=E6NTOneiMDwB1NCpjDRECoaeQ0f3n_fmTLnKTrSHTU4,4917
 annet/mesh/device_models.py,sha256=aFbwVWNSDBcph_Kvv6qZT-uUz0Tbg3z45EvP4i1z2ao,3600
-annet/mesh/executor.py,sha256=6NBi7KBZzKf_92TgxypkoBN0WhZt1egXx0qALzo9Cq8,17497
+annet/mesh/executor.py,sha256=z_3e2neRR4GoEQfJlvfbalelKzOz5yb78zm9lIcLYw4,17578
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
 annet/mesh/models_converter.py,sha256=3q2zs7K8S3pfYSUKKRdtl5CJGbeg4TtYxofAVs_MBsk,3085
-annet/mesh/peer_models.py,sha256=9vn5ENiEZqOZFRFSOJReT8E3E2GzBte628mkmS3cplI,2770
+annet/mesh/peer_models.py,sha256=Div4o1t6Z0TWvy-8WKg4-n9WOd2PKCmIpfbkILDlDtk,2791
 annet/mesh/port_processor.py,sha256=RHiMS5W8qoDkTKiarQ748bcr8bNx4g_R4Y4vZg2k4TU,478
 annet/mesh/registry.py,sha256=xmWF7yxWXmwqX2_jyMAKrbGd2G9sjb4rYDx4Xk61QKc,9607
 annet/rpl/__init__.py,sha256=0kcIktE3AmS0rlm9xzVDf53xk08OeZXgD-6ZLCt_KCs,731
@@ -105,7 +105,7 @@ annet/rpl_generators/cumulus_frr.py,sha256=F-LRT-UPnztUqinp3KYKqh796L9dqkzPKBUxM
 annet/rpl_generators/entities.py,sha256=DIpgAQ8Tslo2hq6iFBaYkJX12BFBiccN8GOaRVxR1Uk,1985
 annet/rpl_generators/execute.py,sha256=wS6e6fwcPWywsHB0gBMqZ17eF0s4YOBgDgwPB_cr5Rw,431
 annet/rpl_generators/policy.py,sha256=NeqB0reRN_KuY8LYkeGT3dRPe2HFDT9RfmVy5fcA3zw,32570
-annet/rpl_generators/prefix_lists.py,sha256=69vr7Yd6rQ9m6S8ksevSNCgegc4Qo445usEFUzGhAuU,7193
+annet/rpl_generators/prefix_lists.py,sha256=D4WXeISevf62EmDu1GYdldjz2gmONFFlmgMyGAOa_m8,7248
 annet/rpl_generators/rd.py,sha256=YGXgx1D2D0-pixgspXJzA6NvW8lx3AmHMxIY2l5rraI,1457
 annet/rulebook/__init__.py,sha256=oafL5HC8QHdkO9CH2q_fxohPMxOgjn-dNQa5kPjuqsA,3942
 annet/rulebook/common.py,sha256=zK1s2c5lc5HQbIlMUQ4HARQudXSgOYiZ_Sxc2I_tHqg,721
@@ -176,10 +176,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.36.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.36.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.36.dist-info/METADATA,sha256=H4zXSdqH1KdZu_hYHp8IkARj044NR3K9tUZsDO8l_mo,854
-annet-0.16.36.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-annet-0.16.36.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.36.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.36.dist-info/RECORD,,
+annet-0.16.37.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.37.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.37.dist-info/METADATA,sha256=-esXnAU-CbKx5Cp3QA41GqBb4w5eWxFUasMwdiljmVo,853
+annet-0.16.37.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+annet-0.16.37.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.37.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.37.dist-info/RECORD,,