annet 0.5__tar.gz → 0.6__tar.gz

{annet-0.5/annet.egg-info → annet-0.6}/PKG-INFO

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

{annet-0.5 → annet-0.6}/annet/annlib/filter_acl.py

@@ -116,7 +116,7 @@ def get_op(line: str) -> typing.Tuple[str, str, str]:
             break
     if opidx >= 0:
         op = line[opidx]
-        indent = line[:opidx] + line[opidx+1:rowstart]
+        indent = line[:opidx] + line[opidx + 1:rowstart]
     if op != " ":
         indent = indent + " "
     return op, indent, line[rowstart:]

{annet-0.5 → annet-0.6}/annet/api/__init__.py

@@ -331,16 +331,15 @@ def diff(args: cli_args.DiffOptions, loader: ann_gen.Loader, filterer: filtering
             acl_rules = res.get_acl_rules(args.acl_safe)
             new_files = res.get_new_files(args.acl_safe)
             new_json_fragment_files = res.get_new_file_fragments()
+            pc_diff_files = []
             if res.old_files or new_files:
-                ret[device] = PCDiff(
-                    hostname=device.hostname,
-                    diff_files=list(_pc_diff(device.hostname, res.old_files, new_files)),
-                )
-            elif res.old_json_fragment_files or new_json_fragment_files:
-                ret[device] = PCDiff(
-                    hostname=device.hostname,
-                    diff_files=list(_json_fragment_diff(device.hostname, res.old_json_fragment_files, new_json_fragment_files)),
-                )
+                pc_diff_files.extend(_pc_diff(device.hostname, res.old_files, new_files))
+            if res.old_json_fragment_files or new_json_fragment_files:
+                pc_diff_files.extend(_json_fragment_diff(device.hostname, res.old_json_fragment_files, new_json_fragment_files))
+
+            if pc_diff_files:
+                pc_diff_files.sort(key=lambda f: f.label)
+                ret[device] = PCDiff(hostname=device.hostname, diff_files=pc_diff_files)
             elif old is not None:
                 rb = rulebook.get_rulebook(device.hw)
                 diff_tree = patching.make_diff(old, new, rb, [acl_rules, res.filter_acl_rules])
@@ -761,7 +760,7 @@ def _json_fragment_diff(
 
 def guess_hw(config_text: str):
     """Пытаемся угадать вендора и hw на основе
-    текста конфига и annushka/rulebook/texts/*.rul"""
+    текста конфига и annet/rulebook/texts/*.rul"""
     scores = {}
     hw_provider = hardware_connector.get()
     for vendor in VENDOR_REVERSES:

{annet-0.5 → annet-0.6}/annet/deploy.py

@@ -2,17 +2,22 @@
 
 
 import abc
+import itertools
 import re
 from collections import namedtuple
 from contextlib import contextmanager
-from typing import Dict, List, Optional, Type
+from typing import Dict, List, Optional, Type, Any, OrderedDict
 
 from contextlog import get_logger
 
 from annet import text_term_format
+from annet.annlib.command import Command, Question, CommandList
+from annet.annlib.netdev.views.hardware import HardwareView
+from annet.annlib.rbparser.deploying import MakeMessageMatcher, Answer
 from annet.cli_args import DeployOptions
 from annet.connectors import Connector
 from annet.output import TextArgs
+from annet.rulebook import get_rulebook, deploying
 from annet.storage import Device
 
 
@@ -439,3 +444,93 @@ def init_colors():
         None: curses.color_pair(8),
         "cyan_blue": curses.color_pair(9),
     }
+
+
+class RulebookQuestionHandler:
+    def __init__(self, dialogs):
+        self._dialogs = dialogs
+
+    def __call__(self, dev: Connector, cmd: Command, match_content: bytes):
+        content = match_content.strip()
+        content = content.decode()
+        for matcher, answer in self._dialogs.items():
+            if matcher(content):
+                return Command(answer.text)
+
+        get_logger().info("no answer in rulebook. dialogs=%s match_content=%s", self._dialogs, match_content)
+        return None
+
+
+def rb_question_to_question(q: MakeMessageMatcher, a: Answer) -> Question:  # TODO: drop MakeMessageMatcher
+    if not a.send_nl:
+        raise Exception("not supported false send_nl")
+    text: str = q._text  # pylint: disable=protected-access
+    is_regexp = False
+    if text.startswith("/") and text.endswith("/"):
+        is_regexp = True
+        text = text[1:-1]
+    res = Question(question=text, answer=a.text, is_regexp=is_regexp)
+    return res
+
+
+def make_cmd_params(rule: Dict[str, Any]) -> Dict[str, Any]:
+    if rule:
+        qa_handler = RulebookQuestionHandler(rule["attrs"]["dialogs"])
+        qa_list: List[Question] = []
+        for matcher, answer in qa_handler._dialogs.items():  # pylint: disable=protected-access
+            qa_list.append(rb_question_to_question(matcher, answer))
+        return {
+            "questions": qa_list,
+            "timeout": rule["attrs"]["timeout"],
+        }
+    return {
+        "timeout": 30,
+    }
+
+
+def make_apply_commands(rule, hw, do_commit, do_finalize):
+    apply_logic = rule["attrs"]["apply_logic"]
+    before, after = apply_logic(hw, do_commit=do_commit, do_finalize=do_finalize)
+    return before, after
+
+
+def fill_cmd_params(rules: OrderedDict, cmd: Command):
+    rule = deploying.match_deploy_rule(rules, (cmd.cmd,), {})
+    if rule:
+        cmd_params = make_cmd_params(rule)
+        cmd.questions = cmd_params.get("questions", None)
+        cmd.timeout = cmd_params["timeout"]
+
+
+def apply_deploy_rulebook(hw: HardwareView, cmd_paths, do_finalize=True, do_commit=True):
+    rules = get_rulebook(hw)["deploying"]
+    cmds_with_apply = []
+    for cmd_path, context in cmd_paths.items():
+        rule = deploying.match_deploy_rule(rules, cmd_path, context)
+        cmd_params = make_cmd_params(rule)
+        before, after = make_apply_commands(rule, hw, do_commit, do_finalize)
+
+        cmd = Command(cmd_path[-1], **cmd_params)
+        # XXX более чистый способ передавать-мета инфу о команде
+        cmd.level = len(cmd_path) - 1
+        cmds_with_apply.append((cmd, before, after))
+
+    def _key(item):
+        _cmd, before, after = item
+        return (tuple(cmd.cmd for cmd in before), tuple(cmd.cmd for cmd in after))
+
+    cmdlist = CommandList()
+    for _k, cmd_before_after in itertools.groupby(cmds_with_apply, key=_key):
+        cmd_before_after = list(cmd_before_after)
+        _, before, after = cmd_before_after[0]
+        for c in before:
+            c.level = 0
+            fill_cmd_params(rules, c)
+            cmdlist.add_cmd(c)
+        for cmd, _before, _after in cmd_before_after:
+            cmdlist.add_cmd(cmd)
+        for c in after:
+            c.level = 0
+            fill_cmd_params(rules, c)
+            cmdlist.add_cmd(c)
+    return cmdlist

{annet-0.5 → annet-0.6}/annet/gen.py

@@ -693,7 +693,7 @@ def _old_new_get_config_cli(ctx: OldNewDeviceContext, device: Device) -> str:
 def _old_new_get_config_files(ctx: OldNewDeviceContext, device: Device) -> DeviceDownloadedFiles:
     old_files = DeviceDownloadedFiles()
 
-    for attr in ('failed_files', 'failed_running', 'failed_packages'):
+    for attr in ("failed_files", "failed_running", "failed_packages"):
         if device in getattr(ctx, attr):
             exc = getattr(ctx, attr).get(device)
             exc = exc or Exception(f"I can't get device {attr[len('failed_'):]} and I don't know why")

{annet-0.5 → annet-0.6}/annet/rulebook/aruba/ap_env.py

@@ -4,15 +4,15 @@ from annet.annlib.types import Op
 
 
 try:
-    from annet.executor import CommandList
+    from annet.executor import CommandList, Command
 except ImportError:
-    from noc.annushka.annet.executor import CommandList
+    from noc.annushka.annet.executor import CommandList, Command
 
 
 def apply(hw, do_commit, do_finalize, **_):
     before, after = CommandList(), CommandList()
     if do_commit:
-        after.add_cmd("write memory")
+        after.add_cmd(Command("write memory"))
     return (before, after)
 
 

{annet-0.5 → annet-0.6}/annet/rulebook/texts/huawei.rul

@@ -325,7 +325,7 @@ interface *                             %logic=huawei.iface.permanent
     trust upstream
 %if hw.Huawei.CE:
     trust *
-%else
+%else:
     trust
 %endif
     dhcp snooping check dhcp-rate enable
@@ -442,7 +442,7 @@ snmp-agent trap source
 snmp-agent packet max-size
 %if hw.Huawei.Quidway:
 snmp-agent protocol source-interface %logic=huawei.misc.undo_redo
-%else
+%else:
 snmp-agent protocol source-interface *
 %endif
 snmp-agent ~

{annet-0.5 → annet-0.6/annet.egg-info}/PKG-INFO

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

{annet-0.5 → annet-0.6}/annet_generators/example/lldp.py

@@ -46,6 +46,7 @@ class Lldp(PartialGenerator):
                 interface all
             """
 
+
 def get_generators(store: Storage) -> List[BaseGenerator]:
     return [
         Lldp(store),

{annet-0.5 → annet-0.6}/annet_nbexport/__init__.py

@@ -4,7 +4,7 @@ import operator
 import os
 import os.path
 import pathlib
-from typing import List
+from typing import List, Optional
 
 from annet.storage import Device, Storage, Query, StorageOpts, StorageProvider
 from annet.annlib.netdev.views.hardware import HardwareView
@@ -125,7 +125,7 @@ class NetboxDTO:
 
 
 class AnnetNbExportStorage(Storage):
-    def __init__(self, opts: "Optional[StorageOpts]" = None):
+    def __init__(self, opts: Optional[StorageOpts] = None):
         self._dump_dir = os.path.join(os.path.dirname(__file__))
 
     def __enter__(self):
@@ -146,7 +146,7 @@ class AnnetNbExportStorage(Storage):
 
     def make_devices(
         self,
-        query: "inventory.Query",
+        query,
         preload_neighbors=False,
         use_mesh=None,
         preload_extra_fields=False,
@@ -158,7 +158,7 @@ class AnnetNbExportStorage(Storage):
                 ret.append(DeviceNb(self, NetboxDTO(**device_data), region=file_path.parent.name))
         return ret
 
-    def get_device(self, obj_id, preload_neighbors=False, use_mesh=None, **kwargs) -> "DeviceView":
+    def get_device(self, obj_id, preload_neighbors=False, use_mesh=None, **kwargs) -> Device:
         for file_path, device_data in _read_dump(self._dump_dir):
             if device_data["name"] == obj_id:
                 return DeviceNb(self, NetboxDTO(**device_data), region=file_path.parent.name)
@@ -168,7 +168,7 @@ class AnnetNbExportStorage(Storage):
 
 
 def _read_dump(dump_dir):
-    for (dirpath, _dirnames, filenames) in  os.walk(dump_dir):
+    for (dirpath, _dirnames, filenames) in os.walk(dump_dir):
         for filename in filenames:
             if filename != "devices.csv":
                 continue