annet 3.6.1__tar.gz → 3.7.0__tar.gz

{annet-3.6.1/annet.egg-info → annet-3.7.0}/PKG-INFO

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

{annet-3.6.1 → annet-3.7.0}/annet/annlib/jsontools.py

@@ -16,6 +16,11 @@ def format_json(data: Any, stable: bool = False) -> str:
     return json.dumps(data, indent=4, ensure_ascii=False, sort_keys=not stable) + "\n"
 
 
+def _sanitize_json_pointer(pattern: str) -> str:
+    """Replace special characters on the JsonPointer valid ones"""
+    return pattern.replace("~", "~0").replace("/", "~1")
+
+
 def apply_json_fragment(
         old: Dict[str, Any],
         new_fragment: Dict[str, Any],
@@ -179,5 +184,5 @@ def _resolve_json_pointers(pattern: str, content: Dict[str, Any]) -> List[jsonpo
 
     ret: List[jsonpointer.JsonPointer] = []
     for matched_parts, _ in matched:
-        ret.append(jsonpointer.JsonPointer("/" + "/".join(matched_parts)))
+        ret.append(jsonpointer.JsonPointer("/" + "/".join([_sanitize_json_pointer(v) for v in matched_parts])))
     return ret

{annet-3.6.1 → annet-3.7.0}/annet/rulebook/cisco/misc.py

@@ -48,12 +48,12 @@ def no_ntp_distribute(rule, key, diff, **_):
     yield from common.default(rule, key, diff)
 
 
-def banner_login(rule, key, diff, **_):
-    if diff[Op.REMOVED]:
-        yield (False, "no banner login", None)
-    elif diff[Op.ADDED]:
+def banner_any(rule, key, diff, **_):
+    if diff[Op.ADDED]:
         # Убираем дополнительный экранирующий сиимвол
-        key = re.sub(r"\^C", "^", key[0])
-        yield (False, f"banner login {key}", None)
+        banner = re.sub(r"\^C", "^", diff[Op.ADDED][0]["row"])
+        yield (False, banner, None)
+    elif diff[Op.REMOVED]:
+        yield (False, f"no banner {key[0]}", None)
     else:
         yield from common.default(rule, key, diff)

{annet-3.6.1 → annet-3.7.0}/annet/rulebook/texts/cisco.rul

@@ -14,7 +14,7 @@
 ip domain-name *
 hostname *
 
-banner login * %logic=cisco.misc.banner_login
+banner * %logic=cisco.misc.banner_any
 
 ip community-list standard ~
 

{annet-3.6.1 → annet-3.7.0}/annet/rulebook/texts/iosxr.rul

@@ -14,7 +14,7 @@
 ip domain-name *
 hostname *
 
-banner login * %logic=cisco.misc.banner_login
+banner * %logic=cisco.misc.banner_any
 
 ip community-list standard ~
 

{annet-3.6.1 → annet-3.7.0}/annet/rulebook/texts/nexus.rul

@@ -13,6 +13,7 @@
 
 ip community-list standard ~
 
+!vrf context management
 vrf context *
 
 vlan group * vlan-list %logic=cisco.vlandb.simple
@@ -34,7 +35,10 @@ snmp-server host ~
 
 ntp distribute %logic=cisco.misc.no_ntp_distribute
 
-!interface */(mgmt|ipmi|Vlan1$)/
+!interface */(ipmi|Vlan1$)/
+
+interface mgmt0$
+    !vrf member management
 
 # SVI/Subifs/Lagg
 interface */(Vlan|Ethernet.*\.|port-channel.*\.?)\d+$/ %diff_logic=nexus.iface.diff

{annet-3.6.1 → annet-3.7.0}/annet/vendors/tabparser.py

@@ -314,6 +314,13 @@ class CiscoFormatter(BlockExitFormatter):
     def split(self, text):
         additional_indent = 0
         block_exit_strings = [self._block_exit]
+
+        # hide banner content
+        pattern = re.compile(r"((^banner [a-z-]+) \^C.*?\^C)", flags=re.MULTILINE | re.DOTALL)
+        repl_map = {replace_str: banner_str for banner_str, replace_str in pattern.findall(text)}
+        for replace_str, banner in repl_map.items():
+            text = text.replace(banner, replace_str)
+
         tree = self.split_remove_spaces(text)
         for i, item in enumerate(tree):
             block_exit_strings, new_indent = self._split_indent(
@@ -321,6 +328,12 @@ class CiscoFormatter(BlockExitFormatter):
             )
             tree[i] = f"{' ' * additional_indent}{item}"
             additional_indent = new_indent
+
+        # restore banner content in the `tree`
+        for i, item in enumerate(tree):
+            if item in repl_map:
+                tree[i] = repl_map[item]
+
         return tree
 
     def block_exit(self, context: Optional[FormatterContext]) -> str:

{annet-3.6.1 → annet-3.7.0/annet.egg-info}/PKG-INFO

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