annet 0.16.20__tar.gz → 0.16.22__tar.gz

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

@@ -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 → annet-0.16.22}/README.md

@@ -1,6 +1,6 @@
 # Annet - configuration generation and deploying utility for network equipment
 
-Annet is a configuration generator that can translate differences between old and new configurations into sequnce of commands. This feature is vital for CLI-based devices, such as Huawei, Cisco IOS, Cisco NX-OS, Juniper. Devices configured via separate config files, Linux, FreeBSD and Cumulus are also supported.
+Annet is a configuration generator that can translate differences between old and new configurations into sequence of commands. This feature is vital for CLI-based devices, such as Huawei, Cisco IOS, Cisco NX-OS, Juniper. Devices configured via separate config files, Linux, FreeBSD and Cumulus are also supported.
 
 It works this way. Annet `gen`erates configuration for a device by running Python code, which usually goes to the Network Source of Truth, like NetBox. Annet then gets the `diff`erence by getting the configuration from the device and comparing it. Finally, Annet translates the difference into a sequence of commands, called a `patch`. After `deploy`ing these commands, the diff will be empty.
 

{annet-0.16.20 → annet-0.16.22}/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-0.16.20 → annet-0.16.22}/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 → annet-0.16.22/annet.egg-info}/PKG-INFO

@@ -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