annet 0.16.36__tar.gz → 0.16.37__tar.gz

{annet-0.16.36/annet.egg-info → annet-0.16.37}/PKG-INFO

@@ -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 → annet-0.16.37}/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-0.16.36 → annet-0.16.37}/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-0.16.36 → annet-0.16.37}/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-0.16.36 → annet-0.16.37}/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-0.16.36 → annet-0.16.37}/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-0.16.36 → annet-0.16.37}/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-0.16.36 → annet-0.16.37}/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 → annet-0.16.37/annet.egg-info}/PKG-INFO

@@ -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 → annet-0.16.37}/annet.egg-info/requires.txt

@@ -15,4 +15,4 @@ adaptix==3.0.0b7
 dataclass-rest==0.4
 
 [netbox]
-annetbox[sync]>=0.1.12
+annetbox[sync]>=0.2.0

{annet-0.16.36 → annet-0.16.37}/setup.py

@@ -44,7 +44,7 @@ if __name__ == "__main__":
           ],
         },
         extras_require={
-            "netbox": ["annetbox[sync]>=0.1.12"],
+            "netbox": ["annetbox[sync]>=0.2.0"],
         },
         python_requires=">=3.10",
         install_requires=requirements(),