annet 0.12.10__tar.gz → 0.13.1__tar.gz

{annet-0.12.10/annet.egg-info → annet-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.12.10
+Version: 0.13.1
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -21,5 +21,6 @@ Requires-Dist: contextlog>=1.1
 Requires-Dist: valkit>=0.1.4
 Requires-Dist: aiohttp>=3.8.4
 Requires-Dist: yarl>=1.8.2
-Requires-Dist: adaptix==3.0.0b2
+Requires-Dist: adaptix==3.0.0b5
 Requires-Dist: dataclass-rest==0.4
+Requires-Dist: annetbox[sync]>=0.1.0

{annet-0.12.10 → annet-0.13.1}/annet/adapters/netbox/v24/storage.py

@@ -1,6 +1,9 @@
 from logging import getLogger
 from typing import Optional, List, Union
 
+from annetbox.v24 import models as api_models
+from annetbox.v24.client_sync import NetboxV24
+
 from annet.adapters.netbox.common import models
 from annet.adapters.netbox.common.manufacturer import (
     is_supported, get_hw, get_breed,
@@ -8,8 +11,6 @@ from annet.adapters.netbox.common.manufacturer import (
 from annet.adapters.netbox.common.query import NetboxQuery
 from annet.adapters.netbox.common.storage_opts import NetboxStorageOpts
 from annet.storage import Storage
-from . import api_models
-from .client import NetboxV24
 
 logger = getLogger(__name__)
 
@@ -156,20 +157,20 @@ class NetboxStorageV24(Storage):
             return []
         return [
             device
-            for device in self.netbox.all_devices().results
+            for device in self.netbox.dcim_all_devices().results
             if _match_query(query, device)
             if is_supported(device.device_type.manufacturer.name)
         ]
 
     def _load_interfaces(self, device_ids: List[int]) -> List[
         models.Interface]:
-        interfaces = self.netbox.all_interfaces(device_id=device_ids)
+        interfaces = self.netbox.dcim_all_interfaces(device_id=device_ids)
         extended_ifaces = {
             interface.id: extend_interface(interface)
             for interface in interfaces.results
         }
 
-        ips = self.netbox.all_ip_addresses(interface_id=list(extended_ifaces))
+        ips = self.netbox.ipam_all_ip_addresses(interface_id=list(extended_ifaces))
         for ip in ips.results:
             extended_ip = extend_ip(ip)
             interface = extended_ifaces[extended_ip.assigned_object_id]
@@ -180,7 +181,7 @@ class NetboxStorageV24(Storage):
             self, obj_id, preload_neighbors=False, use_mesh=None,
             **kwargs,
     ) -> models.NetboxDevice:
-        device = self.netbox.get_device(obj_id)
+        device = self.netbox.dcim_device(obj_id)
         res = extend_device(device=device, storage=self)
         res.interfaces = self._load_interfaces([device.id])
         return res

{annet-0.12.10 → annet-0.13.1}/annet/adapters/netbox/v37/storage.py

@@ -3,6 +3,8 @@ from typing import Optional, List, Union
 
 from adaptix import P
 from adaptix.conversion import impl_converter, link
+from annetbox.v37 import models as api_models
+from annetbox.v37.client_sync import NetboxV37
 
 from annet.adapters.netbox.common import models
 from annet.adapters.netbox.common.manufacturer import (
@@ -12,8 +14,7 @@ from annet.adapters.netbox.common.query import NetboxQuery
 from annet.adapters.netbox.common.storage_opts import NetboxStorageOpts
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.storage import Storage
-from . import api_models
-from .client import NetboxV37
+
 
 logger = getLogger(__name__)
 
@@ -54,7 +55,8 @@ def extend_device(
 
 @impl_converter
 def extend_interface(
-        interface: api_models.Interface, ip_addresses: List[models.IpAddress],
+        interface: api_models.Interface,
+        ip_addresses: List[models.IpAddress],
 ) -> models.Interface:
     ...
 
@@ -109,7 +111,7 @@ class NetboxStorageV37(Storage):
             return []
         return [
             device
-            for device in self.netbox.all_devices(
+            for device in self.netbox.dcim_all_devices(
                 name__ic=query.globs,
             ).results
             if _match_query(query, device)
@@ -118,13 +120,13 @@ class NetboxStorageV37(Storage):
 
     def _load_interfaces(self, device_ids: List[int]) -> List[
         models.Interface]:
-        interfaces = self.netbox.all_interfaces(device_id=device_ids)
+        interfaces = self.netbox.dcim_all_interfaces(device_id=device_ids)
         extended_ifaces = {
             interface.id: extend_interface(interface, [])
             for interface in interfaces.results
         }
 
-        ips = self.netbox.all_ip_addresses(interface_id=list(extended_ifaces))
+        ips = self.netbox.ipam_all_ip_addresses(interface_id=list(extended_ifaces))
         for ip in ips.results:
             extended_ifaces[ip.assigned_object_id].ip_addresses.append(ip)
         return list(extended_ifaces.values())
@@ -133,7 +135,7 @@ class NetboxStorageV37(Storage):
             self, obj_id, preload_neighbors=False, use_mesh=None,
             **kwargs,
     ) -> models.NetboxDevice:
-        device = self.netbox.get_device(obj_id)
+        device = self.netbox.dcim_device(obj_id)
         res = extend_device(device=device, storage=self)
         res.interfaces = self._load_interfaces([device.id])
         return res

{annet-0.12.10 → annet-0.13.1}/annet/annlib/netdev/devdb/data/devdb.json

@@ -98,7 +98,7 @@
 
     "PC": "^(PC|pc|[Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Mm]oxa|[Aa]sterfusion CX)",
 
-    "PC.Whitebox": "([Mm]ellanox SN|[Ee]dge-?[Cc]ore)",
+    "PC.Whitebox": "([Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Aa]sterfusion CX)",
     "PC.Whitebox.Mellanox": "[Mm]ellanox",
     "PC.Whitebox.Mellanox.SN": " SN",
     "PC.Whitebox.Mellanox.SN.SN2100": " SN2100",

{annet-0.12.10 → annet-0.13.1}/annet/annlib/netdev/views/hardware.py

@@ -89,6 +89,8 @@ def hw_to_vendor(hw: HardwareView) -> Optional[str]:
         return "aruba"
     elif hw.Ribbon:
         return "ribbon"
+    elif hw.H3C:
+        return "h3c"
     return None
 
 
@@ -106,6 +108,7 @@ def vendor_to_hw(vendor):
             "aruba": "Aruba",
             "routeros": "RouterOS",
             "ribbon": "Ribbon",
+            "h3c": "H3C",
         }.get(vendor.lower(), vendor),
         None,
     )

{annet-0.12.10 → annet-0.13.1/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.12.10
+Version: 0.13.1
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -21,5 +21,6 @@ Requires-Dist: contextlog>=1.1
 Requires-Dist: valkit>=0.1.4
 Requires-Dist: aiohttp>=3.8.4
 Requires-Dist: yarl>=1.8.2
-Requires-Dist: adaptix==3.0.0b2
+Requires-Dist: adaptix==3.0.0b5
 Requires-Dist: dataclass-rest==0.4
+Requires-Dist: annetbox[sync]>=0.1.0

{annet-0.12.10 → annet-0.13.1}/annet.egg-info/SOURCES.txt

@@ -44,12 +44,8 @@ annet/adapters/netbox/common/query.py
 annet/adapters/netbox/common/status_client.py
 annet/adapters/netbox/common/storage_opts.py
 annet/adapters/netbox/v24/__init__.py
-annet/adapters/netbox/v24/api_models.py
-annet/adapters/netbox/v24/client.py
 annet/adapters/netbox/v24/storage.py
 annet/adapters/netbox/v37/__init__.py
-annet/adapters/netbox/v37/api_models.py
-annet/adapters/netbox/v37/client.py
 annet/adapters/netbox/v37/storage.py
 annet/annlib/__init__.py
 annet/annlib/command.py

{annet-0.12.10 → annet-0.13.1}/annet.egg-info/requires.txt

@@ -12,5 +12,6 @@ contextlog>=1.1
 valkit>=0.1.4
 aiohttp>=3.8.4
 yarl>=1.8.2
-adaptix==3.0.0b2
+adaptix==3.0.0b5
 dataclass-rest==0.4
+annetbox[sync]>=0.1.0

{annet-0.12.10 → annet-0.13.1}/requirements.txt

@@ -12,5 +12,6 @@ contextlog>=1.1
 valkit>=0.1.4
 aiohttp>=3.8.4
 yarl>=1.8.2
-adaptix==3.0.0b2
+adaptix==3.0.0b5
 dataclass-rest==0.4
+annetbox[sync]>=0.1.0

annet-0.12.10/annet/adapters/netbox/v24/api_models.py

@@ -1,73 +0,0 @@
-from dataclasses import dataclass
-from datetime import datetime
-from typing import List, Optional, Any, Dict
-
-from annet.adapters.netbox.common.models import Entity, DeviceType
-
-
-@dataclass
-class Label:
-    value: int
-    label: str
-
-
-@dataclass
-class DeviceIp:
-    id: int
-    address: str
-    family: int
-
-
-@dataclass
-class Device(Entity):
-    url: str
-    display_name: str
-    device_type: DeviceType
-    device_role: Entity
-    tenant: Optional[Entity]
-    platform: Optional[Entity]
-    serial: str
-    asset_tag: Optional[str]
-    site: Entity
-    rack: Optional[Entity]
-    position: Optional[float]
-    face: Optional[Label]
-    status: Label
-    primary_ip: Optional[DeviceIp]
-    primary_ip4: Optional[DeviceIp]
-    primary_ip6: Optional[DeviceIp]
-    tags: List[str]
-    custom_fields: Dict[str, Any]
-    created: datetime
-    last_updated: datetime
-
-
-@dataclass
-class Interface(Entity):
-    device: Entity
-    enabled: bool
-
-
-@dataclass
-class Vrf(Entity):
-    rd: str
-
-
-@dataclass
-class IpAddress:
-    id: int
-    family: int
-    address: str
-    vrf: Optional[Vrf]
-    tenant: Any  # ???
-    status: Label
-    description: Optional[str]
-    custom_fields: Dict[str, Any]
-    tags: List[str]
-    created: datetime
-    last_updated: datetime
-
-    interface: Entity
-
-    nat_inside: Any  # ???
-    nat_outside: Any  # ???

annet-0.12.10/annet/adapters/netbox/v24/client.py

@@ -1,59 +0,0 @@
-from datetime import datetime
-from typing import List, Optional
-
-import dateutil.parser
-from adaptix import Retort, loader
-from dataclass_rest import get
-
-from annet.adapters.netbox.common.client import (
-    BaseNetboxClient, collect, PagingResponse,
-)
-from .api_models import Device, Interface, IpAddress
-
-
-class NetboxV24(BaseNetboxClient):
-    def _init_response_body_factory(self) -> Retort:
-        return Retort(recipe=[
-            loader(datetime, dateutil.parser.parse)
-        ])
-
-    @get("dcim/interfaces")
-    def interfaces(
-            self,
-            device_id: Optional[List[int]] = None,
-            limit: int = 20,
-            offset: int = 0,
-    ) -> PagingResponse[Interface]:
-        pass
-
-    all_interfaces = collect(interfaces, field="device_id")
-
-    @get("ipam/ip-addresses")
-    def ip_addresses(
-            self,
-            interface_id: Optional[List[int]] = None,
-            limit: int = 20,
-            offset: int = 0,
-    ) -> PagingResponse[IpAddress]:
-        pass
-
-    all_ip_addresses = collect(ip_addresses, field="interface_id")
-
-    @get("dcim/devices")
-    def devices(
-            self,
-            name: Optional[List[str]] = None,
-            tag: Optional[str] = None,
-            limit: int = 20,
-            offset: int = 0,
-    ) -> PagingResponse[Device]:
-        pass
-
-    all_devices = collect(devices)
-
-    @get("dcim/devices/{device_id}")
-    def get_device(
-            self,
-            device_id: int,
-    ) -> Device:
-        pass

annet-0.12.10/annet/adapters/netbox/v37/api_models.py

@@ -1,38 +0,0 @@
-from dataclasses import dataclass
-from datetime import datetime
-from typing import List, Optional, Any, Dict
-
-from annet.adapters.netbox.common.models import (
-    Entity, Label, DeviceType, DeviceIp,
-)
-
-
-@dataclass
-class Interface(Entity):
-    device: Entity
-    enabled: bool
-    display: str = ""  # added in 3.x
-
-
-@dataclass
-class Device(Entity):
-    url: str
-    display: str  # renamed in 3.x from display_name
-    device_type: DeviceType
-    device_role: Entity
-    tenant: Optional[Entity]
-    platform: Optional[Entity]
-    serial: str
-    asset_tag: Optional[str]
-    site: Entity
-    rack: Optional[Entity]
-    position: Optional[float]
-    face: Optional[Label]
-    status: Label
-    primary_ip: Optional[DeviceIp]
-    primary_ip4: Optional[DeviceIp]
-    primary_ip6: Optional[DeviceIp]
-    tags: List[Entity]
-    custom_fields: Dict[str, Any]
-    created: datetime
-    last_updated: datetime

annet-0.12.10/annet/adapters/netbox/v37/client.py

@@ -1,62 +0,0 @@
-from datetime import datetime
-from typing import List, Optional
-
-import dateutil.parser
-from adaptix import Retort, loader
-from dataclass_rest import get
-from dataclass_rest.client_protocol import FactoryProtocol
-
-from annet.adapters.netbox.common.client import (
-    BaseNetboxClient, collect, PagingResponse,
-)
-from annet.adapters.netbox.common.models import IpAddress
-from .api_models import Device, Interface
-
-
-class NetboxV37(BaseNetboxClient):
-    def _init_response_body_factory(self) -> FactoryProtocol:
-        return Retort(recipe=[
-            loader(datetime, dateutil.parser.parse)
-        ])
-
-    @get("dcim/interfaces")
-    def interfaces(
-            self,
-            device_id: Optional[List[int]] = None,
-            limit: int = 20,
-            offset: int = 0,
-    ) -> PagingResponse[Interface]:
-        pass
-
-    all_interfaces = collect(interfaces, field="device_id")
-
-    @get("ipam/ip-addresses")
-    def ip_addresses(
-            self,
-            interface_id: Optional[List[int]] = None,
-            limit: int = 20,
-            offset: int = 0,
-    ) -> PagingResponse[IpAddress]:
-        pass
-
-    all_ip_addresses = collect(ip_addresses, field="interface_id")
-
-    @get("dcim/devices")
-    def devices(
-            self,
-            name: Optional[List[str]] = None,
-            name__ic: Optional[List[str]] = None,
-            tag: Optional[List[str]] = None,
-            limit: int = 20,
-            offset: int = 0,
-    ) -> PagingResponse[Device]:
-        pass
-
-    all_devices = collect(devices)
-
-    @get("dcim/devices/{device_id}")
-    def get_device(
-            self,
-            device_id: int,
-    ) -> Device:
-        pass