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

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.16.dist-info → annet-0.16.17.dist-info}/RECORD

@@ -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.16.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.16.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.16.dist-info/METADATA,sha256=HWT2ARwNTk_WK4FcwEtWOa2FrkPAYRZ5BUwr3--hrNA,746
-annet-0.16.16.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-annet-0.16.16.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.16.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.16.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.16.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.16.dist-info/METADATA

@@ -1,27 +0,0 @@
-Metadata-Version: 2.1
-Name: annet
-Version: 0.16.16
-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'
-