annet 3.5.0__py3-none-any.whl → 3.5.1__py3-none-any.whl

annet/adapters/netbox/common/models.py

@@ -207,6 +207,8 @@ class NetboxDevice(Entity, Generic[_InterfaceT]):
     created: datetime
     last_updated: datetime
     cluster: Optional[Entity]
+    config_context: Optional[dict[str, Any]]
+    config_template: Optional[dict[str, Any]]
 
     fqdn: str
     hostname: str

annet/annlib/command.py

@@ -12,6 +12,7 @@ class Question:
     question: str  # frame it using / if it is a regular expression
     answer: str
     is_regexp: Optional[bool] = False
+    not_send_nl: bool = False
 
 
 @dataclass

annet/annlib/rulebook/common.py

@@ -10,7 +10,7 @@ from annet.vendors import registry_connector
 # =====
 def default(rule, key, diff, **_):
     r"""
-        Функция default() обеспичвает базовую логику обработки всех правил. Ее можно заменить с помощью
+        Функция default() обеспечивает базовую логику обработки всех правил. Ее можно заменить с помощью
         параметра %logic в текстовом рулбуке. Она вызывается для каждой команды с уникальным ключом и
         должна возвратить сгенерированный текст патча на основе предоставленного диффа, и, при необходимости,
         вызвать обработку дочерних правил/данных.
@@ -49,8 +49,8 @@ def default(rule, key, diff, **_):
     """
     for op in [Op.ADDED, Op.REMOVED, Op.AFFECTED, Op.MOVED]:
         # Дефолтная функция генерации патчей считает, что не бывает команд с одинаковыми
-        # ключами и разным значением. при этом unchanged мы так не проверяем поскольку
-        # такие случаи возможны когда у нас подмешиваются implicit команды
+        # ключами и разным значением. При этом unchanged мы так не проверяем, поскольку
+        # такие случаи возможны, когда у нас подмешиваются implicit команды
         assert 0 <= len(diff[op]) <= 1, "Too many %s actions for rows %r" % (op, [x["row"] for x in diff[op]])
     if diff[Op.AFFECTED]:
         # При изменении блока нужно вызвать обработку чилдов
@@ -60,7 +60,7 @@ def default(rule, key, diff, **_):
         # При модификации строки удаление нас не интересует, добавление проходит как affected
         yield (True, diff[key][0]["row"], diff[key][0]["children"])
     elif diff[Op.REMOVED]:
-        # При удалении или перемещеннии блока просто снести строку
+        # При удалении или перемещении блока просто снести строку
         yield (False, rule["reverse"].format(*key), None)
 
 
@@ -179,7 +179,7 @@ def multiline_diff(old: odict, new: odict, diff_pre: odict, _pops: tuple[Op, ...
     Особая логика diff'a для хуавейных мультилайнов.
     Она трактует все дочерние элементы %multiline-команды как
     одну общую команду, покидывая внутрь тот Op который был
-    определен на вернем уровне
+    определен на верхнем уровне
     """
 
     def process_multiline(op, tree):

annet/bgp_models.py

@@ -199,6 +199,7 @@ class PeerOptions:
     soft_reconfiguration_inbound: Optional[bool] = None
     not_active: Optional[bool] = None
     mtu: Optional[int] = None
+    password: Optional[str] = None
 
 
 @dataclass
@@ -312,6 +313,7 @@ class PeerGroup:
     soft_reconfiguration_inbound: bool = False
     not_active: bool = False
     mtu: int = 0
+    password: Optional[str] = None
 
 
 @dataclass

annet/cli_args.py

@@ -248,6 +248,11 @@ opt_max_slots = Arg(
     help="The amount of devices parsed at the same time with asyncio"
 )
 
+opt_max_deploy = Arg(
+    "--max-deploy", default=0, type=int,
+    help="The amount of devices deployed at the same time"
+)
+
 opt_hosts_range = Arg(
     "--hosts-range", type=valid_range,
     help="Only work with the specified hosts range: 10 - the first 10. 10:20 - host from 10th up to 20th"
@@ -498,6 +503,7 @@ class DeployOptions(ShowDiffOptions, PatchOptions, DeviceCliOptions):
     no_check_diff = opt_no_check_diff
     entire_reload = opt_entire_reload
     rollback = opt_rollback
+    max_parallel = opt_max_deploy
 
 
 class SelectContext(ArgGroup):

annet/deploy.py

@@ -157,14 +157,13 @@ class RulebookQuestionHandler:
 
 
 def rb_question_to_question(q: MakeMessageMatcher, a: Answer) -> Question:  # TODO: drop MakeMessageMatcher
-    if not a.send_nl:
-        raise Exception("not supported false send_nl")
     text: str = q._text  # pylint: disable=protected-access
+    answer: str = a.text
     is_regexp = False
     if text.startswith("/") and text.endswith("/"):
         is_regexp = True
         text = text[1:-1]
-    res = Question(question=text, answer=a.text, is_regexp=is_regexp)
+    res = Question(question=text, answer=answer, is_regexp=is_regexp, not_send_nl=not a.send_nl)
     return res
 
 

annet/mesh/peer_models.py

@@ -17,6 +17,7 @@ class _SharedOptionsDTO(BaseMeshModel):
     send_community: bool
     bfd: bool
     bfd_timers: BFDTimers
+    password: str
 
 
 class MeshSession(_SharedOptionsDTO):

annet/rulebook/b4com/iface.py

@@ -3,6 +3,72 @@ from annet.annlib.types import Op
 from annet.rulebook import common
 
 
+def diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
+    for iface_row in old:
+        _filter_channel_members(old[iface_row])
+    for iface_row in new:
+        _filter_channel_members(new[iface_row])
+
+    ret = common.default_diff(old, new, diff_pre, _pops)
+    vpn_changed = False
+    for (op, cmd, _, _) in ret:
+        if op in {Op.ADDED, Op.REMOVED}:
+            vpn_changed |= is_vpn_cmd(cmd)
+    if vpn_changed:
+        for cmd in list(old.keys()):
+            if is_ip_cmd(cmd) and not is_vpn_cmd(cmd):
+                del old[cmd]
+        ret = common.default_diff(old, new, diff_pre, _pops)
+    return ret
+
+
+# ===
+
+# Вырезает все команды не разрешенные
+# на членах агрегата. В running-config
+# листинге они наследуются от самого port-channel
+
+
+def _filter_channel_members(tree):
+    if any(is_in_channel(x) for x in tree):
+        for cmd in list(tree.keys()):
+            if not _is_allowed_on_channel(cmd):
+                del tree[cmd]
+
+
+def is_in_channel(cmd_line):
+    """
+    Признак того, что это lagg member
+    """
+    return cmd_line.startswith("channel-group")
+
+
+# Возможно тут есть еще какие-то команды
+def _is_allowed_on_channel(cmd_line):
+    return cmd_line.startswith((
+        "channel-group",
+        "cdp",
+        "description",
+        "inherit",
+        "ip port",
+        "ipv6 port",
+        "mac port",
+        "lacp",
+        "switchport host",
+        "shutdown",
+        "rate-limit cpu",
+        "snmp trap link-status",
+    ))
+
+
+def is_vpn_cmd(cmd):
+    return cmd.startswith("vrf member")
+
+
+def is_ip_cmd(cmd):
+    return cmd.startswith(("ip ", "ipv6 "))
+
+
 def mtu(rule, key, diff, **kwargs):
     """
     Удаляем mtu без указания значения
@@ -28,16 +94,13 @@ 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
+    if diff[Op.REMOVED]:
+        if "ingress" in diff[Op.REMOVED][0]["row"]:
+            yield (False, "no sflow sampling-rate direction ingress", None)
+        elif "egress" in diff[Op.REMOVED][0]["row"]:
+            yield (False, "no sflow sampling-rate direction egress", None)
+    else:
+        yield from common.default(rule, key, diff, **kwargs)
 
 
 def lldp(rule, key, diff, **kwargs):

annet/rulebook/cisco/iface.py

@@ -23,7 +23,7 @@ def diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
 
 
 def is_vpn_cmd(cmd):
-    return cmd.startswith("vrf member")
+    return cmd.startswith(("ip vrf forwarding", "vrf forwarding"))
 
 
 def is_ip_cmd(cmd):

annet/rulebook/generic/misc.py

@@ -0,0 +1,14 @@
+from annet.annlib.types import Op
+
+from annet.rulebook import common
+
+
+def remove_last_param(rule, key, diff, **_):
+    if diff[Op.REMOVED]:
+        for rem in diff[Op.REMOVED]:
+            # Обрабатывать удаление последнего параметра команды
+            cmd_parts = rem["row"].split(" ")
+            cmd_parts.remove(cmd_parts[len(cmd_parts) - 1])
+            yield False, "undo %s" % " ".join(cmd_parts), None
+    else:
+        yield from common.default(rule, key, diff)

annet/rulebook/huawei/aaa.py

@@ -14,13 +14,24 @@ def user(key, diff, **_):
             check_for_remove = False
     if check_for_remove:
         for rem in diff[Op.REMOVED]:
-            # Обрабатывать удаление только пароля, если меняется что-то другое, можно просто накатить без удаления
+            # Обрабатывать удаление только пароля или привилегий, если меняется что-то другое, можно просто накатить без удаления
             if rem["row"].startswith("local-user %s password" % key[0]):
                 yield (False, "undo local-user %s" % key[0], None)
                 return
+            if (rem["row"].startswith("local-user %s privilege" % key[0])
+                    and not _added_contains(diff[Op.ADDED], "local-user %s privilege" % key[0])):
+                yield (False, "undo local-user %s" % key[0], None)
+                return
     yield from added
 
 
+def _added_contains(array: list[dict], lookup_string: str) -> bool:
+    for item in array:
+        if item["row"].startswith(lookup_string):
+            return True
+    return False
+
+
 def domain(rule, key, diff, **_):
     """
     При удалении метода для accounting|authorization|authentication

annet/rulebook/texts/b4com.order

@@ -7,6 +7,9 @@
 feature
 # Далее нужно будет указать команды и их порядок
 sflow
+ip prefix-list
+ipv6 prefix-list
+route-map
 interface *
     description
     ip vrf forwarding
@@ -18,3 +21,4 @@ interface *
         dcbx
         exit
     sflow
+ip community-list

annet/rulebook/texts/b4com.rul

@@ -11,17 +11,25 @@
 #                   Сделано в основном для того чтобы генерировать специальные команды для наливки
 # -----
 # Physical
-sflow *
-
-interface */(ce|xe|eth|vlan)[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
-    description *                 %logic=b4com.iface.description
+sflow
+aaa group server tacacs\+ *
+    ~ %global
+ip prefix-list *
+    ~ %global
+ipv6 prefix-list *
+    ~ %global
+route-map ~
+    ~ %global
+interface */(ce|xe|po|eth|vlan1\.)[0-9\/]+$/     %logic=common.permanent %diff_logic=b4com.iface.diff
+    description
     ip vrf forwarding *
     ip address *
     ipv6 address *
     ipv6 nd *
-    mtu *                         %logic=b4com.iface.mtu
+    mtu
     sflow *                       %logic=b4com.iface.sflow
     lldp-agent
         ~ %global                 %logic=b4com.iface.lldp
         !dcbx *
         !exit
+ip community-list ~

annet/rulebook/texts/cisco.order

@@ -64,7 +64,6 @@ interface *
     encapsulation
     ip vrf forwarding
     vrf forwarding
-    vrf member
     ip
     ipv6
     no ipv6 nd %order_reverse

annet/rulebook/texts/cisco.rul

@@ -40,34 +40,35 @@ snmp-server host ~
 # Disabling this SNMP option throws WARNING which stops mpdaemon set-up process
 no snmp-server sysobjectid type stack-oid
 
-!interface */(mgmt|ipmi|Vlan1$)/
-
-interface Loopback
-    ipv6 address *
-    ip address ~
-    ! no ip address
-
 # SVI/Subifs/Lagg
-interface */(Vlan|Ethernet.*\.|port-channel.*\.?)\d+$/ %diff_logic=cisco.iface.diff
-    vrf member
+interface */(Loopback|vasileft|vasiright|Tunnel|BDI|multiservice|Virtual-Template|Vlan|\w*Ethernet.*\.|[Pp]ort-channel.*\.?)\d+/
+    ip vrf forwarding        %diff_logic=cisco.iface.diff
+    vrf forwarding        %diff_logic=cisco.iface.diff
+    ip address ~        %diff_logic=cisco.iface.diff
+    ip unnumbered *        %diff_logic=cisco.iface.diff
+    ! no ip address
     ipv6 link-local
-    ipv6 address *
+    ipv6 address ~        %diff_logic=cisco.iface.diff
+    ipv6 unnumbered *        %diff_logic=cisco.iface.diff
+    ipv6 enable        %diff_logic=cisco.iface.diff
     ipv6 nd ~                      %logic=cisco.misc.no_ipv6_nd_suppress_ra
-    ip address ~
-    ! no ip address
     mtu
 
 # Physical
-interface */\w*Ethernet[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
+interface */\w*Ethernet[0-9\/]+$/        %logic=common.permanent %diff_logic=cisco.iface.diff
     switchport mode
     switchport trunk native vlan
     switchport access vlan
     switchport trunk allowed vlan %logic=cisco.vlandb.swtrunk
-    vrf member
-    ipv6 link-local
-    ipv6 address *
-    ip address ~
+    ip vrf forwarding        %diff_logic=cisco.iface.diff
+    vrf forwarding        %diff_logic=cisco.iface.diff
+    ip address ~        %diff_logic=cisco.iface.diff
+    ip unnumbered *        %diff_logic=cisco.iface.diff
     ! no ip address
+    ipv6 link-local
+    ipv6 address ~        %diff_logic=cisco.iface.diff
+    ipv6 unnumbered *        %diff_logic=cisco.iface.diff
+    ipv6 enable        %diff_logic=cisco.iface.diff
     channel-group
     mtu
     storm-control * level

annet/rulebook/texts/huawei.deploy

@@ -105,6 +105,8 @@ system tcam acl
 local-user * privilege level
     dialog: Warning: This operation may affect online users, are you sure to change the user privilege level ?[Y/N] ::: Y
     dialog: Warning: This operation may affect online users and will change the user privilege level, Continue? [Y/N]: ::: Y
+local-user * password
+    dialog: Warning: The user using this account will be logged out, and needs to log in again. Do you want to continue? [Y/N] ::: Y
 
 stp *
     dialog: Warning: The global STP state will be changed. Continue? [Y/N] ::: Y
@@ -185,4 +187,10 @@ force transceiver *
 undo force transceiver *
     dialog: /.*Continue\?/ ::: Y
 
+undo local-aaa-user change-password verify
+    dialog: Warning: This command will disable the function of verifying the old password when administrators changes their own passwords. Continue?[Y/N] ::: Y
+
+undo local-user ~
+    dialog: Warning: This operation may affect online users, are you sure to change the user privilege level ?[Y/N] ::: Y
+
 # vim: set syntax=annrulebook:

annet/rulebook/texts/huawei.order

@@ -95,6 +95,7 @@ vlan
 
 hwtacacs-server
 hwtacacs server
+radius-server
 
 aaa
     undo local-user policy security-enhance
@@ -112,6 +113,12 @@ aaa
 
     task-group
     user-group
+
+    #pin removal order to ensure that local-user will be deleted last
+    undo local-user * ftp-directory %order_reverse
+    undo local-user * privilege %order_reverse
+    undo local-user * level %order_reverse
+    undo local-user * %order_reverse
     ~
 
 
@@ -257,6 +264,9 @@ bgp
         peer * as-number *
         peer * enable
         peer * ~
+    l2vpn-ad-family
+        peer * enable
+        peer * ~
     # [NOCDEV-2043] Остальное в глобальном блоке делаем тут
     undo peer * description %order_reverse
     undo peer * * * %order_reverse
@@ -385,4 +395,8 @@ undo sflow %order_reverse
 # индекс референсится в логике патчинга префикс-листа huawei.misc.prefix_list
 undo ip */(ip|ipv6)/-prefix * index 99999999  %order_reverse
 
+#remove template only after all references will be cleared
+undo radius-server template %order_reverse
+undo hwtacacs-server template %order_reverse
+
 ~

annet/rulebook/texts/huawei.rul

@@ -180,13 +180,23 @@ aaa
     undo user-password complexity-check
     task-group *
         task *
-    local-user * privilege level                   %diff_logic=huawei.aaa.local_user_diff
+    local-user * ftp-directory
+    local-user * privilege level                   %diff_logic=huawei.aaa.local_user_diff %logic=huawei.aaa.user
     local-user * level                             %diff_logic=huawei.aaa.local_user_diff
     local-user *                                   %diff_logic=huawei.aaa.local_user_diff %logic=huawei.aaa.user
     */(accounting|authentication|authorization)/-scheme *
         */(accounting|authentication|authorization)/-mode
+
+    domain default
+        */(accounting|authentication|authorization)/-scheme * %logic=huawei.aaa.domain
+        !radius-server default
+        radius-server * %logic=generic.misc.remove_last_param
+        hwtacacs-server * %logic=generic.misc.remove_last_param
+
     domain *
         */(accounting|authentication|authorization)/-scheme * %logic=huawei.aaa.domain
+        radius-server * %logic=generic.misc.remove_last_param
+        hwtacacs-server * %logic=generic.misc.remove_last_param
     ~ %global
 
 hwtacacs-server template *
@@ -195,6 +205,8 @@ hwtacacs-server template *
 hwtacacs server template *
     hwtacacs server shared-key
 
+!radius-server template default
+
 radius-server template *
     radius-server accounting * *
     radius-server authentication * *

annet/vendors/library/b4com.py

@@ -44,3 +44,6 @@ class B4ComVendor(AbstractVendor):
     @property
     def exit(self) -> str:
         return "exit"
+
+    def svi_name(self, num: int) -> str:
+        return f"vlan1.{num}"

annet/vendors/library/iosxr.py

@@ -14,7 +14,7 @@ class IosXrVendor(AbstractVendor):
 
         before.add_cmd(Command("configure exclusive"))
         if do_commit:
-            after.add_cmd(Command("commit"))
+            after.add_cmd(Command("commit show-error"))
         after.add_cmd(Command("exit"))
 
         return before, after

{annet-3.5.0.dist-info → annet-3.5.1.dist-info}/METADATA

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

{annet-3.5.0.dist-info → annet-3.5.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 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=KarLH0TXfGvcT4lDHmh0mRF5Hfh-PpbIxeN6OBPLQOM,12432
+annet/bgp_models.py,sha256=n29UBUbmeO7xdY0hyMi1VxkVmeSEZH8ZzYPfZmG3U7w,12502
 annet/cli.py,sha256=shq3hHzrTxFL3x1_zTOR43QHo0JYs8QSwyOvGtL86Co,12733
-annet/cli_args.py,sha256=jzMKRezWe_87k7VBNzgwPjWGMROJksbgrlX-GDd6oQs,13533
+annet/cli_args.py,sha256=DMVBD4eC8zbaULpsu_B36ADNPBrZBHCw8r0ibNnx0No,13692
 annet/connectors.py,sha256=aoiDVLPizx8CW2p8SAwGCzyO_WW8H9xc2aujbGC4bDg,4882
-annet/deploy.py,sha256=JCcJ2hUmUsaOSrcxFuW8SlN0ubXSnHQ7H_nP_tx-PgE,7698
+annet/deploy.py,sha256=ZTZcomYm2KJkKMyG6XzZaAMPr-Tduwcv67BhsoLARkY,7673
 annet/deploy_ui.py,sha256=XsN1i7E9cNp1SAf1YBwhEBuwN91MvlNMSrLhnQrumA8,28672
 annet/diff.py,sha256=kD_2kxz5wc2TP10xj-BHs6IPq1yNKkXxIco8czjeC6M,9497
 annet/executor.py,sha256=INlWAZFLpHurg8GTXclbSzaeSIXgZo4ccmcRulQqr88,5130
@@ -34,7 +34,7 @@ annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 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=n1RxJSGqXilKcGSqwIc7d2jD1NCaUXG5kQcOO93WTxw,1319
-annet/adapters/netbox/common/models.py,sha256=N9JIH3zj43MvOxkiUOqOpL7ZXIwYbG_Dz2Atx1HtOp0,7906
+annet/adapters/netbox/common/models.py,sha256=SrzUmeqjdOkeb5og-pR0d6aNHeYC3C7LHbeZAvcZ0d8,7997
 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
@@ -52,7 +52,7 @@ annet/adapters/netbox/v42/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 annet/adapters/netbox/v42/models.py,sha256=UWrnRh1k3a048XsVmqh50dF91dunrolIJzmTLT0QExw,1920
 annet/adapters/netbox/v42/storage.py,sha256=iMhdrdAAYZXS_VHoqi_5azFB3BVmp4daK4TVCI9vhxM,4666
 annet/annlib/__init__.py,sha256=fT1l4xV5fqqg8HPw9HqmZVN2qwS8i6X1aIm2zGDjxKY,252
-annet/annlib/command.py,sha256=eiMs5rYImBLQMBsLgFjsfhNUdlWqxkzQnGHHm7j9s4U,1136
+annet/annlib/command.py,sha256=SUoMAmzo7AurMWyAiJNETdcHiwyGQe1YG9f7ZCc1gWQ,1166
 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
@@ -75,7 +75,7 @@ annet/annlib/rbparser/ordering.py,sha256=XknggB92N4IbhHBZZHL0StwCCITt8mkho4D4Nu5
 annet/annlib/rbparser/platform.py,sha256=d1jFH8hGMOf_qiveKE4H-c0OfNnzwmt2VYpSiSOn9qc,42
 annet/annlib/rbparser/syntax.py,sha256=PlKyWqS3zwPwumILmKIci-DmEAbfZp8YycpW1mNqADM,3602
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/annlib/rulebook/common.py,sha256=2ZMu7Z47Ip7d8yMjihDNKKhwl9aV5U4IeCcyXM4CjeA,13527
+annet/annlib/rulebook/common.py,sha256=6A3sOkOanDRTuR7F426zakShGaGKRBmBLDCnqBbBJr8,13531
 annet/api/__init__.py,sha256=-VLQ-Uf2WSdNHXirzdMjgaY8UzrXbGpPHmUnwzB_5YI,33763
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
@@ -96,7 +96,7 @@ annet/mesh/device_models.py,sha256=Vt9yOYBn3b67_Lz0-xnwe4QP-0gCDkX2XvhaZ1JizOM,4
 annet/mesh/executor.py,sha256=U-3LlAkd34SUD-xZK2K0KaQNy0b2xnVGFkTWlftJXWs,17235
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
 annet/mesh/models_converter.py,sha256=nCtzFR3s65MVkCE_xJm1Ci5c2hUwsr6ajfBiSmy3r_8,3565
-annet/mesh/peer_models.py,sha256=Ta0q3MwECz_zzHISbKKvbrGyVXi2Kdg5ZwpbZr8qqJA,2730
+annet/mesh/peer_models.py,sha256=otemIgQCOpUy4kJ5pu5t_H1tjTSv6DoabEqBkUx7hWM,2748
 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
@@ -128,13 +128,15 @@ 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=4Xk4QPPSTO8E2Z2eI1aGVtc6jnhtwGPf6t_cWz9C4YI,1938
+annet/rulebook/b4com/iface.py,sha256=g_QKRT2urqcMgnQeNYT2W2kdT49740qs2x8ss0JSdyc,3565
 annet/rulebook/cisco/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/rulebook/cisco/iface.py,sha256=WISkzjp_G7WKPpg098FCIm4b7ipOxtRLOQbu-7gMUL0,1792
+annet/rulebook/cisco/iface.py,sha256=9urjx0obUdS_HULilQLkGZfiP-U_PZ_k6WWt_xRB2dU,1819
 annet/rulebook/cisco/misc.py,sha256=zgKdWGmjRYmvq58dh7Lbn7ofwSYZoISgXsUh5lkGKF8,2318
 annet/rulebook/cisco/vlandb.py,sha256=pdQ0Ca976_5_cNBbTI6ADN1SP8aAngVBs1AZWltmpsw,3319
+annet/rulebook/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+annet/rulebook/generic/misc.py,sha256=dp8mWMN0v4dkvGjthXvIwvyBNSag_3HruTyhRV7E8sA,519
 annet/rulebook/huawei/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/rulebook/huawei/aaa.py,sha256=Xi8nWyBFaUz4SgoN1NQeOcXzBGCfINQDNiC-crq08uA,3445
+annet/rulebook/huawei/aaa.py,sha256=RyFwnfp7I2Y3Kizc2f3SXSzBm6UbhaHE6TtisBeuD68,3919
 annet/rulebook/huawei/bgp.py,sha256=dN8T3-44ggGEapt4u4sT3bTn_dsoCbS5qdNeSQ8LSTs,4015
 annet/rulebook/huawei/iface.py,sha256=DvLtQ7tfbDQWFmIYV4lxfih13Tdrt24L4-ZS29mCkuc,1126
 annet/rulebook/huawei/misc.py,sha256=Rpwhtm42IgcueDq4K6VOzN2qORoIDYh42Jb7iWL8AII,14424
@@ -151,14 +153,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=1ssX8XPSpCzYgS8quOIpnOtgKhWJbfexGF9lj_D_TmE,873
-annet/rulebook/texts/b4com.rul,sha256=IPaHBWXN0gnaZQLBF8wVK3EPDTs7ueOPdJw1WdX_CtE,1353
+annet/rulebook/texts/b4com.order,sha256=k_9qPnc3olAUTrAeefLwe91rUK9hYgkp8hFl9LRU0V0,932
+annet/rulebook/texts/b4com.rul,sha256=G64FljT5wjCVpejbNmCebfCSGo-YIUrlHrpcn3GdXHc,1409
 annet/rulebook/texts/cisco.deploy,sha256=Hu0NkcGv3f1CWUrnbzI3eQOPXJxtH4NNOPRV68IrW4U,1226
-annet/rulebook/texts/cisco.order,sha256=ecwktxyY2_W63oqv2aqVhvfViuia42fZb-2uLP0Efg8,1942
-annet/rulebook/texts/cisco.rul,sha256=jgL5_xnSwd_H4E8cx4gcneSvJC5W1zz6_BWSb64iuxI,3017
-annet/rulebook/texts/huawei.deploy,sha256=uUsZCHUrC5Zyb_MePrR5svnE1QyGQlg7UxcKf00sJyg,10451
-annet/rulebook/texts/huawei.order,sha256=_X2LmxD9FGcIcb8ziwc13Imy1tBtQJgafrQGmvHPZLM,10649
-annet/rulebook/texts/huawei.rul,sha256=gTGF5vmLb1DbHcEJXQh_8PX-NXJQcyz8NVR0mg4x2XQ,13096
+annet/rulebook/texts/cisco.order,sha256=DarNICBBAEXR8VOFV8SNnuQmwGAG-TGwXlMWpFMTCDE,1927
+annet/rulebook/texts/cisco.rul,sha256=DLve1CQYto-cn-sojGl4qBaWQnCyn3W1qYmPuTxSfqU,3627
+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/iosxr.deploy,sha256=Hu0NkcGv3f1CWUrnbzI3eQOPXJxtH4NNOPRV68IrW4U,1226
 annet/rulebook/texts/iosxr.order,sha256=gUp6XHwzqkDsArCUAwtx3rR1qlGfYsHy2vP9oZN2oDk,1922
 annet/rulebook/texts/iosxr.rul,sha256=MhIoIbOrfqisbyprZLy86DvO4rl6LtPESFnDU9nQUY0,2974
@@ -185,11 +187,11 @@ annet/vendors/tabparser.py,sha256=9AsBUY89YQstbLk2eia-NmuVXaJOG1fd2bIVcI5L43M,31
 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
-annet/vendors/library/b4com.py,sha256=fX9Rh_yUrZY0imuPdI4RBxEwmVlW_FkoKXebYSqF7Wk,1390
+annet/vendors/library/b4com.py,sha256=EABOc-w8XqFGI0hcGU5JjCfXAf9v_Uf4MVdFT5gLZ7Q,1462
 annet/vendors/library/cisco.py,sha256=3-hWdMaQPnUVFJzKX4gNwIIoGxrSqrGrrE0p7QvedyU,1176
 annet/vendors/library/h3c.py,sha256=QOO670R-r9Ge_5T7a7b5FajA4j0HcqJKCCsn4ctbcxc,1045
 annet/vendors/library/huawei.py,sha256=79RINBbuob8KJXQvULbEGVVaGhn3-LzCYuqWQ847eds,1261
-annet/vendors/library/iosxr.py,sha256=f_i09WH3TfOKrQ0RpnzeJD30eNoVQIwrJyhi-DyeoOM,1174
+annet/vendors/library/iosxr.py,sha256=0eFPbiE0jry_IATDxK3-UsPPMkK2gs9-avR51v2HAWw,1185
 annet/vendors/library/juniper.py,sha256=BDljknxDJ0JxEXb3HCbZSC38BuA7OF5mtcQLLftXx_o,1289
 annet/vendors/library/nexus.py,sha256=naTtiaFzNt1YZmxUSR9UCa-z766r1oav0tPXinA2tho,1118
 annet/vendors/library/nokia.py,sha256=RhynYZpti5ftud88vaphLAA3ZrCEKdR8BESXWlUZIH8,1152
@@ -197,8 +199,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.5.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.5.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.5.1.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.5.1.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
@@ -211,8 +213,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.5.0.dist-info/METADATA,sha256=d13vJqNGhtvSbEvqCZvqBT6RoiyDDz07wndWrnxagzk,815
-annet-3.5.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-annet-3.5.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.5.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.5.0.dist-info/RECORD,,
+annet-3.5.1.dist-info/METADATA,sha256=FzDUT_CYHtfBoKd7gyzhTmLsWcbRxt10zyZuFGRYI9g,815
+annet-3.5.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+annet-3.5.1.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.5.1.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.5.1.dist-info/RECORD,,

{annet-3.5.0.dist-info → annet-3.5.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any