annet 3.14.4__tar.gz → 3.15.1__tar.gz

{annet-3.14.4/annet.egg-info → annet-3.15.1}/PKG-INFO

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

{annet-3.14.4 → annet-3.15.1}/annet/annlib/netdev/devdb/data/devdb.json

@@ -110,9 +110,9 @@
     "Nokia.NS7750": " 7750",
     "Nokia.SR_1s": "SR-1s",
 
-    "PC": "^(PC|pc|[Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Mm]oxa|NVIDIA|Nebius|[Aa]sterfusion CX|[Uu]fi[Ss]pace|(VERTIV )?[Aa]vocent)",
+    "PC": "^(PC|pc|[Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Mm]oxa|NVIDIA|Nebius|[Aa]sterfusion CX|[Uu]fi[Ss]pace|NADDOD|FSCOM|(VERTIV )?[Aa]vocent)",
 
-    "PC.Whitebox": "([Mm]ellanox SN|[Ee]dge-?[Cc]ore|NVIDIA|[Aa]sterfusion CX|[Uu]fi[Ss]pace)",
+    "PC.Whitebox": "([Mm]ellanox SN|[Ee]dge-?[Cc]ore|NVIDIA|[Aa]sterfusion CX|[Uu]fi[Ss]pace|NADDOD|FSCOM)",
     "PC.Whitebox.Mellanox": "[Mm]ellanox",
     "PC.Whitebox.Mellanox.SN": " SN",
     "PC.Whitebox.Mellanox.SN.SN2100": " SN2100",

{annet-3.14.4 → annet-3.15.1}/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-3.14.4 → annet-3.15.1}/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-3.14.4 → annet-3.15.1}/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.4 → annet-3.15.1/annet.egg-info}/PKG-INFO

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