annet 0.10__tar.gz → 0.12__tar.gz

{annet-0.10/annet.egg-info → annet-0.12}/PKG-INFO

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

{annet-0.10 → annet-0.12}/annet/adapters/netbox/common/models.py

@@ -1,8 +1,9 @@
 from dataclasses import dataclass, field
 from datetime import datetime
-from typing import List, Optional, Any
+from typing import List, Optional, Any, Dict
 
 from annet.annlib.netdev.views.hardware import HardwareView
+from annet.storage import Storage
 
 
 @dataclass
@@ -61,6 +62,8 @@ class Interface(Entity):
 
 @dataclass
 class NetboxDevice(Entity):
+    url: str
+    storage: Storage
     neighbours_ids: List[int]
 
     display: str
@@ -79,7 +82,7 @@ class NetboxDevice(Entity):
     primary_ip4: Optional[DeviceIp]
     primary_ip6: Optional[DeviceIp]
     tags: List[Entity]
-    custom_fields: dict[str, Any]
+    custom_fields: Dict[str, Any]
     created: datetime
     last_updated: datetime
 
@@ -91,8 +94,12 @@ class NetboxDevice(Entity):
     interfaces: List[Interface]
 
     # compat
+
     def __hash__(self):
-        return hash(self.id)
+        return hash((self.id, type(self)))
+
+    def __eq__(self, other):
+        return type(self) is type(other) and self.url == other.url
 
     def is_pc(self):
         return self.device_type.manufacturer.name == "Mellanox"

{annet-0.10 → annet-0.12}/annet/adapters/netbox/common/status_client.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import Dict
 
 from adaptix import Retort, name_mapping, NameStyle
 from dataclass_rest import get
@@ -10,7 +11,7 @@ from .client import BaseNetboxClient
 @dataclass
 class Status:
     netbox_version: str
-    plugins: dict[str, str]
+    plugins: Dict[str, str]
 
 
 class NetboxStatusClient(BaseNetboxClient):

{annet-0.10 → annet-0.12}/annet/adapters/netbox/v24/api_models.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import List, Optional, Any
+from typing import List, Optional, Any, Dict
 
 from annet.adapters.netbox.common.models import Entity, DeviceType
 
@@ -20,6 +20,7 @@ class DeviceIp:
 
 @dataclass
 class Device(Entity):
+    url: str
     display_name: str
     device_type: DeviceType
     device_role: Entity
@@ -36,7 +37,7 @@ class Device(Entity):
     primary_ip4: Optional[DeviceIp]
     primary_ip6: Optional[DeviceIp]
     tags: List[str]
-    custom_fields: dict[str, Any]
+    custom_fields: Dict[str, Any]
     created: datetime
     last_updated: datetime
 
@@ -61,7 +62,7 @@ class IpAddress:
     tenant: Any  # ???
     status: Label
     description: Optional[str]
-    custom_fields: dict[str, Any]
+    custom_fields: Dict[str, Any]
     tags: List[str]
     created: datetime
     last_updated: datetime

{annet-0.10 → annet-0.12}/annet/adapters/netbox/v24/storage.py

@@ -1,5 +1,5 @@
 from logging import getLogger
-from typing import Optional, List
+from typing import Optional, List, Union
 
 from annet.adapters.netbox.common import models
 from annet.adapters.netbox.common.manufacturer import (
@@ -39,12 +39,13 @@ def extend_label(
 
 
 def extend_device(
-        device: api_models.Device,
+        device: api_models.Device, storage: Storage,
 ) -> models.NetboxDevice:
     manufacturer = device.device_type.manufacturer.name
     model = device.device_type.model
 
     return models.NetboxDevice(
+        url=device.url,
         id=device.id,
         name=device.name,
         display=device.display_name,
@@ -73,6 +74,7 @@ def extend_device(
         breed=get_breed(manufacturer, model),
         interfaces=[],
         neighbours_ids=[],
+        storage=storage,
     )
 
 
@@ -129,14 +131,16 @@ class NetboxStorageV24(Storage):
 
     def make_devices(
             self,
-            query: NetboxQuery,
+            query: Union[NetboxQuery, list],
             preload_neighbors=False,
             use_mesh=None,
             preload_extra_fields=False,
             **kwargs,
-    ) -> list[models.NetboxDevice]:
+    ) -> List[models.NetboxDevice]:
+        if isinstance(query, list):
+            query = NetboxQuery.new(query)
         device_ids = {
-            device.id: extend_device(device=device)
+            device.id: extend_device(device=device, storage=self)
             for device in self._load_devices(query)
         }
         if not device_ids:
@@ -148,6 +152,8 @@ class NetboxStorageV24(Storage):
         return list(device_ids.values())
 
     def _load_devices(self, query: NetboxQuery) -> List[api_models.Device]:
+        if not query.globs:
+            return []
         return [
             device
             for device in self.netbox.all_devices().results
@@ -175,7 +181,7 @@ class NetboxStorageV24(Storage):
             **kwargs,
     ) -> models.NetboxDevice:
         device = self.netbox.get_device(obj_id)
-        res = extend_device(device=device)
+        res = extend_device(device=device, storage=self)
         res.interfaces = self._load_interfaces([device.id])
         return res
 

{annet-0.10 → annet-0.12}/annet/adapters/netbox/v37/api_models.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import List, Optional, Any
+from typing import List, Optional, Any, Dict
 
 from annet.adapters.netbox.common.models import (
     Entity, Label, DeviceType, DeviceIp,
@@ -16,6 +16,7 @@ class Interface(Entity):
 
 @dataclass
 class Device(Entity):
+    url: str
     display: str  # renamed in 3.x from display_name
     device_type: DeviceType
     device_role: Entity
@@ -32,6 +33,6 @@ class Device(Entity):
     primary_ip4: Optional[DeviceIp]
     primary_ip6: Optional[DeviceIp]
     tags: List[Entity]
-    custom_fields: dict[str, Any]
+    custom_fields: Dict[str, Any]
     created: datetime
     last_updated: datetime

{annet-0.10 → annet-0.12}/annet/adapters/netbox/v37/storage.py

@@ -1,5 +1,5 @@
 from logging import getLogger
-from typing import Optional, List
+from typing import Optional, List, Union
 
 from adaptix import P
 from adaptix.conversion import impl_converter, link
@@ -27,13 +27,14 @@ def extend_device_base(
         interfaces: List[models.Interface],
         hw: Optional[HardwareView],
         breed: str,
+        storage: Storage,
         neighbours_ids: List[int],
 ) -> models.NetboxDevice:
     ...
 
 
 def extend_device(
-        device: api_models.Device,
+        device: api_models.Device, storage: Storage,
 ) -> models.NetboxDevice:
     return extend_device_base(
         device=device,
@@ -47,6 +48,7 @@ def extend_device(
             device.device_type.model,
         ),
         neighbours_ids=[],
+        storage=storage,
     )
 
 
@@ -82,14 +84,16 @@ class NetboxStorageV37(Storage):
 
     def make_devices(
             self,
-            query: NetboxQuery,
+            query: Union[NetboxQuery, list],
             preload_neighbors=False,
             use_mesh=None,
             preload_extra_fields=False,
             **kwargs,
     ) -> List[models.NetboxDevice]:
+        if isinstance(query, list):
+            query = NetboxQuery.new(query)
         device_ids = {
-            device.id: extend_device(device=device)
+            device.id: extend_device(device=device, storage=self)
             for device in self._load_devices(query)
         }
         if not device_ids:
@@ -101,6 +105,8 @@ class NetboxStorageV37(Storage):
         return list(device_ids.values())
 
     def _load_devices(self, query: NetboxQuery) -> List[api_models.Device]:
+        if not query.globs:
+            return []
         return [
             device
             for device in self.netbox.all_devices(
@@ -128,7 +134,7 @@ class NetboxStorageV37(Storage):
             **kwargs,
     ) -> models.NetboxDevice:
         device = self.netbox.get_device(obj_id)
-        res = extend_device(device=device)
+        res = extend_device(device=device, storage=self)
         res.interfaces = self._load_interfaces([device.id])
         return res
 

{annet-0.10 → annet-0.12}/annet/annlib/jsontools.py

@@ -92,7 +92,11 @@ def apply_patch(content: Optional[bytes], patch_bytes: bytes) -> bytes:
 def apply_acl_filters(content: Dict[str, Any], filters: List[str]) -> Dict[str, Any]:
     result = {}
     for f in filters:
-        pointer = jsonpointer.JsonPointer(f)
+        filter_text = f.strip()
+        if not filter_text:
+            continue
+
+        pointer = jsonpointer.JsonPointer(filter_text)
 
         try:
             part = pointer.get(copy.deepcopy(content))
@@ -103,7 +107,7 @@ def apply_acl_filters(content: Dict[str, Any], filters: List[str]) -> Dict[str,
                     sub_tree[i] = {}
                 sub_tree = sub_tree[i]
 
-            patch = jsonpatch.JsonPatch([{"op": "add", "path": f, "value": part}])
+            patch = jsonpatch.JsonPatch([{"op": "add", "path": filter_text, "value": part}])
             result = patch.apply(result)
         except jsonpointer.JsonPointerException:
             # no value found in content by the pointer, skip the ACL item