annet 0.16.15__py3-none-any.whl → 0.16.17__py3-none-any.whl

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/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/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/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/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/rulebook/cisco/misc.py

@@ -1,4 +1,6 @@
 import re
+from collections import OrderedDict
+from typing import Any
 
 from annet.annlib.types import Op
 
@@ -55,3 +57,93 @@ def banner_login(rule, key, diff, **_):
         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/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.17.dist-info/METADATA

@@ -0,0 +1,26 @@
+Metadata-Version: 2.1
+Name: annet
+Version: 0.16.17
+Summary: annet
+Home-page: https://github.com/annetutil/annet
+License: MIT
+Requires-Python: >=3.10
+License-File: LICENSE
+License-File: AUTHORS
+Requires-Dist: colorama>=0.4.6
+Requires-Dist: tabulate>=0.9.0
+Requires-Dist: jsonpatch>=1.33
+Requires-Dist: jsonpointer>=2.4
+Requires-Dist: PyYAML>=6.0.1
+Requires-Dist: Pygments>=2.14.0
+Requires-Dist: Mako>=1.2.4
+Requires-Dist: Jinja2>=3.1.2
+Requires-Dist: psutil>=5.8.0
+Requires-Dist: packaging>=23.2
+Requires-Dist: contextlog>=1.1
+Requires-Dist: valkit>=0.1.4
+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.8; extra == "netbox"

{annet-0.16.15.dist-info → annet-0.16.17.dist-info}/RECORD

@@ -1,7 +1,7 @@
-annet/__init__.py,sha256=k2dq8aOYjkjZszKoOlxEmR49uYoKh-8_HC2K8FeqLwA,2139
+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=SUBiOFVK4PCzFO7AjcypF3E9SrvbNx8i7hdUYmLmDMo,8041
+annet/bgp_models.py,sha256=1qDMUFO6GNMIw5HVcIhRcQuOZ4JoelNlTmlcNpbYiGI,8033
 annet/cli.py,sha256=hDpjIr3w47lgQ_CvCQS1SXFDK-SJrf5slbT__5u6GIA,12342
 annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
 annet/connectors.py,sha256=-Lghz3PtWCBU8Ohrp0KKQcmm1AUZtN0EnOaZ6IQgCQI,5105
@@ -83,11 +83,11 @@ annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 annet/generators/common/initial.py,sha256=qYBxXFhyOPy34cxc6hsIXseod-lYCmmbuNHpM0uteY0,1244
 annet/mesh/__init__.py,sha256=ZVFPnNOBgP42d7dUnCypGh3RKy0Ne_ObWVzROlE1nFA,423
 annet/mesh/basemodel.py,sha256=bBBx1wu3ftENgf_4PGCV-SkEcxH3tFekvoointT3894,4739
-annet/mesh/device_models.py,sha256=Jv6g9blnvTVxHGgHhnGd3b_8C3EHGpV7txyyR0Yt_Rg,3301
+annet/mesh/device_models.py,sha256=nh2SX6-j_xsM-3rzp5JlzZGjJD9HjUkiac4-hzXpy2k,3333
 annet/mesh/executor.py,sha256=iDarSYfq9H6MSf-M1HkQOFIaUb8j-nG0sQNbgzq4XIo,13726
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
-annet/mesh/models_converter.py,sha256=9K-B-Y5gQktr6ycHiCIM0OHsCM8yPUpO89AceU0Of3A,3168
-annet/mesh/peer_models.py,sha256=T8sgKcg1a0BAkRVS5Kfc65CrlIB2AqQcwrehfEqWhLk,2572
+annet/mesh/models_converter.py,sha256=3q2zs7K8S3pfYSUKKRdtl5CJGbeg4TtYxofAVs_MBsk,3085
+annet/mesh/peer_models.py,sha256=xyLbWtwJ5Y4OLf-OVZeHwRn2qyWhipOvhD4pDHTbvTE,2665
 annet/mesh/registry.py,sha256=G-FszWc_VKeN3eVpb-MRGbAGzbcSuEVAzbDC2k747XA,8611
 annet/rulebook/__init__.py,sha256=14IpOfTbeJtre7JKrfXVYiH0qAXsUSOL7AatUFmSQs0,3847
 annet/rulebook/common.py,sha256=zK1s2c5lc5HQbIlMUQ4HARQudXSgOYiZ_Sxc2I_tHqg,721
@@ -102,7 +102,7 @@ annet/rulebook/b4com/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 annet/rulebook/b4com/file.py,sha256=zK7RwBk1YaVoDSFSg1u7Pt8u0Fk3nhhu27aJRngemwc,137
 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=l9NTR6cAsrfFyeC_yoOeQ0fOFoPiJfFwnRva5W9vyL0,2259
+annet/rulebook/cisco/misc.py,sha256=KBnxBw5vs-GSoldMBzEB8ygyHEntiydn1vchZDBA3No,5286
 annet/rulebook/cisco/vlandb.py,sha256=pdQ0Ca976_5_cNBbTI6ADN1SP8aAngVBs1AZWltmpsw,3319
 annet/rulebook/huawei/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/huawei/aaa.py,sha256=Xi8nWyBFaUz4SgoN1NQeOcXzBGCfINQDNiC-crq08uA,3445
@@ -127,7 +127,7 @@ annet/rulebook/texts/b4com.order,sha256=G3aToAIHHzKzDCM3q7_lyr9wJvuVOXVbVvF3wm5P
 annet/rulebook/texts/b4com.rul,sha256=5mqyUg_oLRSny2iH6QdhfDWVu6kzgDURtlSATD7DFno,1056
 annet/rulebook/texts/cisco.deploy,sha256=XvXWeOMahE8Uc9RF0xkJj8jGknD4vit8H_f24ubPX7w,1226
 annet/rulebook/texts/cisco.order,sha256=OvNHMNqkCc-DN2dEjLCTKv_7ZhiaHt4q2X4Y4Z8dvR4,1901
-annet/rulebook/texts/cisco.rul,sha256=FvMxKy4FOcFvFYdmcye5RZkWkU8mxIwmEedN83fM82I,3019
+annet/rulebook/texts/cisco.rul,sha256=xMJJgTGmg5wZXTIp5SUdLJIgwka7AIv9Uj6-DWBV3UQ,3055
 annet/rulebook/texts/huawei.deploy,sha256=azEC6_jQRzwnTSrNgag0hHh6L7hezS_eMk6ZDZfWyXI,10444
 annet/rulebook/texts/huawei.order,sha256=ENllPX4kO6xNw2mUQcx11yhxo3tKStZ5mUyc0C6s3d0,10657
 annet/rulebook/texts/huawei.rul,sha256=02Fi1RG4YYea2clHCluBuJDKNbT0hS9jtsk6_h6GK8k,12958
@@ -152,10 +152,10 @@ annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn
 annet_generators/mesh_example/__init__.py,sha256=NfNWgXn1TNiWI6A5tmU6Y-4QV2i33td0Qs3re0MNNMo,218
 annet_generators/mesh_example/bgp.py,sha256=jzyDndSSGYyYBquDnLlR-7P5lzmUKcSyYCml3VsoMC0,1385
 annet_generators/mesh_example/mesh_logic.py,sha256=DJS5JMCTs0rs0LN__0LulNgo2ekUcWiOMe02BlOeFas,1454
-annet-0.16.15.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.15.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.15.dist-info/METADATA,sha256=VI-njmyEaLFgh_aLn0WYEXAxnsims000_VWqTUu5ujc,745
-annet-0.16.15.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-annet-0.16.15.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.15.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.15.dist-info/RECORD,,
+annet-0.16.17.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.17.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.17.dist-info/METADATA,sha256=4rLw_7-NNXC4Y55-ZDYyEPUqYVEg3DKCjM7u8CxY2_w,728
+annet-0.16.17.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+annet-0.16.17.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.17.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.17.dist-info/RECORD,,

{annet-0.16.15.dist-info → annet-0.16.17.dist-info}/WHEEL

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

annet-0.16.15.dist-info/METADATA

@@ -1,27 +0,0 @@
-Metadata-Version: 2.1
-Name: annet
-Version: 0.16.15
-Summary: annet
-Home-page: https://github.com/annetutil/annet
-License: MIT
-Requires-Python: >=3.9
-License-File: LICENSE
-License-File: AUTHORS
-Requires-Dist: colorama >=0.4.6
-Requires-Dist: tabulate >=0.9.0
-Requires-Dist: jsonpatch >=1.33
-Requires-Dist: jsonpointer >=2.4
-Requires-Dist: PyYAML >=6.0.1
-Requires-Dist: Pygments >=2.14.0
-Requires-Dist: Mako >=1.2.4
-Requires-Dist: Jinja2 >=3.1.2
-Requires-Dist: psutil >=5.8.0
-Requires-Dist: packaging >=23.2
-Requires-Dist: contextlog >=1.1
-Requires-Dist: valkit >=0.1.4
-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.8 ; extra == 'netbox'
-