annet 3.14.3__py3-none-any.whl → 3.15.0__py3-none-any.whl

annet/annlib/netdev/devdb/data/devdb.json

@@ -143,6 +143,14 @@
     "PC.Whitebox.Ufispace.S.S9300": " S93\\d\\d",
     "PC.Whitebox.Ufispace.S.S9300.S9301_32DB": " S9301-32DB",
     "PC.Whitebox.Ufispace.S.S9300.S9321_64EO": " S9321-64EO",
+    "PC.Whitebox.NADDOD": "NADDOD",
+    "PC.Whitebox.NADDOD.N": " N",
+    "PC.Whitebox.NADDOD.N.N9500": " N95\\d\\d",
+    "PC.Whitebox.NADDOD.N.N9500.N9500_64OC": " N9500-64OC",
+    "PC.Whitebox.FSCOM": "FSCOM",
+    "PC.Whitebox.FSCOM.N": " N",
+    "PC.Whitebox.FSCOM.N.N9600": " N96\\d\\d",
+    "PC.Whitebox.FSCOM.N.N9600.N9600_64OD": " N9600-64OD",
     "PC.Nebius": "^Nebius",
     "PC.Nebius.Octoport": " NB-D-M-CSM-R",
     "PC.Avocent": " [Aa]vocent",

annet/annlib/rbparser/syntax.py

@@ -52,13 +52,14 @@ def _parse_tree_with_params(raw_tree, scheme, context=None):
     for (raw_rule, children) in raw_tree.items():
         (row, params) = _parse_raw_rule(raw_rule, scheme)
         row_type = "normal"
+
         if row.startswith("!"):
             row = row[1:].strip()
             if len(row) == 0:
                 continue
             row_type = "ignore"
-        elif row.startswith(r"%context="):
-            context = _parse_context(context, row)
+        elif context_raw := params.get("context"):
+            context = _parse_context(context, context_raw)
             continue
         tree[raw_rule] = {
             "row": row,
@@ -75,8 +76,8 @@ def _parse_raw_rule(raw_rule, scheme):
     try:
         index = raw_rule.index("%")
         params = {
-            key: (value if len(value) != 0 else "1")
-            for (key, value) in re.findall(r"\s%([a-zA-Z_]\w*)(?:=([^\s]*))?", raw_rule)
+            key: (value.strip() if len(value.strip()) != 0 else "1")
+            for (key, value) in re.findall(r"%([a-zA-Z_]\w*)(?:=([^%]*))?", raw_rule[index:])
         }
         if params:
             raw_rule = raw_rule[:index].strip()
@@ -85,7 +86,7 @@ def _parse_raw_rule(raw_rule, scheme):
 
     row = re.sub(r"\s+", " ", raw_rule.strip())
     params = _fill_and_validate(params, scheme, raw_rule)
-    return (row, params)
+    return row, params
 
 
 def _fill_and_validate(params, scheme, raw_rule):
@@ -109,8 +110,5 @@ def match_context(ifcontext, context):
 
 
 def _parse_context(context, row):
-    keyword = r"%context="
-    if not row.startswith(keyword):
-        raise ValueError(row)
-    name, value = row[len(keyword):].strip().split(":")
+    name, value = row.strip().split(":")
     return lib.merge_dicts(context, {name: value})

annet/implicit.py

@@ -25,7 +25,7 @@ def compile_tree(tree):
         rule = {
             "type": attrs["type"],
             "children": compile_tree(attrs["children"]) if attrs.get("children") else odict(),
-            "regexp": syntax.compile_row_regexp(attrs["row"]),
+            "regexp": attrs["params"]["regexp"] or syntax.compile_row_regexp(attrs["row"]),
         }
         rules[attrs["row"]] = rule
     return rules
@@ -66,13 +66,14 @@ def _implicit_tree(device):
         elif device.hw.Huawei.Quidway.S5700.S5735I:
             text = """
                 !interface *
-                    !port link-type access
+                    port link-type access %regexp=port link-type .*
                 interface NULL0
             """
         elif device.hw.Huawei.Quidway.S2x:
             text = """
                 !interface *
-                    !port link-type hybrid
+                    port link-type hybrid %regexp=port link-type .*
+                    dot1x enable
                 interface NULL0
             """
         else:
@@ -179,8 +180,14 @@ def _implicit_tree(device):
                 system mtu routing 1500
                 system mtu jumbo 9000
             """
+
     return parse_text(text)
 
 
 def parse_text(text):
-    return syntax.parse_text(text, {})
+    return syntax.parse_text(text, {
+        "regexp": {
+            "default": None,
+            "validator": lambda x: syntax.compile_row_regexp(x),
+        },
+    })

annet/rulebook/patching.py

@@ -18,7 +18,6 @@ MULTILINE_DIFF_LOGIC = "common.multiline_diff"
 # =====
 @functools.lru_cache()
 def compile_patching_text(text, vendor):
-
     return _compile_patching(
         tree=syntax.parse_text(text, params_scheme={
             "global": {
@@ -45,6 +44,10 @@ def compile_patching_text(text, vendor):
                 "validator": valid_bool,
                 "default": False,
             },
+            "context": {
+                "validator": str,
+                "default": None,
+            },
             "rewrite": {
                 "validator": valid_bool,
                 "default": False,

{annet-3.14.3.dist-info → annet-3.15.0.dist-info}/METADATA

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

{annet-3.14.3.dist-info → annet-3.15.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ annet/diff.py,sha256=kD_2kxz5wc2TP10xj-BHs6IPq1yNKkXxIco8czjeC6M,9497
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
 annet/gen.py,sha256=y9e7P551uJ-thjBS2p-ZRMgwQa8kPF_JAoEXJ3am77Y,30683
 annet/hardware.py,sha256=O2uadehcavZ10ssPr-db3XYHK8cpbG7C7XFkO-I6r_s,1161
-annet/implicit.py,sha256=SkACAc32eUGJSHfUIDL3cWoBguST42-HJDzScJuvJIc,6626
+annet/implicit.py,sha256=K6vuX0Y7nR1FWP_pJV33R9AiHhQARkvpa2Pu-KTg1u0,6869
 annet/lib.py,sha256=4N4X6jCCrig5rk7Ua4AofrV9zK9jhzkBq57fLsfBJjw,4812
 annet/output.py,sha256=se8EpyNS9f9kPOlOaAV0ht4DjzDoBr8F2UafiezLPYw,7743
 annet/parallel.py,sha256=yM53RYaSpbIOUuBx4y07B_3jW8J-w3taiZWjcq_1r6A,17397
@@ -63,7 +63,7 @@ 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=I-NKzenyjsmUKpmIerQOfZExnnnDpPdNZLdRanyu-Nk,1020
-annet/annlib/netdev/devdb/data/devdb.json,sha256=ptegQaH_HxmAEePlMx52GaiobM2xp1RXEJcvR7IAHGY,7174
+annet/annlib/netdev/devdb/data/devdb.json,sha256=6XuEDvL97_q9_i6mh4HNMtvjz5tKCiWPjDKjbgZZsoc,7525
 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=XvHtRn29SROKtxqMyr86oc1ItUKy36N98ppfuJQL8PY,3235
@@ -72,7 +72,7 @@ annet/annlib/rbparser/acl.py,sha256=I_1VUZQgF-s4dYTxyEDxQ-GkAP2MeXonzzsc2xROpTM,
 annet/annlib/rbparser/deploying.py,sha256=ACT8QNhDAhJx3ZKuGh2nYBOrpdka2qEKuLDxvQAGKLk,1649
 annet/annlib/rbparser/ordering.py,sha256=XknggB92N4IbhHBZZHL0StwCCITt8mkho4D4Nu5Kb4k,2185
 annet/annlib/rbparser/platform.py,sha256=d1jFH8hGMOf_qiveKE4H-c0OfNnzwmt2VYpSiSOn9qc,42
-annet/annlib/rbparser/syntax.py,sha256=PlKyWqS3zwPwumILmKIci-DmEAbfZp8YycpW1mNqADM,3602
+annet/annlib/rbparser/syntax.py,sha256=Q-AIjoRnM54pNLKknAxmGdXLg5vpikh6Lal-J330TjY,3530
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=6A3sOkOanDRTuR7F426zakShGaGKRBmBLDCnqBbBJr8,13531
 annet/api/__init__.py,sha256=5YzScmeCDsHiDhtT3RwY_lMuikRZ6o7CVrlnJCln2A8,34116
@@ -118,7 +118,7 @@ annet/rpl_generators/rd.py,sha256=mw5-ictMdCQbkFcMi4R8iKqwmOp52Y9HnQuEitT6yrc,26
 annet/rulebook/__init__.py,sha256=AmcqrLYaoU1-sO2vmtjWZbzsZ44_w7nXncoEVa_hpyk,3997
 annet/rulebook/common.py,sha256=zK1s2c5lc5HQbIlMUQ4HARQudXSgOYiZ_Sxc2I_tHqg,721
 annet/rulebook/deploying.py,sha256=9CMeOUw5L1OWdrccSRfpJyH9H_jH7xWNU1JldviBNrk,3015
-annet/rulebook/patching.py,sha256=7iZvtjR7T8_bK6mCsGlC5uPmntCDQ9OkkDHRWupnMNA,5045
+annet/rulebook/patching.py,sha256=BrA6i2LeJm89Q0esKerPjA7cW__jou26HLlFCJ8E_0w,5151
 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
@@ -199,8 +199,8 @@ annet/vendors/library/optixtrans.py,sha256=VdME69Ca4HAEgoaKN21fZxnmmsqqaxOe_HZja
 annet/vendors/library/pc.py,sha256=vfv31_NPi7M-4AUDL89UcpawK2E6xvCpELA209cd1ho,1086
 annet/vendors/library/ribbon.py,sha256=DDOBq-_-FL9dCxqXs2inEWZ-pvw-dJ-A-prA7cKMhec,1216
 annet/vendors/library/routeros.py,sha256=iQa7m_4wjuvcgBOI9gyZwlw1BvzJfOkvUbyoEk-NI9I,1254
-annet-3.14.3.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.14.3.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.15.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.15.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
 annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
@@ -213,8 +213,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=HPgxScDvSqJPdz0c2SppDrH82DZYC4zUaniQwcWmh4A,1176
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-3.14.3.dist-info/METADATA,sha256=oOmmrA_5GQH9B_GK2zSet72zauJiZs47naDVeX7JwIQ,816
-annet-3.14.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-annet-3.14.3.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.14.3.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.14.3.dist-info/RECORD,,
+annet-3.15.0.dist-info/METADATA,sha256=wge239q2HwJbhQ3Ril7PHaryvJgliyiz8O9FCLSbbQ0,816
+annet-3.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+annet-3.15.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.15.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.15.0.dist-info/RECORD,,