annet 3.5.0__tar.gz → 3.5.1__tar.gz

{annet-3.5.0/annet.egg-info → annet-3.5.1}/PKG-INFO

@@ -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 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.1/annet/rulebook/b4com/iface.py

@@ -0,0 +1,119 @@
+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 без указания значения
+    """
+    if diff[Op.REMOVED]:
+        yield (False, "no mtu", None)
+    elif diff[Op.ADDED]:
+        yield from common.default(rule, key, diff, **kwargs)
+
+
+def description(rule, key, diff, **kwargs):
+    """
+    Удаляем description без указания значения
+    """
+    if diff[Op.REMOVED]:
+        yield (False, "no description", 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
+    """
+    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):
+    """
+    Обрабатываем блок lldp-agent
+    """
+    result = common.default(rule, key, diff, **kwargs)
+    for op, cmd, ch in result:
+        # Не удаляем все что начинается с set, т.к. set перезаписывает предыдущий конфиг
+        if diff[Op.REMOVED] and "set lldp" in cmd:
+            pass
+        # В случае lldp tlv ... select удаляем все что до select
+        elif diff[Op.REMOVED] and cmd.endswith("select"):
+            yield (op, " ".join(cmd.split()[:-1]), ch)
+        else:
+            yield (op, cmd, ch)

{annet-3.5.0 → annet-3.5.1}/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-3.5.1/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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-3.5.0 → annet-3.5.1}/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 → annet-3.5.1/annet.egg-info}/PKG-INFO

@@ -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 → annet-3.5.1}/annet.egg-info/SOURCES.txt

@@ -145,6 +145,8 @@ annet/rulebook/cisco/__init__.py
 annet/rulebook/cisco/iface.py
 annet/rulebook/cisco/misc.py
 annet/rulebook/cisco/vlandb.py
+annet/rulebook/generic/__init__.py
+annet/rulebook/generic/misc.py
 annet/rulebook/huawei/__init__.py
 annet/rulebook/huawei/aaa.py
 annet/rulebook/huawei/bgp.py

annet-3.5.0/annet/rulebook/b4com/iface.py

@@ -1,56 +0,0 @@
-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 description(rule, key, diff, **kwargs):
-    """
-    Удаляем description без указания значения
-    """
-    if diff[Op.REMOVED]:
-        yield (False, "no description", 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):
-    """
-    Обрабатываем блок lldp-agent
-    """
-    result = common.default(rule, key, diff, **kwargs)
-    for op, cmd, ch in result:
-        # Не удаляем все что начинается с set, т.к. set перезаписывает предыдущий конфиг
-        if diff[Op.REMOVED] and "set lldp" in cmd:
-            pass
-        # В случае lldp tlv ... select удаляем все что до select
-        elif diff[Op.REMOVED] and cmd.endswith("select"):
-            yield (op, " ".join(cmd.split()[:-1]), ch)
-        else:
-            yield (op, cmd, ch)