annet 0.16.20__tar.gz → 0.16.21__tar.gz

{annet-0.16.20/annet.egg-info → annet-0.16.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.20
+Version: 0.16.21
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.16.20 → annet-0.16.21}/annet/annlib/tabparser.py

@@ -330,6 +330,17 @@ class CiscoFormatter(BlockExitFormatter):
             yield from super().block_exit(context)
 
 
+class AristaFormatter(CiscoFormatter):
+
+    def block_exit(self, context: Optional[FormatterContext]) -> str:
+        current = context and context.row or ""
+
+        if current.startswith(("address-family")):
+            yield from block_wrapper("exit")
+        else:
+            yield from super().block_exit(context)
+
+
 class AsrFormatter(BlockExitFormatter):
     def __init__(self, indent="  "):
         super().__init__("exit", indent)
@@ -705,7 +716,7 @@ def make_formatter(vendor, **kwargs):
         "nexus": CiscoFormatter,
         "huawei": HuaweiFormatter,
         "optixtrans": OptixtransFormatter,
-        "arista": CiscoFormatter,
+        "arista": AristaFormatter,
         "nokia": NokiaFormatter,
         "routeros": RosFormatter,
         "aruba": CiscoFormatter,

{annet-0.16.20 → annet-0.16.21}/annet/tabparser.py

@@ -11,6 +11,7 @@ from annet.annlib.tabparser import (  # pylint: disable=unused-import
     RibbonFormatter,
     RosFormatter,
     parse_to_tree,
+    AristaFormatter,
 )
 
 
@@ -21,7 +22,7 @@ def make_formatter(hw, **kwargs):
         cls = HuaweiFormatter
     elif hw.Cisco.ASR or hw.Cisco.XRV:
         cls = AsrFormatter
-    elif hw.Nexus or hw.Cisco or hw.Arista or hw.Aruba or hw.B4com:
+    elif hw.Nexus or hw.Cisco or hw.Aruba or hw.B4com:
         cls = CiscoFormatter
     elif hw.Juniper:
         cls = JuniperFormatter
@@ -35,6 +36,8 @@ def make_formatter(hw, **kwargs):
         cls = RibbonFormatter
     elif hw.H3C:
         cls = HuaweiFormatter
+    elif hw.Arista:
+        cls = AristaFormatter
     else:
         raise NotImplementedError("Unknown formatter for hw '%s'" % hw)
 

{annet-0.16.20 → annet-0.16.21/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.20
+Version: 0.16.21
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT