annet 0.14.3__py3-none-any.whl → 0.14.5__py3-none-any.whl

annet/adapters/netbox/common/storage_opts.py

@@ -1,4 +1,5 @@
 import os
+from typing import Any
 
 
 class NetboxStorageOpts:
@@ -7,7 +8,7 @@ class NetboxStorageOpts:
         self.token = token
 
     @classmethod
-    def from_cli_opts(cls, cli_opts):
+    def parse_params(cls, conf_params: dict[str, str] | None, cli_opts: Any):
         return cls(
             url=os.getenv("NETBOX_URL", "http://localhost"),
             token=os.getenv("NETBOX_TOKEN", "").strip(),

annet/adapters/netbox/provider.py

@@ -32,3 +32,6 @@ class NetboxProvider(StorageProvider):
 
     def query(self):
         return NetboxQuery
+
+    def name(self) -> str:
+        return "netbox"

annet/adapters/netbox/v37/storage.py

@@ -4,7 +4,7 @@ from ipaddress import ip_interface
 from collections import defaultdict
 
 from adaptix import P
-from adaptix.conversion import impl_converter, link
+from adaptix.conversion import impl_converter, link, link_constant
 from annetbox.v37 import models as api_models
 from annetbox.v37.client_sync import NetboxV37
 
@@ -24,13 +24,13 @@ 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,
         interfaces: List[models.Interface],
         hw: Optional[HardwareView],
         breed: str,
-        neighbours: Optional[List[models.NetboxDevice]],
         storage: Storage,
 ) -> models.NetboxDevice:
     ...
@@ -45,7 +45,7 @@ def extend_device(
     platform_name: str = ""
     if device.platform:
         platform_name = device.platform.name
-    return extend_device_base(
+    res = extend_device_base(
         device=device,
         interfaces=interfaces,
         breed=get_breed(
@@ -57,9 +57,10 @@ def extend_device(
             device.device_type.model,
             platform_name,
         ),
-        neighbours=neighbours,
         storage=storage,
     )
+    res.neighbours = neighbours
+    return res
 
 
 @impl_converter

annet/annlib/netdev/devdb/data/devdb.json

@@ -52,6 +52,8 @@
     "Huawei.CE.CE8800.CE8850": " CE8850",
     "Huawei.CE.CE8800.CE8851": " CE8851",
     "Huawei.CE.CE9800": " CE98\\d\\d",
+    "Huawei.DC": " DC\\d+",
+    "Huawei.DC.DC908": " DC908",
     "Huawei.Quidway": " S\\d+",
     "Huawei.Quidway.S2x": " S2\\d{3}",
     "Huawei.Quidway.S2x.S2300": " S23\\d\\d",
@@ -129,6 +131,10 @@
     "Aruba.AP.AP500": " AP-5\\d\\d",
     "Aruba.AP.AP500.AP514": " AP-514",
     "Aruba.AP.AP500.AP515": " AP-515",
+    "Aruba.AP.AP600": " AP-6\\d\\d",
+    "Aruba.AP.AP600.AP615": " AP-615",
+    "Aruba.AP.AP600.AP635": " AP-635",
+    "Aruba.AP.AP600.AP655": " AP-655",
     "Aruba.AP.IAP": " IAP-",
     "Aruba.AP.IAP.IAP300": " IAP-3\\d\\d",
     "Aruba.AP.IAP.IAP300.IAP304": " IAP-304",

annet/api/__init__.py

@@ -45,7 +45,7 @@ from annet.output import (
 )
 from annet.parallel import Parallel, TaskResult
 from annet.reference import RefTracker
-from annet.storage import Device, storage_connector
+from annet.storage import Device, get_storage
 from annet.types import Diff, ExitCode, OldNewResult, Op, PCDiff, PCDiffFile
 
 
@@ -218,8 +218,8 @@ def log_host_progress_cb(pool: Parallel, task_result: TaskResult):
         stacklevel=2,
     )
     args = cast(cli_args.QueryOptions, pool.args[0])
-    connector = storage_connector.get()
-    storage_opts = connector.opts().from_cli_opts(args)
+    connector, connector_opts = get_storage()
+    storage_opts = connector.opts().parse_params(connector_opts, args)
     with connector.storage()(storage_opts) as storage:
         fqdns = storage.resolve_fdnds_by_query(args.query)
     PoolProgressLogger(device_fqdns=fqdns)(pool, task_result)

annet/cli.py

@@ -19,7 +19,7 @@ from annet.diff import gen_sort_diff
 from annet.gen import Loader, old_raw
 from annet.lib import get_context_path, repair_context_file
 from annet.output import output_driver_connector, OutputDriver
-from annet.storage import storage_connector
+from annet.storage import get_storage
 
 
 def fill_base_args(parser: ArgParser, pkg_name: str, logging_config: str):
@@ -62,12 +62,11 @@ def _gen_current_items(
 @contextmanager
 def get_loader(gen_args: cli_args.GenOptions, args: cli_args.QueryOptions):
     exit_stack = ExitStack()
-    connectors = storage_connector.get_all()
     storages = []
     with exit_stack:
-        for connector in connectors:
-            storage_opts = connector.opts().from_cli_opts(args)
-            storages.append(exit_stack.enter_context(connector.storage()(storage_opts)))
+        connector, connector_opts = get_storage()
+        storage_opts = connector.opts().parse_params(connector_opts, args)
+        storages.append(exit_stack.enter_context(connector.storage()(storage_opts)))
         yield Loader(*storages, args=gen_args)
 
 

annet/cli_args.py

@@ -10,7 +10,7 @@ from valkit.common import valid_string_list
 
 from annet.argparse import Arg, ArgGroup, DefaultFromEnv
 from annet.hardware import hardware_connector
-from annet.storage import Query, storage_connector
+from annet.storage import Query, get_storage
 
 
 # ====
@@ -361,14 +361,9 @@ class QueryOptionsBase(CacheOptions):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if not isinstance(self.query, Query):
-            connectors = storage_connector.get_all()
-            if not connectors:
-                pass
-            elif len(connectors) == 1:
-                query_type = connectors[0].query()
-                self.query = query_type.new(self.query, hosts_range=self.hosts_range)
-            else:
-                logging.warning("Multiple connectors found, skip parsing query")
+            storage, _ = get_storage()
+            query_type = storage.query()
+            self.query = query_type.new(self.query, hosts_range=self.hosts_range)
 
 
 class QueryOptions(QueryOptionsBase):

annet/configs/context.yml

@@ -10,9 +10,16 @@ generators:
   default:
     - annet_generators.example
 
+storage:
+  default:
+    adapter: annet.adapters.file.provider
+    params:
+      path: /path/to/file
+
 context:
   default:
     connection: default
     generators: default
+    storage: default
 
 selected_context: default

annet/connectors.py

@@ -3,6 +3,7 @@ from abc import ABC
 from functools import cached_property
 from importlib.metadata import entry_points
 from typing import Generic, Optional, Type, TypeVar, List
+from annet.lib import get_context
 
 T = TypeVar("T")
 
@@ -33,7 +34,7 @@ class Connector(ABC, Generic[T]):
         res = self._classes[0]
         return res(*args, **kwargs)
 
-    def get_all(self, *args, **kwargs) -> T:
+    def get_all(self, *args, **kwargs) -> list[T]:
         if self._classes is None:
             self._classes = self._entry_point or [self._get_default()]
 

annet/storage.py

@@ -1,10 +1,6 @@
 import abc
 from typing import Any, Iterable, Optional, Type, Union, Protocol
-
-try:
-    from annet.connectors import Connector
-except ImportError:
-    from noc.annushka.annet.connectors import Connector  # noqa: F401
+from annet.connectors import Connector, get_context
 
 
 class _StorageConnector(Connector["StorageProvider"]):
@@ -28,6 +24,10 @@ class StorageProvider(abc.ABC):
     def query(self) -> Type["Query"]:
         pass
 
+    @abc.abstractmethod
+    def name(self) -> str:
+        pass
+
 
 class Storage(abc.ABC):
     @abc.abstractmethod
@@ -69,7 +69,7 @@ class Storage(abc.ABC):
 class StorageOpts(abc.ABC):
     @classmethod
     @abc.abstractmethod
-    def from_cli_opts(cls, cli_opts) -> "StorageOpts":
+    def parse_params(cls, conf_params: dict[str, str] | None, cli_opts: Any):
         pass
 
 
@@ -123,3 +123,20 @@ class Device(Protocol):
     @abc.abstractmethod
     def breed(self):
         pass
+
+
+def get_storage() -> (Storage, dict[str, Any]):
+    connectors = storage_connector.get_all()
+    seen: list[str] = []
+    if context_storage := get_context().get("storage"):
+        for connector in connectors:
+            con_name = connector.name()
+            seen.append(con_name)
+            if "adapter" not in context_storage:
+                raise Exception("adapter is not set in %s" % context_storage)
+            if context_storage["adapter"] == con_name:
+                return connector, context_storage.get("params", {})
+        else:
+            raise Exception("unknown storage %s: seen %s" % (context_storage["adapter"], seen))
+    else:
+        return connectors[0], {}

{annet-0.14.3.dist-info → annet-0.14.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.14.3
+Version: 0.14.5
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -21,6 +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.0b5
+Requires-Dist: adaptix ==3.0.0b7
 Requires-Dist: dataclass-rest ==0.4
 

{annet-0.14.3.dist-info → annet-0.14.5.dist-info}/RECORD

@@ -1,9 +1,9 @@
 annet/__init__.py,sha256=oyElxAW97sHgQccGafhaWVBveBn1gSjjdP_xHROaRLg,2139
 annet/annet.py,sha256=TMdEuM7GJQ4TjRVmuK3bCTZN-21lxjQ9sXqEdILUuBk,725
 annet/argparse.py,sha256=MoBD0LPnHdA6HU7z1uQNArYlkD92znoeGIFTMnS4dRM,12608
-annet/cli.py,sha256=Nk956O3nOEVsOLyOqKDgjqJaB2uVlwYb9tPrWMbB4E4,9632
-annet/cli_args.py,sha256=5sCD20ls18NDASPOHT5MbAFB10gyayGcFosKaJTLDps,16047
-annet/connectors.py,sha256=FLFJlhb73g2c8e61zYnGn8dTkIiaaWYqeUCsZd48AWg,2471
+annet/cli.py,sha256=MxdH5m4r2MfXYwCbgSDUqjSibxw7VzSg7_hsB47RWnw,9601
+annet/cli_args.py,sha256=1RZ_Sy5oSiiUNzf4FIefvUa_s-JsR8IYd-SvN7apocw,15823
+annet/connectors.py,sha256=fJXwSjOnI7xu571nMspgXmvQZmjXP8mWp8pWoHFAEVQ,2511
 annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=EaeQ_JeRFuUUHUoR2LXDcNvY7IVg0eA2d6zSmQVJt-M,19216
@@ -16,25 +16,25 @@ annet/output.py,sha256=hJNGzL4Z3KgvqaCBkkmuuiXPhb64F1QV8YHkwnfhaaI,6852
 annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
-annet/storage.py,sha256=B16iUJwxKd0RWnUaogWQs0WQtiH1YCzPypSHNpBYPDM,2395
+annet/storage.py,sha256=DU-j-I2bQHva_ZQOT407TnGOHx1rd0AA_W7OcLXiPzM,3086
 annet/tabparser.py,sha256=ZjiI43ZVbrpMVR8qNbTbNh_U3oZ26VDc_2Y9wkkDkYA,874
 annet/text_term_format.py,sha256=CHb6viv45vmYl-SK1A1vyPHGhaEni6jVybBusaQnct8,2813
 annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
 annet/types.py,sha256=f2HwqoKa6AucwFwDMszoouB6m1B8n6VmdjHMktO30Kc,7175
 annet/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/provider.py,sha256=OM7Hq2vnMHNVBfubJvx2qJlMYm3VvKhomdLMNO8YnLQ,1024
+annet/adapters/netbox/provider.py,sha256=Gymku2Ad7um4GR9MqzQzm2o2cBLHLhIYbF1Ytl0r0MA,1076
 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=van_-9-3cnBadZkF3Srae_m8cUSjf8KQCCCHFcdeQyo,1758
 annet/adapters/netbox/common/models.py,sha256=bJP6lIWFB85AW5gLNyfd0VHeqEtYIdLJcNH9r8cb8RI,2859
 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/common/storage_opts.py,sha256=idOm1na_2Axdi4MdLN4tAsPvsp5zBtJYD9j7cUiI-W8,400
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/v24/storage.py,sha256=ogCu5XXIpcpPtuz7dWfDFIbqtz8k5G96PL6mhAQWwBU,6026
 annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/v37/storage.py,sha256=3Xv4BoStxy80iev4B9WMxUxl_U0LdKG6ZoTykMpliLw,7485
+annet/adapters/netbox/v37/storage.py,sha256=plqHzb_jH0Etagmg3K8lmNw5hOWUocoSZtAPBlnnOQY,7524
 annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
 annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=UPt3kYFQdQdVVy3ePYzNHPAxMVmHxCrCnZnMCV6ou2Q,4587
@@ -49,7 +49,7 @@ annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/db.py,sha256=fI_u5aya4l61mbYSjj4JwlVfi3s7obt2jqERSuXGRUI,1634
 annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm58tmMWVU,892
-annet/annlib/netdev/devdb/data/devdb.json,sha256=NldGS8_whScc7eC_CZPEDB9AoxtfvK_51oJVFIu0Tlo,5072
+annet/annlib/netdev/devdb/data/devdb.json,sha256=8U-2p2yCE6jHdBehASiQoQdJ7c2_Hc9SFGefNLaGiBo,5287
 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=o-w-k1bOORWwEnSGsDq-9Q_oIeH3yQv9eiCJn_UgG-Y,3324
@@ -61,8 +61,8 @@ annet/annlib/rbparser/platform.py,sha256=iyqy4A-6vUKM4j6hrOA6tsgWBXk7LcvkFrS2QHg
 annet/annlib/rbparser/syntax.py,sha256=eEUmszwPjdw57aofUYNQVcaxHPNV9yx9JNapjYY-BGM,3572
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=9kCZwZpsH5UliF2OzaN9nLs2eLlz_d__4L7_oZ3SrCw,16054
-annet/api/__init__.py,sha256=vwmyZK_iCdAjlJ0jS5CXSroDAZFzGe3JiXL-WoZiovU,33154
-annet/configs/context.yml,sha256=nt4QnzYzrG2hqmaWOUsab2wgFl-CXmFSzbto6rqqFt4,291
+annet/api/__init__.py,sha256=-G9wlYePC3ZgNo1p8r17vmx0WLb3UNvCw3ZJ9UhYJ-I,33169
+annet/configs/context.yml,sha256=jzAQX9WbjFw_nsju8FLCCGfRc4ZXD0Mhb5pvO9emegI,413
 annet/configs/logging.yaml,sha256=Hu42lRK248dssp9TgkbHCaZNl0E6f4IChGb0XaQnTVo,970
 annet/generators/__init__.py,sha256=ACMH9UQ4I3uq2b8nDzOn2dgYxreDq4_3ojOGwht0-No,15543
 annet/generators/base.py,sha256=rgQLcQBPZm4ecbKmRhVOpBR-GFJAiVfdb_y5f2-LUR8,3670
@@ -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.14.3.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.14.3.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.14.3.dist-info/METADATA,sha256=tidvB8sVztyRupypCAJF8mNOCVk7zUq_d90JmC5QgOo,694
-annet-0.14.3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-annet-0.14.3.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.14.3.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.14.3.dist-info/RECORD,,
+annet-0.14.5.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.14.5.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.14.5.dist-info/METADATA,sha256=afiQ_c_4hpqasJGxN74HLYQmV-sgVK3yeiGQO1ys0AQ,694
+annet-0.14.5.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+annet-0.14.5.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.14.5.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.14.5.dist-info/RECORD,,

{annet-0.14.3.dist-info → annet-0.14.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any