annet 1.0.3__py3-none-any.whl → 1.1.0__py3-none-any.whl

annet/rulebook/juniper/__init__.py

@@ -1,73 +1,122 @@
 import re
 from collections import OrderedDict as odict
-from functools import wraps
+import functools
 
 from annet.annlib.lib import jun_activate, jun_is_inactive, merge_dicts
 from annet.annlib.types import Op
-
+from annet.tabparser import JuniperFormatter
 from annet.rulebook import common
 
 
-def _inactive_blocks(diff_foo):
-    @wraps(diff_foo)
-    def wrapper(old, new, diff_pre, *args, **kwargs):
+def comment_processor(item: common.DiffItem):
+    if item.op in (Op.REMOVED, Op.ADDED) and item.row.startswith(JuniperFormatter.Comment.begin):
+        comment = JuniperFormatter.Comment.loads(item.row)
+
+        item.diff_pre["attrs"]["context"]["row"] = comment.row
+        item.diff_pre["attrs"]["context"]["comment"] = comment.comment
+        item.diff_pre["key"] = item.diff_pre["raw_rule"] = (
+            f"{JuniperFormatter.Comment.begin} {comment.row} {JuniperFormatter.Comment.end}"
+        )
+
+        return common.DiffItem(
+            item.op,
+            f"{JuniperFormatter.Comment.begin} {comment.comment} {JuniperFormatter.Comment.end}",
+            item.children,
+            item.diff_pre,
+        )
+    else:
+        return item
+
+
+def inactive_blocks(diff_foo):
+    @functools.wraps(diff_foo)
+    def wrapper(old: odict, new: odict, diff_pre, *args, **kwargs):
         old_inactives = list(map(jun_activate, filter(jun_is_inactive, old)))
         new_inactives = list(map(jun_activate, filter(jun_is_inactive, new)))
+
+        diff: list[common.DiffItem]
+
         if len(old_inactives) == 0 and len(new_inactives) == 0:
-            return diff_foo(old, new, diff_pre, *args, **kwargs)
-
-        inactive_pre = odict([(jun_activate(k), v) for k, v in diff_pre.items() if jun_is_inactive(k)])
-        merged_pre = merge_dicts(diff_pre, inactive_pre)
-        diff = diff_foo(_strip_toplevel_inactives(old),
-                        _strip_toplevel_inactives(new),
-                        merged_pre,
-                        *args, **kwargs)
-
-        for activated in [k for k in old_inactives if k in new]:
-            diff += [(Op.ADDED, _activate_cmd(activated, merged_pre), {}, diff_pre[activated]["match"])]
-
-        for deactivated in [k for k in new_inactives if k not in old_inactives]:
-            # если деактивуруемого блока не существует - ставим один deactivate, глубже не идем
-            if deactivated not in diff_pre:
-                diff = [(Op.ADDED, _deactivate_cmd(deactivated, merged_pre), {}, inactive_pre[deactivated]["match"])]
-            else:
-                diff += [(Op.ADDED, _deactivate_cmd(deactivated, merged_pre), {}, diff_pre[deactivated]["match"])]
-        return diff
+            diff = diff_foo(old, new, diff_pre, *args, **kwargs)
+        else:
+            inactive_pre = odict([(jun_activate(k), v) for k, v in diff_pre.items() if jun_is_inactive(k)])
+            merged_pre = merge_dicts(diff_pre, inactive_pre)
+
+            diff = diff_foo(
+                strip_toplevel_inactives(old),
+                strip_toplevel_inactives(new),
+                merged_pre,
+                *args, **kwargs
+            )
+
+            for activated in [k for k in old_inactives if k in new]:
+                diff.append(
+                    common.DiffItem(
+                        Op.ADDED,
+                        activate_cmd(activated, merged_pre),
+                        [],
+                        diff_pre[activated]["match"]
+                    )
+                )
+
+            for deactivated in [k for k in new_inactives if k not in old_inactives]:
+                # если деактивуруемого блока не существует - ставим один deactivate, глубже не идем
+                if deactivated not in diff_pre:
+                    diff = [
+                        common.DiffItem(
+                            Op.ADDED,
+                            deactivate_cmd(deactivated, merged_pre),
+                            [],
+                            inactive_pre[deactivated]["match"]
+                        )
+                    ]
+                else:
+                    diff.append(
+                        common.DiffItem(
+                            Op.ADDED,
+                            deactivate_cmd(deactivated, merged_pre),
+                            [],
+                            diff_pre[deactivated]["match"]
+                        )
+                    )
+
+        return list(map(comment_processor, diff))
+
     return wrapper
 
 
-@_inactive_blocks
+@inactive_blocks
 def default_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
     diff = common.default_diff(old, new, diff_pre, _pops)
-    diff = _ignore_quotes(diff)
-    diff = _strip_inactive_removed(diff)
+    diff = ignore_quotes(diff)
+    diff = strip_inactive_removed(diff)
     return diff
 
 
-@_inactive_blocks
+@inactive_blocks
 def ordered_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
     diff = common.ordered_diff(old, new, diff_pre, _pops)
-    diff = _ignore_quotes(diff)
-    diff = _strip_inactive_removed(diff)
+    diff = ignore_quotes(diff)
+    diff = strip_inactive_removed(diff)
     return diff
 
 
 # =====
-def _strip_toplevel_inactives(tree):
+def strip_toplevel_inactives(tree):
     for inactive in filter(jun_is_inactive, tree):
         assert jun_activate(inactive) not in tree
     return odict([(k, v) if not jun_is_inactive(k) else (jun_activate(k), v) for k, v in tree.items()])
 
 
-def _activate_cmd(active_key, diff_pre):
-    return _cmd(active_key, diff_pre, "activate")
+def activate_cmd(active_key, diff_pre):
+    return cmd(active_key, diff_pre, "activate")
 
 
-def _deactivate_cmd(active_key, diff_pre):
-    return _cmd(active_key, diff_pre, "deactivate")
+def deactivate_cmd(active_key, diff_pre):
+    return cmd(active_key, diff_pre, "deactivate")
 
 
-def _cmd(active_key, diff_pre, cmd):
+def cmd(active_key, diff_pre, cmd):
     assert not jun_is_inactive(active_key)
     if not diff_pre[active_key]["subtree"]:
         # Если конанда не имеет подблоков И имеет агрументы то надо их отбросить
@@ -75,7 +124,7 @@ def _cmd(active_key, diff_pre, cmd):
     return " ".join([cmd, active_key])
 
 
-def _ignore_quotes(diff):
+def ignore_quotes(diff):
     """
     Фильтрует из diff строки которые различаются
     только наличием/отсутсвием кавычек
@@ -86,19 +135,19 @@ def _ignore_quotes(diff):
     """
     equivs = {}
     for elem in diff:
-        key = _strip_quotes(elem[1])
+        key = strip_quotes(elem[1])
         if key not in equivs:
             equivs[key] = 0
         equivs[key] += 1
-    filtered_diff = [elem for elem in diff if equivs[_strip_quotes(elem[1])] == 1]
+    filtered_diff = [elem for elem in diff if equivs[strip_quotes(elem[1])] == 1]
     return filtered_diff
 
 
-def _strip_quotes(key):
+def strip_quotes(key):
     return re.sub(r"\"(?P<quoted_text>[^\"]+)\"$", r"\g<quoted_text>", key)
 
 
-def _strip_inactive_removed(diff):
+def strip_inactive_removed(diff):
     for elem in diff:
         if elem[0] == Op.REMOVED and elem[3]["key"]:
             key = elem[3]["key"][0]

annet/rulebook/texts/arista.order

@@ -1,3 +1,4 @@
+# vim: set syntax=annrulebook:
 # В этом файле определяется порядок команд, в котором их следует подавать на устройство.
 # - Если порядок команды не важен - ее можно не писать сюда совсем.
 # - Если команда начинается с undo и прописан параметр %order_reverse - команда считается
@@ -29,7 +30,7 @@ ntp
 
 
 qos profile *
-    ~ %global
+    ~
 
 
 snmp-server
@@ -49,7 +50,7 @@ tacacs-server
 
 
 aaa group
-    ~ %global
+    ~
 
 
 aaa
@@ -59,7 +60,7 @@ username
 
 
 role
-    ~ %global
+    ~
 
 
 vlan
@@ -73,14 +74,14 @@ mpls ip
 mpls ldp
 
 router isis
-    ~ %global
+    ~
 
 interface
-    ~ %global
+    ~
 
 
 (?:ip|ipv6) access-list
-    ~ %global
+    ~
 
 
 (?:ip|ipv6) route
@@ -101,15 +102,15 @@ qos map
 
 
 route-map * (?:permit|deny) *
-    ~ %global
+    ~
 
 
 router bfd
-    ~ %global
+    ~
 
 
 router bgp
-    ~ %global
+    ~
 
 
 router multicast
@@ -119,8 +120,7 @@ ip tacacs
 
 
 management
-    ~ %global
+    ~
 
 
-# vim: set syntax=annrulebook:
-~ %global
+~

annet/rulebook/texts/arista.rul

@@ -5,7 +5,7 @@ qos profile *
     ~ %global
 
 username * ssh-key
-username *
+username *                %logic=arista.aaa.user
 
 aaa group ~
     ~ %global

annet/rulebook/texts/huawei.order

@@ -1,3 +1,4 @@
+# vim: set syntax=annrulebook:
 # В этом файле определяется порядок команд, в котором их следует подавать на устройство.
 # - Если порядок команды не важен - ее можно не писать сюда совсем.
 # - Если команда начинается с undo и прописан параметр %order_reverse - команда считается
@@ -384,5 +385,4 @@ undo sflow %order_reverse
 # индекс референсится в логике патчинга префикс-листа huawei.misc.prefix_list
 undo ip */(ip|ipv6)/-prefix * index 99999999  %order_reverse
 
-# vim: set syntax=annrulebook:
-~ %global
+~

annet/rulebook/texts/juniper.order

@@ -0,0 +1,4 @@
+# Правило на все команды
+* %global
+# Добавляем веса комментам, чтобы они катились всегда после команд
+*/\/\*(?:(?!\*\/).)*\*\// %global

{annet-1.0.3.dist-info → annet-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 1.0.3
+Version: 1.1.0
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
@@ -15,7 +15,6 @@ 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

{annet-1.0.3.dist-info → annet-1.1.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 annet/__init__.py,sha256=0OKkFkqog8As7B6ApdpKQkrEAcEELUREWp82D8WvGA8,1846
 annet/annet.py,sha256=TMdEuM7GJQ4TjRVmuK3bCTZN-21lxjQ9sXqEdILUuBk,725
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
-annet/bgp_models.py,sha256=NBPbMWwzo4uWFslrpE4blQO1k4CxJqeleRBDhDg9Rd0,9665
+annet/bgp_models.py,sha256=oibTSdipNkGL4t8Xn94bhyKHMOtwbPBqmYaAy4FmTxQ,12361
 annet/cli.py,sha256=hDpjIr3w47lgQ_CvCQS1SXFDK-SJrf5slbT__5u6GIA,12342
 annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
 annet/connectors.py,sha256=aoiDVLPizx8CW2p8SAwGCzyO_WW8H9xc2aujbGC4bDg,4882
 annet/deploy.py,sha256=3O96k17FbVt8KCvxF4gujXAB81U2-XRJyHLpbc9ekSQ,7529
 annet/deploy_ui.py,sha256=SDTJ-CF6puW0KHQ0g_NDp61Tqh6xkTBMxv8PrBhGyNI,27977
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
-annet/executor.py,sha256=Jny-hm0otZA1naPpFWR-R16SbaZioSQ8pkx-Yd2PYlM,19004
+annet/executor.py,sha256=ZOuexyr2k7CtUttaP1mAZMRoSA-ja_AHaH6inQji24A,5575
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
 annet/gen.py,sha256=A718tYqIcxAa8tQEdjR6PjQ2ovWBnwPH7STKh38lmFY,33567
 annet/hardware.py,sha256=_iR28dWiPtt6ZYdk-qg1sxazkSRJE3ukqKB-fFFfQak,1141
@@ -50,21 +50,21 @@ annet/annlib/filter_acl.py,sha256=0w1VF6WcONiTYTQh0yWi6_j9rCTc_kMLAUMr0hbdkNU,72
 annet/annlib/jsontools.py,sha256=BS7s4rI8R9c_y3zz0zYl1l6con65oQ0MvfsC1dsXZts,5535
 annet/annlib/lib.py,sha256=eJ4hcVuQ6pdYBzLs4YKCHFtq45idOfZCYp92XfF7_QI,15317
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
-annet/annlib/patching.py,sha256=p5u3jl3_Iod0CGcnfZsfFR3Izo_roorny_v0stjDCWs,21142
-annet/annlib/tabparser.py,sha256=Xsje7t2bEZqZ8hhgnEYgjQGaDZ5mBWgNxwE2wpCkwXQ,28961
+annet/annlib/patching.py,sha256=5CZOT5RZsOgOPm-NhzJe3YwpbYlw6DLKsOhvZil6pdc,21258
+annet/annlib/tabparser.py,sha256=oGQyf_w6y4mnms0Lybjw1LDf3vD1DuucV00SHYWrpKI,30833
 annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/db.py,sha256=fI_u5aya4l61mbYSjj4JwlVfi3s7obt2jqERSuXGRUI,1634
 annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm58tmMWVU,892
-annet/annlib/netdev/devdb/data/devdb.json,sha256=4zTtgZw0SagYZuyItYiwoFxUAsQ1NTXfn2MjRSh-b4U,6387
+annet/annlib/netdev/devdb/data/devdb.json,sha256=E9dnmAbAJpg_-F82ZZIjUaKFL02vDC7W7yfMyjaah2Q,6561
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=rIlyvnA3uM8bB_7oq1nS2KDxTp6dQh2hz-FbNhYIpOU,4630
 annet/annlib/netdev/views/hardware.py,sha256=3JCZLH7deIHhCguwPJTUX-WDvWjG_xt6BdSEZSO6zkQ,4226
 annet/annlib/rbparser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rbparser/acl.py,sha256=RR8yPt6t96_IiyuKVbeZ-3x32cyhBAT2wC1y99oWBO8,3931
 annet/annlib/rbparser/deploying.py,sha256=ACT8QNhDAhJx3ZKuGh2nYBOrpdka2qEKuLDxvQAGKLk,1649
-annet/annlib/rbparser/ordering.py,sha256=DiKqyY8Khz-5MTxNF1GSNtZgtyKwT3YYCXpahIPB6Ps,1779
-annet/annlib/rbparser/platform.py,sha256=hnxznTfV9txXi1PkR1hZrprTrQJvlwgqXVL8vXkYmv4,1558
+annet/annlib/rbparser/ordering.py,sha256=Ux_uIOywzSbYcALK_k_bdzhC9pyYerqETsI63hsutJI,1949
+annet/annlib/rbparser/platform.py,sha256=Q9HtqmhyzV3JK_236_4LjC2wgp5fgxY6seDfWYl1oHU,1558
 annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=hqwmmNofm5q2f-hV2usMY-IPMeiANLth28tZcRBYJTw,16640
@@ -84,10 +84,10 @@ annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 annet/generators/common/initial.py,sha256=qYBxXFhyOPy34cxc6hsIXseod-lYCmmbuNHpM0uteY0,1244
 annet/mesh/__init__.py,sha256=lcgdnBIxc2MAN7Er1bcErEKPqrjWO4uIp_1FldMXTYg,557
 annet/mesh/basemodel.py,sha256=E6NTOneiMDwB1NCpjDRECoaeQ0f3n_fmTLnKTrSHTU4,4917
-annet/mesh/device_models.py,sha256=aFbwVWNSDBcph_Kvv6qZT-uUz0Tbg3z45EvP4i1z2ao,3600
+annet/mesh/device_models.py,sha256=q_E4E_glVZRVUjVbWhvbAt4Qv8wx7IcY689EBx-OKuo,4216
 annet/mesh/executor.py,sha256=z_3e2neRR4GoEQfJlvfbalelKzOz5yb78zm9lIcLYw4,17578
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
-annet/mesh/models_converter.py,sha256=3q2zs7K8S3pfYSUKKRdtl5CJGbeg4TtYxofAVs_MBsk,3085
+annet/mesh/models_converter.py,sha256=itfrxDd5zdTQpFNmo-YXIFQDpYyBuQ6g7xpcjxvK6uA,3221
 annet/mesh/peer_models.py,sha256=Div4o1t6Z0TWvy-8WKg4-n9WOd2PKCmIpfbkILDlDtk,2791
 annet/mesh/port_processor.py,sha256=RHiMS5W8qoDkTKiarQ748bcr8bNx4g_R4Y4vZg2k4TU,478
 annet/mesh/registry.py,sha256=xmWF7yxWXmwqX2_jyMAKrbGd2G9sjb4rYDx4Xk61QKc,9607
@@ -113,6 +113,7 @@ annet/rulebook/common.py,sha256=zK1s2c5lc5HQbIlMUQ4HARQudXSgOYiZ_Sxc2I_tHqg,721
 annet/rulebook/deploying.py,sha256=XV0XQvc3YvwM8SOgOQlc-fCW4bnjQg_1CTZkTwMp14A,2972
 annet/rulebook/patching.py,sha256=ve_D-9lnWs6Qb_NwqOLUWX-b_tI_L3pwQ7cgUPnqndY,4970
 annet/rulebook/arista/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+annet/rulebook/arista/aaa.py,sha256=7fBTwBnz9SOqYbwG8GBeEQTJG0e4uC4HkuZJeMG-kAY,2250
 annet/rulebook/arista/iface.py,sha256=bgj6a3r__-OE6VyYbSfnD6ps2QJKyX028W7IFJww-UY,720
 annet/rulebook/aruba/__init__.py,sha256=ILggeID6kNWcDBGzhXm_mebcfkuLSq5prBFU5DyPFs4,500
 annet/rulebook/aruba/ap_env.py,sha256=5fUVLhXH4-0DAtv8t0yoqJUibaRMuzF8Q7mGFzNsEN8,4692
@@ -130,15 +131,14 @@ annet/rulebook/huawei/bgp.py,sha256=dN8T3-44ggGEapt4u4sT3bTn_dsoCbS5qdNeSQ8LSTs,
 annet/rulebook/huawei/iface.py,sha256=DvLtQ7tfbDQWFmIYV4lxfih13Tdrt24L4-ZS29mCkuc,1126
 annet/rulebook/huawei/misc.py,sha256=Rpwhtm42IgcueDq4K6VOzN2qORoIDYh42Jb7iWL8AII,14424
 annet/rulebook/huawei/vlandb.py,sha256=B4BEUhZetjsNNhIJOp9cXtJSAYKMOgQucO8oAxSkRI0,4658
-annet/rulebook/juniper/__init__.py,sha256=WByFrqKCdr-ORCme2AURQGnYbN66t3omB3-9dWktT9o,3887
+annet/rulebook/juniper/__init__.py,sha256=FnVaO7FHYz7O1ExRE6igYX7OKMUgx5_siC-aoHOLx1s,5380
 annet/rulebook/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/nexus/iface.py,sha256=aeog9iSGT2zZ78tsGlrRcfgfOv7yW3jLwryXqdeplRw,2923
-annet/rulebook/ribbon/__init__.py,sha256=TRbkQVvk0-HxkUQW9-LmiG6XIfTZ-8t3SiaDemNCzK4,347
 annet/rulebook/routeros/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/routeros/file.py,sha256=zK7RwBk1YaVoDSFSg1u7Pt8u0Fk3nhhu27aJRngemwc,137
 annet/rulebook/texts/arista.deploy,sha256=OS9eFyJpEPztcOHkBwajw_RTJfTT7ivaMHfx4_HXaUg,792
-annet/rulebook/texts/arista.order,sha256=e7e5pnzMZAfmXJ0sUaaWmep6JMeErNnd7DkouUVIZsU,1472
-annet/rulebook/texts/arista.rul,sha256=QQbro8eFlc7DCHk0-CTHX_rnj5rqumRzXlY60ga72jo,815
+annet/rulebook/texts/arista.order,sha256=1jbKfF0USYi2b8V5qFlp4LjBAr3QGL9OkmoQqEK3PW8,1385
+annet/rulebook/texts/arista.rul,sha256=fGZe1L-x75rKQuRC5oLJMv1gSt1tJ0htOXfKt-tho64,853
 annet/rulebook/texts/aruba.deploy,sha256=hI432Bq-of_LMXuUflCu7eNSEFpx6qmj0KItEw6sgHI,841
 annet/rulebook/texts/aruba.order,sha256=ZMakkn0EJ9zomgY6VssoptJImrHrUmYnCqivzLBFTRo,1158
 annet/rulebook/texts/aruba.rul,sha256=zvGVpoYyJvMoL0fb1NQ8we_GCLZXno8nwWpZIOScLQQ,2584
@@ -149,8 +149,9 @@ annet/rulebook/texts/cisco.deploy,sha256=Hu0NkcGv3f1CWUrnbzI3eQOPXJxtH4NNOPRV68I
 annet/rulebook/texts/cisco.order,sha256=OvNHMNqkCc-DN2dEjLCTKv_7ZhiaHt4q2X4Y4Z8dvR4,1901
 annet/rulebook/texts/cisco.rul,sha256=jgL5_xnSwd_H4E8cx4gcneSvJC5W1zz6_BWSb64iuxI,3017
 annet/rulebook/texts/huawei.deploy,sha256=uUsZCHUrC5Zyb_MePrR5svnE1QyGQlg7UxcKf00sJyg,10451
-annet/rulebook/texts/huawei.order,sha256=ENllPX4kO6xNw2mUQcx11yhxo3tKStZ5mUyc0C6s3d0,10657
+annet/rulebook/texts/huawei.order,sha256=_X2LmxD9FGcIcb8ziwc13Imy1tBtQJgafrQGmvHPZLM,10649
 annet/rulebook/texts/huawei.rul,sha256=02Fi1RG4YYea2clHCluBuJDKNbT0hS9jtsk6_h6GK8k,12958
+annet/rulebook/texts/juniper.order,sha256=yUid8mNGQtZSq_WUZisuBtKtdWSKu4_MPVRIHS1neN0,210
 annet/rulebook/texts/juniper.rul,sha256=EmtrEJZesnmc2nXjURRD2G0WOq4zLluI_PNupKhSOJs,2654
 annet/rulebook/texts/nexus.deploy,sha256=9YNAQEw7aQxtYZJbE-dMD6qJrTzs_G92Ifrx3Ft4Wn4,1120
 annet/rulebook/texts/nexus.order,sha256=AZMKCD5Zf_mBOlE36aMDvO4w5rdbepTz1Dsyv7xP9Qs,1834
@@ -177,10 +178,10 @@ annet_generators/rpl_example/generator.py,sha256=zndIGfV4ZlTxPgAGYs7bMQvTc_tYScO
 annet_generators/rpl_example/items.py,sha256=Ez1RF5YhcXNCusBmeApIjRL3rBlMazNZd29Gpw1_IsA,766
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-1.0.3.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-1.0.3.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-1.0.3.dist-info/METADATA,sha256=-u0h5cpMTSZeM6mxBvqvpPQ7hC1gwrza2aeHubezCDs,851
-annet-1.0.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-annet-1.0.3.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-1.0.3.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-1.0.3.dist-info/RECORD,,
+annet-1.1.0.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-1.1.0.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-1.1.0.dist-info/METADATA,sha256=sIW7Dw8SLb9IBLPciWoWXTUlq0lx6n_lRsFhTyzOtk0,822
+annet-1.1.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+annet-1.1.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-1.1.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-1.1.0.dist-info/RECORD,,

{annet-1.0.3.dist-info → annet-1.1.0.dist-info}/WHEEL

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

annet/rulebook/ribbon/__init__.py

@@ -1,12 +0,0 @@
-from annet.annlib.rulebook import common
-from annet.annlib.types import Op
-
-
-def default_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
-    diff = common.default_diff(old, new, diff_pre, _pops)
-    return diff
-
-
-def ordered_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
-    diff = common.ordered_diff(old, new, diff_pre, _pops)
-    return diff