annet 0.6__py3-none-any.whl → 0.7__py3-none-any.whl

annet/adapters/netbox/v37/api_models.py

@@ -0,0 +1,37 @@
+from dataclasses import dataclass
+from datetime import datetime
+from typing import List, Optional, Any
+
+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):
+    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/adapters/netbox/v37/client.py

@@ -0,0 +1,62 @@
+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

annet/adapters/netbox/v37/storage.py

@@ -0,0 +1,143 @@
+from logging import getLogger
+from typing import Optional, List
+
+from adaptix import P
+from adaptix.conversion import impl_converter, link
+
+from annet.adapters.netbox.common import models
+from annet.adapters.netbox.common.manufacturer import (
+    is_supported, get_hw, get_breed,
+)
+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__)
+
+
+@impl_converter(recipe=[
+    link(P[api_models.Device].name, P[models.NetboxDevice].hostname),
+    link(P[api_models.Device].name, P[models.NetboxDevice].fqdn),
+])
+def extend_device_base(
+        device: api_models.Device,
+        interfaces: List[models.Interface],
+        hw: Optional[HardwareView],
+        breed: str,
+        neighbours_ids: List[int],
+) -> models.NetboxDevice:
+    ...
+
+
+def extend_device(
+        device: api_models.Device,
+) -> models.NetboxDevice:
+    return extend_device_base(
+        device=device,
+        interfaces=[],
+        breed=get_breed(
+            device.device_type.manufacturer.name,
+            device.device_type.model,
+        ),
+        hw=get_hw(
+            device.device_type.manufacturer.name,
+            device.device_type.model,
+        ),
+        neighbours_ids=[],
+    )
+
+
+@impl_converter
+def extend_interface(
+        interface: api_models.Interface, ip_addresses: List[models.IpAddress],
+) -> models.Interface:
+    ...
+
+
+class NetboxStorageV37(Storage):
+    def __init__(self, opts: Optional[NetboxStorageOpts] = None):
+        self.netbox = NetboxV37(
+            url=opts.url,
+            token=opts.token,
+        )
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, _, __, ___):
+        pass
+
+    def resolve_object_ids_by_query(self, query: NetboxQuery):
+        return [
+            d.id for d in self._load_devices(query)
+        ]
+
+    def resolve_fdnds_by_query(self, query: NetboxQuery):
+        return [
+            d.name for d in self._load_devices(query)
+        ]
+
+    def make_devices(
+            self,
+            query: NetboxQuery,
+            preload_neighbors=False,
+            use_mesh=None,
+            preload_extra_fields=False,
+            **kwargs,
+    ) -> List[models.NetboxDevice]:
+        device_ids = {
+            device.id: extend_device(device=device)
+            for device in self._load_devices(query)
+        }
+        if not device_ids:
+            return []
+
+        interfaces = self._load_interfaces(list(device_ids))
+        for interface in interfaces:
+            device_ids[interface.device.id].interfaces.append(interface)
+        return list(device_ids.values())
+
+    def _load_devices(self, query: NetboxQuery) -> List[api_models.Device]:
+        return [
+            device
+            for device in self.netbox.all_devices(
+                name__ic=query.globs,
+            ).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)
+        extended_ifaces = {
+            interface.id: extend_interface(interface, [])
+            for interface in interfaces.results
+        }
+
+        ips = self.netbox.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())
+
+    def get_device(
+            self, obj_id, preload_neighbors=False, use_mesh=None,
+            **kwargs,
+    ) -> models.NetboxDevice:
+        device = self.netbox.get_device(obj_id)
+        res = extend_device(device=device)
+        res.interfaces = self._load_interfaces([device.id])
+        return res
+
+    def flush_perf(self):
+        pass
+
+
+def _match_query(query: NetboxQuery, device_data: api_models.Device) -> bool:
+    for subquery in query.globs:
+        if subquery.strip() in device_data.name:
+            return True
+    return False

annet/api/__init__.py

@@ -188,7 +188,9 @@ def _print_pre_as_diff(pre, show_rules, indent, file=None, _level=0):
 def log_host_progress_cb(pool: Parallel, task_result: TaskResult):
     progress_logger = get_logger("progress")
     args = cast(cli_args.QueryOptions, pool.args[0])
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         hosts = storage.resolve_fdnds_by_query(args.query)
     perc = int(pool.tasks_done / len(hosts) * 100)
     fqdn = hosts[task_result.device_id]
@@ -210,7 +212,9 @@ def log_host_progress_cb(pool: Parallel, task_result: TaskResult):
 # =====
 def gen(args: cli_args.ShowGenOptions):
     """ Сгенерировать конфиг для устройств """
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         loader = ann_gen.Loader(storage, args)
         stdin = args.stdin(storage=storage, filter_acl=args.filter_acl, config=None)
 
@@ -243,7 +247,9 @@ def _diff_files(old_files, new_files, context=3):
 def patch(args: cli_args.ShowPatchOptions):
     """ Сгенерировать патч для устройств """
     global live_configs  # pylint: disable=global-statement
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         loader = ann_gen.Loader(storage, args)
         if args.config == "running":
             fetcher = annet.deploy.fetcher_connector.get()
@@ -286,7 +292,9 @@ def _patch_worker(device_id, args: cli_args.ShowPatchOptions, stdin, loader: ann
 # =====
 def res_diff_patch(device_id, args: cli_args.ShowPatchOptions, stdin, loader: ann_gen.Loader, filterer: filtering.Filterer) -> Iterable[
     Tuple[OldNewResult, Dict, Dict]]:
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         for res in ann_gen.old_new(
             args,
             storage,
@@ -314,7 +322,9 @@ def res_diff_patch(device_id, args: cli_args.ShowPatchOptions, stdin, loader: an
 
 def diff(args: cli_args.DiffOptions, loader: ann_gen.Loader, filterer: filtering.Filterer) -> Mapping[Device, Union[Diff, PCDiff]]:
     ret = {}
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         for res in ann_gen.old_new(
             args,
             storage,
@@ -624,7 +634,9 @@ def deploy(args: cli_args.DeployOptions) -> ExitCode:
     """ Сгенерировать конфиг для устройств и задеплоить его """
     ret: ExitCode = 0
     deployer = Deployer(args)
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         global live_configs  # pylint: disable=global-statement
         loader = ann_gen.Loader(storage, args)
         filterer = filtering.filterer_connector.get()

annet/cli.py

@@ -54,7 +54,9 @@ def show_current(args: cli_args.QueryOptions, config, arg_out: cli_args.FileOutO
                         entire_data = ""
                     yield (output_driver.entire_config_dest_path(device, entire_path), entire_data, False)
 
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         ids = storage.resolve_object_ids_by_query(args.query)
         if not ids:
             get_logger().error("No devices found for %s", args.query)
@@ -80,7 +82,9 @@ def gen(args: cli_args.ShowGenOptions):
 @subcommand(cli_args.ShowDiffOptions)
 def diff(args: cli_args.ShowDiffOptions):
     """ Сгенерировать конфиг для устройств и показать дифф по рулбуку с текущим """
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         filterer = filtering.filterer_connector.get()
         loader = Loader(storage, args)
         output_driver_connector.get().write_output(

annet/cli_args.py

@@ -433,6 +433,11 @@ class FileOutOptions(ArgGroup):
     no_label = opt_no_label
     no_color = opt_no_color
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.dest:
+            self.no_color = True
+
 
 class DiffOptions(GenOptions, ComocutorOptions):
     clear = opt_clear
@@ -467,6 +472,11 @@ class ShowDiffOptions(DiffOptions, FileOutOptions):
     show_rules = opt_show_rules
     no_collapse = opt_no_collapse
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.dest:
+            self.no_collapse = True
+
 
 class ShowPatchOptions(PatchOptions, FileOutOptions):
     indent = opt_indent

annet/diff.py

@@ -30,8 +30,7 @@ def gen_sort_diff(
     :param diffs: Маппинг устройства в дифф
     :param args: Параметры коммандной строки
     """
-    # NOCDEV-2201 non-null --dest implies --no-collapse
-    if args.no_collapse or args.dest:
+    if args.no_collapse:
         devices_to_diff = {(dev,): diff for dev, diff in diffs.items()}
     else:
         non_pc_diffs = {dev: diff for dev, diff in diffs.items() if not isinstance(diff, PCDiff)}

annet/gen.py

@@ -425,7 +425,9 @@ def worker(device_id, args: ShowGenOptions, stdin, loader: "Loader", filterer: F
     if span:
         span.set_attribute("device.id", device_id)
 
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         for res in old_new(
             args,
             storage,
@@ -465,7 +467,9 @@ def worker(device_id, args: ShowGenOptions, stdin, loader: "Loader", filterer: F
 
 
 def old_new_worker(device_id, args: DeployOptions, config, stdin, loader: "Loader", filterer: Filterer):
-    with storage_connector.get().storage()(args) as storage:
+    connector = storage_connector.get()
+    storage_opts = connector.opts().from_cli_opts(args)
+    with connector.storage()(storage_opts) as storage:
         yield from old_new(
             args,
             storage,

annet/generators/__init__.py

@@ -538,15 +538,7 @@ def _get_generators(module_paths: Union[List[str], dict], storage, device=None):
         module = importlib.import_module(module_path)
         if hasattr(module, "get_generators"):
             generators: List[BaseGenerator] = module.get_generators(storage)
-            if device is None:
-                res_generators += generators
-            else:
-                logger = get_logger()
-                for gen in generators:
-                    if gen.supports_vendor(device.hw.vendor):
-                        res_generators.append(gen)
-                    else:
-                        logger.info("generator %s does not support device vendor %s, skipping", gen, device.hw.vendor)
+            res_generators += generators
     return res_generators
 
 
@@ -706,6 +698,12 @@ class PartialGenerator(TreeGenerator):
     def run(self, device) -> Iterable[Union[str, tuple]]:
         if hasattr(self, "run_" + device.hw.vendor):
             return getattr(self, "run_" + device.hw.vendor)(device)
+        logger = get_logger()
+        logger.info(
+            "generator %s is not supported for vendor %s",
+            self,
+            device.hw.vendor,
+        )
         return iter(())
 
     def get_user_runner(self, device):

annet/output.py

@@ -133,7 +133,9 @@ class OutputDriverBasic(OutputDriver):
         ret = []
         fqdns = {}
         if args:
-            with storage_connector.get().storage()(args) as storage:
+            connector = storage_connector.get()
+            storage_opts = connector.opts().from_cli_opts(args)
+            with connector.storage()(storage_opts) as storage:
                 fqdns = storage.resolve_fdnds_by_query(args.query)
         for (assignment, exc) in fail.items():
             label = assignment

{annet-0.6.dist-info → annet-0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.6
+Version: 0.7
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -21,4 +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: dataclass-rest ==0.4
 

{annet-0.6.dist-info → annet-0.7.dist-info}/RECORD

@@ -1,18 +1,18 @@
 annet/__init__.py,sha256=oyElxAW97sHgQccGafhaWVBveBn1gSjjdP_xHROaRLg,2139
 annet/annet.py,sha256=TMdEuM7GJQ4TjRVmuK3bCTZN-21lxjQ9sXqEdILUuBk,725
 annet/argparse.py,sha256=MoBD0LPnHdA6HU7z1uQNArYlkD92znoeGIFTMnS4dRM,12608
-annet/cli.py,sha256=HoVD9DDZZurxG7YHrU8d2kDJS2tBOCMsmMgJFgarNKI,8284
-annet/cli_args.py,sha256=FuyHLANmTXZl4W9Q4pfT3mMtRiVswM88L5WFhSzu6eA,15871
+annet/cli.py,sha256=bkAaHKBYmvdaFawm_KOM7CehMm18RTR8TkMYAxm-7lo,8464
+annet/cli_args.py,sha256=rmBTJ64sljQWFTIbhTEBZRIo08Gi9NAoFZrMermZEuY,16152
 annet/connectors.py,sha256=M2NeyFgBEGJ_tMR9HgQ4cpli0nBciqZJDVMQXEueMws,1908
 annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
-annet/diff.py,sha256=0QG_3Ur5k7ajRuWUrM089yt_Fxss06OTBSUE3h54Nxw,3460
+annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=bw7COJNtssuxIqbQehlHYJnkdUeYvvL8WO5B-c67XE0,19040
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=aDrTS3X9Lo47F7Mj21PaGzn27TIgAehcsJ5k5uihB30,31246
+annet/gen.py,sha256=WC3ZMjTKtUCRXE4yy-Z3n5MOm3LkLJbXvspyfW8BeVs,31426
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
 annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
 annet/lib.py,sha256=zQIfNBg7fAAk2BHbHAqy_McAiXhz0RqpBAcfdU-6pAA,3742
-annet/output.py,sha256=fEKQ_EncOeZzzlO43tctZVbi37QS1j2m4MYxbvpLxAo,6984
+annet/output.py,sha256=XsX3o4vxe7Ayw7ocY-pV5VY-9-D5_Q_yeWy2ZY1Hubk,7090
 annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
@@ -21,6 +21,24 @@ 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=f0iwSJGSQ7GvWeXgXqBCoxzYNezMa4YASQEHJzWUrWU,6962
+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/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=Kti1T54emv6_FUkhgRiSIo_ZdmvWZZTRvooHO2_H1bM,1731
+annet/adapters/netbox/common/query.py,sha256=OgUuF-bvshpoBUkrOs0tsMUAhjTsttzx3VV30ryFl0Y,577
+annet/adapters/netbox/common/status_client.py,sha256=3oozmdfewPXODEkNrDRfcz_pTeXRVDQiNiD-AE6Lrug,567
+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/api_models.py,sha256=xG3n9ILYdD2jNxav8IH6Bm6fX4vbHPUkHBLze4Ly1bc,1314
+annet/adapters/netbox/v24/client.py,sha256=-r91zVTThn12mN1zBj3XNyqlP6BGOrAPm_GbBT2bXpI,1497
+annet/adapters/netbox/v24/storage.py,sha256=SCTSOea8OHiLAPmBXIop80mIUOLuA48rLpKlitYJt1k,5620
+annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+annet/adapters/netbox/v37/api_models.py,sha256=O59bYesIWlxHx3C2TW4TQnfN9YMsE_rbiw2mYsormcc,886
+annet/adapters/netbox/v37/client.py,sha256=GgFIV5IGlyEplvwOLLd1BxtsbPWkeHEtL22kWV_X0b0,1668
+annet/adapters/netbox/v37/storage.py,sha256=5jp2AgalijTdFkMnjvGGGnxqjwk-bn6QWzTRTfNyyHM,4216
 annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
 annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=UPt3kYFQdQdVVy3ePYzNHPAxMVmHxCrCnZnMCV6ou2Q,4587
@@ -47,10 +65,10 @@ 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=dF9Dnnr31IOKBP0zV-ZP6z1HcwQ8yGTPOHmFC3GdW7g,33212
+annet/api/__init__.py,sha256=VooP9u9f6e8vF7FPUE-r0JAGqCjck9-2b0dVNWAtoLM,33752
 annet/configs/context.yml,sha256=nt4QnzYzrG2hqmaWOUsab2wgFl-CXmFSzbto6rqqFt4,291
 annet/configs/logging.yaml,sha256=Hu42lRK248dssp9TgkbHCaZNl0E6f4IChGb0XaQnTVo,970
-annet/generators/__init__.py,sha256=7yp4OxluAMSozXRaDPabDqfyGJDh4YJXKcAb4KYEzyM,34049
+annet/generators/__init__.py,sha256=LQoqGz_0imhtxvyuwBrBpB6iSuzS2S0UxNJEpO77BiM,33829
 annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/generators/common/initial.py,sha256=XI7uWLMuLrHC-uXm38oRbM1YVuELAvMHLZFHM9x5IF8,1229
 annet/rulebook/__init__.py,sha256=14IpOfTbeJtre7JKrfXVYiH0qAXsUSOL7AatUFmSQs0,3847
@@ -102,12 +120,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_nbexport/__init__.py,sha256=dr_q90ziWR20ckM6l-IWI3PqngHZwqrgPns7NDtq5B8,6362
-annet_nbexport/main.py,sha256=f65WKdS2xvbttllCe5IYkoenPEy8C4SzvNydhh4ZEVM,1216
-annet-0.6.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.6.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.6.dist-info/METADATA,sha256=OO8K6pmnZ0fyA9DZ-V6kysoqMoOKzlk_ONv36XLACJc,622
-annet-0.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-annet-0.6.dist-info/entry_points.txt,sha256=g_pJ55300jUXfafHl7izmDJ6RVSo6iW9IaNfysM3Y0w,151
-annet-0.6.dist-info/top_level.txt,sha256=uL47QByRwuZV5yWC58gd4IkHM8sVSAJ1pZb-6W-gMfY,38
-annet-0.6.dist-info/RECORD,,
+annet-0.7.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.7.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.7.dist-info/METADATA,sha256=hkf7Zql0Tekm9u10L6exfVSV6LjhQ7367c7VZ8WxOw8,691
+annet-0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+annet-0.7.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.7.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.7.dist-info/RECORD,,

{annet-0.6.dist-info → annet-0.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

annet-0.7.dist-info/entry_points.txt

@@ -0,0 +1,5 @@
+[annet.connectors]
+storage = annet.adapters.netbox.provider:NetboxProvider
+
+[console_scripts]
+annet = annet.annet:main

{annet-0.6.dist-info → annet-0.7.dist-info}/top_level.txt

@@ -1,3 +1,2 @@
 annet
 annet_generators
-annet_nbexport

annet-0.6.dist-info/entry_points.txt

@@ -1,6 +0,0 @@
-[annet.connectors]
-storage = annet_nbexport:AnnetNbExportProvder
-
-[console_scripts]
-annet = annet.annet:main
-annet_nbexport = annet_nbexport.main:main