annet 3.6.0__tar.gz → 3.6.1__tar.gz

{annet-3.6.0/annet.egg-info → annet-3.6.1}/PKG-INFO

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

{annet-3.6.0 → annet-3.6.1}/annet/annlib/command.py

@@ -17,7 +17,7 @@ class Question:
 
 @dataclass
 class Command:
-    cmd: str
+    cmd: str | bytes
     questions: Optional[List[Question]] = None
     exc_handler: Optional[List[Question]] = None
     timeout: Optional[int] = None  # total timeout
@@ -26,6 +26,8 @@ class Command:
     suppress_eof: bool = False
 
     def __str__(self) -> str:
+        if isinstance(self.cmd, bytes):
+            return self.cmd.decode("utf-8")
         return self.cmd
 
 

{annet-3.6.0 → annet-3.6.1}/annet/cli_args.py

@@ -249,7 +249,7 @@ opt_max_slots = Arg(
 )
 
 opt_max_deploy = Arg(
-    "--max-deploy", default=0, type=int,
+    "--max-deploy", default=DefaultFromEnv("ANN_MAX_DEPLOY", "0"), type=int,
     help="The amount of devices deployed at the same time"
 )
 

{annet-3.6.0 → annet-3.6.1}/annet/rpl_generators/policy.py

@@ -1048,7 +1048,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             yield "delete", "extcommunity", "rt", "all"
             added.extend(action.value.replaced)
 
-            added.extend(action.value.replaced)
+        added.extend(action.value.added)
         for member_name in added:
             typename = self._iosxr_community_type_str(communities[member_name].type)
             yield "set", "extcommunity", typename, member_name, "additive"

annet-3.6.1/annet/rulebook/juniper/iface.py

@@ -0,0 +1,39 @@
+import ipaddress
+from annet.annlib.types import Op
+from annet.rulebook import common
+from annet.rulebook.common import DiffItem
+
+
+def ipv6_addr(old, new, diff_pre, _pops):
+    """
+    Приводим все ipv6-адреса в объекты IPv6Interface и далее сравниваем
+    """
+    address_new_line = [a for a in map(_parse_ipv6, new) if a]
+    address_old_line = [a for a in map(_parse_ipv6, old) if a]
+
+    ret = []
+    for item in common.default_diff(old, new, diff_pre, _pops):
+        # Проверяем адрес помеченный под снос на наличии в новом списке
+        if item.op == Op.REMOVED and _parse_ipv6(item.row) in address_new_line:
+            result_item = DiffItem(Op.AFFECTED, item.row, item.children, item.diff_pre)
+        # Проверяем адрес помеченный для добавления на наличии в старом списке
+        elif item.op == Op.ADDED and _parse_ipv6(item.row) in address_old_line:
+            result_item = None
+        # Остальное без изменений
+        else:
+            result_item = item
+        if result_item:
+            ret.append(result_item)
+    return ret
+
+
+def _parse_ipv6(row):
+    """
+    Парсит IPv6-интерфейс из строки, предполагая, что адрес находится на втором месте.
+    Возвращает объект IPv6Interface или None.
+    """
+    if row:
+        parts = row.split()
+        if len(parts) > 1:
+            return ipaddress.IPv6Interface(parts[1])
+    return None

{annet-3.6.0 → annet-3.6.1}/annet/rulebook/texts/juniper.rul

@@ -72,6 +72,8 @@ interfaces
             description ~
             mtu *
             vlan-tags
+            family inet6
+                address * %diff_logic=juniper.iface.ipv6_addr
         description ~
         mtu *
         hold-time

{annet-3.6.0 → annet-3.6.1/annet.egg-info}/PKG-INFO

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

{annet-3.6.0 → annet-3.6.1}/annet.egg-info/SOURCES.txt

@@ -154,6 +154,7 @@ annet/rulebook/huawei/iface.py
 annet/rulebook/huawei/misc.py
 annet/rulebook/huawei/vlandb.py
 annet/rulebook/juniper/__init__.py
+annet/rulebook/juniper/iface.py
 annet/rulebook/nexus/__init__.py
 annet/rulebook/nexus/iface.py
 annet/rulebook/routeros/__init__.py