annet 0.16.18__tar.gz → 0.16.19__tar.gz

{annet-0.16.18/annet.egg-info → annet-0.16.19}/PKG-INFO

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

{annet-0.16.18 → annet-0.16.19}/annet/adapters/netbox/common/manufacturer.py

@@ -17,7 +17,8 @@ _VENDORS = {
     "aruba": "Aruba",
     "routeros": "RouterOS",
     "ribbon": "Ribbon",
-    "b4com": "B4com"
+    "b4com": "B4com",
+    "h3c": "H3C",
 }
 
 
@@ -37,6 +38,8 @@ def get_breed(manufacturer: str, model: str):
         return "vrp85"
     elif manufacturer == "Huawei":
         return "vrp55"
+    elif manufacturer == "H3C":
+        return "h3c"
     elif manufacturer in ("Mellanox", "NVIDIA"):
         return "cuml2"
     elif manufacturer == "Juniper":

{annet-0.16.18 → annet-0.16.19}/annet/annlib/netdev/devdb/data/devdb.json

@@ -53,6 +53,7 @@
     "Huawei.CE.CE8800.CE8850": " CE8850",
     "Huawei.CE.CE8800.CE8851": " CE8851",
     "Huawei.CE.CE8800.CE8855": " CE8855",
+    "Huawei.CE.CE8800.CE8875": " CE8875",
     "Huawei.CE.CE9800": " CE98\\d\\d",
     "Huawei.CE.CE9800.CE9855": " CE9855",
     "Huawei.CE.CE9800.CE9860": " CE9860",

{annet-0.16.18 → annet-0.16.19}/annet/annlib/rbparser/platform.py

@@ -1,5 +1,6 @@
 VENDOR_REVERSES = {
     "huawei": "undo",
+    "h3c": "undo",
     "optixtrans": "undo",
     "cisco": "no",
     "nexus": "no",
@@ -45,6 +46,7 @@ VENDOR_DIFF_ORDERED = {
 
 VENDOR_EXIT = {
     "huawei": "quit",
+    "h3c": "quit",
     "optixtrans": "quit",
     "cisco": "exit",
     "nexus": "exit",
@@ -57,3 +59,7 @@ VENDOR_EXIT = {
     "ribbon": "exit",
     "b4com": "exit",
 }
+
+VENDOR_ALIASES = {
+    "h3c": "huawei",
+}

{annet-0.16.18 → annet-0.16.19}/annet/annlib/rulebook/common.py

@@ -356,6 +356,10 @@ def apply(hw, do_commit, do_finalize, **_):
             after.add_cmd(Command("commit"))
         if do_finalize:
             after.add_cmd(Command("write", timeout=40))
+    elif hw.H3C:
+        before.add_cmd(Command("system-view"))
+        if do_finalize:
+            after.add_cmd(Command("save force", timeout=20))
     else:
         raise Exception("unknown hw %s" % hw)
 

{annet-0.16.18 → annet-0.16.19}/annet/annlib/tabparser.py

@@ -2,7 +2,7 @@ import dataclasses
 import itertools
 import re
 from collections import OrderedDict as odict
-from typing import TYPE_CHECKING, Any, Dict, Iterable, Optional, Tuple, Union
+from typing import TYPE_CHECKING, Any, Dict, Iterable, Optional, Tuple, Union, List
 
 from .types import Op
 
@@ -271,8 +271,63 @@ class CiscoFormatter(BlockExitFormatter):
     def __init__(self, indent="  "):
         super().__init__("exit", indent)
 
+    def _split_indent(
+        self, line: str, indent: int, block_exit_strings: List[str]
+    ) -> Tuple[List[str], int]:
+        """
+        The small helper calculates indent shift based on block exit string.
+        If configuration line has non-default block exit string it means that
+        new subsection is started and indent should be increased.
+        If configuration line exists in list of block exit strings,
+        it means that subsection is finished and indent should be decreased
+
+        Args:
+            line: just configuration line
+            indent: current indent
+            block_exit_strings: list of previously seen block exit strings
+        Returns:
+            new indent and list of previously seen block exit strings
+        """
+
+        if line.strip() in block_exit_strings:
+            indent -= 1
+            block_exit_strings.remove(line.strip())
+            return block_exit_strings, indent
+
+        block_exit_wrapped = [
+            v for v in self.block_exit(FormatterContext(current=(line.strip(), {})))
+        ]
+
+        if not block_exit_wrapped or len(block_exit_wrapped) != 3:
+            return block_exit_strings, indent
+        if not isinstance(block_exit_wrapped[1], str):
+            return block_exit_strings, indent
+        if block_exit_wrapped[1] == self._block_exit:
+            return block_exit_strings, indent
+
+        indent += 1
+        block_exit_strings.append(block_exit_wrapped[1])
+        return block_exit_strings, indent
+
     def split(self, text):
-        return self.split_remove_spaces(text)
+        additional_indent = 0
+        block_exit_strings = [self._block_exit]
+        tree = self.split_remove_spaces(text)
+        for i, item in enumerate(tree):
+            block_exit_strings, new_indent = self._split_indent(
+                item, additional_indent, block_exit_strings
+            )
+            tree[i] = f"{' ' * additional_indent}{item}"
+            additional_indent = new_indent
+        return tree
+
+    def block_exit(self, context: Optional[FormatterContext]) -> str:
+        current = context and context.row or ""
+
+        if current.startswith(("address-family")):
+            yield from block_wrapper("exit-address-family")
+        else:
+            yield from super().block_exit(context)
 
 
 class AsrFormatter(BlockExitFormatter):

{annet-0.16.18 → annet-0.16.19}/annet/rulebook/__init__.py

@@ -5,7 +5,7 @@ from typing import Iterable, Union
 
 from annet.annlib.lib import mako_render
 from annet.annlib.rbparser.ordering import compile_ordering_text
-from annet.annlib.rbparser.platform import VENDOR_REVERSES
+from annet.annlib.rbparser.platform import VENDOR_REVERSES, VENDOR_ALIASES
 
 from annet.connectors import CachedConnector
 from annet.rulebook.deploying import compile_deploying_text
@@ -64,7 +64,8 @@ class DefaultRulebookProvider(RulebookProvider):
             return self._rulebook_cache[hw]
 
         assert hw.vendor in VENDOR_REVERSES, "Unknown vendor: %s" % (hw.vendor)
-        patching = compile_patching_text(self._render_rul(hw.vendor + ".rul", hw), hw.vendor)
+        rul_vendor_name = VENDOR_ALIASES.get(hw.vendor, hw.vendor)
+        patching = compile_patching_text(self._render_rul(rul_vendor_name + ".rul", hw), rul_vendor_name)
 
         try:
             ordering_text = self._render_rul(hw.vendor + ".order", hw)

annet-0.16.19/annet/rulebook/cisco/misc.py

@@ -0,0 +1,59 @@
+import re
+from collections import OrderedDict
+from typing import Any
+
+from annet.annlib.types import Op
+
+from annet.rulebook import common
+
+
+def ssh_key(rule, key, diff, hw, **_):
+    """
+    При включении ssh надо еще сгенерировать ключ. По конфигу никак не понять есть ли ключ на свитче или нет.
+    """
+    if diff[Op.ADDED]:
+        added = sorted([x["row"] for x in diff[Op.ADDED]])
+        if added == ["ip ssh version 2"]:
+            # Отсыпаем mpdaemon-у подсказок для дополнительной команды при наливке
+            comment = rule["comment"]
+            rule["comment"] = ["!!suppress_errors!!", "!!timeout=240!!"]
+            if hw.Cisco.C2960:
+                yield (False, "crypto key generate rsa modulus 2048", None)
+            else:
+                yield (False, "crypto key generate rsa general-keys modulus 2048", None)
+            rule["comment"] = comment
+    yield from common.default(rule, key, diff)
+
+
+def no_ipv6_nd_suppress_ra(rule, key, diff, **_):
+    """
+    При конфигурации ipv6 nd на нексусах нужно добавлять
+    no ipv6 nd suppress-ra
+    иначе RA не будет включен.
+    К сожалению данной команды не видно в running-config.
+    Поэтому подмешиваем ее в патч вместо генератора
+    """
+    if diff[Op.ADDED]:
+        yield (False, "no ipv6 nd suppress-ra", None)
+    yield from common.default(rule, key, diff)
+
+
+def no_ntp_distribute(rule, key, diff, **_):
+    """
+    Для того, чтобы удалить NTP из CFS, сначала нужно сбросить активные
+    NTP сессии.
+    """
+    if diff[Op.REMOVED]:
+        yield (False, "clear ntp session", None)
+    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]:
+        # Убираем дополнительный экранирующий сиимвол
+        key = re.sub(r"\^C", "^", key[0])
+        yield (False, f"banner login {key}", None)
+    else:
+        yield from common.default(rule, key, diff)

{annet-0.16.18 → annet-0.16.19}/annet/rulebook/texts/cisco.rul

@@ -73,7 +73,7 @@ interface */\w*Ethernet[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.
     storm-control * level
     spanning-tree portfast
 
-router bgp *     %diff_logic=cisco.misc.bgp_diff
+router bgp
     router-id
     vrf *
         router-id

{annet-0.16.18 → annet-0.16.19}/annet/tabparser.py

@@ -33,6 +33,8 @@ def make_formatter(hw, **kwargs):
         cls = CommonFormatter
     elif hw.Ribbon:
         cls = RibbonFormatter
+    elif hw.H3C:
+        cls = HuaweiFormatter
     else:
         raise NotImplementedError("Unknown formatter for hw '%s'" % hw)
 

{annet-0.16.18 → annet-0.16.19/annet.egg-info}/PKG-INFO

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

annet-0.16.18/annet/rulebook/cisco/misc.py

@@ -1,149 +0,0 @@
-import re
-from collections import OrderedDict
-from typing import Any
-
-from annet.annlib.types import Op
-
-from annet.rulebook import common
-
-
-def ssh_key(rule, key, diff, hw, **_):
-    """
-    При включении ssh надо еще сгенерировать ключ. По конфигу никак не понять есть ли ключ на свитче или нет.
-    """
-    if diff[Op.ADDED]:
-        added = sorted([x["row"] for x in diff[Op.ADDED]])
-        if added == ["ip ssh version 2"]:
-            # Отсыпаем mpdaemon-у подсказок для дополнительной команды при наливке
-            comment = rule["comment"]
-            rule["comment"] = ["!!suppress_errors!!", "!!timeout=240!!"]
-            if hw.Cisco.C2960:
-                yield (False, "crypto key generate rsa modulus 2048", None)
-            else:
-                yield (False, "crypto key generate rsa general-keys modulus 2048", None)
-            rule["comment"] = comment
-    yield from common.default(rule, key, diff)
-
-
-def no_ipv6_nd_suppress_ra(rule, key, diff, **_):
-    """
-    При конфигурации ipv6 nd на нексусах нужно добавлять
-    no ipv6 nd suppress-ra
-    иначе RA не будет включен.
-    К сожалению данной команды не видно в running-config.
-    Поэтому подмешиваем ее в патч вместо генератора
-    """
-    if diff[Op.ADDED]:
-        yield (False, "no ipv6 nd suppress-ra", None)
-    yield from common.default(rule, key, diff)
-
-
-def no_ntp_distribute(rule, key, diff, **_):
-    """
-    Для того, чтобы удалить NTP из CFS, сначала нужно сбросить активные
-    NTP сессии.
-    """
-    if diff[Op.REMOVED]:
-        yield (False, "clear ntp session", None)
-    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]:
-        # Убираем дополнительный экранирующий сиимвол
-        key = re.sub(r"\^C", "^", key[0])
-        yield (False, f"banner login {key}", None)
-    else:
-        yield from common.default(rule, key, diff)
-
-
-def bgp_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
-    """
-    Some oder versions of Cisco IOS doesn't create subsection for address family block.
-
-    it looks like:
-
-    router bgp 65111
-     bgp router-id 1.1.1.1
-     bgp log-neighbor-changes
-     neighbor SPINE peer-group
-     !
-     address-family ipv4
-     neighbor SPINE send-community both
-     neighbor SPINE soft-reconfiguration inbound
-     neighbor SPINE route-map TOR_IMPORT_SPINE in
-     neighbor SPINE route-map TOR_EXPORT_SPINE out
-     exit-address-family
-
-    but should be
-
-    router bgp 65111
-     bgp router-id 1.1.1.1
-     bgp log-neighbor-changes
-     neighbor SPINE peer-group
-     !
-     address-family ipv4
-      neighbor SPINE send-community both
-      neighbor SPINE soft-reconfiguration inbound
-      neighbor SPINE route-map TOR_IMPORT_SPINE in
-      neighbor SPINE route-map TOR_EXPORT_SPINE out
-     exit-address-family
-
-    The diff_logic func do it before make diff.
-    """
-    corrected_old = _create_subsections(old, "address-family")
-
-    yield from common.default_diff(corrected_old, new, diff_pre, _pops)
-
-
-def _create_subsections(data: OrderedDict[str, Any], sub_section_prefix: str) -> OrderedDict[str, Any]:
-    """
-    Reorganizes the given OrderedDict to nest commands under their respective
-    sub_section_prefix keys.
-
-    This function traverses the entries in the provided OrderedDict and groups
-    together all entries that are between keys with sub_section_prefix under those
-    keys as nested OrderedDicts. The reorganization keeps the order of entries
-    stable, only adding nesting where appropriate.
-
-    Args:
-        data (OrderedDict): The original configuration to be transformed.
-        sub_section_prefix (str): Prefix of subsection key
-
-    Returns:
-        OrderedDict: A new OrderedDict with nested 'address-family' sections.
-    """
-
-    result = OrderedDict()
-    sub_section = None
-    temp: OrderedDict = OrderedDict()
-
-    for key, value in data.items():
-        # make nested loop if found nested values
-        if value:
-            fixed_value: OrderedDict[str, Any] = _create_subsections(value, sub_section_prefix)
-        else:
-            fixed_value = value
-        if key.startswith(sub_section_prefix):
-            # in case of data has already had subsections
-            if value:
-                result[key] = fixed_value
-                continue
-            # if previous subsection present save collected data from temporary dict
-            if sub_section:
-                result[sub_section] = temp
-            # find a new subsection and initialize new dict
-            sub_section = key
-            temp = OrderedDict()
-        # put found data to temporary dict
-        elif sub_section:
-            temp[key] = fixed_value
-        else:
-            result[key] = fixed_value
-    # if data is finished save collected data from temporary dict
-    if sub_section:
-        result[sub_section] = temp
-
-    return result