annet 0.16.15__tar.gz → 0.16.17__tar.gz

{annet-0.16.15/annet.egg-info → annet-0.16.17}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.15
+Version: 0.16.17
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: colorama>=0.4.6

{annet-0.16.15 → annet-0.16.17}/annet/__init__.py

@@ -56,6 +56,6 @@ def init(options: Namespace):
 
 
 def assert_python_version():
-    if sys.version_info < (3, 9, 0):
-        sys.stderr.write("Error: you need python 3.9.0 or higher\n")
+    if sys.version_info < (3, 10, 0):
+        sys.stderr.write("Error: you need python 3.10.0 or higher\n")
         sys.exit(1)

{annet-0.16.15 → annet-0.16.17}/annet/bgp_models.py

@@ -67,7 +67,7 @@ class BFDTimers:
     multiplier: int = 4
 
 
-Family = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled", "ipv6_labeled"]
+Family = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast"]
 
 
 @dataclass(frozen=True)
@@ -182,6 +182,8 @@ class PeerGroup:
     internal_name: str = ""
     description: str = ""
     update_source: str = ""
+    import_policy: str = ""
+    export_policy: str = ""
 
     # more strict version of PeerOptions
     local_as: ASN = ASN(None)
@@ -242,8 +244,6 @@ class VrfOptions:
     ipv6_labeled_unicast: FamilyOptions
 
     vrf_name_global: Optional[str] = None
-    import_policy: Optional[str] = None
-    export_policy: Optional[str] = None
     rt_import: list[str] = field(default_factory=list)
     rt_export: list[str] = field(default_factory=list)
     rt_import_v4: list[str] = field(default_factory=list)

{annet-0.16.15 → annet-0.16.17}/annet/mesh/device_models.py

@@ -41,8 +41,8 @@ class _FamiliesMixin:
     def __init__(self, **kwargs):
         kwargs.setdefault("ipv4_unicast", FamilyOptions(family="ipv4_unicast"))
         kwargs.setdefault("ipv6_unicast", FamilyOptions(family="ipv6_unicast"))
-        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled"))
-        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled"))
+        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled_unicast"))
+        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled_unicast"))
         super().__init__(**kwargs)
     ipv4_unicast: Annotated[FamilyOptions, Merge()]
     ipv6_unicast: Annotated[FamilyOptions, Merge()]
@@ -54,8 +54,8 @@ class VrfOptions(_FamiliesMixin, BaseMeshModel):
     def __init__(self, vrf_name: str, **kwargs):
         kwargs.setdefault("ipv4_unicast", FamilyOptions(family="ipv4_unicast", vrf_name=vrf_name))
         kwargs.setdefault("ipv6_unicast", FamilyOptions(family="ipv6_unicast", vrf_name=vrf_name))
-        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled", vrf_name=vrf_name))
-        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled", vrf_name=vrf_name))
+        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled_unicast", vrf_name=vrf_name))
+        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled_unicast", vrf_name=vrf_name))
         kwargs.setdefault("groups", KeyDefaultDict(lambda x: MeshPeerGroup(name=x)))
         super().__init__(vrf_name=vrf_name, **kwargs)
 

{annet-0.16.15 → annet-0.16.17}/annet/mesh/models_converter.py

@@ -61,9 +61,6 @@ retort = Retort(
         }),
         loader(list[PeerGroup], lambda x: list(x.values()), Chain.FIRST),
         loader(PeerGroup, ObjMapping, Chain.FIRST),
-        name_mapping(PeerGroup, map={
-            "local_as": "asnum",
-        }),
     ]
 )
 

{annet-0.16.15 → annet-0.16.17}/annet/mesh/peer_models.py

@@ -3,7 +3,7 @@ from typing import Literal, Annotated, Union, Optional
 from .basemodel import BaseMeshModel, Concat
 from ..bgp_models import BFDTimers
 
-FamilyName = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled", "ipv6_labeled"]
+FamilyName = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast"]
 
 
 class _SharedOptionsDTO(BaseMeshModel):
@@ -117,7 +117,11 @@ class VirtualPeerDTO(MeshSession):
 class MeshPeerGroup(_OptionsDTO):
     name: str
     families: Annotated[set[FamilyName], Concat()]
+    local_as: Union[int, str]
     remote_as: Union[int, str]
     internal_name: str
     update_source: str
     description: str
+
+    import_policy: str
+    export_policy: str

annet-0.16.17/annet/rulebook/cisco/misc.py

@@ -0,0 +1,149 @@
+import re
+from collections import OrderedDict
+from typing import Any
+
+from annet.annlib.types import Op
+
+from annet.rulebook import common
+
+
+def ssh_key(rule, key, diff, hw, **_):
+    """
+    При включении ssh надо еще сгенерировать ключ. По конфигу никак не понять есть ли ключ на свитче или нет.
+    """
+    if diff[Op.ADDED]:
+        added = sorted([x["row"] for x in diff[Op.ADDED]])
+        if added == ["ip ssh version 2"]:
+            # Отсыпаем mpdaemon-у подсказок для дополнительной команды при наливке
+            comment = rule["comment"]
+            rule["comment"] = ["!!suppress_errors!!", "!!timeout=240!!"]
+            if hw.Cisco.C2960:
+                yield (False, "crypto key generate rsa modulus 2048", None)
+            else:
+                yield (False, "crypto key generate rsa general-keys modulus 2048", None)
+            rule["comment"] = comment
+    yield from common.default(rule, key, diff)
+
+
+def no_ipv6_nd_suppress_ra(rule, key, diff, **_):
+    """
+    При конфигурации ipv6 nd на нексусах нужно добавлять
+    no ipv6 nd suppress-ra
+    иначе RA не будет включен.
+    К сожалению данной команды не видно в running-config.
+    Поэтому подмешиваем ее в патч вместо генератора
+    """
+    if diff[Op.ADDED]:
+        yield (False, "no ipv6 nd suppress-ra", None)
+    yield from common.default(rule, key, diff)
+
+
+def no_ntp_distribute(rule, key, diff, **_):
+    """
+    Для того, чтобы удалить NTP из CFS, сначала нужно сбросить активные
+    NTP сессии.
+    """
+    if diff[Op.REMOVED]:
+        yield (False, "clear ntp session", None)
+    yield from common.default(rule, key, diff)
+
+
+def banner_login(rule, key, diff, **_):
+    if diff[Op.REMOVED]:
+        yield (False, "no banner login", None)
+    elif diff[Op.ADDED]:
+        # Убираем дополнительный экранирующий сиимвол
+        key = re.sub(r"\^C", "^", key[0])
+        yield (False, f"banner login {key}", None)
+    else:
+        yield from common.default(rule, key, diff)
+
+
+def bgp_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
+    """
+    Some oder versions of Cisco IOS doesn't create subsection for address family block.
+
+    it looks like:
+
+    router bgp 65111
+     bgp router-id 1.1.1.1
+     bgp log-neighbor-changes
+     neighbor SPINE peer-group
+     !
+     address-family ipv4
+     neighbor SPINE send-community both
+     neighbor SPINE soft-reconfiguration inbound
+     neighbor SPINE route-map TOR_IMPORT_SPINE in
+     neighbor SPINE route-map TOR_EXPORT_SPINE out
+     exit-address-family
+
+    but should be
+
+    router bgp 65111
+     bgp router-id 1.1.1.1
+     bgp log-neighbor-changes
+     neighbor SPINE peer-group
+     !
+     address-family ipv4
+      neighbor SPINE send-community both
+      neighbor SPINE soft-reconfiguration inbound
+      neighbor SPINE route-map TOR_IMPORT_SPINE in
+      neighbor SPINE route-map TOR_EXPORT_SPINE out
+     exit-address-family
+
+    The diff_logic func do it before make diff.
+    """
+    corrected_old = _create_subsections(old, "address-family")
+
+    yield from common.default_diff(corrected_old, new, diff_pre, _pops)
+
+
+def _create_subsections(data: OrderedDict[str, Any], sub_section_prefix: str) -> OrderedDict[str, Any]:
+    """
+    Reorganizes the given OrderedDict to nest commands under their respective
+    sub_section_prefix keys.
+
+    This function traverses the entries in the provided OrderedDict and groups
+    together all entries that are between keys with sub_section_prefix under those
+    keys as nested OrderedDicts. The reorganization keeps the order of entries
+    stable, only adding nesting where appropriate.
+
+    Args:
+        data (OrderedDict): The original configuration to be transformed.
+        sub_section_prefix (str): Prefix of subsection key
+
+    Returns:
+        OrderedDict: A new OrderedDict with nested 'address-family' sections.
+    """
+
+    result = OrderedDict()
+    sub_section = None
+    temp: OrderedDict = OrderedDict()
+
+    for key, value in data.items():
+        # make nested loop if found nested values
+        if value:
+            fixed_value: OrderedDict[str, Any] = _create_subsections(value, sub_section_prefix)
+        else:
+            fixed_value = value
+        if key.startswith(sub_section_prefix):
+            # in case of data has already had subsections
+            if value:
+                result[key] = fixed_value
+                continue
+            # if previous subsection present save collected data from temporary dict
+            if sub_section:
+                result[sub_section] = temp
+            # find a new subsection and initialize new dict
+            sub_section = key
+            temp = OrderedDict()
+        # put found data to temporary dict
+        elif sub_section:
+            temp[key] = fixed_value
+        else:
+            result[key] = fixed_value
+    # if data is finished save collected data from temporary dict
+    if sub_section:
+        result[sub_section] = temp
+
+    return result

{annet-0.16.15 → annet-0.16.17}/annet/rulebook/texts/cisco.rul

@@ -73,7 +73,7 @@ interface */\w*Ethernet[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.
     storm-control * level
     spanning-tree portfast
 
-router bgp *
+router bgp *     %diff_logic=cisco.misc.bgp_diff
     router-id
     vrf *
         router-id

{annet-0.16.15 → annet-0.16.17/annet.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.15
+Version: 0.16.17
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: colorama>=0.4.6

{annet-0.16.15 → annet-0.16.17}/setup.py

@@ -46,7 +46,7 @@ if __name__ == "__main__":
         extras_require={
             "netbox": ["annetbox[sync]>=0.1.8"],
         },
-        python_requires=">=3.9",
+        python_requires=">=3.10",
         install_requires=requirements(),
         include_package_data=True,
     )

annet-0.16.15/annet/rulebook/cisco/misc.py

@@ -1,57 +0,0 @@
-import re
-
-from annet.annlib.types import Op
-
-from annet.rulebook import common
-
-
-def ssh_key(rule, key, diff, hw, **_):
-    """
-    При включении ssh надо еще сгенерировать ключ. По конфигу никак не понять есть ли ключ на свитче или нет.
-    """
-    if diff[Op.ADDED]:
-        added = sorted([x["row"] for x in diff[Op.ADDED]])
-        if added == ["ip ssh version 2"]:
-            # Отсыпаем mpdaemon-у подсказок для дополнительной команды при наливке
-            comment = rule["comment"]
-            rule["comment"] = ["!!suppress_errors!!", "!!timeout=240!!"]
-            if hw.Cisco.C2960:
-                yield (False, "crypto key generate rsa modulus 2048", None)
-            else:
-                yield (False, "crypto key generate rsa general-keys modulus 2048", None)
-            rule["comment"] = comment
-    yield from common.default(rule, key, diff)
-
-
-def no_ipv6_nd_suppress_ra(rule, key, diff, **_):
-    """
-    При конфигурации ipv6 nd на нексусах нужно добавлять
-    no ipv6 nd suppress-ra
-    иначе RA не будет включен.
-    К сожалению данной команды не видно в running-config.
-    Поэтому подмешиваем ее в патч вместо генератора
-    """
-    if diff[Op.ADDED]:
-        yield (False, "no ipv6 nd suppress-ra", None)
-    yield from common.default(rule, key, diff)
-
-
-def no_ntp_distribute(rule, key, diff, **_):
-    """
-    Для того, чтобы удалить NTP из CFS, сначала нужно сбросить активные
-    NTP сессии.
-    """
-    if diff[Op.REMOVED]:
-        yield (False, "clear ntp session", None)
-    yield from common.default(rule, key, diff)
-
-
-def banner_login(rule, key, diff, **_):
-    if diff[Op.REMOVED]:
-        yield (False, "no banner login", None)
-    elif diff[Op.ADDED]:
-        # Убираем дополнительный экранирующий сиимвол
-        key = re.sub(r"\^C", "^", key[0])
-        yield (False, f"banner login {key}", None)
-    else:
-        yield from common.default(rule, key, diff)