annet 3.7.0__py3-none-any.whl → 3.9.0__py3-none-any.whl

annet/adapters/netbox/common/models.py

@@ -139,7 +139,7 @@ class FHRPGroup(Generic[_DeviceIPT]):
     group_id: int
     display: str
     protocol: str
-    description: str
+    description: str | None
 
     name: str
     auth_type: str | None
@@ -235,7 +235,7 @@ class NetboxDevice(Entity, Generic[_InterfaceT, _DeviceIPT]):
     device_type: DeviceType
     # `device_role` deprecated since v4.0, replace in derived classes.
     tenant: Optional[Entity]
-    platform: Optional[Entity]
+    platform: Optional[EntityWithSlug]
     serial: str
     asset_tag: Optional[str]
     site: Entity

annet/adapters/netbox/provider.py

@@ -21,6 +21,7 @@ def storage_factory(opts: NetboxStorageOpts) -> Storage:
         "4.0": NetboxStorageV41,
         "4.1": NetboxStorageV41,
         "4.2": NetboxStorageV42,
+        "4.3": NetboxStorageV42,
     }
 
     status = None
@@ -37,7 +38,8 @@ def storage_factory(opts: NetboxStorageOpts) -> Storage:
         else:
             raise ValueError(f"Unsupported version: {status.netbox_version}")
     except ClientLibraryError:
-        raise ValueError(f"Connection error: Unable to reach Netbox at URL: {opts.url}")
+        raise ValueError(
+            f"Connection error: Unable to reach Netbox at URL: {opts.url}")
     raise Exception(f"Unsupported version: {status.netbox_version}")
 
 

annet/adapters/netbox/v37/models.py

@@ -20,6 +20,7 @@ class PrefixV37(Prefix):
 
 @dataclass
 class IpAddressV37(IpAddress[PrefixV37]):
+    role: Optional[Label] = None
     prefix: Optional[PrefixV37] = None
 
 

annet/adapters/netbox/v41/models.py

@@ -4,7 +4,7 @@ import warnings
 from datetime import datetime, timezone
 from annet.adapters.netbox.common.models import Entity, Interface, \
     InterfaceType, IpAddress, Label, NetboxDevice, DeviceIp, IpFamily, Prefix, \
-    FHRPGroupAssignment, FHRPGroup
+    FHRPGroupAssignment, FHRPGroup, EntityWithSlug
 
 
 @dataclass
@@ -14,6 +14,7 @@ class PrefixV41(Prefix):
 
 @dataclass
 class IpAddressV41(IpAddress[PrefixV41]):
+    role: Optional[Label] = None
     prefix: Optional[PrefixV41] = None
 
 
@@ -52,7 +53,7 @@ class InterfaceV41(Interface[IpAddressV41, FHRPGroupAssignmentV41]):
 
 @dataclass
 class NetboxDeviceV41(NetboxDevice[InterfaceV41, DeviceIpV41]):
-    role: Entity
+    role: EntityWithSlug
 
     @property
     def device_role(self):

annet/adapters/netbox/v42/models.py

@@ -22,6 +22,7 @@ class PrefixV42(Prefix):
 
 @dataclass
 class IpAddressV42(IpAddress[PrefixV42]):
+    role: Optional[Label] = None
     prefix: Optional[PrefixV42] = None
 
 

annet/annlib/jsontools.py

@@ -4,8 +4,9 @@ import copy
 import fnmatch
 import json
 from collections.abc import Mapping, Sequence
+from itertools import starmap
 from operator import itemgetter
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, Iterable, List, Optional
 
 import jsonpatch
 import jsonpointer
@@ -16,23 +17,28 @@ def format_json(data: Any, stable: bool = False) -> str:
     return json.dumps(data, indent=4, ensure_ascii=False, sort_keys=not stable) + "\n"
 
 
-def _sanitize_json_pointer(pattern: str) -> str:
-    """Replace special characters on the JsonPointer valid ones"""
-    return pattern.replace("~", "~0").replace("/", "~1")
-
-
 def apply_json_fragment(
         old: Dict[str, Any],
-        new_fragment: Dict[str, Any],
-        acl: List[str],
+        new_fragment: Dict[str, Any], *,
+        acl: Sequence[str],
+        filters: Sequence[str] | None = None,
 ) -> Dict[str, Any]:
     """
     Replace parts of the old document with 'new_fragment' using ACL restrictions.
+    If `filter` is not `None`, only those parts which also matches at least one filter
+    from the list will be modified (updated or deleted).
     """
     full_new_config = copy.deepcopy(old)
     for acl_item in acl:
         new_pointers = _resolve_json_pointers(acl_item, new_fragment)
         old_pointers = _resolve_json_pointers(acl_item, full_new_config)
+        if filters is not None:
+            new_pointers = _apply_filters_to_json_pointers(
+                new_pointers, filters, content=new_fragment
+            )
+            old_pointers = _apply_filters_to_json_pointers(
+                old_pointers, filters, content=full_new_config
+            )
 
         for pointer in new_pointers:
             new_value = pointer.get(new_fragment)
@@ -102,30 +108,7 @@ def apply_patch(content: Optional[bytes], patch_bytes: bytes) -> bytes:
     return new_contents
 
 
-def apply_acl_filters(content: Dict[str, Any], filters: List[str]) -> Dict[str, Any]:
-    result = {}
-    for f in filters:
-        filter_text = f.strip()
-        if not filter_text:
-            continue
-
-        pointers = _resolve_json_pointers(filter_text, content)
-        for pointer in pointers:
-            part = pointer.get(copy.deepcopy(content))
-
-            sub_tree = result
-            for i in pointer.get_parts():
-                if i not in sub_tree:
-                    sub_tree[i] = {}
-                sub_tree = sub_tree[i]
-
-            patch = jsonpatch.JsonPatch([{"op": "add", "path": pointer.path, "value": part}])
-            result = patch.apply(result)
-
-    return result
-
-
-def _resolve_json_pointers(pattern: str, content: Dict[str, Any]) -> List[jsonpointer.JsonPointer]:
+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.
 
@@ -163,7 +146,7 @@ def _resolve_json_pointers(pattern: str, content: Dict[str, Any]) -> List[jsonpo
     ]
     """
     parts = jsonpointer.JsonPointer(pattern).parts
-    matched = [([], content)]
+    matched = [((), content)]
     for part in parts:
         new_matched = []
         for matched_parts, doc in matched:
@@ -179,10 +162,64 @@ def _resolve_json_pointers(pattern: str, content: Dict[str, Any]) -> List[jsonpo
                     if fnmatch.fnmatchcase(str(i), part)
                 ]
             for key, sub_doc in keys_and_docs:
-                new_matched.append((matched_parts + [key], sub_doc))
+                new_matched.append((matched_parts + (key,), sub_doc))
         matched = new_matched
 
-    ret: List[jsonpointer.JsonPointer] = []
+    ret: list[jsonpointer.JsonPointer] = []
     for matched_parts, _ in matched:
-        ret.append(jsonpointer.JsonPointer("/" + "/".join([_sanitize_json_pointer(v) for v in matched_parts])))
+        ret.append(jsonpointer.JsonPointer.from_parts(matched_parts))
     return ret
+
+
+def _apply_filters_to_json_pointers(
+        pointers: Iterable[jsonpointer.JsonPointer],
+        filters: Sequence[str], *,
+        content: Any,
+) -> list[jsonpointer.JsonPointer]:
+
+    """
+    Takes a list of pointers, a list of filters and a document
+    and returns a list of pointers that match at least one of the filters
+    (if necessary, pointers may be deeper than from the input).
+
+    For example, given:
+    pointers=["/foo", "/lorem/ipsum", "/lorem/dolor"],
+    filters=["/foo/b*/q*", "/lorem"],
+    content={
+        "foo": {
+            "bar": {
+                "baz": [1, 2],
+                "qux": [3, 4]
+            },
+            "qux": {
+                "baz": [5, 6]
+            }
+        },
+        "lorem": {
+            "ipsum": [7, 8],
+            "dolor": "sit",
+            "amet": "consectetur"
+        }
+    }
+    The function will return:
+    ["/foo/bar/qux", "/lorem/ipsum", "/lorem/dolor"]
+    """
+
+    ret: set[jsonpointer.JsonPointer] = set()
+    for filter_item in filters:
+        filter_parts = jsonpointer.JsonPointer(filter_item).parts
+        for pointer in pointers:
+            pointer_parts = pointer.parts
+            if not all(starmap(fnmatch.fnmatchcase, zip(pointer_parts, filter_parts))):
+                continue  # common part not matched
+            if len(filter_parts) > len(pointer_parts):
+                # filter is deeper than data pointer
+                deeper_doc = pointer.resolve(content)
+                deeper_pattern = "".join((
+                    f"/{jsonpointer.escape(part)}"
+                    for part in filter_parts[len(pointer_parts):]
+                ))
+                ret.update(map(pointer.join, _resolve_json_pointers(deeper_pattern, deeper_doc)))
+            else:
+                ret.add(pointer)
+    return sorted(ret)

annet/bgp_models.py

@@ -1,6 +1,6 @@
 from collections.abc import Sequence, Iterable
 from dataclasses import dataclass, field
-from typing import Literal, Union, Optional
+from typing import Literal, Union, Optional, Annotated
 
 
 class VidRange:
@@ -162,7 +162,8 @@ class PeerOptions:
     send_lcommunity: Optional[bool] = None
     send_extcommunity: Optional[bool] = None
     send_labeled: Optional[bool] = None
-    import_limit: Optional[bool] = None
+    import_limit: Optional[int] = None
+    import_limit_action: Optional[str] = None
     teardown_timeout: Optional[bool] = None
     redistribute: Optional[bool] = None
     passive: Optional[bool] = None
@@ -241,7 +242,9 @@ class FamilyOptions:
     vrf_name: str = ""
     multipath: int = 0
     global_multipath: int = 0
-    aggregate: Aggregate = field(default_factory=Aggregate)
+    aggregate: Aggregate = field(default_factory=Aggregate)  # use `aggregates` instead
+    aggregates: tuple[Aggregate, ...] = ()
+    af_loops: Optional[int] = None
     redistributes: tuple[Redistribute, ...] = ()
     allow_default: bool = False
     aspath_relax: bool = False
@@ -276,7 +279,8 @@ class PeerGroup:
     send_lcommunity: bool = False
     send_extcommunity: bool = False
     send_labeled: bool = False
-    import_limit: bool = False
+    import_limit: int = False
+    import_limit_action: Optional[str] = None
     teardown_timeout: bool = False
     redistribute: bool = False
     passive: bool = False

annet/gen.py

@@ -259,38 +259,19 @@ def _old_new_per_device(ctx: OldNewDeviceContext, device: Device, filterer: Filt
 
         entire_results = res.entire_results
         json_fragment_results = res.json_fragment_results
-        old_json_fragment_files = old_files.json_fragment_files
 
         new_files = res.new_files()
-        new_json_fragment_files = res.new_json_fragment_files(old_json_fragment_files)
-
-        filters: List[str] = []
-        filters_text = build_filter_text(filterer, device, ctx.stdin, ctx.args, ctx.config)
-        if filters_text:
-            filters = filters_text.split("\n")
-
-            for file_name in new_json_fragment_files:
-                if new_json_fragment_files.get(file_name) is not None:
-                    new_json_fragment_files = _update_json_config(
-                        new_json_fragment_files,
-                        file_name,
-                        jsontools.apply_acl_filters(new_json_fragment_files[file_name][0], filters)
-                    )
-            for file_name in old_json_fragment_files:
-                if old_json_fragment_files.get(file_name) is not None:
-                    old_json_fragment_files[file_name] = jsontools.apply_acl_filters(old_json_fragment_files[file_name], filters)
+
+        filters = None
+        if filters_text := build_filter_text(filterer, device, ctx.stdin, ctx.args, ctx.config):
+            filters = filters_text.removesuffix("\n").split("\n")
+
+        old_json_fragment_files = old_files.json_fragment_files.copy()
+        new_json_fragment_files = res.new_json_fragment_files(old_json_fragment_files, filters=filters)
 
         if ctx.args.acl_safe:
             safe_new_files = res.new_files(safe=True)
-            safe_new_json_fragment_files = res.new_json_fragment_files(old_json_fragment_files, safe=True)
-            if filters:
-                for file_name in safe_new_json_fragment_files:
-                    if safe_new_json_fragment_files.get(file_name):
-                        safe_new_json_fragment_files = _update_json_config(
-                            safe_new_json_fragment_files,
-                            file_name,
-                            jsontools.apply_acl_filters(safe_new_json_fragment_files[file_name][0], filters)
-                        )
+            safe_new_json_fragment_files = res.new_json_fragment_files(old_json_fragment_files, safe=True, filters=filters)
 
     if ctx.args.profile:
         perf = res.perf_mesures()
@@ -322,13 +303,6 @@ def _old_new_per_device(ctx: OldNewDeviceContext, device: Device, filterer: Filt
     )
 
 
-def _update_json_config(json_files, file_name, new_config):
-    file = list(json_files[file_name])
-    file[0] = new_config
-    json_files[file_name] = tuple(file)
-    return json_files
-
-
 @dataclasses.dataclass
 class DeviceDownloadedFiles:
     # map file path to file content for entire generators

annet/generators/result.py

@@ -4,9 +4,11 @@ import textwrap
 from collections import OrderedDict as odict
 from typing import (
     Any,
+    Callable,
     Dict,
     Optional,
-    Tuple, Callable,
+    Sequence,
+    Tuple,
 )
 
 from annet.annlib import jsontools
@@ -84,6 +86,7 @@ class RunGeneratorResult:
             self,
             old_files: Dict[str, Optional[str]],
             safe: bool = False,
+            filters: Sequence[str] | None = None,
     ) -> Dict[str, Tuple[Any, Optional[str]]]:
         # TODO: safe
         files: Dict[str, Tuple[Any, Optional[str]]] = {}
@@ -101,9 +104,9 @@ class RunGeneratorResult:
             previous_config: Dict[str, Any] = files[filepath][0]
             new_fragment = generator_result.config
             new_config = jsontools.apply_json_fragment(
-                previous_config,
-                new_fragment,
-                result_acl,
+                previous_config, new_fragment,
+                acl=result_acl,
+                filters=filters,
             )
             if jsontools.format_json(new_config) == jsontools.format_json(previous_config):
                 # config is not changed, deprioritize reload_cmd

annet/mesh/device_models.py

@@ -1,11 +1,11 @@
 from typing import Annotated, Optional, Union
 
-from annet.bgp_models import Family, Redistribute
+from annet.bgp_models import Family, Redistribute, Aggregate
 from .basemodel import BaseMeshModel, Concat, DictMerge, Merge, KeyDefaultDict
 from .peer_models import MeshPeerGroup
 
 
-class Aggregate(BaseMeshModel):
+class _Aggregate(BaseMeshModel):
     policy: str
     routes: Annotated[tuple[str, ...], Concat()]
     as_path: str
@@ -17,13 +17,15 @@ class Aggregate(BaseMeshModel):
 
 class FamilyOptions(BaseMeshModel):
     def __init__(self, **kwargs):
-        kwargs.setdefault("aggregate", Aggregate())
+        kwargs.setdefault("aggregate", _Aggregate())
         super().__init__(**kwargs)
     family: Family
     vrf_name: str
     multipath: int
     global_multipath: int
-    aggregate: Annotated[Aggregate, Merge()]
+    aggregate: Annotated[_Aggregate, Merge()]  # use `aggregates` instead
+    aggregates: Annotated[tuple[Aggregate, ...], Concat()]
+    af_loops: int
     redistributes: Annotated[tuple[Redistribute, ...], Concat()]
     allow_default: bool
     aspath_relax: bool

annet/mesh/executor.py

@@ -22,11 +22,34 @@ from .registry import (
 logger = getLogger(__name__)
 
 
+@dataclass(frozen=True)
+class TargetInterface:
+    subif: int | None = None
+    svi: int | None = None
+    lag: int | None = None
+    port: str | None = None
+
+
 @dataclass(frozen=True)
 class PeerKey:
     fqdn: str
     addr: str
     vrf: str
+    interface: TargetInterface
+
+
+def target_interface(
+        peer: DirectPeerDTO | IndirectPeerDTO | VirtualLocalDTO,
+        ports: list[str],
+) -> TargetInterface:
+    subif = getattr(peer, "subif", None)
+    svi = getattr(peer, "svi", None)
+    lag = getattr(peer, "lag", None)
+    port = None
+    if not (svi or lag):
+        if len(ports) == 1:
+            port = ports[0]
+    return TargetInterface(subif, svi, lag, port)
 
 
 class Pair(BaseMeshModel):
@@ -171,7 +194,8 @@ class MeshExecutor:
                 peer_key = PeerKey(
                     fqdn=pair.device.fqdn,
                     addr=addr,
-                    vrf=getattr(pair.connected, "vrf", "")
+                    vrf=getattr(pair.connected, "vrf", ""),
+                    interface=target_interface(pair.local, [p[0] for p in ports]),
                 )
                 try:
                     if peer_key in neighbor_peers:
@@ -278,7 +302,8 @@ class MeshExecutor:
             peer_key = PeerKey(
                 fqdn=connected_device.fqdn,
                 addr=addr,
-                vrf=getattr(connected_dto, "vrf", "")
+                vrf=getattr(connected_dto, "vrf", ""),
+                interface=target_interface(pair.local, []),
             )
             try:
                 if peer_key in connected_peers:

annet/mesh/peer_models.py

@@ -45,7 +45,8 @@ class _OptionsDTO(_SharedOptionsDTO):
     extended_next_hop: bool
     send_lcommunity: bool
     send_extcommunity: bool
-    import_limit: bool
+    import_limit: Optional[int]
+    import_limit_action: Optional[str]
     teardown_timeout: bool
     redistribute: bool
     passive: bool

annet/rulebook/texts/b4com.order

@@ -4,7 +4,9 @@
 #   обратной, но занимает место между прямыми там, где указано.
 
 # Фичи должны быть включены прежде всего
-feature
+feature %order_reverse
+ntp enable
+ntp server
 # Далее нужно будет указать команды и их порядок
 sflow
 ip prefix-list

annet/rulebook/texts/b4com.rul

@@ -11,6 +11,8 @@
 #                   Сделано в основном для того чтобы генерировать специальные команды для наливки
 # -----
 # Physical
+feature ~
+ntp ~
 sflow
 aaa group server tacacs\+ *
     ~ %global
@@ -20,7 +22,7 @@ ipv6 prefix-list *
     ~ %global
 route-map ~
     ~ %global
-interface */(ce|xe|po|eth|vlan1\.)[0-9\/]+$/     %logic=common.permanent %diff_logic=b4com.iface.diff
+interface */(ce|xe|po|eth(-0-)?|vlan1\.)[0-9\/]+$/     %logic=common.permanent %diff_logic=b4com.iface.diff
     description
     ip vrf forwarding *
     ip address *

annet/rulebook/texts/huawei.order

@@ -71,7 +71,11 @@ ntp
 acl port-pool
 acl ip-pool
 acl ipv6-pool
-acl
+acl ~
+    undo rule * description %order_reverse
+    undo rule ~ %order_reverse
+    rule * */deny|permit/
+    rule * description
 
 system tcam
 

annet/rulebook/texts/huawei.rul

@@ -113,13 +113,11 @@ acl ip-pool *
 acl ipv6-pool *
     ~ %global
 
-acl name *
+acl */(name|number)/ *
+    rule * description
     rule * %logic=huawei.misc.undo_redo
-acl number *
-    rule * %logic=huawei.misc.undo_redo
-acl ipv6 name *
-    rule * %logic=huawei.misc.undo_redo
-acl ipv6 number *
+acl ipv6 */(name|number)/ *
+    rule * description
     rule * %logic=huawei.misc.undo_redo
 
 */(ftp|FTP|ssh|telnet)/ server acl
@@ -141,6 +139,7 @@ ssh server key-exchange
 ssh server dh-exchange
 ssh server cipher
 ssh server hmac
+ssh server publickey
 
 ftp client source %logic=huawei.misc.undo_redo
 
@@ -429,6 +428,12 @@ isis *
 
 error-down auto-recovery cause link-flap
 
+configuration file auto-save backup-to-server server
+configuration file auto-save
+
+
+set save-configuration backup-to-server *
+set save-configuration *
 
 ip route-static default-bfd
 ipv6 route-static default-bfd

annet/vendors/tabparser.py

@@ -323,6 +323,13 @@ class CiscoFormatter(BlockExitFormatter):
 
         tree = self.split_remove_spaces(text)
         for i, item in enumerate(tree):
+            # fix incorrect indent for "exit-address-family"
+            if item == " exit-address-family":
+                item = "  exit-address-family"
+            # fix incorrect indent for "class-map match.*"
+            if i and tree[i - 1].startswith("class-map match"):
+                if item.startswith("  description"):
+                    item = item[1:]
             block_exit_strings, new_indent = self._split_indent(
                 item, additional_indent, block_exit_strings
             )

{annet-3.7.0.dist-info → annet-3.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.7.0
+Version: 3.9.0
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -21,7 +21,7 @@ Requires-Dist: yarl>=1.8.2
 Requires-Dist: adaptix==3.0.0b7
 Requires-Dist: dataclass-rest==0.4
 Provides-Extra: netbox
-Requires-Dist: annetbox[sync]>=0.6.0; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.7.0; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file

{annet-3.7.0.dist-info → annet-3.9.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 annet/__init__.py,sha256=eDQub3o0HdHcTWU4ZJpySrJuffGkbWts5CHXZYwVV9A,1915
 annet/annet.py,sha256=vyQ__n5hkjub3aWO8tksHPoUSbTeK97MyMcR_U8_BSU,1016
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
-annet/bgp_models.py,sha256=n29UBUbmeO7xdY0hyMi1VxkVmeSEZH8ZzYPfZmG3U7w,12502
+annet/bgp_models.py,sha256=avbt0dR9_vxNUGFJ20pJHpgQifFzCbEzZClwlQPLULY,12709
 annet/cli.py,sha256=shq3hHzrTxFL3x1_zTOR43QHo0JYs8QSwyOvGtL86Co,12733
 annet/cli_args.py,sha256=d0WuGiZfe42-nMvurX1bOb3iUMg0TSK-hxk8J1THxSY,13728
 annet/connectors.py,sha256=aoiDVLPizx8CW2p8SAwGCzyO_WW8H9xc2aujbGC4bDg,4882
@@ -10,7 +10,7 @@ annet/deploy_ui.py,sha256=XsN1i7E9cNp1SAf1YBwhEBuwN91MvlNMSrLhnQrumA8,28672
 annet/diff.py,sha256=kD_2kxz5wc2TP10xj-BHs6IPq1yNKkXxIco8czjeC6M,9497
 annet/executor.py,sha256=INlWAZFLpHurg8GTXclbSzaeSIXgZo4ccmcRulQqr88,5130
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
-annet/gen.py,sha256=j6SUrhEbfVQJrF2pOuWQaaBABwABk8cYzOln78jJ320,31956
+annet/gen.py,sha256=y9e7P551uJ-thjBS2p-ZRMgwQa8kPF_JAoEXJ3am77Y,30683
 annet/hardware.py,sha256=O2uadehcavZ10ssPr-db3XYHK8cpbG7C7XFkO-I6r_s,1161
 annet/implicit.py,sha256=i6UxQAQESXWlIBohNuFQuSEgvdsydRzyBu1r7nrR2F4,6083
 annet/lib.py,sha256=4N4X6jCCrig5rk7Ua4AofrV9zK9jhzkBq57fLsfBJjw,4812
@@ -29,12 +29,12 @@ annet/adapters/fetchers/stub/fetcher.py,sha256=FzpkIzPJBQVuNNSdXKoGzkALmIGMgo2gm
 annet/adapters/file/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/provider.py,sha256=K6P5I2UjGZ3N3ayoUaVw10mf9lE5SD8W0kpB7TSefNA,2272
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/adapter.py,sha256=L9xFMcYk7E7w6MH8N0qdg8h-CSP4nZzrOMFlw0_33EU,2600
 annet/adapters/netbox/common/client.py,sha256=PaxHG4W9H8_uunIwMBNYkLq4eQJYoO6p6gY-ciQs7Nc,2563
 annet/adapters/netbox/common/manufacturer.py,sha256=9jTfzwx5XmETrjSbIJu_FhNaByaUbGQE787c5rBor-4,1137
-annet/adapters/netbox/common/models.py,sha256=dC2jej8t6XR-AY8K_qzbYRq46Urvqefp_x1O-uAy4hk,8910
+annet/adapters/netbox/common/models.py,sha256=wm0aIxsv7nvQfCXoqI5sWSxRW3guLCB_aQU7KDiB0YY,8925
 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=GVF30gV4X828MPhUOZ3HsNhWvYp0J5k6LoRFd2UOk7c,9712
@@ -43,20 +43,20 @@ annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 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=um19-ZHC700a7vpUiW8XMwBjxPcRe1StuchAxA3wZjY,1907
+annet/adapters/netbox/v37/models.py,sha256=LTjotRcTYWUR3KFvdg3LjBhek4OQblOvJr5yvP9AAPg,1940
 annet/adapters/netbox/v37/storage.py,sha256=XBYuDvNWngofXf7Kiy-V-AyGXfIszP8UQyf1N0Obq5c,5041
 annet/adapters/netbox/v41/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/v41/models.py,sha256=iZUP0ca3t-hF_DBBJsp1JOlZEJk4CJkWsB4NxPJtrpA,2140
+annet/adapters/netbox/v41/models.py,sha256=RI8QHpNIcrXNubis1rUFJ1j9bL881fz4meLXvAY8Yi0,2197
 annet/adapters/netbox/v41/storage.py,sha256=kK_oyWNa_Ha2vSk66ca4Uxq9OZsep3y2XsRWrLp_L-Q,5095
 annet/adapters/netbox/v42/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/v42/models.py,sha256=t8UaSfzl_8ri10VoIK1TSwjL8VRmMpJYQeS3AH01VSs,2021
+annet/adapters/netbox/v42/models.py,sha256=JNrBMeZ1SznjRzaqKNBP5jtHEKHN40X1V-BlgrMpKwE,2054
 annet/adapters/netbox/v42/storage.py,sha256=zScnvOqjPuS39vwXcE-QDkCUosBr-nafDdgFA4jzioY,6022
 annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
 annet/annlib/command.py,sha256=GsgzQ8oFiHFan1Tfyo340rWgfhyU4_sCKJGhBm2jG6Y,1258
 annet/annlib/diff.py,sha256=MZ6eQAU3cadQp8KaSE6uAYFtcfMDCIe_eNuVROnYkCk,4496
 annet/annlib/errors.py,sha256=jBcSFzY6Vj-FxR__vqjFm-87AwYQ0xHuAopTirii5AU,287
 annet/annlib/filter_acl.py,sha256=ZJvNpSwE5MzJS_sKLenQpZgTuM-IrngwcbukQRq90do,7195
-annet/annlib/jsontools.py,sha256=pz6dJMEN_TSkzWoBTzC6jp7xd3K86yVTw5KsxkuTIWQ,5747
+annet/annlib/jsontools.py,sha256=XsQuaDZtBn55A-Mf6hK7BbsExa6CeyQl_m1QueI_5oE,7176
 annet/annlib/lib.py,sha256=lxmYrbeablFMhFtvFmADVpVShSFi9TN4gNWaBs_Ygm0,14952
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
 annet/annlib/patching.py,sha256=1bxlLDRx15GjB6aNk6kAx7t3WPPLHffYvSy7VLGnCig,21506
@@ -87,16 +87,16 @@ annet/generators/jsonfragment.py,sha256=Cl43t9_OtNWRxesk3B69h60KvD37tiK9W7sLLmpp
 annet/generators/partial.py,sha256=XI01KDA--XwjSEU33SOQCCJZRXFq5boRz1uJA8lVA1g,3502
 annet/generators/perf.py,sha256=IaAcfEVtX7UNO11VOCXzp-FPj_tOx_CDQ34HGThCn4c,2225
 annet/generators/ref.py,sha256=QVdeL8po1D0kBsVLOpCjFR81D8yNTk-kaQj5WUM4hng,438
-annet/generators/result.py,sha256=zMAvGOYQU803bGy6datZduHLgrEqK2Zba_Jcf9Qn9p0,4976
+annet/generators/result.py,sha256=8fBfKQ7vWi9DlGOUFYz0y47UlCI1gTqix3riX2CgQng,5065
 annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/generators/common/initial.py,sha256=qYBxXFhyOPy34cxc6hsIXseod-lYCmmbuNHpM0uteY0,1244
 annet/mesh/__init__.py,sha256=lcgdnBIxc2MAN7Er1bcErEKPqrjWO4uIp_1FldMXTYg,557
 annet/mesh/basemodel.py,sha256=E6NTOneiMDwB1NCpjDRECoaeQ0f3n_fmTLnKTrSHTU4,4917
-annet/mesh/device_models.py,sha256=Vt9yOYBn3b67_Lz0-xnwe4QP-0gCDkX2XvhaZ1JizOM,4710
-annet/mesh/executor.py,sha256=U-3LlAkd34SUD-xZK2K0KaQNy0b2xnVGFkTWlftJXWs,17235
+annet/mesh/device_models.py,sha256=0qWyNlk6ICviWs4pt0XJK2wptwdwM3UwxjyNHe56CjU,4829
+annet/mesh/executor.py,sha256=gfRQXSTivL0DJrhnGH-4kmCTiIxDS_vReQyle3bF2FI,17970
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
 annet/mesh/models_converter.py,sha256=nCtzFR3s65MVkCE_xJm1Ci5c2hUwsr6ajfBiSmy3r_8,3565
-annet/mesh/peer_models.py,sha256=otemIgQCOpUy4kJ5pu5t_H1tjTSv6DoabEqBkUx7hWM,2748
+annet/mesh/peer_models.py,sha256=9fx-JiLTJ6E-CVBmu0BpkJwH4JwpdTOozJYlY2uH_Q4,2796
 annet/mesh/port_processor.py,sha256=RHiMS5W8qoDkTKiarQ748bcr8bNx4g_R4Y4vZg2k4TU,478
 annet/mesh/registry.py,sha256=xmWF7yxWXmwqX2_jyMAKrbGd2G9sjb4rYDx4Xk61QKc,9607
 annet/rpl/__init__.py,sha256=8nSiFpXH4OhzRGKr-013nHwwKk5Y50uh2gL7d_IoV8U,757
@@ -154,14 +154,14 @@ annet/rulebook/texts/aruba.deploy,sha256=hI432Bq-of_LMXuUflCu7eNSEFpx6qmj0KItEw6
 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=k_9qPnc3olAUTrAeefLwe91rUK9hYgkp8hFl9LRU0V0,932
-annet/rulebook/texts/b4com.rul,sha256=G64FljT5wjCVpejbNmCebfCSGo-YIUrlHrpcn3GdXHc,1409
+annet/rulebook/texts/b4com.order,sha256=4Uoq0Of33L-BHdKMBNf4P4Lus_g4TwEAX5hoOD8-ey0,969
+annet/rulebook/texts/b4com.rul,sha256=WAhAV5HEotXtQU0CVyS3UScDsnCjQ2qDVNdC87s3vIg,1431
 annet/rulebook/texts/cisco.deploy,sha256=Hu0NkcGv3f1CWUrnbzI3eQOPXJxtH4NNOPRV68IrW4U,1226
 annet/rulebook/texts/cisco.order,sha256=DarNICBBAEXR8VOFV8SNnuQmwGAG-TGwXlMWpFMTCDE,1927
 annet/rulebook/texts/cisco.rul,sha256=cX9CyqKpgpr8B1Qe3aEe66wZpfaGg7fmsIsmgW6Yip4,3619
 annet/rulebook/texts/huawei.deploy,sha256=5vrvhai2BjaJ793A3EHHCthic3dnGKp2_rAgViVIouI,10951
-annet/rulebook/texts/huawei.order,sha256=XuIaP2CpgxR0v8sIniY9DjVE_LR71tLBRENNjdQvCoY,11119
-annet/rulebook/texts/huawei.rul,sha256=-O597iFqiYpuo3yrfvIUbE0IulabStqGkBS-Drl3KrE,13574
+annet/rulebook/texts/huawei.order,sha256=4qXuoqfJ8Hck11LACKwaWP2ARHwPrtLfCut1BDRAg7E,11244
+annet/rulebook/texts/huawei.rul,sha256=-Da3qjDaAWeW1IFMsLmAzo8XTCkqc2PGTqPGV8v3btA,13705
 annet/rulebook/texts/iosxr.deploy,sha256=Hu0NkcGv3f1CWUrnbzI3eQOPXJxtH4NNOPRV68IrW4U,1226
 annet/rulebook/texts/iosxr.order,sha256=gUp6XHwzqkDsArCUAwtx3rR1qlGfYsHy2vP9oZN2oDk,1922
 annet/rulebook/texts/iosxr.rul,sha256=JMFJ94ORNeDQo_X73iPS6pFUmXYTBuL5pkUypgHcOig,2966
@@ -184,7 +184,7 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet/vendors/__init__.py,sha256=gQcDFlKeWDZB6vxJ_MdPWEoE-C5dg-YgXvgGkuV9YLw,569
 annet/vendors/base.py,sha256=AmM3--gqC-Rpw5Xu_-hqthWZ9EoZRL8x6eOHwadZGbo,1145
 annet/vendors/registry.py,sha256=LgPg4oxWrgxsfpLpJ6OWEGFmUzlVlHzziSXsZTi82uc,2540
-annet/vendors/tabparser.py,sha256=4_20MlPTMFT_epKX5UZ7AKk1XjPH6xePykyLVwjlEIE,32007
+annet/vendors/tabparser.py,sha256=EQrJb0Tz0Lj5byJ8Qr5fayYUCgKDgpJcAz4Smb2kxvs,32374
 annet/vendors/library/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/vendors/library/arista.py,sha256=J4ltZ7sS_TgIECg2U7fizvxwfS4-s35Of0tNDNWWYbE,1302
 annet/vendors/library/aruba.py,sha256=tvrSFSA43n0uelCv-NLQnqxO01d0y2mrfhncpOX7zoQ,1257
@@ -200,8 +200,8 @@ annet/vendors/library/optixtrans.py,sha256=VdME69Ca4HAEgoaKN21fZxnmmsqqaxOe_HZja
 annet/vendors/library/pc.py,sha256=vfv31_NPi7M-4AUDL89UcpawK2E6xvCpELA209cd1ho,1086
 annet/vendors/library/ribbon.py,sha256=DDOBq-_-FL9dCxqXs2inEWZ-pvw-dJ-A-prA7cKMhec,1216
 annet/vendors/library/routeros.py,sha256=iQa7m_4wjuvcgBOI9gyZwlw1BvzJfOkvUbyoEk-NI9I,1254
-annet-3.7.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.7.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.9.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.9.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
 annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
@@ -214,8 +214,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=HPgxScDvSqJPdz0c2SppDrH82DZYC4zUaniQwcWmh4A,1176
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-3.7.0.dist-info/METADATA,sha256=onj4p2T-4pNuRQvnGTBqOmqPtPezXhWBrUWjqz6sn4c,815
-annet-3.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-annet-3.7.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.7.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.7.0.dist-info/RECORD,,
+annet-3.9.0.dist-info/METADATA,sha256=IT0giJ4lQCykA668X_GV_hDfSQv8bkpNkEOFhNXgRWI,815
+annet-3.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+annet-3.9.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.9.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.9.0.dist-info/RECORD,,