annet 3.0.0__py3-none-any.whl → 3.1.0__py3-none-any.whl

annet/__init__.py

@@ -7,14 +7,15 @@ from argparse import SUPPRESS, Namespace
 
 import colorama
 import yaml
-from annet.annlib.errors import (  # pylint: disable=wrong-import-position
-    DeployCancelled,
-    ExecError,
-)
 from contextlog import patch_logging, patch_threading
 from valkit.python import valid_logging_level
 
 import annet.argparse
+from annet.annlib import tabparser  # pylint: disable=unused-import
+from annet.annlib.errors import (  # pylint: disable=wrong-import-position
+    DeployCancelled,
+    ExecError,
+)
 
 
 __all__ = ("DeployCancelled", "ExecError")

annet/annlib/patching.py

@@ -184,7 +184,8 @@ class Orderer:
         f_rule = ""
         children = []
         ordering = self.rb
-        block_exit = platform.VENDOR_EXIT[self.vendor]
+
+        block_exit = registry_connector.get()[self.vendor].exit
 
         for (order, (raw_rule, rule)) in enumerate(ordering.items()):
             if (

annet/annlib/rbparser/platform.py

@@ -1,69 +1,3 @@
-VENDOR_REVERSES = {
-    "huawei": "undo",
-    "h3c": "undo",
-    "optixtrans": "undo",
-    "cisco": "no",
-    "iosxr": "no",
-    "nexus": "no",
-    "juniper": "delete",
-    "arista": "no",
-    "nokia": "delete",
-    "routeros": "remove",
-    "aruba": "no",
-    "pc": "-",
-    "ribbon": "delete",
-    "b4com": "no",
-}
-
-VENDOR_DIFF = {
-    "huawei": "common.default_diff",
-    "optixtrans": "common.default_diff",
-    "cisco": "common.default_diff",
-    "iosxr": "common.default_diff",
-    "nexus": "common.default_diff",
-    "juniper": "juniper.default_diff",
-    "arista": "common.default_diff",
-    "nokia": "juniper.default_diff",
-    "routeros": "common.default_diff",
-    "aruba": "aruba.default_diff",
-    "pc": "common.default_diff",
-    "ribbon": "juniper.default_diff",
-    "b4com": "common.default_diff",
-}
-
-VENDOR_DIFF_ORDERED = {
-    "huawei": "common.ordered_diff",
-    "optixtrans": "common.ordered_diff",
-    "cisco": "common.ordered_diff",
-    "iosxr": "common.ordered_diff",
-    "nexus": "common.ordered_diff",
-    "juniper": "juniper.ordered_diff",
-    "arista": "common.ordered_diff",
-    "nokia": "juniper.ordered_diff",
-    "routeros": "common.ordered_diff",
-    "aruba": "common.ordered_diff",
-    "pc": "common.ordered_diff",
-    "ribbon": "juniper.ordered_diff",
-    "b4com": "common.ordered_diff",
-}
-
-VENDOR_EXIT = {
-    "huawei": "quit",
-    "h3c": "quit",
-    "optixtrans": "quit",
-    "cisco": "exit",
-    "iosxr": "exit",
-    "nexus": "exit",
-    "arista": "exit",
-    "juniper": "",
-    "nokia": "",
-    "routeros": "",
-    "aruba": "exit",
-    "pc": "",
-    "ribbon": "exit",
-    "b4com": "exit",
-}
-
 VENDOR_ALIASES = {
     "h3c": "huawei",
 }

annet/annlib/rulebook/common.py

@@ -135,20 +135,21 @@ class DiffItem(typing.NamedTuple):
     diff_pre: typing.Dict[str, typing.Any]
 
 
-def default_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
+Differ = typing.Callable[[odict, odict, odict, tuple[Op, ...]], list[DiffItem]]
+
+
+def default_diff(old: odict, new: odict, diff_pre: odict, _pops: tuple[Op, ...] = (Op.AFFECTED,)) -> list[DiffItem]:
     diff = base_diff(old, new, diff_pre, _pops, moved_to_affected=True)
     return diff
 
 
-def ordered_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
+def ordered_diff(old: odict, new: odict, diff_pre: odict, _pops: tuple[Op, ...] = (Op.AFFECTED,)) -> list[DiffItem]:
     diff = base_diff(old, new, diff_pre, _pops, moved_to_affected=False)
     return diff
 
 
-def rewrite_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
-    def iter_diff(
-        diff: typing.List[DiffItem],
-    ) -> typing.Iterable[typing.Tuple[int, typing.List[DiffItem]]]:
+def rewrite_diff(old: odict, new: odict, diff_pre: odict, _pops: tuple[Op, ...] = (Op.AFFECTED,)) -> list[DiffItem]:
+    def iter_diff(diff: list[DiffItem]) -> typing.Iterable[tuple[int, list[DiffItem]]]:
         queue = [diff]
         while queue:
             items, queue = queue[0], queue[1:]
@@ -173,16 +174,18 @@ def rewrite_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
     return diff
 
 
-def multiline_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
+def multiline_diff(old: odict, new: odict, diff_pre: odict, _pops: tuple[Op, ...] = (Op.AFFECTED,)) -> list[DiffItem]:
     """
     Особая логика diff'a для хуавейных мультилайнов.
     Она трактует все дочерние элементы %multiline-команды как
     одну общую команду, покидывая внутрь тот Op который был
     определен на вернем уровне
     """
+
     def process_multiline(op, tree):
-        for (row, children) in tree.items():
-            yield (op, row, list(process_multiline(op, children)), None)
+        for row, children in tree.items():
+            yield op, row, list(process_multiline(op, children)), None
+
     ret = []
     for item in default_diff(old, new, diff_pre, _pops):
         if old.get(item.row, {}) == new.get(item.row, {}):
@@ -192,23 +195,27 @@ def multiline_diff(old, new, diff_pre, _pops=(Op.AFFECTED,)):
             op, tree = Op.REMOVED, old
         children = list(process_multiline(op, tree[item.row]))
         ret.append(DiffItem(item.op, item.row, children, item.diff_pre))
+
     return ret
 
 
-def base_diff(old, new, diff_pre, pops, moved_to_affected=False) -> typing.List[DiffItem]:
+def base_diff(
+    old: odict, new: odict, diff_pre: odict, pops: tuple[Op, ...], moved_to_affected: bool = False
+) -> list[DiffItem]:
     diff_indexed: typing.List[typing.Tuple[int, DiffItem]] = []
     old = _ignore_case(diff_pre, old)
     new = _ignore_case(diff_pre, new)
 
-    for (index, row) in enumerate(old):
+    for index, row in enumerate(old):
         if row not in new:
-            children = call_diff_logic(diff_pre[row]["subtree"], old[row], {}, pops + (Op.REMOVED,))
+            children = call_diff_logic(diff_pre[row]["subtree"], old[row], odict(), pops + (Op.REMOVED,))
             diff_indexed.append((index, DiffItem(
                 op=Op.REMOVED,
                 row=row,
                 children=children,
                 diff_pre=diff_pre[row]["match"],
             )))
+
     old_indexes = {row: index for (index, row) in enumerate(old)}
     block_in_disorder = False
     parent_op = pops[-1]
@@ -232,13 +239,13 @@ def base_diff(old, new, diff_pre, pops, moved_to_affected=False) -> typing.List[
     return [x[1] for x in diff_indexed]
 
 
-def call_diff_logic(diff_pre, old, new, pops=(Op.AFFECTED,)):
+def call_diff_logic(diff_pre: odict, old: odict, new: odict, pops: tuple[Op, ...] = (Op.AFFECTED,)):
     """
     Группируем команды в старом и новом конфиге согласно выставленным
     в рулбуке атрибутам %diff_logic и вызывает их поочереди согласно
     порядку команд в old и new, предпочитая old (т.е. сначала удаления)
     """
-    diff_logics = odict()
+    diff_logics: odict = odict()
     for row in old:
         logic = diff_pre[row]["match"]["attrs"]["diff_logic"]
         if logic not in diff_logics:

annet/annlib/tabparser.py

@@ -819,24 +819,6 @@ class RosFormatter(CommonFormatter):
         return commands
 
 
-def make_formatter(vendor, **kwargs):
-    formatters = {
-        "juniper": JuniperFormatter,
-        "cisco": CiscoFormatter,
-        "nexus": NexusFormatter,
-        "huawei": HuaweiFormatter,
-        "optixtrans": OptixtransFormatter,
-        "arista": AristaFormatter,
-        "nokia": NokiaFormatter,
-        "routeros": RosFormatter,
-        "aruba": ArubaFormatter,
-        "pc": CommonFormatter,
-        "ribbon": RibbonFormatter,
-        "b4com": B4comFormatter,
-    }
-    return formatters[vendor](**kwargs)
-
-
 # ====
 def parse_to_tree(text, splitter, comments=("!", "#")):
     tree = odict()

annet/api/__init__.py

@@ -25,7 +25,6 @@ import annet.deploy_ui
 import annet.lib
 from annet.annlib import jsontools
 from annet.annlib.netdev.views.hardware import HardwareView
-from annet.annlib.rbparser.platform import VENDOR_REVERSES
 from annet.annlib.types import GeneratorType
 from contextlog import get_logger
 
@@ -139,16 +138,19 @@ def _read_device_config(path, hw):
     _logger = get_logger()
     _logger.debug("Reading %r ...", path)
     score = 1
+    vendor_registry = registry_connector.get()
 
     with open(path) as cfgdump_file:
         text = cfgdump_file.read()
     try:
         if not hw:
             hw, score = guess_hw(text)
+
         config = tabparser.parse_to_tree(
             text=text,
-            splitter=tabparser.make_formatter(hw).split,
+            splitter=vendor_registry.match(hw).make_formatter().split,
         )
+
         return config, hw, score
     except tabparser.ParserError:
         _logger.exception("Parser error: %r", path)
@@ -157,7 +159,7 @@ def _read_device_config(path, hw):
 
 # =====
 def _format_patch_blocks(patch_tree, hw, indent):
-    formatter = tabparser.make_formatter(hw, indent=indent)
+    formatter = registry_connector.get().match(hw).make_formatter(indent=indent)
     return formatter.patch(patch_tree)
 
 
@@ -396,9 +398,12 @@ class CliDeployerJob(DeployerJob):
         (diff_obj, patch_tree) = _diff_and_patch(device, old, new, acl_rules,
                                                  res.filter_acl_rules, self.add_comments,
                                                  do_commit=not self.args.dont_commit)
-        cmds = tabparser.make_formatter(device.hw, indent="").cmd_paths(patch_tree)
+
+        formatter = registry_connector.get().match(device.hw).make_formatter(indent="")
+        cmds = formatter.cmd_paths(patch_tree)
         if not cmds:
             return
+
         self._has_diff = True
         self.diffs[device] = diff_obj
         self.cmd_lines.extend(["= %s " % device.hostname, ""])
@@ -551,7 +556,7 @@ class Deployer:
                 dest_name = "= %s" % ", ".join([dev.hostname for dev in devices])
                 diff_lines.extend([dest_name, ""])
 
-            for line in tabparser.make_formatter(devices[0].hw).diff(diff_obj):
+            for line in registry_connector.get().match(devices[0].hw).make_formatter().diff(diff_obj):
                 diff_lines.append(line)
             diff_lines.append("")
         return diff_lines
@@ -787,14 +792,17 @@ def guess_hw(config_text: str):
     текста конфига и annet/rulebook/texts/*.rul"""
     scores = {}
     hw_provider = hardware_connector.get()
-    for vendor in registry_connector.get():
+    vendor_registry = registry_connector.get()
+    for vendor in vendor_registry:
         hw = hw_provider.vendor_to_hw(vendor)
-        fmtr = tabparser.make_formatter(hw)
         rb = rulebook.get_rulebook(hw)
+        fmtr = vendor_registry[vendor].make_formatter()
+
         try:
             config = tabparser.parse_to_tree(config_text, fmtr.split)
         except Exception:
             continue
+
         pre = patching.make_pre(patching.make_diff({}, config, rb, []))
         metric = _count_pre_score(pre)
         scores[metric] = hw

annet/diff.py

@@ -21,8 +21,8 @@ from annet.cli_args import ShowDiffOptions
 from annet.connectors import CachedConnector
 from annet.output import output_driver_connector
 from annet.storage import Device
-from annet.tabparser import make_formatter
 from annet.types import Diff, PCDiff, PCDiffFile
+from annet.vendors import registry_connector
 
 from .gen import Loader, old_new
 
@@ -159,7 +159,7 @@ def _transform_text_diff_for_collapsing(text_diff) -> List[str]:
 
 
 def _make_text_diff(device: Device, diff: Diff) -> List[str]:
-    formatter = make_formatter(device.hw)
+    formatter = registry_connector.get().match(device.hw).make_formatter()
     res = formatter.diff(diff)
     return res
 
@@ -226,7 +226,7 @@ class FrrFileDiffer(UnifiedFileDiffer):
         indent = "  "
         rb = rulebook.rulebook_provider_connector.get()
         rulebook_data = rb.get_rulebook(hw)
-        formatter = tabparser.make_formatter(hw, indent=indent)
+        formatter = registry_connector.get().match(hw).make_formatter(indent=indent)
 
         old_tree = tabparser.parse_to_tree(old_text or "", splitter=formatter.split)
         new_tree = tabparser.parse_to_tree(new_text or "", splitter=formatter.split)

annet/gen.py

@@ -29,7 +29,7 @@ from annet import generators, implicit, patching, tabparser, tracing
 from annet.annlib import jsontools
 from annet.annlib.rbparser.acl import compile_acl_text
 from annet.cli_args import DeployOptions, GenOptions, ShowGenOptions
-from annet.deploy import scrub_config, get_fetcher
+from annet.deploy import get_fetcher, scrub_config
 from annet.filtering import Filterer
 from annet.generators import (
     BaseGenerator,
@@ -40,12 +40,12 @@ from annet.generators import (
     PartialGenerator,
     RefGenerator,
 )
-from annet.lib import merge_dicts, percentile, do_async
+from annet.lib import do_async, merge_dicts, percentile
 from annet.output import output_driver_connector
-from annet.parallel import Parallel
-from annet.storage import Device, Storage, storage_connector
+from annet.storage import Device, Storage
 from annet.tracing import tracing_connector
 from annet.types import OldNewResult
+from annet.vendors import registry_connector
 
 
 # Вывод всех генераторов вместе.
@@ -162,7 +162,7 @@ def _old_new_per_device(ctx: OldNewDeviceContext, device: Device, filterer: Filt
         if ctx.config != "empty":
             old = tabparser.parse_to_tree(
                 text=text,
-                splitter=tabparser.make_formatter(device.hw).split,
+                splitter=registry_connector.get().match(device.hw).make_formatter().split,
             )
         if not old:
             res = generators.run_partial_initial(device)
@@ -638,7 +638,7 @@ def _existing_cfg_file_name(config_dir: str, device) -> Optional[str]:
 
 
 def format_config_blocks(config, hw, indent, _level=0):
-    formatter = tabparser.make_formatter(hw, indent=indent)
+    formatter = registry_connector.get().match(hw).make_formatter(indent=indent)
     return formatter.join(config)
 
 

annet/generators/__init__.py

@@ -7,24 +7,15 @@ import os
 import re
 import textwrap
 from collections import OrderedDict as odict
-from typing import (
-    FrozenSet,
-    Iterable,
-    List,
-    Optional,
-    Union,
-)
+from typing import FrozenSet, Iterable, List, Optional, Union
 
-from annet.annlib.rbparser.acl import compile_acl_text
 from contextlog import get_logger
 
-from annet.storage import Device
-
 from annet import patching, tabparser, tracing
+from annet.annlib.rbparser.acl import compile_acl_text
 from annet.cli_args import GenSelectOptions, ShowGeneratorsOptions
-from annet.lib import (
-    get_context,
-)
+from annet.lib import get_context
+from annet.storage import Device
 from annet.tracing import tracing_connector
 from annet.types import (
     GeneratorEntireResult,
@@ -33,19 +24,20 @@ from annet.types import (
     GeneratorPartialRunArgs,
     GeneratorResult,
 )
-from .base import (
-    BaseGenerator,
-    TextGenerator as TextGenerator,
-    ParamsList as ParamsList,
-)
-from .exceptions import NotSupportedDevice, GeneratorError
+from annet.vendors import registry_connector
+
+from .base import BaseGenerator
+from .base import ParamsList as ParamsList
+from .base import TextGenerator as TextGenerator
+from .entire import Entire
+from .exceptions import GeneratorError, NotSupportedDevice
 from .jsonfragment import JSONFragment
 from .partial import PartialGenerator
-from .entire import Entire
-from .ref import RefGenerator
 from .perf import GeneratorPerfMesurer
+from .ref import RefGenerator
 from .result import RunGeneratorResult
 
+
 # =====
 DISABLED_TAG = "disable"
 
@@ -200,7 +192,8 @@ def _run_partial_generator(gen: "PartialGenerator", run_args: GeneratorPartialRu
                 logger.error("Generator error in file '%s:%i'", filename, lineno)
                 raise GeneratorError(f"{gen} on {device}") from err
 
-            fmtr = tabparser.make_formatter(device.hw)
+            fmtr = registry_connector.get().match(device.hw).make_formatter()
+
             try:
                 config = tabparser.parse_to_tree(text=output, splitter=fmtr.split)
             except tabparser.ParserError as err:

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, VENDOR_ALIASES
+from annet.annlib.rbparser.platform import VENDOR_ALIASES
 
 from annet.connectors import CachedConnector
 from annet.rulebook.deploying import compile_deploying_text

annet/rulebook/juniper/__init__.py

@@ -1,10 +1,10 @@
+import functools
 import re
 from collections import OrderedDict as odict
-import functools
 
 from annet.annlib.lib import jun_activate, jun_is_inactive, merge_dicts
+from annet.annlib.tabparser import JuniperFormatter
 from annet.annlib.types import Op
-from annet.tabparser import JuniperFormatter
 from annet.rulebook import common
 
 

annet/rulebook/patching.py

@@ -1,7 +1,6 @@
 import functools
 import re
 from collections import OrderedDict as odict
-
 from annet.annlib.rbparser import platform, syntax
 from annet.vendors import registry_connector
 from valkit.common import valid_bool, valid_string_list
@@ -19,6 +18,7 @@ MULTILINE_DIFF_LOGIC = "common.multiline_diff"
 # =====
 @functools.lru_cache()
 def compile_patching_text(text, vendor):
+
     return _compile_patching(
         tree=syntax.parse_text(text, params_scheme={
             "global": {
@@ -31,7 +31,7 @@ def compile_patching_text(text, vendor):
             },
             "diff_logic": {
                 "validator": valid_object_path,
-                "default": platform.VENDOR_DIFF[vendor],
+                "default": registry_connector.get()[vendor].diff(False),
             },
             "comment": {
                 "validator": valid_string_list,
@@ -86,7 +86,7 @@ def _compile_patching(tree, reverse_prefix, vendor):
             }
         else:
             if attrs["params"]["ordered"]:
-                attrs["params"]["diff_logic"] = platform.VENDOR_DIFF_ORDERED[vendor]
+                attrs["params"]["diff_logic"] = registry_connector.get()[vendor].diff(True)
                 attrs["params"]["logic"] = ORDERED_PATCH_LOGIC
             elif attrs["params"]["rewrite"]:
                 attrs["params"]["diff_logic"] = REWRITE_DIFF_LOGIC

annet/vendors/base.py

@@ -2,6 +2,7 @@ import abc
 from typing import ClassVar
 
 from annet.annlib.netdev.views.hardware import HardwareView
+from annet.annlib.tabparser import CommonFormatter
 
 
 class AbstractVendor(abc.ABC):
@@ -16,6 +17,14 @@ class AbstractVendor(abc.ABC):
     def reverse(self) -> str:
         raise NotImplementedError
 
+    def diff(self, order: bool) -> str:
+        return "common.ordered_diff" if order else "common.default_diff"
+
+    @property
+    @abc.abstractmethod
+    def exit(self) -> str:
+        raise NotImplementedError
+
     @property
     @abc.abstractmethod
     def hardware(self) -> HardwareView:
@@ -23,3 +32,7 @@ class AbstractVendor(abc.ABC):
 
     def svi_name(self, num: int) -> str:
         return f"vlan{num}"
+
+    @abc.abstractmethod
+    def make_formatter(self, **kwargs) -> CommonFormatter:
+        raise NotImplementedError

annet/vendors/registry.py

@@ -2,9 +2,11 @@ import enum
 from operator import itemgetter
 
 from annet.annlib.netdev.views.hardware import HardwareView
+from annet.annlib.tabparser import CommonFormatter
 
 from .base import AbstractVendor
 
+
 _SENTINEL = enum.Enum("_SENTINEL", "sentinel")
 sentinel = _SENTINEL.sentinel
 
@@ -21,6 +23,13 @@ class GenericVendor(AbstractVendor):
     def hardware(self) -> HardwareView:
         return HardwareView("")
 
+    def make_formatter(self, **kwargs) -> CommonFormatter:
+        return CommonFormatter(**kwargs)
+
+    @property
+    def exit(self) -> str:
+        return ""
+
 
 GENERIC_VENDOR = GenericVendor()
 

{annet-3.0.0.dist-info → annet-3.1.0.dist-info}/METADATA

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

{annet-3.0.0.dist-info → annet-3.1.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-annet/__init__.py,sha256=0OKkFkqog8As7B6ApdpKQkrEAcEELUREWp82D8WvGA8,1846
+annet/__init__.py,sha256=mq-nzRTsR4cLd-wy4BL1i1MI57f2iG_5NX0iKViF_9U,1914
 annet/annet.py,sha256=vyQ__n5hkjub3aWO8tksHPoUSbTeK97MyMcR_U8_BSU,1016
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
 annet/bgp_models.py,sha256=oibTSdipNkGL4t8Xn94bhyKHMOtwbPBqmYaAy4FmTxQ,12361
@@ -7,10 +7,10 @@ annet/cli_args.py,sha256=jzMKRezWe_87k7VBNzgwPjWGMROJksbgrlX-GDd6oQs,13533
 annet/connectors.py,sha256=aoiDVLPizx8CW2p8SAwGCzyO_WW8H9xc2aujbGC4bDg,4882
 annet/deploy.py,sha256=JCcJ2hUmUsaOSrcxFuW8SlN0ubXSnHQ7H_nP_tx-PgE,7698
 annet/deploy_ui.py,sha256=KcP1g_c1HSA3n5qFxbGHd8t_arL4_xJV46PFO-7FLg8,28650
-annet/diff.py,sha256=vz51az7RrXdYXsPbNMi9Y2awbjNRPQSFl6zzvE36Kx4,9441
+annet/diff.py,sha256=rxomgjyewq0VxKqWCqHEjYt6s_Ihv3HXiUr5QVHPlWU,9497
 annet/executor.py,sha256=lcKI-EbYqeCiBNpL729kSltduzxbAzOkQ1L_QK7tNv8,5112
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
-annet/gen.py,sha256=m76bL6rVbusNV_uVHrHnA3D7TUvvLtckXx7hlr5HGA0,31897
+annet/gen.py,sha256=3p8HxC17yxTno1Kb4f7csjBTazXnB6FCRmKq000YLmg,31931
 annet/hardware.py,sha256=e7RWc5yPdEDT5hxNqcqWv9g9DRWIgwAieA2iT4FdPqc,1158
 annet/implicit.py,sha256=G6EwZbrtUp089qRAwh96hminp236-1pJbeKAedoEafg,6056
 annet/lib.py,sha256=4N4X6jCCrig5rk7Ua4AofrV9zK9jhzkBq57fLsfBJjw,4812
@@ -19,7 +19,6 @@ annet/parallel.py,sha256=onkE3q3Pe1CjOa3fI20vWUA5VO50sPlPxzfyiVdo8pI,17703
 annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
 annet/storage.py,sha256=44f2aHNFOsQMSJwFvGxyu26oRcs3QmS24TKivcfPlxU,4064
-annet/tabparser.py,sha256=oN0pFeO1GEgMD-ti9rHl5SvaYZPZbrYx_BIVedIC5JQ,1257
 annet/text_term_format.py,sha256=y0U6VuFEAEil8Ab3HB8DBbVHisu31EHiRV7AOVruCeA,2816
 annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
 annet/types.py,sha256=f2HwqoKa6AucwFwDMszoouB6m1B8n6VmdjHMktO30Kc,7175
@@ -60,8 +59,8 @@ annet/annlib/filter_acl.py,sha256=mxDga-3SXqpPEsdQypTq0ScqUqP625lxX-DmJalEc3s,71
 annet/annlib/jsontools.py,sha256=BS7s4rI8R9c_y3zz0zYl1l6con65oQ0MvfsC1dsXZts,5535
 annet/annlib/lib.py,sha256=lxmYrbeablFMhFtvFmADVpVShSFi9TN4gNWaBs_Ygm0,14952
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
-annet/annlib/patching.py,sha256=1Ku5dNCQS9nlsMEr7tt7o1uGBsBeqfVFw4NY8aWYvnc,21483
-annet/annlib/tabparser.py,sha256=aXwY0glVQ4__Sg1FFXiSPghyoNQRrMUQ7XCjMq__3lM,32016
+annet/annlib/patching.py,sha256=eSqhiOv98EOEODbRaYxOY8qaW4Ju58EzGB-uddeCId8,21493
+annet/annlib/tabparser.py,sha256=cDo-tAt0gGAToQwK4j0fLh31M0WEBpQclVshPAmanYc,31496
 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
@@ -74,14 +73,14 @@ annet/annlib/rbparser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 annet/annlib/rbparser/acl.py,sha256=I_1VUZQgF-s4dYTxyEDxQ-GkAP2MeXonzzsc2xROpTM,3974
 annet/annlib/rbparser/deploying.py,sha256=ACT8QNhDAhJx3ZKuGh2nYBOrpdka2qEKuLDxvQAGKLk,1649
 annet/annlib/rbparser/ordering.py,sha256=XknggB92N4IbhHBZZHL0StwCCITt8mkho4D4Nu5Kb4k,2185
-annet/annlib/rbparser/platform.py,sha256=vNoK25ACNQuDRv5I9uDfmNi8Y8yi10XWSbWIeKEVUgs,1672
+annet/annlib/rbparser/platform.py,sha256=d1jFH8hGMOf_qiveKE4H-c0OfNnzwmt2VYpSiSOn9qc,42
 annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/annlib/rulebook/common.py,sha256=-E6ATuFkSjNhyK0hiGd-iap5Ch5up2MNuVCbobWfmeU,16649
-annet/api/__init__.py,sha256=KYtCj2Kgj2Qt1eqhk8kpSz4QgXToDdK2Okvtac3UD-w,33152
+annet/annlib/rulebook/common.py,sha256=-x4dYuKDi1T5lxk1PRWQ91FGRlV4UAJ0sQC9vnbhzWw,17016
+annet/api/__init__.py,sha256=EMGUgt3pTi2MDF8DfXlS8PGX2zT0iGLY01R6QlQHvGg,33305
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
-annet/generators/__init__.py,sha256=9MmstB59DlHGnY7GP36nyTiAdKtHdsJTyOYc0cxwm5U,16398
+annet/generators/__init__.py,sha256=wJbNLI1bMppE71tnjJrqNGtbtLZ_gdRd-HytdZPzBiY,16451
 annet/generators/base.py,sha256=rgQLcQBPZm4ecbKmRhVOpBR-GFJAiVfdb_y5f2-LUR8,3670
 annet/generators/entire.py,sha256=Oe7d0VuIn2sLcOKuRVQW9uR8Vuirg0edekFMSZCMnI4,2786
 annet/generators/exceptions.py,sha256=GPXTBgn2xZ3Ev_bdOPlfCLGRC1kQHe_dEq88S-uyi5s,151
@@ -118,10 +117,10 @@ annet/rpl_generators/execute.py,sha256=wS6e6fwcPWywsHB0gBMqZ17eF0s4YOBgDgwPB_cr5
 annet/rpl_generators/policy.py,sha256=j_2EtAsaxldhZZT4kRXKZacuAsGnHr3JSc2BMxr_Pow,37174
 annet/rpl_generators/prefix_lists.py,sha256=5jM5Xj0dtx5xF9ap-TgExs0ofRAzm0LN2j3aL5Ub_yc,4778
 annet/rpl_generators/rd.py,sha256=YGXgx1D2D0-pixgspXJzA6NvW8lx3AmHMxIY2l5rraI,1457
-annet/rulebook/__init__.py,sha256=WtDrO9BrbrF1o06zOTVrEMGuTgDtv7MfF8B29pRW77U,3996
+annet/rulebook/__init__.py,sha256=Zm2RycKvIa-x-FwvaLSdJEV3t-V1QhsnjjkQ5dB7SzI,3979
 annet/rulebook/common.py,sha256=zK1s2c5lc5HQbIlMUQ4HARQudXSgOYiZ_Sxc2I_tHqg,721
 annet/rulebook/deploying.py,sha256=9CMeOUw5L1OWdrccSRfpJyH9H_jH7xWNU1JldviBNrk,3015
-annet/rulebook/patching.py,sha256=4JQE_qmdHb0Eggj9ytp99P1Z59uW5ZeUrPJIOdfgi_0,5022
+annet/rulebook/patching.py,sha256=7iZvtjR7T8_bK6mCsGlC5uPmntCDQ9OkkDHRWupnMNA,5045
 annet/rulebook/arista/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/arista/aaa.py,sha256=7fBTwBnz9SOqYbwG8GBeEQTJG0e4uC4HkuZJeMG-kAY,2250
 annet/rulebook/arista/iface.py,sha256=bgj6a3r__-OE6VyYbSfnD6ps2QJKyX028W7IFJww-UY,720
@@ -141,7 +140,7 @@ annet/rulebook/huawei/bgp.py,sha256=dN8T3-44ggGEapt4u4sT3bTn_dsoCbS5qdNeSQ8LSTs,
 annet/rulebook/huawei/iface.py,sha256=DvLtQ7tfbDQWFmIYV4lxfih13Tdrt24L4-ZS29mCkuc,1126
 annet/rulebook/huawei/misc.py,sha256=Rpwhtm42IgcueDq4K6VOzN2qORoIDYh42Jb7iWL8AII,14424
 annet/rulebook/huawei/vlandb.py,sha256=B4BEUhZetjsNNhIJOp9cXtJSAYKMOgQucO8oAxSkRI0,4658
-annet/rulebook/juniper/__init__.py,sha256=Wl1pb-Ncsmmw1wF_QVf9tq5SbAxhnLmmmkzXCs-rX_o,5369
+annet/rulebook/juniper/__init__.py,sha256=DZu6Od4Uow0UHE1vNMnBJwCwynOFouHXNs253yStpZ4,5376
 annet/rulebook/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/rulebook/nexus/iface.py,sha256=aeog9iSGT2zZ78tsGlrRcfgfOv7yW3jLwryXqdeplRw,2923
 annet/rulebook/routeros/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -181,10 +180,10 @@ annet/rulebook/texts/ribbon.rul,sha256=609LyLTDCtXPVQNAzqS-VEyCpW3byHP8TCMJLFMn5
 annet/rulebook/texts/routeros.order,sha256=M71uy_hf0KAjLNS3zZY3uih4m2xLUcu26FEoVVjC6k0,905
 annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019O1DE,1203
 annet/vendors/__init__.py,sha256=gQcDFlKeWDZB6vxJ_MdPWEoE-C5dg-YgXvgGkuV9YLw,569
-annet/vendors/base.py,sha256=ll7WKL9KtHiNl9Cs6pQs4bJH6c6JRhyHIM7wdgkysdU,536
-annet/vendors/registry.py,sha256=hav8ONavMAM7FCHgF-0_NKC_ntNAtcTicjxqXNtbovw,2326
-annet-3.0.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.0.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet/vendors/base.py,sha256=KLf_lv-Vm3uPH_Kuovdr1V257EALmAS_gYhKEL196FA,919
+annet/vendors/registry.py,sha256=zJUj5vJ105kD7xvxt84MYNTNYZI08AKCNTCmE0YtMzo,2539
+annet-3.1.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.1.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
 annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
@@ -197,8 +196,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=d99HSXDHFjZq511EvGhIqRTWK3F4ZsCWfdUqFYQcyhE,772
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-3.0.0.dist-info/METADATA,sha256=x8H3f6rBvrh1jfXlkoWpqA5LiH7ZB6mnoc04Yhb6o6I,815
-annet-3.0.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-annet-3.0.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.0.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.0.0.dist-info/RECORD,,
+annet-3.1.0.dist-info/METADATA,sha256=f3Fl0PUMC6covEz71fAYKY8zPOV3ffBitlfF5XM1KVo,815
+annet-3.1.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+annet-3.1.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.1.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.1.0.dist-info/RECORD,,

annet/tabparser.py

@@ -1,53 +0,0 @@
-from annet.annlib.tabparser import (  # pylint: disable=unused-import
-    AsrFormatter,
-    CiscoFormatter,
-    CommonFormatter,
-    HuaweiFormatter,
-    OptixtransFormatter,
-    JuniperFormatter,
-    JuniperList,
-    NokiaFormatter,
-    ParserError,
-    RibbonFormatter,
-    RosFormatter,
-    parse_to_tree,
-    AristaFormatter,
-    NexusFormatter,
-    B4comFormatter,
-    ArubaFormatter,
-)
-
-
-def make_formatter(hw, **kwargs):
-    if hw.OptiXtrans:
-        cls = OptixtransFormatter
-    elif hw.Huawei:
-        cls = HuaweiFormatter
-    elif hw.Cisco.ASR or hw.Cisco.XRV or hw.Cisco.XR:
-        cls = AsrFormatter
-    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:
-        cls = NokiaFormatter
-    elif hw.RouterOS:
-        cls = RosFormatter
-    elif hw.PC:
-        cls = CommonFormatter
-    elif hw.Ribbon:
-        cls = RibbonFormatter
-    elif hw.H3C:
-        cls = HuaweiFormatter
-    elif hw.Arista:
-        cls = AristaFormatter
-    else:
-        raise NotImplementedError("Unknown formatter for hw '%s'" % hw)
-
-    return cls(**kwargs)