annet 0.16.20__py3-none-any.whl → 0.16.22__py3-none-any.whl

annet/annlib/tabparser.py

@@ -330,6 +330,41 @@ class CiscoFormatter(BlockExitFormatter):
             yield from super().block_exit(context)
 
 
+class NexusFormatter(BlockExitFormatter):
+    def __init__(self, indent="  "):
+        super().__init__("exit", indent)
+
+    def split(self, text):
+        return self.split_remove_spaces(text)
+
+
+class B4comFormatter(BlockExitFormatter):
+    def __init__(self, indent="  "):
+        super().__init__("exit", indent)
+
+    def split(self, text):
+        return self.split_remove_spaces(text)
+
+
+class ArubaFormatter(BlockExitFormatter):
+    def __init__(self, indent="  "):
+        super().__init__("exit", indent)
+
+    def split(self, text):
+        return self.split_remove_spaces(text)
+
+
+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)
@@ -702,16 +737,16 @@ def make_formatter(vendor, **kwargs):
     formatters = {
         "juniper": JuniperFormatter,
         "cisco": CiscoFormatter,
-        "nexus": CiscoFormatter,
+        "nexus": NexusFormatter,
         "huawei": HuaweiFormatter,
         "optixtrans": OptixtransFormatter,
-        "arista": CiscoFormatter,
+        "arista": AristaFormatter,
         "nokia": NokiaFormatter,
         "routeros": RosFormatter,
-        "aruba": CiscoFormatter,
+        "aruba": ArubaFormatter,
         "pc": CommonFormatter,
         "ribbon": RibbonFormatter,
-        "b4com": CiscoFormatter,
+        "b4com": B4comFormatter,
     }
     return formatters[vendor](**kwargs)
 

annet/tabparser.py

@@ -11,6 +11,10 @@ from annet.annlib.tabparser import (  # pylint: disable=unused-import
     RibbonFormatter,
     RosFormatter,
     parse_to_tree,
+    AristaFormatter,
+    NexusFormatter,
+    B4comFormatter,
+    ArubaFormatter,
 )
 
 
@@ -21,8 +25,14 @@ 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:
+        cls = NexusFormatter
+    elif hw.Cisco:
         cls = CiscoFormatter
+    elif hw.B4com:
+        cls = B4comFormatter
+    elif hw.Aruba:
+        cls = ArubaFormatter
     elif hw.Juniper:
         cls = JuniperFormatter
     elif hw.Nokia:
@@ -35,6 +45,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.dist-info → annet-0.16.22.dist-info}/METADATA

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

{annet-0.16.20.dist-info → annet-0.16.22.dist-info}/RECORD

@@ -18,7 +18,7 @@ annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
 annet/storage.py,sha256=eAHEvPbRuKDUJdnkzSrHmW_lBJS3Y0g93Y2VJ4qzifQ,3941
-annet/tabparser.py,sha256=hf-_9R14C-_Q17lxUqbyT377QkrKhJLnaL-cG_YpUIQ,1016
+annet/tabparser.py,sha256=rRzfZSurR5P1eSdVWXMjABvV4PX83NRRQY0CzwabExw,1242
 annet/text_term_format.py,sha256=CHb6viv45vmYl-SK1A1vyPHGhaEni6jVybBusaQnct8,2813
 annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
 annet/types.py,sha256=f2HwqoKa6AucwFwDMszoouB6m1B8n6VmdjHMktO30Kc,7175
@@ -50,7 +50,7 @@ annet/annlib/jsontools.py,sha256=DVmA6kmKGSCsKrFnag4EMR1WKe39Owlvzpfdo726ufk,547
 annet/annlib/lib.py,sha256=eJ4hcVuQ6pdYBzLs4YKCHFtq45idOfZCYp92XfF7_QI,15317
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
 annet/annlib/patching.py,sha256=2CpAT3T43IUFJR57qTYSwjQ0smg0uHWN43df4n1WArs,19937
-annet/annlib/tabparser.py,sha256=OrRAkXv0vb0erZ3YLM2_LzoOo-A8qXTnaTHHyI1WYKY,28175
+annet/annlib/tabparser.py,sha256=tyTGtad90EfiQq9oNdCx8mEJ5edGcmKMXgoGwPLKrw4,29086
 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
@@ -164,10 +164,10 @@ annet_generators/rpl_example/__init__.py,sha256=z4-gsDv06BBpgTwRohc50VBQYFD26QVu
 annet_generators/rpl_example/items.py,sha256=6x7b0wZ7Vjn6yCaJ-aGbpTHm7fyqO77b-LRqzzhEbh4,615
 annet_generators/rpl_example/policy_generator.py,sha256=KFCqn347CIPcnllOHfINYeKgNSr6Wl-bdM5Xj_YKhYM,11183
 annet_generators/rpl_example/route_policy.py,sha256=QjxFjkePHfTo2CpMeRVaDqZXNXLM-gGlE8EocHuOR4Y,1189
-annet-0.16.20.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.20.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.20.dist-info/METADATA,sha256=Pd3UDfkQof5iuNlBbyrZrXmZYHEIuSNJzcimOVLIbRw,728
-annet-0.16.20.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-annet-0.16.20.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.20.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.20.dist-info/RECORD,,
+annet-0.16.22.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.22.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.22.dist-info/METADATA,sha256=frHIxkxuAjOtU1YOrES7-G9ENwzZeGgD2MNLc3TrW6g,728
+annet-0.16.22.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+annet-0.16.22.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.22.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.22.dist-info/RECORD,,