annet 0.13.2__py3-none-any.whl → 0.13.4__py3-none-any.whl

annet/adapters/netbox/common/models.py

@@ -39,6 +39,22 @@ class DeviceIp:
     family: int
 
 
+@dataclass
+class Prefix:
+    id: int
+    prefix: str
+    site: Entity | None
+    vrf: Entity | None
+    tenant: Entity | None
+    vlan: Entity | None
+    role: Entity | None
+    status: Label
+    is_pool: bool
+    custom_fields: dict[str, Any]
+    created: datetime
+    last_updated: datetime
+
+
 @dataclass
 class IpAddress:
     id: int
@@ -50,12 +66,27 @@ class IpAddress:
     tags: List[Entity]
     created: datetime
     last_updated: datetime
+    prefix: Optional[Prefix] = None
+
+
+@dataclass
+class InterfaceConnectedEndpoint(Entity):
+    device: Entity
+
+
+@dataclass
+class InterfaceType:
+    value: str
+    label: str
 
 
 @dataclass
 class Interface(Entity):
     device: Entity
     enabled: bool
+    description: str
+    type: InterfaceType
+    connected_endpoints: Optional[list[InterfaceConnectedEndpoint]]
     display: str = ""
     ip_addresses: List[IpAddress] = field(default_factory=list)
 
@@ -64,7 +95,6 @@ class Interface(Entity):
 class NetboxDevice(Entity):
     url: str
     storage: Storage
-    neighbours_ids: List[int]
 
     display: str
     device_type: DeviceType
@@ -92,6 +122,7 @@ class NetboxDevice(Entity):
     breed: str
 
     interfaces: List[Interface]
+    neighbours: Optional[List["NetboxDevice"]]
 
     # compat
 

annet/adapters/netbox/v37/storage.py

@@ -1,5 +1,7 @@
 from logging import getLogger
-from typing import Optional, List, Union
+from typing import Optional, List, Union, Dict
+from ipaddress import ip_interface
+from collections import defaultdict
 
 from adaptix import P
 from adaptix.conversion import impl_converter, link
@@ -28,18 +30,21 @@ def extend_device_base(
         interfaces: List[models.Interface],
         hw: Optional[HardwareView],
         breed: str,
+        neighbours: Optional[List[models.NetboxDevice]],
         storage: Storage,
-        neighbours_ids: List[int],
 ) -> models.NetboxDevice:
     ...
 
 
 def extend_device(
-        device: api_models.Device, storage: Storage,
+        device: api_models.Device,
+        interfaces: List[models.Interface],
+        neighbours: Optional[List[models.NetboxDevice]],
+        storage: Storage,
 ) -> models.NetboxDevice:
     return extend_device_base(
         device=device,
-        interfaces=[],
+        interfaces=interfaces,
         breed=get_breed(
             device.device_type.manufacturer.name,
             device.device_type.model,
@@ -48,7 +53,7 @@ def extend_device(
             device.device_type.manufacturer.name,
             device.device_type.model,
         ),
-        neighbours_ids=[],
+        neighbours=neighbours,
         storage=storage,
     )
 
@@ -61,6 +66,13 @@ def extend_interface(
     ...
 
 
+@impl_converter
+def extend_ip_address(
+        ip_address: models.IpAddress, prefix: Optional[models.Prefix],
+) -> models.IpAddress:
+    ...
+
+
 class NetboxStorageV37(Storage):
     def __init__(self, opts: Optional[NetboxStorageOpts] = None):
         self.netbox = NetboxV37(
@@ -95,15 +107,29 @@ class NetboxStorageV37(Storage):
         if isinstance(query, list):
             query = NetboxQuery.new(query)
         device_ids = {
-            device.id: extend_device(device=device, storage=self)
+            device.id: extend_device(
+                device=device,
+                interfaces=[],
+                neighbours=[],
+                storage=self,
+            )
             for device in self._load_devices(query)
         }
         if not device_ids:
             return []
 
         interfaces = self._load_interfaces(list(device_ids))
+        neighbours = {x.id: x for x in self._load_neighbours(interfaces)}
+        neighbours_seen = 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())
 
     def _load_devices(self, query: NetboxQuery) -> List[api_models.Device]:
@@ -118,26 +144,65 @@ class NetboxStorageV37(Storage):
             if is_supported(device.device_type.manufacturer.name)
         ]
 
-    def _load_interfaces(self, device_ids: List[int]) -> List[
-        models.Interface]:
-        interfaces = self.netbox.dcim_all_interfaces(device_id=device_ids)
+    def _extend_interfaces(self, interfaces: List[models.Interface]) -> List[models.Interface]:
         extended_ifaces = {
             interface.id: extend_interface(interface, [])
-            for interface in interfaces.results
+            for interface in interfaces
         }
 
         ips = self.netbox.ipam_all_ip_addresses(interface_id=list(extended_ifaces))
+        ip_to_cidrs: Dict[str, str] = {ip.address: str(ip_interface(ip.address).network) for ip in ips.results}
+        prefixes = self.netbox.ipam_all_prefixes(prefix=list(ip_to_cidrs.values()))
+        cidr_to_prefix: Dict[str, models.Prefix] = {x.prefix: x for x in prefixes.results}
+
         for ip in ips.results:
+            cidr = ip_to_cidrs[ip.address]
+            ip = extend_ip_address(ip, prefix=cidr_to_prefix.get(cidr))
             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]:
+        interfaces = self.netbox.dcim_all_interfaces(device_id=device_ids)
+        return self._extend_interfaces(interfaces.results)
+
+    def _load_interfaces_by_id(self, ids: List[int]) -> List[models.Interface]:
+        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,
     ) -> models.NetboxDevice:
         device = self.netbox.dcim_device(obj_id)
-        res = extend_device(device=device, storage=self)
-        res.interfaces = self._load_interfaces([device.id])
+        interfaces = self._load_interfaces([device.id])
+        neighbours = self._load_neighbours(interfaces)
+
+        res = extend_device(
+            device=device,
+            storage=self,
+            interfaces=interfaces[device.id],
+            neighbours=neighbours,
+        )
         return res
 
     def flush_perf(self):

annet/annlib/netdev/views/hardware.py

@@ -61,6 +61,10 @@ class HardwareView(HardwareLeaf):
     def vendor(self) -> Optional[str]:
         return hw_to_vendor(self)
 
+    @property
+    def soft(self) -> str:
+        return self._soft
+
     def __hash__(self):
         return hash(self.model)
 

annet/gen.py

@@ -513,9 +513,11 @@ def worker(device_id, args: ShowGenOptions, stdin, loader: "Loader", filterer: F
             dumped_data = json.dumps(data, indent=4, sort_keys=True, ensure_ascii=False)
             yield (output_driver.entire_config_dest_path(device, path), dumped_data, False)
 
-        has_file_result = new_files or new_file_fragments
-        has_partial_result = new or not has_file_result
-        if device.hw.vendor in platform.VENDOR_REVERSES and has_partial_result:
+        # Consider result of partial run empty and create an empty dest file
+        # only if there are some acl rules that has been matched.
+        # Otherwise treat it as if no supported generators have been found.
+        acl_rules = res.get_acl_rules(args.acl_safe)
+        if device.hw.vendor in platform.VENDOR_REVERSES and acl_rules:
             orderer = patching.Orderer.from_hw(device.hw)
             yield (output_driver.cfg_file_names(device)[0],
                    format_config_blocks(
@@ -606,14 +608,14 @@ def _print_perf(gen_type, perf):
                 (
                     (gen if not method else None),
                     (method or "." * 30),
-                    sum(map(itemgetter("time"), stat)),
-                    (min(map(itemgetter("time"), stat)) if method else None),
-                    (percentile(stat, 0.95, itemgetter("time")) if method else None),
-                    (max(map(itemgetter("time"), stat)) if method else None),
-                    (len(stat) if method else None),
+                    sum(map(itemgetter("time"), stat) if stat else None),
+                    (min(map(itemgetter("time"), stat)) if stat else None),
+                    (percentile(stat, 0.95, itemgetter("time")) if stat else None),
+                    (max(map(itemgetter("time"), stat)) if stat else None),
+                    (len(stat) if stat else None),
                     (len(list(filter(
                                      lambda item: item in ["call", "disk_write"],
-                                     map(itemgetter("op"), stat)))) if method else None),
+                                     map(itemgetter("op"), stat)))) if stat else None),
                 )
 
                 for (gen, gen_perf) in sorted(

annet/generators/__init__.py

@@ -125,9 +125,9 @@ def run_partial_initial(device):
 
 @tracing.function
 def run_partial_generators(
-        gens: List["PartialGenerator"],
-        ref_gens: List["RefGenerator"],
-        run_args: GeneratorPartialRunArgs,
+    gens: List["PartialGenerator"],
+    ref_gens: List["RefGenerator"],
+    run_args: GeneratorPartialRunArgs,
 ):
     logger = get_logger(host=run_args.device.hostname)
     tracing_connector.get().set_device_attributes(tracing_connector.get().get_current_span(), run_args.device)
@@ -151,14 +151,12 @@ def run_partial_generators(
         if not result:
             continue
 
-        config = result.safe_config if run_args.use_acl_safe else result.config
-
-        ref_match = ret.ref_matcher.match(config)
+        ref_match = ret.ref_matcher.match(result.config)
         for ref_gen, groups in ref_match:
             gens.append(ref_gen.with_groups(groups))
             ret.ref_track.add(gen.__class__, ref_gen.__class__)
 
-        ret.ref_track.config(gen.__class__, config)
+        ret.ref_track.config(gen.__class__, result.config)
         ret.add_partial(result)
 
     return ret

{annet-0.13.2.dist-info → annet-0.13.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.13.2
+Version: 0.13.4
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.13.2.dist-info → annet-0.13.4.dist-info}/RECORD

@@ -8,7 +8,7 @@ annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=EaeQ_JeRFuUUHUoR2LXDcNvY7IVg0eA2d6zSmQVJt-M,19216
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=Gl2-6A1ekuz4mDf7SjGAmI8CMoLXoOtjNcgOvY3SoP0,33376
+annet/gen.py,sha256=jlAkT_phlIYrpOIqVc0GrApWp3Y8zr8lyxnZgIdL2F4,33533
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
 annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
 annet/lib.py,sha256=tQQlxZg1A2Q-tp18PoqBuORQmvP5dAAmAPvP6bBA6a0,3764
@@ -27,14 +27,14 @@ annet/adapters/netbox/provider.py,sha256=OM7Hq2vnMHNVBfubJvx2qJlMYm3VvKhomdLMNO8
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/client.py,sha256=-lWZmphD-OPuLIHNKhW_h2bnjrVaiyKYAD_MUPasEbo,2483
 annet/adapters/netbox/common/manufacturer.py,sha256=UH_tEKT3GXC8WSm15q0xxXRE7aj0b0icgwmR--PRWBs,1771
-annet/adapters/netbox/common/models.py,sha256=yHppe8UIc4Ww8UUqXChlfkmqgr96uhsOlvT8NrxvYGA,1917
+annet/adapters/netbox/common/models.py,sha256=rmFQ93NUCnFM-p58aS4sjiOaTuYR0Xz65soiW7IQfDk,2516
 annet/adapters/netbox/common/query.py,sha256=OgUuF-bvshpoBUkrOs0tsMUAhjTsttzx3VV30ryFl0Y,577
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
 annet/adapters/netbox/common/storage_opts.py,sha256=rl_0pr3VzmOy6PDZIUMkKSBfJh90gD9TFL3yBhK_8ME,337
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/v24/storage.py,sha256=uDcAuabORu8ag3OXDHXKDK469Pd-kNXpUI_Cg-hgW_k,5919
 annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/v37/storage.py,sha256=ZL8ebQAMWfRUJWmMbEODq41KlIDhAqV6P--2hH3APJM,4525
+annet/adapters/netbox/v37/storage.py,sha256=9CxLr2tMWvGA1BLtjd5TTp2qEUQ_aYJq0eZSe-S242E,7372
 annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
 annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=UPt3kYFQdQdVVy3ePYzNHPAxMVmHxCrCnZnMCV6ou2Q,4587
@@ -52,7 +52,7 @@ annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm
 annet/annlib/netdev/devdb/data/devdb.json,sha256=NldGS8_whScc7eC_CZPEDB9AoxtfvK_51oJVFIu0Tlo,5072
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=XJ6UO6sYSO5pIoe5R4eTQmKwx0_JJ71_h8QSYAURtyk,4184
-annet/annlib/netdev/views/hardware.py,sha256=FtYlN5MWjCPn-GkDdIQrGO5mDrVYbbY8g_T7bNmfFPk,3256
+annet/annlib/netdev/views/hardware.py,sha256=o-w-k1bOORWwEnSGsDq-9Q_oIeH3yQv9eiCJn_UgG-Y,3324
 annet/annlib/rbparser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rbparser/acl.py,sha256=RR8yPt6t96_IiyuKVbeZ-3x32cyhBAT2wC1y99oWBO8,3931
 annet/annlib/rbparser/deploying.py,sha256=ACT8QNhDAhJx3ZKuGh2nYBOrpdka2qEKuLDxvQAGKLk,1649
@@ -64,7 +64,7 @@ annet/annlib/rulebook/common.py,sha256=9kCZwZpsH5UliF2OzaN9nLs2eLlz_d__4L7_oZ3Sr
 annet/api/__init__.py,sha256=vwmyZK_iCdAjlJ0jS5CXSroDAZFzGe3JiXL-WoZiovU,33154
 annet/configs/context.yml,sha256=nt4QnzYzrG2hqmaWOUsab2wgFl-CXmFSzbto6rqqFt4,291
 annet/configs/logging.yaml,sha256=Hu42lRK248dssp9TgkbHCaZNl0E6f4IChGb0XaQnTVo,970
-annet/generators/__init__.py,sha256=tk20umBuMEcd8QKET3mxJQsDj-dvjlwGnrlgTw0wbRY,15622
+annet/generators/__init__.py,sha256=ACMH9UQ4I3uq2b8nDzOn2dgYxreDq4_3ojOGwht0-No,15543
 annet/generators/base.py,sha256=rgQLcQBPZm4ecbKmRhVOpBR-GFJAiVfdb_y5f2-LUR8,3670
 annet/generators/entire.py,sha256=7WySkVaXNT3ZAiHcQ0JUKdlhGJAN8cNUxF6c7ilYnO8,2928
 annet/generators/exceptions.py,sha256=GPXTBgn2xZ3Ev_bdOPlfCLGRC1kQHe_dEq88S-uyi5s,151
@@ -124,10 +124,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
 annet_generators/example/lldp.py,sha256=68CLrK7vxTQQy9XIBxtywuEdBNlIlfXGYj8_wYWs5UI,1146
-annet-0.13.2.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.13.2.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.13.2.dist-info/METADATA,sha256=YBUO24OLpM9o_u1-a6cJVcwPpqHyi8q_MVKx7Vt5Xss,694
-annet-0.13.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-annet-0.13.2.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.13.2.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.13.2.dist-info/RECORD,,
+annet-0.13.4.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.13.4.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.13.4.dist-info/METADATA,sha256=Ug49vbZb6q3AP41fId0L8o2hCst2KTJ9V4l2MgYF2rA,694
+annet-0.13.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+annet-0.13.4.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.13.4.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.13.4.dist-info/RECORD,,