annet 0.16.33__py3-none-any.whl → 0.16.35__py3-none-any.whl

annet/adapters/netbox/common/query.py

@@ -1,8 +1,19 @@
+from collections import defaultdict
 from dataclasses import dataclass
-from typing import List, Union, Iterable, Optional
+from typing import cast, List, Union, Iterable, Optional, TypedDict
 
 from annet.storage import Query
 
+FIELD_VALUE_SEPARATOR = ":"
+ALLOWED_GLOB_GROUPS = ["site", "tag", "role"]
+
+
+class Filter(TypedDict, total=False):
+    site: list[str]
+    tag: list[str]
+    role: list[str]
+    name: list[str]
+
 
 @dataclass
 class NetboxQuery(Query):
@@ -22,5 +33,29 @@ class NetboxQuery(Query):
         # We process every query host as a glob
         return self.query
 
+    def parse_query(self) -> Filter:
+        query_groups = defaultdict(list)
+        for q in self.globs:
+            if FIELD_VALUE_SEPARATOR in q:
+                glob_type, param = q.split(FIELD_VALUE_SEPARATOR, 2)
+                if glob_type not in ALLOWED_GLOB_GROUPS:
+                    raise Exception(f"unknown query type: '{glob_type}'")
+                if not param:
+                    raise Exception(f"empty param for '{glob_type}'")
+                query_groups[glob_type].append(param)
+            else:
+                query_groups["name"].append(q)
+
+        query_groups.default_factory = None
+        return cast(Filter, query_groups)
+
     def is_empty(self) -> bool:
         return len(self.query) == 0
+
+    def is_host_query(self) -> bool:
+        if not self.globs:
+            return False
+        for q in self.globs:
+            if FIELD_VALUE_SEPARATOR in q:
+                return False
+        return True

annet/adapters/netbox/v37/storage.py

@@ -1,8 +1,8 @@
-from logging import getLogger
-from typing import Any, Optional, List, Union, Dict
-from ipaddress import ip_interface
-from collections import defaultdict
 import ssl
+from collections import defaultdict
+from ipaddress import ip_interface
+from logging import getLogger
+from typing import Any, Optional, List, Union, Dict, cast
 
 from adaptix import P
 from adaptix.conversion import impl_converter, link, link_constant
@@ -13,7 +13,7 @@ from annet.adapters.netbox.common import models
 from annet.adapters.netbox.common.manufacturer import (
     get_hw, get_breed,
 )
-from annet.adapters.netbox.common.query import NetboxQuery
+from annet.adapters.netbox.common.query import NetboxQuery, FIELD_VALUE_SEPARATOR
 from annet.adapters.netbox.common.storage_opts import NetboxStorageOpts
 from annet.annlib.netdev.views.hardware import HardwareView
 from annet.storage import Storage, Device, Interface
@@ -101,6 +101,9 @@ class NetboxStorageV37(Storage):
             self.exact_host_filter = opts.exact_host_filter
         self.netbox = NetboxV37(url=url, token=token, ssl_context=ctx)
         self._all_fqdns: Optional[list[str]] = None
+        self._id_devices: dict[int, models.NetboxDevice] = {}
+        self._name_devices: dict[str, models.NetboxDevice] = {}
+        self._short_name_devices: dict[str, models.NetboxDevice] = {}
 
     def __enter__(self):
         return self
@@ -136,6 +139,37 @@ class NetboxStorageV37(Storage):
     ) -> List[models.NetboxDevice]:
         if isinstance(query, list):
             query = NetboxQuery.new(query)
+
+        devices = []
+        if query.is_host_query():
+            globs = []
+            for glob in query.globs:
+                if glob in self._name_devices:
+                    devices.append(self._name_devices[glob])
+                if glob in self._short_name_devices:
+                    devices.append(self._short_name_devices[glob])
+                else:
+                    globs.append(glob)
+            if not globs:
+                return devices
+            query = NetboxQuery.new(globs)
+
+        return devices + self._make_devices(
+            query=query,
+            preload_neighbors=preload_neighbors,
+            use_mesh=use_mesh,
+            preload_extra_fields=preload_extra_fields,
+            **kwargs
+        )
+
+    def _make_devices(
+            self,
+            query: NetboxQuery,
+            preload_neighbors=False,
+            use_mesh=None,
+            preload_extra_fields=False,
+            **kwargs,
+    ) -> List[models.NetboxDevice]:
         device_ids = {
             device.id: extend_device(
                 device=device,
@@ -148,6 +182,9 @@ class NetboxStorageV37(Storage):
         if not device_ids:
             return []
 
+        for device in device_ids.values():
+            self._record_device(device)
+
         interfaces = self._load_interfaces(list(device_ids))
         neighbours = {x.id: x for x in self._load_neighbours(interfaces)}
         neighbours_seen: dict[str, set] = defaultdict(set)
@@ -162,21 +199,22 @@ class NetboxStorageV37(Storage):
 
         return list(device_ids.values())
 
+    def _record_device(self, device: models.NetboxDevice):
+        self._id_devices[device.id] = device
+        self._short_name_devices[device.name] = device
+        if not self.exact_host_filter:
+            short_name = device.name.split(".")[0]
+            self._short_name_devices[short_name] = device
+
     def _load_devices(self, query: NetboxQuery) -> List[api_models.Device]:
         if not query.globs:
             return []
-        if self.exact_host_filter:
-            devices = self.netbox.dcim_all_devices(name__ie=query.globs).results
-        else:
-            query = _hostname_dot_hack(query)
-            devices = [
-                device
-                for device in self.netbox.dcim_all_devices(
-                    name__ic=query.globs,
-                ).results
-                if _match_query(query, device)
-            ]
-        return devices
+        query_groups = parse_glob(self.exact_host_filter, query)
+        return [
+            device
+            for device in self.netbox.dcim_all_devices(**query_groups).results
+            if _match_query(self.exact_host_filter, query, device)
+        ]
 
     def _extend_interfaces(self, interfaces: List[models.Interface]) -> List[models.Interface]:
         extended_ifaces = {
@@ -227,6 +265,9 @@ class NetboxStorageV37(Storage):
             self, obj_id, preload_neighbors=False, use_mesh=None,
             **kwargs,
     ) -> models.NetboxDevice:
+        if obj_id in self._id_devices:
+            return self._id_devices[obj_id]
+
         device = self.netbox.dcim_device(obj_id)
         interfaces = self._load_interfaces([device.id])
         neighbours = self._load_neighbours(interfaces)
@@ -237,6 +278,7 @@ class NetboxStorageV37(Storage):
             interfaces=interfaces,
             neighbours=neighbours,
         )
+        self._record_device(res)
         return res
 
     def flush_perf(self):
@@ -261,14 +303,23 @@ class NetboxStorageV37(Storage):
         return res
 
 
-def _match_query(query: NetboxQuery, device_data: api_models.Device) -> bool:
-    for subquery in query.globs:
-        if subquery.strip() in device_data.name:
+def _match_query(exact_host_filter: bool, query: NetboxQuery, device_data: api_models.Device) -> bool:
+    """
+    Additional filtering after netbox due to limited backend logic.
+    """
+    if exact_host_filter:
+        return True  # nothing to check, all filtering is done by netbox
+    hostnames = [subquery.strip() for subquery in query.globs if FIELD_VALUE_SEPARATOR not in subquery]
+    if not hostnames:
+        return True  # no hostnames to check
+    short_name = device_data.name.split(".")[0]
+    for hostname in hostnames:
+        if short_name == hostname or device_data.name == hostname:
             return True
     return False
 
 
-def _hostname_dot_hack(netbox_query: NetboxQuery) -> NetboxQuery:
+def _hostname_dot_hack(raw_query: str) -> str:
     # there is no proper way to lookup host by its hostname
     # ie find "host" with fqdn "host.example.com"
     # besides using name__ic (ie startswith)
@@ -280,9 +331,20 @@ def _hostname_dot_hack(netbox_query: NetboxQuery) -> NetboxQuery:
             raw_query = raw_query + "."
         return raw_query
 
-    raw_query = netbox_query.query
     if isinstance(raw_query, list):
         for i, name in enumerate(raw_query):
             raw_query[i] = add_dot(name)
+    elif isinstance(raw_query, str):
+        raw_query = add_dot(raw_query)
 
-    return NetboxQuery(raw_query)
+    return raw_query
+
+
+def parse_glob(exact_host_filter: bool, query: NetboxQuery) -> dict[str, list[str]]:
+    query_groups = cast(dict[str, list[str]], query.parse_query())
+    if names := query_groups.pop("name", None):
+        if exact_host_filter:
+            query_groups["name__ie"] = names
+        else:
+            query_groups["name__ic"] = [_hostname_dot_hack(name) for name in names]
+    return query_groups

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

@@ -166,6 +166,8 @@
 
     "B4com": "^[Bb]4com",
     "B4com.CS2148P": "^[Bb]4com B4T-CS2148P.*",
+    "B4com.CS4100": "^[Bb]4com B4T-CS41.*",
+    "B4com.CS4132U": "^[Bb]4com B4T-CS4132U.*",
     "B4com.CS4148Q": "^[Bb]4com B4T-CS4148Q.*",
-    "B4com.CS4146U": "^[Bb]4com B4T-CS4146U.*"
+    "B4com.CS4164U": "^[Bb]4com B4T-CS4164U.*"
 }

annet/annlib/rulebook/common.py

@@ -346,14 +346,14 @@ def apply(hw, do_commit, do_finalize, **_):
         after.add_cmd(Command("exit"))
     elif hw.B4com.CS2148P:
         before.add_cmd(Command("conf t"))
-        after.add_cmd(Command("exit"))
+        after.add_cmd(Command("end"))
         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"))
+            after.add_cmd(Command("end"))
         if do_finalize:
             after.add_cmd(Command("write", timeout=40))
     elif hw.H3C:

annet/bgp_models.py

@@ -142,7 +142,6 @@ class Peer:
 class Aggregate:
     policy: str = ""
     routes: tuple[str, ...] = ()  # "182.168.1.0/24",
-    export_policy: str = ""
     as_path: str = ""
     reference: str = ""
     suppress: bool = False
@@ -290,21 +289,18 @@ def _used_policies(peer: Union[Peer, PeerGroup]) -> Iterable[str]:
 
 
 def _used_redistribute_policies(opts: Union[GlobalOptions, VrfOptions]) -> Iterable[str]:
-    for red in opts.ipv4_unicast.redistributes:
-        if red.policy:
-            yield red.policy
-    for red in opts.ipv6_unicast.redistributes:
-        if red.policy:
-            yield red.policy
-    for red in opts.ipv4_labeled_unicast.redistributes:
-        if red.policy:
-            yield red.policy
-    for red in opts.ipv6_labeled_unicast.redistributes:
-        if red.policy:
-            yield red.policy
-    for red in opts.l2vpn_evpn.redistributes:
-        if red.policy:
-            yield red.policy
+    for family_opts in (
+        opts.ipv4_unicast,
+        opts.ipv6_unicast,
+        opts.ipv4_labeled_unicast,
+        opts.ipv6_labeled_unicast,
+        opts.l2vpn_evpn,
+    ):
+        for red in family_opts.redistributes:
+            if red.policy:
+                yield red.policy
+        if family_opts.aggregate and family_opts.aggregate.policy:
+            yield family_opts.aggregate.policy
 
 
 def extract_policies(config: BgpConfig) -> Sequence[str]:

annet/mesh/device_models.py

@@ -8,7 +8,6 @@ from .peer_models import MeshPeerGroup
 class Aggregate(BaseMeshModel):
     policy: str
     routes: Annotated[tuple[str, ...], Concat()]
-    export_policy: str
     as_path: str
     reference: str
     suppress: bool
@@ -22,7 +21,7 @@ class FamilyOptions(BaseMeshModel):
         super().__init__(**kwargs)
     family: Family
     vrf_name: str
-    multipath: int = 0
+    multipath: int
     global_multipath: int
     aggregate: Annotated[Aggregate, Merge()]
     redistributes: Annotated[tuple[Redistribute, ...], Concat()]

annet/mesh/executor.py

@@ -144,8 +144,17 @@ class MeshExecutor:
         for rule in rules:
             handler_name = self._handler_name(rule.handler)
             if rule.direct_order:
+                if rule.name_right not in neigbors:
+                    print(list(neigbors), flush=True)
+                    raise ValueError(
+                        f"Device `{device.fqdn}` has no neighbor `{rule.name_right}` required for `{handler_name}`. {list(neigbors)}",
+                    )
                 neighbor_device = neigbors[rule.name_right]
             else:
+                if rule.name_left not in neigbors:
+                    raise ValueError(
+                        f"Device `{device.fqdn}` has no neighbor `{rule.name_left}` required for `{handler_name}`",
+                    )
                 neighbor_device = neigbors[rule.name_left]
             all_connected_ports = [
                 (p1.name, p2.name)

annet/mesh/registry.py

@@ -208,11 +208,11 @@ class MeshRulesRegistry:
 
     def lookup_direct(self, device: str, neighbors: list[str]) -> list[MatchedDirectPair]:
         found = []
-        device = self._normalize_host(device)
+        device_norm = self._normalize_host(device)
         for neighbor in neighbors:
-            neighbor = self._normalize_host(neighbor)
+            neighbor_norm = self._normalize_host(neighbor)
             for rule in self.direct_rules:
-                if args := rule.matcher.match_pair(device, neighbor):
+                if args := rule.matcher.match_pair(device_norm, neighbor_norm):
                     found.append(MatchedDirectPair(
                         handler=rule.handler,
                         port_processor=rule.port_processor,
@@ -222,7 +222,7 @@ class MeshRulesRegistry:
                         match_left=args[0],
                         match_right=args[1],
                     ))
-                if args := rule.matcher.match_pair(neighbor, device):
+                if args := rule.matcher.match_pair(neighbor_norm, device_norm):
                     found.append(MatchedDirectPair(
                         handler=rule.handler,
                         port_processor=rule.port_processor,
@@ -238,11 +238,11 @@ class MeshRulesRegistry:
 
     def lookup_indirect(self, device: str, devices: list[str]) -> list[MatchedIndirectPair]:
         found = []
-        device = self._normalize_host(device)
+        device_norm = self._normalize_host(device)
         for other_device in devices:
-            other_device = self._normalize_host(other_device)
+            other_device_norm = self._normalize_host(other_device)
             for rule in self.indirect_rules:
-                if args := rule.matcher.match_pair(device, other_device):
+                if args := rule.matcher.match_pair(device_norm, other_device_norm):
                     found.append(MatchedIndirectPair(
                         handler=rule.handler,
                         direct_order=True,
@@ -251,7 +251,7 @@ class MeshRulesRegistry:
                         match_left=args[0],
                         match_right=args[1],
                     ))
-                if args := rule.matcher.match_pair(other_device, device):
+                if args := rule.matcher.match_pair(other_device_norm, device_norm):
                     found.append(MatchedIndirectPair(
                         handler=rule.handler,
                         direct_order=False,
@@ -266,9 +266,9 @@ class MeshRulesRegistry:
 
     def lookup_virtual(self, device: str) -> list[MatchedVirtualPair]:
         found = []
-        device = self._normalize_host(device)
+        device_norm = self._normalize_host(device)
         for rule in self.virtual_rules:
-            if args := rule.matcher.match_one(device):
+            if args := rule.matcher.match_one(device_norm):
                 found.append(MatchedVirtualPair(
                     handler=rule.handler,
                     match=args,
@@ -280,9 +280,9 @@ class MeshRulesRegistry:
 
     def lookup_global(self, device: str) -> list[MatchedGlobal]:
         found = []
-        device = self._normalize_host(device)
+        device_norm = self._normalize_host(device)
         for rule in self.global_rules:
-            if args := rule.matcher.match_one(device):
+            if args := rule.matcher.match_one(device_norm):
                 found.append(MatchedGlobal(
                     handler=rule.handler,
                     match=args,

annet/rulebook/b4com/iface.py

@@ -0,0 +1,42 @@
+from annet.annlib.types import Op
+
+from annet.rulebook import common
+
+
+def mtu(rule, key, diff, **kwargs):
+    """
+    Удаляем mtu без указания значения
+    """
+    if diff[Op.REMOVED]:
+        yield (False, "no mtu", None)
+    elif diff[Op.ADDED]:
+        yield from common.default(rule, key, diff, **kwargs)
+
+
+def sflow(rule, key, diff, **kwargs):
+    """
+    Команда sflow sampling-rate * direction ingress max-header-size *
+    сносится без указания sampling-rate и max-header-size
+    """
+    result = common.default(rule, key, diff, **kwargs)
+    for op, cmd, ch in result:
+        if diff[Op.REMOVED]:
+            if "ingress" in diff[Op.REMOVED][0]["row"]:
+                yield (op, "no sflow sampling-rate direction ingress", ch)
+            elif "egress" in diff[Op.REMOVED][0]["row"]:
+                yield (op, "no sflow sampling-rate direction egress", ch)
+            else:
+                yield (op, cmd, ch)
+    return result
+
+
+def lldp(rule, key, diff, **kwargs):
+    """
+    Не удаляем все что начинается с set, т.к. set перезаписывает предыдущий конфиг
+    """
+    result = common.default(rule, key, diff, **kwargs)
+    for op, cmd, ch in result:
+        if diff[Op.REMOVED] and "set lldp" in cmd:
+            pass
+        else:
+            yield (op, cmd, ch)

annet/rulebook/texts/b4com.rul

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

annet/rulebook/texts/huawei.deploy

@@ -32,7 +32,7 @@ undo route-distinguisher *
     dialog: Warning: All VPN targets of this EVPN instance and all EVPN address family-related configurations under BGP will be deleted. Continue? [Y/N]: ::: Y
 
 save
-    dialog: Warning: The current configuration will be written to the device. Continue? [Y/N] ::: Y
+    dialog: /Warning: The current configuration will be written to the device. Continue\? \[Y/N\]:?/ ::: Y
     dialog: Warning: The current configuration will be written to the device. Are you sure to continue? [Y/N]: ::: Y
     dialog: Are you sure to continue?[Y/N] ::: Y
     dialog: Are you sure to continue? [Y/N] ::: Y

{annet-0.16.33.dist-info → annet-0.16.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 0.16.33
+Version: 0.16.35
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -23,7 +23,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.1.10; extra == "netbox"
+Requires-Dist: annetbox[sync]>=0.1.12; extra == "netbox"
 Dynamic: home-page
 Dynamic: license
 Dynamic: provides-extra

{annet-0.16.33.dist-info → annet-0.16.35.dist-info}/RECORD

@@ -1,7 +1,7 @@
 annet/__init__.py,sha256=W8kkZ3Axu-6VJwgQ0cn4UeOVNy6jab0cqgHKLQny1D0,2141
 annet/annet.py,sha256=TMdEuM7GJQ4TjRVmuK3bCTZN-21lxjQ9sXqEdILUuBk,725
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
-annet/bgp_models.py,sha256=I9DQpf3LU71RBk9kCUdA-RnGkA3eORngYkC3_obsLmk,9669
+annet/bgp_models.py,sha256=M2gtOJMsua8SlUySc57VtG71-TmydxP1bthQEcUVpNo,9528
 annet/cli.py,sha256=hDpjIr3w47lgQ_CvCQS1SXFDK-SJrf5slbT__5u6GIA,12342
 annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
 annet/connectors.py,sha256=-Lghz3PtWCBU8Ohrp0KKQcmm1AUZtN0EnOaZ6IQgCQI,5105
@@ -34,13 +34,13 @@ annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 annet/adapters/netbox/common/client.py,sha256=PaxHG4W9H8_uunIwMBNYkLq4eQJYoO6p6gY-ciQs7Nc,2563
 annet/adapters/netbox/common/manufacturer.py,sha256=LAPT6OlV_ew96GhtwNrCpeiT0IGrg2_9__MMdZk431U,1733
 annet/adapters/netbox/common/models.py,sha256=Xq6Dc3kY9_QyvS9DiKEq1AxjTxiF4qEKhs1EMtBw-k4,7384
-annet/adapters/netbox/common/query.py,sha256=ziUFM7cUEbEIf3k1szTll4aO-OCUa-2Ogxbebi7Tegs,646
+annet/adapters/netbox/common/query.py,sha256=mv5WlU6gGge8gUYwloXDXEABmfP5teYyq8DyBtGdFkw,1761
 annet/adapters/netbox/common/status_client.py,sha256=XXx0glomaBaglmkUEy6YtFOxQQkHb59CDA0h1I-IhxM,592
 annet/adapters/netbox/common/storage_opts.py,sha256=5tt6wxUUJTIzNbOVXMnYBwZedNAIqYlve3YWl6GdbZM,1197
 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
-annet/adapters/netbox/v37/storage.py,sha256=G-nj-iuNN5inR0tY2XnjFnXXFYrgMZeTJ9DQ7OgjK44,10336
+annet/adapters/netbox/v37/storage.py,sha256=noG-Lt1ZRiXm_uJE8xTRBsEvnEWcB1p2Uszuz6zECiI,12721
 annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
 annet/annlib/command.py,sha256=uuBddMQphtn8P5MO5kzIa8_QrtMns-k05VeKv1bcAuA,1043
 annet/annlib/diff.py,sha256=MZ6eQAU3cadQp8KaSE6uAYFtcfMDCIe_eNuVROnYkCk,4496
@@ -55,7 +55,7 @@ annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/db.py,sha256=fI_u5aya4l61mbYSjj4JwlVfi3s7obt2jqERSuXGRUI,1634
 annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm58tmMWVU,892
-annet/annlib/netdev/devdb/data/devdb.json,sha256=Zt9pj6h2clMi0i26bGVsx0gqQl8vCSk6iLajIYWeKX4,6192
+annet/annlib/netdev/devdb/data/devdb.json,sha256=DBl8iU2K_tydteB_a8mXUlgrv_Na3UXSJschuhyjsqs,6284
 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=3JCZLH7deIHhCguwPJTUX-WDvWjG_xt6BdSEZSO6zkQ,4226
@@ -66,7 +66,7 @@ annet/annlib/rbparser/ordering.py,sha256=DiKqyY8Khz-5MTxNF1GSNtZgtyKwT3YYCXpahIP
 annet/annlib/rbparser/platform.py,sha256=hnxznTfV9txXi1PkR1hZrprTrQJvlwgqXVL8vXkYmv4,1558
 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=bx_Iwui-JJeyctUPF1OsEll0Aa-IQZadBPQjaeuoWgw,16638
+annet/annlib/rulebook/common.py,sha256=hqwmmNofm5q2f-hV2usMY-IPMeiANLth28tZcRBYJTw,16640
 annet/api/__init__.py,sha256=WGpVMfIxVy9F_jH6nqHSQypEEcsSNa9yF2WFEwhUVwI,34156
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
@@ -83,13 +83,13 @@ annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 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=KkbD8tuWfnh4gR8iOV9C7ihLR4jxjyuF52AU2DPPLXA,3627
-annet/mesh/executor.py,sha256=0RLsdtldozoFgDGFuhU5mdckuMwGg0y_DFIji1RfTQg,16969
+annet/mesh/device_models.py,sha256=aFbwVWNSDBcph_Kvv6qZT-uUz0Tbg3z45EvP4i1z2ao,3600
+annet/mesh/executor.py,sha256=6NBi7KBZzKf_92TgxypkoBN0WhZt1egXx0qALzo9Cq8,17497
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
 annet/mesh/models_converter.py,sha256=3q2zs7K8S3pfYSUKKRdtl5CJGbeg4TtYxofAVs_MBsk,3085
 annet/mesh/peer_models.py,sha256=9vn5ENiEZqOZFRFSOJReT8E3E2GzBte628mkmS3cplI,2770
 annet/mesh/port_processor.py,sha256=RHiMS5W8qoDkTKiarQ748bcr8bNx4g_R4Y4vZg2k4TU,478
-annet/mesh/registry.py,sha256=BCRIOrINP0krcgvF59uFJqyhmSviQ03GSzWpxLVYlIg,9527
+annet/mesh/registry.py,sha256=xmWF7yxWXmwqX2_jyMAKrbGd2G9sjb4rYDx4Xk61QKc,9607
 annet/rpl/__init__.py,sha256=0kcIktE3AmS0rlm9xzVDf53xk08OeZXgD-6ZLCt_KCs,731
 annet/rpl/action.py,sha256=PY6W66j908RuqQ1_ioxayqVN-70rxDk5Z59EGHtxI98,1246
 annet/rpl/condition.py,sha256=MJri4MbWtPkLHIsLMAtsIEF7e8IAS9dIImjmJs5vS5U,3418
@@ -118,6 +118,7 @@ annet/rulebook/aruba/ap_env.py,sha256=5fUVLhXH4-0DAtv8t0yoqJUibaRMuzF8Q7mGFzNsEN
 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/b4com/iface.py,sha256=0MXq01fhgd0ZxrS99TMxEP9qqIW2ofadsIBthCZVPTc,1392
 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=zgKdWGmjRYmvq58dh7Lbn7ofwSYZoISgXsUh5lkGKF8,2318
@@ -142,11 +143,11 @@ annet/rulebook/texts/aruba.order,sha256=ZMakkn0EJ9zomgY6VssoptJImrHrUmYnCqivzLBF
 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/b4com.rul,sha256=OiQroBySk33he1YNN3jOn5sGL_WDBJEejDI6F7jIWo0,1224
 annet/rulebook/texts/cisco.deploy,sha256=Hu0NkcGv3f1CWUrnbzI3eQOPXJxtH4NNOPRV68IrW4U,1226
 annet/rulebook/texts/cisco.order,sha256=OvNHMNqkCc-DN2dEjLCTKv_7ZhiaHt4q2X4Y4Z8dvR4,1901
 annet/rulebook/texts/cisco.rul,sha256=jgL5_xnSwd_H4E8cx4gcneSvJC5W1zz6_BWSb64iuxI,3017
-annet/rulebook/texts/huawei.deploy,sha256=azEC6_jQRzwnTSrNgag0hHh6L7hezS_eMk6ZDZfWyXI,10444
+annet/rulebook/texts/huawei.deploy,sha256=uUsZCHUrC5Zyb_MePrR5svnE1QyGQlg7UxcKf00sJyg,10451
 annet/rulebook/texts/huawei.order,sha256=ENllPX4kO6xNw2mUQcx11yhxo3tKStZ5mUyc0C6s3d0,10657
 annet/rulebook/texts/huawei.rul,sha256=02Fi1RG4YYea2clHCluBuJDKNbT0hS9jtsk6_h6GK8k,12958
 annet/rulebook/texts/juniper.rul,sha256=EmtrEJZesnmc2nXjURRD2G0WOq4zLluI_PNupKhSOJs,2654
@@ -175,10 +176,10 @@ annet_generators/rpl_example/generator.py,sha256=zndIGfV4ZlTxPgAGYs7bMQvTc_tYScO
 annet_generators/rpl_example/items.py,sha256=Ez1RF5YhcXNCusBmeApIjRL3rBlMazNZd29Gpw1_IsA,766
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-0.16.33.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.33.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.33.dist-info/METADATA,sha256=4FDrHTUVwwM6GIzoAZ96e3XHrSiSHvSShAY7v7jw4qg,854
-annet-0.16.33.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-annet-0.16.33.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.33.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.33.dist-info/RECORD,,
+annet-0.16.35.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.35.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.35.dist-info/METADATA,sha256=XiL8MGmXK4eW_mXEUkn6P6AoDJYlKpqdzAeom1JFr8Q,854
+annet-0.16.35.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+annet-0.16.35.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.35.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.35.dist-info/RECORD,,