annet 2.6.0__py3-none-any.whl → 3.0.0__py3-none-any.whl

annet/adapters/file/provider.py

@@ -1,13 +1,16 @@
-from annet.annlib.netdev.views.dump import DumpableView
-from annet.storage import Query
+import dataclasses
 from dataclasses import dataclass, fields
-from typing import List, Iterable, Optional, Any, Sequence
-from annet.storage import StorageProvider, Storage
-from annet.connectors import AdapterWithName
-from annet.storage import Device as DeviceCls
-from annet.annlib.netdev.views.hardware import vendor_to_hw, HardwareView
+from typing import Any, Iterable, List, Optional, Sequence
+
 import yaml
 
+from annet.annlib.netdev.views.dump import DumpableView
+from annet.annlib.netdev.views.hardware import HardwareView
+from annet.connectors import AdapterWithName
+from annet.hardware import hardware_connector
+from annet.storage import Device as DeviceProtocol
+from annet.storage import Query, Storage, StorageProvider
+
 
 @dataclass
 class Interface(DumpableView):
@@ -23,29 +26,46 @@ class Interface(DumpableView):
 @dataclass
 class DeviceStorage:
     fqdn: str
-    vendor: str
+
+    vendor: Optional[str] = None
+    hw_model: Optional[str] = None
+    sw_version: Optional[str] = None
+
     hostname: Optional[str] = None
     serial: Optional[str] = None
     id: Optional[str] = None
     interfaces: Optional[list[Interface]] = None
     storage: Optional[Storage] = None
 
+    hw: HardwareView = dataclasses.field(init=False)
+
     def __post_init__(self):
         if not self.id:
             self.id = self.fqdn
         if not self.hostname:
             self.hostname = self.fqdn.split(".")[0]
-        hw = vendor_to_hw(self.vendor)
-        if not hw:
-            raise Exception("unknown vendor")
+
+        if self.hw_model:
+            hw = HardwareView(self.hw_model, self.sw_version)
+            if self.vendor and self.vendor != hw.vendor:
+                raise Exception(f"Vendor {self.vendor} is not vendor from hw model ({hw.vendor})")
+            else:
+                self.vendor = hw.vendor
+        else:
+            hw_provider = hardware_connector.get()
+            hw: HardwareView = hw_provider.vendor_to_hw(self.vendor)
+            if not hw:
+                raise Exception("unknown vendor")
+            self.hw_model = hw.model
         self.hw = hw
+
         if isinstance(self.interfaces, list):
             interfaces = []
             for iface in self.interfaces:
                 try:
                     interfaces.append(Interface(**iface))
                 except Exception as e:
-                    raise Exception("unable to parse %s as Interface %s" % (iface, e))
+                    raise Exception("unable to parse %s as Interface: %s" % (iface, e))
             self.interfaces = interfaces
 
     def set_storage(self, storage: Storage):
@@ -53,7 +73,7 @@ class DeviceStorage:
 
 
 @dataclass
-class Device(DeviceCls, DumpableView):
+class Device(DeviceProtocol, DumpableView):
     dev: DeviceStorage
 
     def __hash__(self):
@@ -79,7 +99,7 @@ class Device(DeviceCls, DumpableView):
 
     @property
     def storage(self) -> Storage:
-        return self
+        return self.dev.storage
 
     @property
     def hw(self) -> HardwareView:
@@ -91,7 +111,11 @@ class Device(DeviceCls, DumpableView):
 
     @property
     def neighbours_ids(self):
-        pass
+        return []
+
+    @property
+    def neighbours_fqdns(self) -> list[str]:
+        return []
 
     def make_lag(self, lag: int, ports: Sequence[str], lag_min_links: Optional[int]) -> Interface:
         raise NotImplementedError
@@ -105,8 +129,8 @@ class Device(DeviceCls, DumpableView):
     def find_interface(self, name: str) -> Optional[Interface]:
         raise NotImplementedError
 
-    def neighbours_fqdns(self) -> list[str]:
-        return []
+    def flush_perf(self):
+        pass
 
 
 @dataclass
@@ -120,7 +144,7 @@ class Devices:
                 try:
                     devices.append(Device(dev=DeviceStorage(**dev)))
                 except Exception as e:
-                    raise Exception("unable to parse %s as Device %s" % (dev, e))
+                    raise Exception("unable to parse %s as Device: %s" % (dev, e))
             self.devices = devices
 
 
@@ -193,12 +217,12 @@ class FS(Storage):
         return [dev.fqdn for dev in result]
 
     def make_devices(
-            self,
-            query: Query | list,
-            preload_neighbors=False,
-            use_mesh=None,
-            preload_extra_fields=False,
-            **kwargs,
+        self,
+        query: Query | list,
+        preload_neighbors=False,
+        use_mesh=None,
+        preload_extra_fields=False,
+        **kwargs,
     ) -> list[Device]:
         if isinstance(query, list):
             query = Query.new(query)
@@ -231,8 +255,7 @@ def filter_query(devices: list[Device], query: Query) -> list[Device]:
 
 def read_inventory(path: str, storage: Storage) -> Devices:
     with open(path, "r") as f:
-        data = f.read()
-    file_data = yaml.load(data, Loader=yaml.BaseLoader)
+        file_data = yaml.load(f, Loader=yaml.SafeLoader)
     res = dataclass_from_dict(Devices, file_data)
     for dev in res.devices:
         dev.dev.set_storage(storage)

annet/adapters/netbox/common/manufacturer.py

@@ -4,32 +4,13 @@ from annet.annlib.netdev.views.hardware import HardwareView
 
 logger = getLogger(__name__)
 
-_VENDORS = {
-    "cisco": "Cisco",
-    "catalyst": "Cisco Catalyst",
-    "nexus": "Cisco Nexus",
-    "iosxr": "Cisco XR",
-    "huawei": "Huawei",
-    "optixtrans": "Huawei OptiXtrans",
-    "juniper": "Juniper",
-    "arista": "Arista",
-    "pc": "PC",
-    "nokia": "Nokia",
-    "aruba": "Aruba",
-    "routeros": "RouterOS",
-    "ribbon": "Ribbon",
-    "b4com": "B4com",
-    "h3c": "H3C",
-}
-
 
 def get_hw(manufacturer: str, model: str, platform_name: str):
-    # by some reason Netbox calls Mellanox SN as MSN, so we fix them here
+    # By some reason Netbox calls Mellanox SN as MSN, so we fix them here
     if manufacturer == "Mellanox" and model.startswith("MSN"):
         model = model.replace("MSN", "SN", 1)
-    vendor = manufacturer + " " + model
-    hw = HardwareView(_VENDORS.get(vendor.lower(), vendor), platform_name)
-    return hw
+
+    return HardwareView(manufacturer + " " + model, platform_name)
 
 
 def get_breed(manufacturer: str, model: str):

annet/adapters/netbox/common/models.py

@@ -5,8 +5,9 @@ from ipaddress import ip_interface, IPv6Interface
 from typing import List, Optional, Any, Dict, Sequence, TypeVar, Generic
 
 from annet.annlib.netdev.views.dump import DumpableView
-from annet.annlib.netdev.views.hardware import HardwareView, lag_name, svi_name
+from annet.annlib.netdev.views.hardware import HardwareView, lag_name
 from annet.storage import Storage
+from annet.vendors import registry_connector
 
 
 @dataclass
@@ -259,7 +260,7 @@ class NetboxDevice(Entity, Generic[_InterfaceT]):
         return lag_interface
 
     def _svi_name(self, svi: int) -> str:
-        return svi_name(self.hw, svi)
+        return registry_connector.get().match(self.hw).svi_name(svi)
 
     def add_svi(self, svi: int) -> _InterfaceT:
         name = self._svi_name(svi)

annet/adapters/netbox/v24/models.py

@@ -1,11 +1,12 @@
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
 from ipaddress import ip_interface, IPv6Interface
-from typing import List, Optional, Any, Dict, Sequence, Callable
+from typing import List, Optional, Any, Dict, Sequence
 
 from annet.annlib.netdev.views.dump import DumpableView
-from annet.annlib.netdev.views.hardware import HardwareView, lag_name, svi_name
+from annet.annlib.netdev.views.hardware import HardwareView, lag_name
 from annet.storage import Storage
+from annet.vendors import registry_connector
 
 
 @dataclass
@@ -259,7 +260,7 @@ class NetboxDevice(Entity):
         return lag_interface
 
     def _svi_name(self, svi: int) -> str:
-        return svi_name(self.hw, svi)
+        return registry_connector.get().match(self.hw).svi_name(svi)
 
     def add_svi(self, svi: int) -> Interface:
         name = self._svi_name(svi)

annet/annlib/netdev/views/hardware.py

@@ -1,3 +1,4 @@
+import functools
 from typing import Optional
 
 from annet.annlib.netdev.devdb import parse_hw_model
@@ -51,20 +52,31 @@ class HardwareLeaf(DumpableView):
 
 
 class HardwareView(HardwareLeaf):
-    def __init__(self, hw_model, sw_version):
-        (true_sequences, false_sequences) = parse_hw_model(hw_model or "")
+    def __init__(self, hw_model, sw_version: Optional[str] = None):
+        true_sequences, false_sequences = parse_hw_model(hw_model or "")
         super().__init__((), true_sequences, false_sequences)
         self.model = hw_model or ""
         self._soft = sw_version or ""
 
     @property
     def vendor(self) -> Optional[str]:
-        return hw_to_vendor(self)
+        from annet.hardware import hardware_connector
+        return hardware_connector.get().hw_to_vendor(self)
 
     @property
     def soft(self) -> str:
         return self._soft
 
+    @soft.setter
+    def soft(self, value: str) -> None:
+        self._soft = value
+
+    def match(self, expr: str) -> bool:
+        dev_path = expr.split(".")
+        if dev_path and dev_path[0] == "hw":
+            dev_path = dev_path[1:]
+        return bool(functools.reduce(getattr, dev_path, self))
+
     def __hash__(self):
         return hash(self.model)
 
@@ -72,62 +84,6 @@ class HardwareView(HardwareLeaf):
         return self.model == other.model
 
 
-def hw_to_vendor(hw: HardwareView) -> Optional[str]:
-    if hw.Nexus:
-        return "nexus"
-    elif hw.Cisco.XR or hw.Cisco.ASR or hw.Cisco.XRV:
-        return "iosxr"
-    elif hw.Cisco:
-        return "cisco"
-    elif hw.OptiXtrans:
-        return "optixtrans"
-    elif hw.Huawei:
-        return "huawei"
-    elif hw.Juniper:
-        return "juniper"
-    elif hw.Arista:
-        return "arista"
-    elif hw.PC:
-        return "pc"
-    elif hw.Nokia:
-        return "nokia"
-    elif hw.RouterOS:
-        return "routeros"
-    elif hw.Aruba:
-        return "aruba"
-    elif hw.Ribbon:
-        return "ribbon"
-    elif hw.H3C:
-        return "h3c"
-    elif hw.B4com:
-        return "b4com"
-    return None
-
-
-def vendor_to_hw(vendor):
-    hw = HardwareView(
-        {
-            "cisco": "Cisco",
-            "catalyst": "Cisco Catalyst",
-            "nexus": "Cisco Nexus",
-            "iosxr": "Cisco XR",
-            "huawei": "Huawei",
-            "optixtrans": "Huawei OptiXtrans",
-            "juniper": "Juniper",
-            "arista": "Arista",
-            "pc": "PC",
-            "nokia": "Nokia",
-            "aruba": "Aruba",
-            "routeros": "RouterOS",
-            "ribbon": "Ribbon",
-            "h3c": "H3C",
-            "b4com": "B4com",
-        }.get(vendor.lower(), vendor),
-        None,
-    )
-    return hw
-
-
 def lag_name(hw: HardwareView, nlagg: int) -> str:
     if hw.Huawei:
         return f"Eth-Trunk{nlagg}"
@@ -148,14 +104,3 @@ def lag_name(hw: HardwareView, nlagg: int) -> str:
     if hw.Nokia:
         return f"lagg-{nlagg}"
     raise NotImplementedError(hw)
-
-
-def svi_name(hw: HardwareView, num: int) -> str:
-    if hw.Juniper:
-        return f"irb.{num}"
-    elif hw.Huawei:
-        return f"Vlanif{num}"
-    elif hw.Arista or hw.Cisco:
-        return f"Vlan{num}"
-    else:
-        return f"vlan{num}"

annet/annlib/patching.py

@@ -19,6 +19,7 @@ from .rulebook.common import call_diff_logic
 from .rulebook.common import default as common_default
 from .tabparser import CommonFormatter
 from .types import Diff, Op
+from ..vendors import registry_connector
 
 
 # =====
@@ -224,14 +225,15 @@ class Orderer:
         return (f_order or 0), cmd_direct, odict(children), f_rule
 
     def order_config(self, config):
-        if self.vendor not in platform.VENDOR_REVERSES:
+        if self.vendor not in registry_connector.get():
             return config
-
-        ordered = []
-        reverse_prefix = platform.VENDOR_REVERSES[self.vendor]
         if not config:
             return odict()
-        for (row, children) in config.items():
+
+        ordered = []
+        reverse_prefix = registry_connector.get()[self.vendor].reverse
+
+        for row, children in config.items():
             cmd_direct = not row.startswith(reverse_prefix)
             (order, direct, rb, _) = self.get_order(row, cmd_direct)
             child_orderer = Orderer(rb, self.vendor)

annet/annlib/rbparser/acl.py

@@ -5,7 +5,8 @@ from typing import Any, Callable, List, Optional
 from valkit import add_validator_magic
 from valkit.common import valid_bool, valid_number, valid_string_list
 
-from . import platform, syntax
+from annet.vendors import registry_connector
+from . import syntax
 
 
 # =====
@@ -13,7 +14,7 @@ from . import platform, syntax
 def compile_acl_text(text, vendor, allow_ignore=False):
     return _compile_acl(
         trees=[syntax.parse_text(text, _PARAMS_SCHEME)],
-        reverse_prefix=platform.VENDOR_REVERSES[vendor],
+        reverse_prefix=registry_connector.get()[vendor].reverse,
         allow_ignore=allow_ignore,
         vendor=vendor,
     )

annet/annlib/rbparser/ordering.py

@@ -4,7 +4,8 @@ from collections import OrderedDict as odict
 
 from valkit.common import valid_bool, valid_string_list
 
-from . import platform, syntax
+from annet.vendors import registry_connector
+from . import syntax
 
 
 # =====
@@ -25,7 +26,7 @@ def compile_ordering_text(text, vendor):
                 "default": None,
             }
         }),
-        reverse_prefix=platform.VENDOR_REVERSES[vendor],
+        reverse_prefix=registry_connector.get()[vendor].reverse,
     )
 
 

annet/api/__init__.py

@@ -48,6 +48,7 @@ from annet.parallel import Parallel, TaskResult
 from annet.reference import RefTracker
 from annet.storage import Device, get_storage
 from annet.types import Diff, ExitCode, OldNewResult, Op, PCDiff, PCDiffFile
+from annet.vendors import registry_connector
 
 DEFAULT_INDENT = "  "
 
@@ -786,7 +787,7 @@ def guess_hw(config_text: str):
     текста конфига и annet/rulebook/texts/*.rul"""
     scores = {}
     hw_provider = hardware_connector.get()
-    for vendor in VENDOR_REVERSES:
+    for vendor in registry_connector.get():
         hw = hw_provider.vendor_to_hw(vendor)
         fmtr = tabparser.make_formatter(hw)
         rb = rulebook.get_rulebook(hw)

annet/hardware.py

@@ -1,17 +1,11 @@
 import abc
 from typing import Any
 
-from annet.annlib.netdev.views.hardware import HardwareView, hw_to_vendor
-
+from annet.annlib.netdev.views.hardware import HardwareView
+from annet.vendors import registry_connector
 from annet.connectors import Connector
 
 
-try:
-    from annet.annlib.netdev.views.hardware import vendor_to_hw
-except ImportError:
-    from netdev.views.hardware import vendor_to_hw
-
-
 class _HardwareConnector(Connector["HarwareProvider"]):
     name = "Hardware"
     ep_name = "hardware"
@@ -31,7 +25,7 @@ class HarwareProvider(abc.ABC):
         pass
 
     @abc.abstractmethod
-    def hw_to_vendor(self, hw: Any) -> str:
+    def hw_to_vendor(self, hw: Any) -> str | None:
         pass
 
 
@@ -40,7 +34,9 @@ class AnnetHardwareProvider(HarwareProvider):
         return HardwareView(hw_model, sw_version)
 
     def vendor_to_hw(self, vendor: str) -> HardwareView:
-        return vendor_to_hw(vendor)
+        return registry_connector.get().get(vendor.lower()).hardware
 
-    def hw_to_vendor(self, hw: HardwareView) -> str:
-        return hw_to_vendor(hw)
+    def hw_to_vendor(self, hw: HardwareView) -> str | None:
+        if vendor := registry_connector.get().match(hw, None):
+            return vendor.NAME
+        return None

annet/rulebook/__init__.py

@@ -10,6 +10,7 @@ from annet.annlib.rbparser.platform import VENDOR_REVERSES, VENDOR_ALIASES
 from annet.connectors import CachedConnector
 from annet.rulebook.deploying import compile_deploying_text
 from annet.rulebook.patching import compile_patching_text
+from annet.vendors import registry_connector
 
 
 class RulebookProvider(ABC):
@@ -63,7 +64,7 @@ class DefaultRulebookProvider(RulebookProvider):
         if hw in self._rulebook_cache:
             return self._rulebook_cache[hw]
 
-        assert hw.vendor in VENDOR_REVERSES, "Unknown vendor: %s" % (hw.vendor)
+        assert hw.vendor in registry_connector.get(), "Unknown vendor: %s" % (hw.vendor)
         rul_vendor_name = VENDOR_ALIASES.get(hw.vendor, hw.vendor)
         patching = compile_patching_text(self._render_rul(rul_vendor_name + ".rul", hw), rul_vendor_name)
 

annet/rulebook/deploying.py

@@ -2,8 +2,9 @@ import functools
 from collections import OrderedDict as odict
 from collections import namedtuple
 
-from annet.annlib.rbparser import platform, syntax
+from annet.annlib.rbparser import syntax
 from annet.annlib.rbparser.deploying import compile_messages
+from annet.vendors import registry_connector
 from valkit.common import valid_bool, valid_number, valid_string_list
 from valkit.python import valid_object_path
 
@@ -38,7 +39,7 @@ def compile_deploying_text(text, vendor):
                 "default": [],
             }
         }),
-        reverse_prefix=platform.VENDOR_REVERSES[vendor],
+        reverse_prefix=registry_connector.get()[vendor].reverse,
     )
 
 

annet/rulebook/patching.py

@@ -3,12 +3,12 @@ import re
 from collections import OrderedDict as odict
 
 from annet.annlib.rbparser import platform, syntax
+from annet.vendors import registry_connector
 from valkit.common import valid_bool, valid_string_list
 from valkit.python import valid_object_path
 
 from .common import import_rulebook_function
 
-
 DEFAULT_PATCH_LOGIC = "common.default"
 ORDERED_PATCH_LOGIC = "common.ordered"
 REWRITE_PATCH_LOGIC = "common.rewrite"
@@ -62,7 +62,7 @@ def compile_patching_text(text, vendor):
                 "default": False,
             },
         }),
-        reverse_prefix=platform.VENDOR_REVERSES[vendor],
+        reverse_prefix=registry_connector.get()[vendor].reverse,
         vendor=vendor,
     )
 

annet/vendors/__init__.py

@@ -0,0 +1,33 @@
+from typing import Callable
+
+from annet.connectors import Connector
+from annet.vendors.base import AbstractVendor
+
+from .library import (
+    arista,
+    aruba,
+    b4com,
+    cisco,
+    h3c,
+    huawei,
+    iosxr,
+    juniper,
+    nexus,
+    nokia,
+    optixtrans,
+    pc,
+    ribbon,
+    routeros,
+)
+from .registry import Registry, registry
+
+
+class _RegistryConnector(Connector[Registry]):
+    name = "Registry"
+    ep_name = "vendors"
+
+    def _get_default(self) -> Callable[[], Registry]:
+        return lambda: registry
+
+
+registry_connector = _RegistryConnector()

annet/vendors/base.py

@@ -0,0 +1,25 @@
+import abc
+from typing import ClassVar
+
+from annet.annlib.netdev.views.hardware import HardwareView
+
+
+class AbstractVendor(abc.ABC):
+    NAME: ClassVar[str]
+
+    @abc.abstractmethod
+    def match(self) -> list[str]:
+        raise NotImplementedError
+
+    @property
+    @abc.abstractmethod
+    def reverse(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abc.abstractmethod
+    def hardware(self) -> HardwareView:
+        raise NotImplementedError
+
+    def svi_name(self, num: int) -> str:
+        return f"vlan{num}"

annet/vendors/registry.py

@@ -0,0 +1,84 @@
+import enum
+from operator import itemgetter
+
+from annet.annlib.netdev.views.hardware import HardwareView
+
+from .base import AbstractVendor
+
+_SENTINEL = enum.Enum("_SENTINEL", "sentinel")
+sentinel = _SENTINEL.sentinel
+
+
+class GenericVendor(AbstractVendor):
+    def match(self) -> list[str]:
+        return []
+
+    @property
+    def reverse(self) -> str:
+        return "-"
+
+    @property
+    def hardware(self) -> HardwareView:
+        return HardwareView("")
+
+
+GENERIC_VENDOR = GenericVendor()
+
+
+class Registry:
+    def __init__(self):
+        self.vendors: dict[str, AbstractVendor] = {}
+        self._matchers = {}
+
+    def register(self, cls: type[AbstractVendor]) -> type[AbstractVendor]:
+        if not cls.NAME:
+            raise RuntimeError(f"{cls.__name__} has empty NAME field")
+        if cls.NAME in self.vendors:
+            raise RuntimeError(f"{cls.__name__} with name {cls.NAME} already registered")
+        self.vendors[cls.NAME] = cls()
+
+        return cls
+
+    def __add__(self, other: "Registry"):
+        self.vendors = dict(**other.vendors, **self.vendors)
+
+    def __getitem__(self, item) -> AbstractVendor:
+        if item in self.vendors:
+            return self.vendors[item]
+        raise RuntimeError(f"Unknown vendor {item}")
+
+    def match(
+        self,
+        hw: HardwareView | str,
+        default: _SENTINEL | AbstractVendor | None = sentinel
+    ) -> AbstractVendor | None:
+        if isinstance(hw, str):
+            hw = HardwareView(hw, "")
+
+        matched: list[tuple[AbstractVendor, int]] = []
+        for name, vendor in self.vendors.items():
+            for item in vendor.match():
+                if hw.match(item):
+                    matched.append((vendor, item.count(".")))
+
+        if matched:
+            return next(iter(sorted(matched, key=itemgetter(1), reverse=True)))[0]
+        if default is sentinel:
+            return GENERIC_VENDOR
+        return default
+
+    def get(self, item: str, default: _SENTINEL | AbstractVendor | None = sentinel) -> AbstractVendor | None:
+        if item in self:
+            return self[item]
+        if default is sentinel:
+            return GENERIC_VENDOR
+        return default
+
+    def __contains__(self, item):
+        return item in self.vendors
+
+    def __iter__(self):
+        return iter(self.vendors)
+
+
+registry = Registry()

{annet-2.6.0.dist-info → annet-3.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 2.6.0
+Version: 3.0.0
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-2.6.0.dist-info → annet-3.0.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ annet/diff.py,sha256=vz51az7RrXdYXsPbNMi9Y2awbjNRPQSFl6zzvE36Kx4,9441
 annet/executor.py,sha256=lcKI-EbYqeCiBNpL729kSltduzxbAzOkQ1L_QK7tNv8,5112
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
 annet/gen.py,sha256=m76bL6rVbusNV_uVHrHnA3D7TUvvLtckXx7hlr5HGA0,31897
-annet/hardware.py,sha256=_iR28dWiPtt6ZYdk-qg1sxazkSRJE3ukqKB-fFFfQak,1141
+annet/hardware.py,sha256=e7RWc5yPdEDT5hxNqcqWv9g9DRWIgwAieA2iT4FdPqc,1158
 annet/implicit.py,sha256=G6EwZbrtUp089qRAwh96hminp236-1pJbeKAedoEafg,6056
 annet/lib.py,sha256=4N4X6jCCrig5rk7Ua4AofrV9zK9jhzkBq57fLsfBJjw,4812
 annet/output.py,sha256=se8EpyNS9f9kPOlOaAV0ht4DjzDoBr8F2UafiezLPYw,7743
@@ -28,20 +28,20 @@ annet/adapters/fetchers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 annet/adapters/fetchers/stub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/fetchers/stub/fetcher.py,sha256=FzpkIzPJBQVuNNSdXKoGzkALmIGMgo2gmGLXzYWdDYA,891
 annet/adapters/file/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/file/provider.py,sha256=KyHuA5w9E4T3Lxeko8b5M7jRmu7yhTJVLqLkas4ue1A,6654
+annet/adapters/file/provider.py,sha256=3hNt0QQg46SVymLQ4Bh9G4VNYyhnB7gV5yu5OiIJpZE,7307
 annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/provider.py,sha256=SrxW_uBLvMTqtRiYXreL6RrZK4MpxVguF2ITnYOnVHU,2226
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/adapter.py,sha256=-YcO3371D8hupNXKf5f4-FdFSjTto-7VKDvz29Gid38,2016
 annet/adapters/netbox/common/client.py,sha256=PaxHG4W9H8_uunIwMBNYkLq4eQJYoO6p6gY-ciQs7Nc,2563
-annet/adapters/netbox/common/manufacturer.py,sha256=A3g9RrCpzYQQbdZ3OGYBalDn-OI7LlBnkXvMM757ftI,1770
-annet/adapters/netbox/common/models.py,sha256=b-xAQb1vtCLqafMl4npwNEznPT_QghlOWe3Yc7JkQ5c,7620
+annet/adapters/netbox/common/manufacturer.py,sha256=n1RxJSGqXilKcGSqwIc7d2jD1NCaUXG5kQcOO93WTxw,1319
+annet/adapters/netbox/common/models.py,sha256=IS9q5ZhrDhp74sjl5exSQu6lVOrQCX_I_RRtA9uCcdg,7686
 annet/adapters/netbox/common/query.py,sha256=kbNQSZwkjFeDArHwA8INHUauxCxYElXtNh58pZipWdo,1867
 annet/adapters/netbox/common/status_client.py,sha256=POaqiQJ0jPcqUQH-X_fWHVnKB7TBYveNriaT0eNTlfI,769
 annet/adapters/netbox/common/storage_base.py,sha256=3dn42CWTEZVBig4ABhy5BMQQ3YGb28InncWZoGvrgKk,8768
 annet/adapters/netbox/common/storage_opts.py,sha256=wfv1spElomwgVYMCgGth3SWVF0RsRgtUgq9GpFL9hJs,1520
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/v24/models.py,sha256=TAZUYXf1TlOrzgitWZaaLvW0tB143RgnFb1wA2X9lc8,7549
+annet/adapters/netbox/v24/models.py,sha256=RH2ooUPHOtHT0q1ZQE7v23FgmcsGenzzSgJyft13o1k,7605
 annet/adapters/netbox/v24/storage.py,sha256=zptzrW4aZUv_exuGw0DqQPm_kXZR3DwL4zRHYL6twTk,6219
 annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/v37/models.py,sha256=VqI1bT5E5pFIaDJWxWMU6bioNyrXKJuNq-_J8YIJIbw,1613
@@ -60,7 +60,7 @@ annet/annlib/filter_acl.py,sha256=mxDga-3SXqpPEsdQypTq0ScqUqP625lxX-DmJalEc3s,71
 annet/annlib/jsontools.py,sha256=BS7s4rI8R9c_y3zz0zYl1l6con65oQ0MvfsC1dsXZts,5535
 annet/annlib/lib.py,sha256=lxmYrbeablFMhFtvFmADVpVShSFi9TN4gNWaBs_Ygm0,14952
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
-annet/annlib/patching.py,sha256=IZYW4kydEzBmRi_PZ8Lk0g7hx-sSYl2wjd6lDaI0D4k,21435
+annet/annlib/patching.py,sha256=1Ku5dNCQS9nlsMEr7tt7o1uGBsBeqfVFw4NY8aWYvnc,21483
 annet/annlib/tabparser.py,sha256=aXwY0glVQ4__Sg1FFXiSPghyoNQRrMUQ7XCjMq__3lM,32016
 annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -69,16 +69,16 @@ annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm
 annet/annlib/netdev/devdb/data/devdb.json,sha256=t-j7SjEqSWNPhYV3cPQCSpODc3VGcRKJze9fgj4L9Uw,6710
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=rIlyvnA3uM8bB_7oq1nS2KDxTp6dQh2hz-FbNhYIpOU,4630
-annet/annlib/netdev/views/hardware.py,sha256=jybt3BjEKbhSIU6A4MvA2X2-i3BqWcllvMAX_EKLGMU,4396
+annet/annlib/netdev/views/hardware.py,sha256=XvHtRn29SROKtxqMyr86oc1ItUKy36N98ppfuJQL8PY,3235
 annet/annlib/rbparser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/annlib/rbparser/acl.py,sha256=RR8yPt6t96_IiyuKVbeZ-3x32cyhBAT2wC1y99oWBO8,3931
+annet/annlib/rbparser/acl.py,sha256=I_1VUZQgF-s4dYTxyEDxQ-GkAP2MeXonzzsc2xROpTM,3974
 annet/annlib/rbparser/deploying.py,sha256=ACT8QNhDAhJx3ZKuGh2nYBOrpdka2qEKuLDxvQAGKLk,1649
-annet/annlib/rbparser/ordering.py,sha256=SmN_22pIJSIkmyT1-HSjWsqid7UJ0DgkqyQu7IO3bS4,2142
+annet/annlib/rbparser/ordering.py,sha256=XknggB92N4IbhHBZZHL0StwCCITt8mkho4D4Nu5Kb4k,2185
 annet/annlib/rbparser/platform.py,sha256=vNoK25ACNQuDRv5I9uDfmNi8Y8yi10XWSbWIeKEVUgs,1672
 annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=-E6ATuFkSjNhyK0hiGd-iap5Ch5up2MNuVCbobWfmeU,16649
-annet/api/__init__.py,sha256=DU88rY4sQLUoBE9g0WxgqF6GdL7CIUAak01Ejuf63qc,33098
+annet/api/__init__.py,sha256=KYtCj2Kgj2Qt1eqhk8kpSz4QgXToDdK2Okvtac3UD-w,33152
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
 annet/generators/__init__.py,sha256=9MmstB59DlHGnY7GP36nyTiAdKtHdsJTyOYc0cxwm5U,16398
@@ -118,10 +118,10 @@ annet/rpl_generators/execute.py,sha256=wS6e6fwcPWywsHB0gBMqZ17eF0s4YOBgDgwPB_cr5
 annet/rpl_generators/policy.py,sha256=j_2EtAsaxldhZZT4kRXKZacuAsGnHr3JSc2BMxr_Pow,37174
 annet/rpl_generators/prefix_lists.py,sha256=5jM5Xj0dtx5xF9ap-TgExs0ofRAzm0LN2j3aL5Ub_yc,4778
 annet/rpl_generators/rd.py,sha256=YGXgx1D2D0-pixgspXJzA6NvW8lx3AmHMxIY2l5rraI,1457
-annet/rulebook/__init__.py,sha256=oafL5HC8QHdkO9CH2q_fxohPMxOgjn-dNQa5kPjuqsA,3942
+annet/rulebook/__init__.py,sha256=WtDrO9BrbrF1o06zOTVrEMGuTgDtv7MfF8B29pRW77U,3996
 annet/rulebook/common.py,sha256=zK1s2c5lc5HQbIlMUQ4HARQudXSgOYiZ_Sxc2I_tHqg,721
-annet/rulebook/deploying.py,sha256=XV0XQvc3YvwM8SOgOQlc-fCW4bnjQg_1CTZkTwMp14A,2972
-annet/rulebook/patching.py,sha256=ve_D-9lnWs6Qb_NwqOLUWX-b_tI_L3pwQ7cgUPnqndY,4970
+annet/rulebook/deploying.py,sha256=9CMeOUw5L1OWdrccSRfpJyH9H_jH7xWNU1JldviBNrk,3015
+annet/rulebook/patching.py,sha256=4JQE_qmdHb0Eggj9ytp99P1Z59uW5ZeUrPJIOdfgi_0,5022
 annet/rulebook/arista/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/arista/aaa.py,sha256=7fBTwBnz9SOqYbwG8GBeEQTJG0e4uC4HkuZJeMG-kAY,2250
 annet/rulebook/arista/iface.py,sha256=bgj6a3r__-OE6VyYbSfnD6ps2QJKyX028W7IFJww-UY,720
@@ -180,10 +180,14 @@ annet/rulebook/texts/ribbon.deploy,sha256=hCq2XeAcwaYanyQ8lTdnez6Pgq-gRqpNuR8dAl
 annet/rulebook/texts/ribbon.rul,sha256=609LyLTDCtXPVQNAzqS-VEyCpW3byHP8TCMJLFMn5cc,2108
 annet/rulebook/texts/routeros.order,sha256=M71uy_hf0KAjLNS3zZY3uih4m2xLUcu26FEoVVjC6k0,905
 annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019O1DE,1203
-annet-2.6.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-2.6.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet/vendors/__init__.py,sha256=gQcDFlKeWDZB6vxJ_MdPWEoE-C5dg-YgXvgGkuV9YLw,569
+annet/vendors/base.py,sha256=ll7WKL9KtHiNl9Cs6pQs4bJH6c6JRhyHIM7wdgkysdU,536
+annet/vendors/registry.py,sha256=hav8ONavMAM7FCHgF-0_NKC_ntNAtcTicjxqXNtbovw,2326
+annet-3.0.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.0.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet_generators/example/__init__.py,sha256=1z030I00c9KeqW0ntkT1IRLYKD5LZAHYjiNHrOLen1Q,221
+annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
+annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
 annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn6yo,2100
 annet_generators/mesh_example/__init__.py,sha256=NfNWgXn1TNiWI6A5tmU6Y-4QV2i33td0Qs3re0MNNMo,218
 annet_generators/mesh_example/bgp.py,sha256=jzyDndSSGYyYBquDnLlR-7P5lzmUKcSyYCml3VsoMC0,1385
@@ -193,8 +197,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=d99HSXDHFjZq511EvGhIqRTWK3F4ZsCWfdUqFYQcyhE,772
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-2.6.0.dist-info/METADATA,sha256=5dAbgYBs9h-co3Rqk177VqRH5wNcEOEh15ZNaaTBS7w,815
-annet-2.6.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-annet-2.6.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-2.6.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-2.6.0.dist-info/RECORD,,
+annet-3.0.0.dist-info/METADATA,sha256=x8H3f6rBvrh1jfXlkoWpqA5LiH7ZB6mnoc04Yhb6o6I,815
+annet-3.0.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+annet-3.0.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.0.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.0.0.dist-info/RECORD,,

annet_generators/example/__init__.py

@@ -1,10 +1,15 @@
+import itertools
 from typing import List
 
 from annet.generators import BaseGenerator
 from annet.storage import Storage
 
 from . import lldp
+from . import hostname
 
 
 def get_generators(store: Storage) -> List[BaseGenerator]:
-    return lldp.get_generators(store)
+    return list(itertools.chain.from_iterable([
+        hostname.get_generators(store),
+        lldp.get_generators(store),
+    ]))

annet_generators/example/hostname.py

@@ -0,0 +1,113 @@
+from typing import List
+
+from annet.generators import BaseGenerator, PartialGenerator
+from annet.storage import Storage
+
+
+class Hostname(PartialGenerator):
+    TAGS = ["hostname"]
+
+    def acl_huawei(self, _):
+        return """
+        sysname
+        header
+        """
+
+    def acl_safe_huawei(self, _):
+        return """
+        sysname
+        header
+        """
+
+    def run_huawei(self, device):
+        yield "sysname", device.hostname
+        yield 'header login information "%s"' % device.hostname
+
+    def acl_cisco(self, _):
+        return """
+            hostname
+            banner login
+        """
+
+    def acl_safe_cisco(self, _):
+        return """
+            hostname
+            banner login
+        """
+
+    def run_cisco(self, device):
+        if device.hw.Cisco.AIR and device.tags["Lightweight WiFi точка"]:
+            return
+        elif device.hw.Catalyst:
+            yield "banner login ^C%s^C" % device.hostname
+        yield "hostname", device.hostname
+
+    def acl_arista(self, _):
+        return """
+            hostname
+        """
+
+    def acl_safe_arista(self, _):
+        return """
+            hostname
+        """
+
+    def run_arista(self, device):
+        yield "hostname", device.hostname
+
+    acl_nexus = acl_arista
+    run_nexus = run_arista
+
+    def acl_juniper(self, _):
+        return """
+            system  %cant_delete
+                host-name
+        """
+
+    def acl_safe_juniper(self, _):
+        return """
+            system  %cant_delete
+                host-name
+        """
+
+    def run_juniper(self, device):
+        with self.block("system"):
+            yield "host-name", device.hostname
+
+    acl_ribbon = acl_juniper
+    acl_safe_ribbon = acl_safe_juniper
+    run_ribbon = run_juniper
+
+    def acl_nokia(self, _):
+        return """
+            system
+                name
+        """
+
+    def acl_safe_nokia(self, _):
+        return """
+            system
+                name
+        """
+
+    def run_nokia(self, device):
+        with self.block("system"):
+            yield "name", self.literal(device.hostname)
+
+    def acl_routeros(self, _):
+        return """
+        system              %cant_delete
+            identity        %cant_delete
+                set ~       %cant_delete
+        """
+
+    def run_routeros(self, device):
+        with self.block("system"):
+            with self.block("identity"):
+                yield f"set name={device.hostname}"
+
+
+def get_generators(store: Storage) -> List[BaseGenerator]:
+    return [
+        Hostname(store),
+    ]