annet 0.15.6__py3-none-any.whl → 0.16.1__py3-none-any.whl

annet/adapters/netbox/common/manufacturer.py

@@ -17,6 +17,7 @@ _VENDORS = {
     "aruba": "Aruba",
     "routeros": "RouterOS",
     "ribbon": "Ribbon",
+    "b4com": "B4com"
 }
 
 
@@ -46,4 +47,8 @@ def get_breed(manufacturer: str, model: str):
         return "adva8"
     elif manufacturer == "Arista":
         return "eos4"
+    elif manufacturer == "B4com":
+        return "bcom-os"
+    elif manufacturer == "MikroTik":
+        return "routeros"
     return ""

annet/adapters/netbox/common/models.py

@@ -52,17 +52,17 @@ class DeviceIp(DumpableView):
 class Prefix(DumpableView):
     id: int
     prefix: str
-    site: Entity | None
-    vrf: Entity | None
-    tenant: Entity | None
-    vlan: Entity | None
-    role: Entity | None
+    site: Optional[Entity]
+    vrf: Optional[Entity]
+    tenant: Optional[Entity]
+    vlan: Optional[Entity]
+    role: Optional[Entity]
     status: Label
     is_pool: bool
     custom_fields: dict[str, Any]
     created: datetime
     last_updated: datetime
-    description: str | None = ""
+    description: Optional[str] = ""
 
     @property
     def _dump__list_key(self):
@@ -166,5 +166,5 @@ class NetboxDevice(Entity):
     def __eq__(self, other):
         return type(self) is type(other) and self.url == other.url
 
-    def is_pc(self):
+    def is_pc(self) -> bool:
         return self.device_type.manufacturer.name == "Mellanox"

annet/adapters/netbox/common/storage_opts.py

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

annet/annlib/jsontools.py

@@ -1,7 +1,9 @@
-"""Support JSON patch (RFC 6902) and JSON Pointer (RFC 6901)."""
+"""Support JSON patch (RFC 6902) and JSON Pointer (RFC 6901) with globs."""
 
 import copy
+import fnmatch
 import json
+from collections.abc import Mapping, Sequence
 from typing import Any, Dict, List, Optional
 
 import jsonpatch
@@ -23,24 +25,21 @@ def apply_json_fragment(
     """
     full_new_config = copy.deepcopy(old)
     for acl_item in acl:
-        pointer = jsonpointer.JsonPointer(acl_item)
+        new_pointers = _resolve_json_pointers(acl_item, new_fragment)
+        old_pointers = _resolve_json_pointers(acl_item, full_new_config)
 
-        try:
+        for pointer in new_pointers:
             new_value = pointer.get(new_fragment)
-        except jsonpointer.JsonPointerException:
-            # no value found in new_fragment by the pointer,
-            # try to delete it from the new config
-            try:
-                doc, part = pointer.to_last(full_new_config)
-                if isinstance(doc, dict) and isinstance(part, str):
-                    doc.pop(part, None)
-            except jsonpointer.JsonPointerException:
-                # not found in the old config either
-                pass
-            continue
+            _ensure_pointer_exists(full_new_config, pointer)
+            pointer.set(full_new_config, new_value)
 
-        _ensure_pointer_exists(full_new_config, pointer)
-        pointer.set(full_new_config, new_value)
+        # delete matched parts in old config whicn are not present in the new
+        paths = {p.path for p in new_pointers}
+        to_delete = [p for p in old_pointers if p.path not in paths]
+        for pointer in to_delete:
+            doc, part = pointer.to_last(full_new_config)
+            if isinstance(doc, dict) and isinstance(part, str):
+                doc.pop(part, None)
 
     return full_new_config
 
@@ -104,9 +103,8 @@ def apply_acl_filters(content: Dict[str, Any], filters: List[str]) -> Dict[str,
         if not filter_text:
             continue
 
-        pointer = jsonpointer.JsonPointer(filter_text)
-
-        try:
+        pointers = _resolve_json_pointers(filter_text, content)
+        for pointer in pointers:
             part = pointer.get(copy.deepcopy(content))
 
             sub_tree = result
@@ -115,10 +113,70 @@ 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": filter_text, "value": part}])
+            patch = jsonpatch.JsonPatch([{"op": "add", "path": pointer.path, "value": part}])
             result = patch.apply(result)
-        except jsonpointer.JsonPointerException:
-            # no value found in content by the pointer, skip the ACL item
-            continue
 
     return result
+
+
+def _resolve_json_pointers(pattern: str, content: Dict[str, Any]) -> List[jsonpointer.JsonPointer]:
+    """
+    Resolve globbed json pointer pattern to a list of actual pointers, existing in the document.
+
+    For example, given the following document:
+
+    {
+        "foo": {
+            "bar": {
+                "baz": [1, 2]
+            },
+            "qux": {
+                "baz": [3, 4]
+            },
+        }
+    }
+
+    Pattern "/f*/*/baz" will resolve to:
+
+    [
+        "/foo/bar/baz"",
+        "/foo/qux/baz",
+    ]
+
+    Pattern "/f*/q*/baz/*" will resolve to:
+
+    [
+        "/foo/qux/baz/0",
+        "/foo/qux/baz/1",
+    ]
+
+    Pattern "/*" will resolve to:
+
+    [
+        "/foo"
+    ]
+    """
+    parts = jsonpointer.JsonPointer(pattern).parts
+    matched = [([], content)]
+    for part in parts:
+        new_matched = []
+        for matched_parts, doc in matched:
+            keys_and_docs = []
+            if isinstance(doc, Mapping):
+                keys_and_docs = [
+                    (key, doc[key]) for key in doc.keys()
+                    if fnmatch.fnmatchcase(key, part)
+                ]
+            elif isinstance(doc, Sequence):
+                keys_and_docs = [
+                    (str(i), doc[i]) for i in range(len(doc))
+                    if fnmatch.fnmatchcase(str(i), part)
+                ]
+            for key, sub_doc in keys_and_docs:
+                new_matched.append((matched_parts + [key], sub_doc))
+        matched = new_matched
+
+    ret: List[jsonpointer.JsonPointer] = []
+    for matched_parts, _ in matched:
+        ret.append(jsonpointer.JsonPointer("/" + "/".join(matched_parts)))
+    return ret

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

@@ -156,5 +156,10 @@
 
     "H3C": "^[Hh]3[Cc]",
     "H3C.S12500": " S125\\d{2}",
-    "H3C.S12500.S12500R": " S12500R"
+    "H3C.S12500.S12500R": " S12500R",
+
+    "B4com": "^[Bb]4com",
+    "B4com.CS2148P": "^[Bb]4com B4T-CS2148P.*",
+    "B4com.CS4148Q": "^[Bb]4com B4T-CS4148Q.*",
+    "B4com.CS4146U": "^[Bb]4com B4T-CS4146U.*"
 }

annet/annlib/netdev/views/hardware.py

@@ -97,6 +97,8 @@ def hw_to_vendor(hw: HardwareView) -> Optional[str]:
         return "ribbon"
     elif hw.H3C:
         return "h3c"
+    elif hw.B4com:
+        return "b4com"
     return None
 
 
@@ -116,6 +118,7 @@ def vendor_to_hw(vendor):
             "routeros": "RouterOS",
             "ribbon": "Ribbon",
             "h3c": "H3C",
+            "b4com": "B4com",
         }.get(vendor.lower(), vendor),
         None,
     )

annet/annlib/rbparser/platform.py

@@ -10,6 +10,7 @@ VENDOR_REVERSES = {
     "aruba": "no",
     "pc": "-",
     "ribbon": "delete",
+    "b4com": "no",
 }
 
 VENDOR_DIFF = {
@@ -24,6 +25,7 @@ VENDOR_DIFF = {
     "aruba": "aruba.default_diff",
     "pc": "common.default_diff",
     "ribbon": "ribbon.default_diff",
+    "b4com": "common.default_diff",
 }
 
 VENDOR_DIFF_ORDERED = {
@@ -38,6 +40,7 @@ VENDOR_DIFF_ORDERED = {
     "aruba": "common.ordered_diff",
     "pc": "common.ordered_diff",
     "ribbon": "ribbon.default_diff",
+    "b4com": "common.ordered_diff",
 }
 
 VENDOR_EXIT = {
@@ -52,4 +55,5 @@ VENDOR_EXIT = {
     "aruba": "exit",
     "pc": "",
     "ribbon": "exit",
+    "b4com": "exit",
 }

annet/annlib/rulebook/common.py

@@ -344,6 +344,18 @@ def apply(hw, do_commit, do_finalize, **_):
         if do_commit:
             after.add_cmd(Command("commit", timeout=30))
         after.add_cmd(Command("exit"))
+    elif hw.B4com.CS2148P:
+        before.add_cmd(Command("conf t"))
+        after.add_cmd(Command("exit"))
+        if do_finalize:
+            after.add_cmd(Command("write", timeout=40))
+    elif hw.B4com:
+        before.add_cmd(Command("conf t"))
+        after.add_cmd(Command("exit"))
+        if do_commit:
+            after.add_cmd(Command("commit"))
+        if do_finalize:
+            after.add_cmd(Command("write", timeout=40))
     else:
         raise Exception("unknown hw %s" % hw)
 

annet/annlib/tabparser.py

@@ -656,6 +656,7 @@ def make_formatter(vendor, **kwargs):
         "aruba": CiscoFormatter,
         "pc": CommonFormatter,
         "ribbon": RibbonFormatter,
+        "b4com": CiscoFormatter,
     }
     return formatters[vendor](**kwargs)
 

annet/api/__init__.py

@@ -6,7 +6,7 @@ import sys
 import time
 import warnings
 from collections import OrderedDict as odict
-from itertools import groupby
+from itertools import groupby, chain
 from operator import itemgetter
 from typing import (
     Any,
@@ -35,6 +35,7 @@ from annet import diff as ann_diff
 from annet import filtering
 from annet import gen as ann_gen
 from annet import patching, rulebook, tabparser, tracing
+from annet.rulebook import deploying
 from annet.filtering import Filterer
 from annet.hardware import hardware_connector
 from annet.output import (
@@ -499,10 +500,15 @@ class PCDeployerJob(DeployerJob):
             for cmd in deployer_driver.build_exit_cmdlist(device.hw):
                 after.add_cmd(cmd)
             cmds_pre_files = {}
-            for file in self.deploy_cmds[device]["files"]:
-                if before:
-                    cmds_pre_files[file] = "\n".join(map(str, before)).encode(encoding="utf-8")
-                self.deploy_cmds[device]["cmds"][file] += "\n".join(map(str, after)).encode(encoding="utf-8")
+            rules = rulebook.get_rulebook(device.hw)["deploying"]
+            for file, content in self.deploy_cmds[device]["files"].items():
+                rule = deploying.match_deploy_rule(rules, [file], content)
+                before_more, after_more = annet.deploy.make_apply_commands(rule, res.device.hw, do_commit=True, do_finalize=True, path=file)
+
+                cmds_pre_files[file] = "\n".join(map(str, chain(before, before_more))).encode(encoding="utf-8")
+                after_cmds = "\n".join(map(str, chain(after, after_more))).encode(encoding="utf-8")
+                if after_cmds:
+                    self.deploy_cmds[device]["cmds"][file] += b"\n" + after_cmds
             self.deploy_cmds[device]["cmds_pre_files"] = cmds_pre_files
 
 

annet/cli.py

@@ -8,7 +8,7 @@ import subprocess
 import shutil
 import sys
 from contextlib import ExitStack, contextmanager
-from typing import Tuple, Iterable
+from typing import Optional, Tuple, Iterable
 
 import tabulate
 import yaml
@@ -129,7 +129,7 @@ def show_generators(args: cli_args.ShowGeneratorsOptions):
     """ List applicable generators (for a device if query is set) """
     arg_gens = cli_args.GenOptions(args)
     with get_loader(arg_gens, args) as loader:
-        device: Device | None = None
+        device: Optional[Device] = None
         devices = loader.devices
         if len(devices) == 1:
             device = devices[0]

annet/deploy.py

@@ -481,9 +481,9 @@ def make_cmd_params(rule: Dict[str, Any]) -> Dict[str, Any]:
     }
 
 
-def make_apply_commands(rule, hw, do_commit, do_finalize):
+def make_apply_commands(rule: dict, hw: HardwareView, do_commit: bool, do_finalize: bool, path: Optional[str] = None):
     apply_logic = rule["attrs"]["apply_logic"]
-    before, after = apply_logic(hw, do_commit=do_commit, do_finalize=do_finalize)
+    before, after = apply_logic(hw, do_commit=do_commit, do_finalize=do_finalize, path=path)
     return before, after
 
 

annet/lib.py

@@ -141,6 +141,4 @@ def repair_context_file() -> None:
 
 
 def do_async(coro: Awaitable):
-    loop = asyncio.get_event_loop()
-    res = loop.run_until_complete(coro)
-    return res
+    return asyncio.run(coro)

annet/rulebook/b4com/file.py

@@ -0,0 +1,5 @@
+from annet.annlib.types import Op
+
+
+def change(key, diff, **kwargs):
+    yield from [(True, add["row"], None) for add in diff[Op.ADDED]]

annet/rulebook/texts/b4com.deploy

@@ -0,0 +1,18 @@
+# Рулбук деплоя на устройства
+#
+# Операторы:
+#   *  Один аргумент
+#   ~  Несколько аргументов (минимум один)
+#
+# Параметры:
+#   %timeout=...  Таймаут выполнения команды (в секундах, по умолчанию 30)
+#
+# Ответы на вопросы
+#
+# <команда>
+#   dialog: <вопрос> ::: <ответ> <параметры>
+#
+# Если <вопрос> заключён в слеши (//), то воспринимается как регулярка, иначе - точное совпадение.
+# Параметы:
+#   %send_nl=...  Посылать ли перевод строки после ответа (bool, по умолчанию true)
+# -----

annet/rulebook/texts/b4com.order

@@ -0,0 +1,8 @@
+# В этом файле определяется порядок команд, в котором их следует подавать на устройство.
+# - Если порядок команды не важен - ее можно не писать сюда совсем.
+# - Если команда начинается с undo и прописан параметр %order_reverse - команда считается
+#   обратной, но занимает место между прямыми там, где указано.
+
+# Фичи должны быть включены прежде всего
+feature
+# Далее нужно будет указать команды и их порядок

annet/rulebook/texts/b4com.rul

@@ -0,0 +1,18 @@
+# Операторы:
+#   *  Один аргумент в undo
+#   ~  Несколько аргументов (минимум один) в undo
+#
+# Параметры:
+#   %global         Команда действует на любом уровне ниже
+#   %logic=...      Кастомная функция обработки правила
+#   %diff_logic=... Кастомная функция построения диффа.
+#                   данная функция работает для подблоков (в отличие от %logic)
+#   %comment=...    Добавить коммент после строки который будет видно с опцией patch --add-comments
+#                   Сделано в основном для того чтобы генерировать специальные команды для наливки
+# -----
+# Physical
+interface */(ce|xe)[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
+    ipv6 address *
+    mtu *
+    lldp-agent
+    ~         %rewrite %global

annet/storage.py

@@ -1,6 +1,7 @@
 import abc
 from typing import Any, Iterable, Optional, Type, Union, Protocol, Dict
 from annet.connectors import Connector, get_connector_from_config
+from annet.annlib.netdev.views.hardware import HardwareView
 
 
 class _StorageConnector(Connector["StorageProvider"]):
@@ -95,12 +96,12 @@ class Device(Protocol):
         pass
 
     @abc.abstractmethod
-    def is_pc(self):
+    def is_pc(self) -> bool:
         pass
 
     @property
     @abc.abstractmethod
-    def hw(self):
+    def hw(self) -> HardwareView:
         pass
 
     @property
@@ -110,12 +111,12 @@ class Device(Protocol):
 
     @property
     @abc.abstractmethod
-    def fqdn(self):
+    def fqdn(self) -> str:
         pass
 
     @property
     @abc.abstractmethod
-    def hostname(self):
+    def hostname(self) -> str:
         pass
 
     @property
@@ -125,7 +126,7 @@ class Device(Protocol):
 
     @property
     @abc.abstractmethod
-    def breed(self):
+    def breed(self) -> str:
         pass
 
 

annet/tabparser.py

@@ -21,7 +21,7 @@ def make_formatter(hw, **kwargs):
         cls = HuaweiFormatter
     elif hw.Cisco.ASR or hw.Cisco.XRV:
         cls = AsrFormatter
-    elif hw.Nexus or hw.Cisco or hw.Arista or hw.Aruba:
+    elif hw.Nexus or hw.Cisco or hw.Arista or hw.Aruba or hw.B4com:
         cls = CiscoFormatter
     elif hw.Juniper:
         cls = JuniperFormatter

{annet-0.15.6.dist-info → annet-0.16.1.dist-info}/METADATA

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

{annet-0.15.6.dist-info → annet-0.16.1.dist-info}/RECORD

@@ -1,23 +1,23 @@
 annet/__init__.py,sha256=k2dq8aOYjkjZszKoOlxEmR49uYoKh-8_HC2K8FeqLwA,2139
 annet/annet.py,sha256=TMdEuM7GJQ4TjRVmuK3bCTZN-21lxjQ9sXqEdILUuBk,725
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
-annet/cli.py,sha256=ugxI_NFi-yuMn4RIlFKlqCDUurPXlSAa7kR9hkd1OxA,12329
+annet/cli.py,sha256=hDpjIr3w47lgQ_CvCQS1SXFDK-SJrf5slbT__5u6GIA,12342
 annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
 annet/connectors.py,sha256=_DY5JwR_uU_obOpzo2a_JsexIE-lbNjG1Hq2nOpQm4w,5067
-annet/deploy.py,sha256=bG_VvUINz91ljUmnVNNQI4l-Dl4Zdp8ragN5GJZnA28,18885
+annet/deploy.py,sha256=pM7r8ipk7y-b4OIenc8FMqZpy5F6TmKdo8DDUJNRBlY,18956
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=FrYAUuh2TpSVX42SlTN_PhuSHmXG4Wj1nieY9Wqv9so,19122
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
 annet/gen.py,sha256=Xy4VyK8pfH97wZ8Zv2bD2SNxhEx9-S93Zp7pQm-VnuU,33592
 annet/hardware.py,sha256=_iR28dWiPtt6ZYdk-qg1sxazkSRJE3ukqKB-fFFfQak,1141
 annet/implicit.py,sha256=_3eY9NKqpLUm25vlJIP2cHN4gdTgzO6rG6mwCKJYMnQ,5439
-annet/lib.py,sha256=W6Z9UurcyF1zU3gAd8hIec9yBzeeHzxZEkvf1cIg8KI,4280
+annet/lib.py,sha256=z-qhs68ap0xHZjGdn-vTUqE91IPaUM6eU_Pee7Exniw,4218
 annet/output.py,sha256=BNPzjuhMa7gSJ8ze_1O-Ey0tTxSyhAiwfztZMQwhMzk,7176
 annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
-annet/storage.py,sha256=lL33L4s63sMTS4n0kzC2mtrhpXAu0RYBvKC6U7I--gs,2706
-annet/tabparser.py,sha256=dEavhVBd9TEFf2NOW_JpTDcz2rzNtP4siQPceWalpl0,957
+annet/storage.py,sha256=s5kiSonsQZnT-ioAyoLtezLe1QbbJwK5-Wr1QfMxupU,2811
+annet/tabparser.py,sha256=N0O7G9DTdmgcBDxz0PH7B_r-Z8FsUkZqm9hTBy3PZFA,969
 annet/text_term_format.py,sha256=CHb6viv45vmYl-SK1A1vyPHGhaEni6jVybBusaQnct8,2813
 annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
 annet/types.py,sha256=f2HwqoKa6AucwFwDMszoouB6m1B8n6VmdjHMktO30Kc,7175
@@ -26,11 +26,11 @@ annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 annet/adapters/netbox/provider.py,sha256=mnvxSy3vTwdEHvzfy_Tfji4J4-BDmiKwkcF0s-EAs2M,1449
 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=K1z2ioP9ZikxjjfSAuAAszZALW0o9w1kLTnW5cR16tU,1412
-annet/adapters/netbox/common/models.py,sha256=Vgxbl_Mm-zOAi2BTlEzDppTTgZjafFEC5F9s_MTd_xU,3263
+annet/adapters/netbox/common/manufacturer.py,sha256=WZsBfHq6kohbbkszxPARjMdXB5rWGBO4Gz1rA-IlqL8,1555
+annet/adapters/netbox/common/models.py,sha256=uAUTzyZk9-B4xdVGCe2nSSBO8PXAiUYvYHOTnQAdQbU,3289
 annet/adapters/netbox/common/query.py,sha256=ziUFM7cUEbEIf3k1szTll4aO-OCUa-2Ogxbebi7Tegs,646
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
-annet/adapters/netbox/common/storage_opts.py,sha256=afBMiIOOHFRJLh4KCLPflCCXKxh7D7VX9EL5wxFkuZI,494
+annet/adapters/netbox/common/storage_opts.py,sha256=iadgWGMb-rfSp3SnFAw8SH5bMKjwvcAsJ74v_z0CCXQ,507
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/v24/storage.py,sha256=THI592VLx3ehixsPZQ1Ko3mYIAZQbnDY-toIziqBbL8,6005
 annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,28 +40,28 @@ annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=UPt3kYFQdQdVVy3ePYzNHPAxMVmHxCrCnZnMCV6ou2Q,4587
 annet/annlib/errors.py,sha256=jBcSFzY6Vj-FxR__vqjFm-87AwYQ0xHuAopTirii5AU,287
 annet/annlib/filter_acl.py,sha256=0w1VF6WcONiTYTQh0yWi6_j9rCTc_kMLAUMr0hbdkNU,7203
-annet/annlib/jsontools.py,sha256=J_pToAAXQphP1QFh6uLQH9PnmHO68I5WV64qIQXLeDQ,3807
+annet/annlib/jsontools.py,sha256=4-2r_mPNbecKreuUr3vlLv3ykJdhRmyUD8AdF2nSAxc,5430
 annet/annlib/lib.py,sha256=eJ4hcVuQ6pdYBzLs4YKCHFtq45idOfZCYp92XfF7_QI,15317
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
 annet/annlib/patching.py,sha256=GwG2lT4w-I1Ls3Eswn6SPJLBUVt2M3Ysw1fmXsWamYw,19793
-annet/annlib/tabparser.py,sha256=djxW4d3pozqrNT6ZkrOxIUZkgGiZXHy7JvQSjao5MyY,25964
+annet/annlib/tabparser.py,sha256=9ry4DxZn6ibShd7fFtH_TElm3lT5tgMGkHcpGXNVuUY,25997
 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=pW4gwys2SbduBC65hepV_HOv9uxn8pxz0ckvGFJiPoU,5727
+annet/annlib/netdev/devdb/data/devdb.json,sha256=GEKBY3Mx1wjLmhlN9h6VIj5RoTCA2thmDIEXBvv6EVg,5898
 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=6453atMaeoLWJSXzZxQ0zeTrdtRwCv0dlu6ivvpcdYE,3423
+annet/annlib/netdev/views/hardware.py,sha256=1JdTkrumOTYd5GKz4_LKg8G-B6ccrzl5VdNT-JhX40A,3495
 annet/annlib/rbparser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rbparser/acl.py,sha256=RR8yPt6t96_IiyuKVbeZ-3x32cyhBAT2wC1y99oWBO8,3931
 annet/annlib/rbparser/deploying.py,sha256=ACT8QNhDAhJx3ZKuGh2nYBOrpdka2qEKuLDxvQAGKLk,1649
 annet/annlib/rbparser/ordering.py,sha256=DiKqyY8Khz-5MTxNF1GSNtZgtyKwT3YYCXpahIPB6Ps,1779
-annet/annlib/rbparser/platform.py,sha256=_W84Gt3XwURT2MLngZSmwZbWgqsnbrwzjNgHIHa8Xug,1365
+annet/annlib/rbparser/platform.py,sha256=QI9KuCrel3X19PW5u56hWi1UhJ9mxlTYtUIpmcmGRUc,1477
 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=9kCZwZpsH5UliF2OzaN9nLs2eLlz_d__4L7_oZ3SrCw,16054
-annet/api/__init__.py,sha256=xC4a-iSQACUZYoBujjZa1CjVWlNqxWpif15zCdvS828,33128
+annet/annlib/rulebook/common.py,sha256=Kd9Xout0xC6ZZDnyaORx0W-1kSM-gTgjQbp1iIXWxic,16489
+annet/api/__init__.py,sha256=KWoJfo2ByHC8EsIhU4szuhGwE8OKYS7Y1TN2xkhe0qA,33563
 annet/configs/context.yml,sha256=jzAQX9WbjFw_nsju8FLCCGfRc4ZXD0Mhb5pvO9emegI,413
 annet/configs/logging.yaml,sha256=Hu42lRK248dssp9TgkbHCaZNl0E6f4IChGb0XaQnTVo,970
 annet/generators/__init__.py,sha256=ACMH9UQ4I3uq2b8nDzOn2dgYxreDq4_3ojOGwht0-No,15543
@@ -84,6 +84,8 @@ annet/rulebook/arista/iface.py,sha256=bgj6a3r__-OE6VyYbSfnD6ps2QJKyX028W7IFJww-U
 annet/rulebook/aruba/__init__.py,sha256=ILggeID6kNWcDBGzhXm_mebcfkuLSq5prBFU5DyPFs4,500
 annet/rulebook/aruba/ap_env.py,sha256=5fUVLhXH4-0DAtv8t0yoqJUibaRMuzF8Q7mGFzNsEN8,4692
 annet/rulebook/aruba/misc.py,sha256=O0p_wsR07gtB8rm1eJvJ7VYnGm5T8Uau_SVKR9FVInI,234
+annet/rulebook/b4com/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+annet/rulebook/b4com/file.py,sha256=zK7RwBk1YaVoDSFSg1u7Pt8u0Fk3nhhu27aJRngemwc,137
 annet/rulebook/cisco/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/cisco/iface.py,sha256=WISkzjp_G7WKPpg098FCIm4b7ipOxtRLOQbu-7gMUL0,1792
 annet/rulebook/cisco/misc.py,sha256=l9NTR6cAsrfFyeC_yoOeQ0fOFoPiJfFwnRva5W9vyL0,2259
@@ -104,6 +106,9 @@ annet/rulebook/texts/arista.rul,sha256=HUYiN55s8Y6Wrd5q1Awe7-o5BYBh7gIxthUC5Nvrf
 annet/rulebook/texts/aruba.deploy,sha256=hI432Bq-of_LMXuUflCu7eNSEFpx6qmj0KItEw6sgHI,841
 annet/rulebook/texts/aruba.order,sha256=ZMakkn0EJ9zomgY6VssoptJImrHrUmYnCqivzLBFTRo,1158
 annet/rulebook/texts/aruba.rul,sha256=zvGVpoYyJvMoL0fb1NQ8we_GCLZXno8nwWpZIOScLQQ,2584
+annet/rulebook/texts/b4com.deploy,sha256=SVX8-yLHM90tJC4M-ekpGuGM1aQZW3euSGyg67l--R0,781
+annet/rulebook/texts/b4com.order,sha256=G3aToAIHHzKzDCM3q7_lyr9wJvuVOXVbVvF3wm5PiTE,707
+annet/rulebook/texts/b4com.rul,sha256=5mqyUg_oLRSny2iH6QdhfDWVu6kzgDURtlSATD7DFno,1056
 annet/rulebook/texts/cisco.deploy,sha256=XvXWeOMahE8Uc9RF0xkJj8jGknD4vit8H_f24ubPX7w,1226
 annet/rulebook/texts/cisco.order,sha256=eE9ddPQr8ZumjffQsMvl-BBymOwV6juETZU3r7kpRvk,1709
 annet/rulebook/texts/cisco.rul,sha256=HGg62zXCn8UVXu9x_Ja5QivPcY5Yo5BYi1CaOXCaDHA,2869
@@ -118,6 +123,7 @@ annet/rulebook/texts/nokia.rul,sha256=gxK7FCRdjGUs7tDHTUebVOgkzWINAGibMPtz8tzvwg
 annet/rulebook/texts/optixtrans.deploy,sha256=SVX8-yLHM90tJC4M-ekpGuGM1aQZW3euSGyg67l--R0,781
 annet/rulebook/texts/optixtrans.order,sha256=NbeEP5oBsC-Iw84T8dpmc_s3BXJofXYeTdGdjUmPsYM,623
 annet/rulebook/texts/optixtrans.rul,sha256=MvQX16Gyc1loCgPgLd2Ei1BYrTDZ33CayQurc_j9xVk,898
+annet/rulebook/texts/pc.deploy,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/texts/pc.order,sha256=WTSosHmIA5LyHO_DNAH1VDeuXHEgZ9e_aDFyAtIW6rE,275
 annet/rulebook/texts/pc.rul,sha256=zwIkSdOsJ6gmIj1sfy0xa4_yQRRBRjSQEqopsqFE2u8,302
 annet/rulebook/texts/ribbon.deploy,sha256=hCq2XeAcwaYanyQ8lTdnez6Pgq-gRqpNuR8dAleIn3U,864
@@ -126,11 +132,11 @@ annet/rulebook/texts/routeros.order,sha256=M71uy_hf0KAjLNS3zZY3uih4m2xLUcu26FEoV
 annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019O1DE,1203
 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.15.6.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.15.6.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.15.6.dist-info/METADATA,sha256=d4SamOgnBPYxqPgPhCeG99snQCis2cRKYdPy6TgvdJw,694
-annet-0.15.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-annet-0.15.6.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.15.6.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.15.6.dist-info/RECORD,,
+annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn6yo,2100
+annet-0.16.1.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.1.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.1.dist-info/METADATA,sha256=fBLYdAEadQVUPbjdikTJS2OOmaMiWWvIgrGgEv4nLY8,694
+annet-0.16.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+annet-0.16.1.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.1.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.1.dist-info/RECORD,,

annet_generators/example/lldp.py

@@ -46,6 +46,34 @@ class Lldp(PartialGenerator):
                 interface all
             """
 
+    def acl_b4com(self, device):
+        return """
+        lldp *
+        interface *
+         lldp-agent
+            *
+        """
+
+    def run_b4com(self, device):
+        yield """
+        lldp run
+        lldp tlv-select basic-mgmt port-description
+        lldp tlv-select basic-mgmt system-name
+        lldp tlv-select basic-mgmt system-capabilities
+        lldp tlv-select basic-mgmt system-description
+        lldp tlv-select basic-mgmt management-address
+        """
+        for iface in device.interfaces:
+            with self.multiblock(f"interface {iface.name}"):
+                with self.multiblock("lldp-agent"):
+                    yield """
+                    set lldp enable txrx
+                    set lldp chassis-id-tlv ip-address
+                    set lldp port-id-tlv if-name
+                    lldp tlv basic-mgmt system-name select
+                    lldp tlv basic-mgmt system-description select
+                    """
+
 
 def get_generators(store: Storage) -> List[BaseGenerator]:
     return [