annet 0.15.1__tar.gz → 0.15.2__tar.gz

{annet-0.15.1/annet.egg-info → annet-0.15.2}/PKG-INFO

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

{annet-0.15.1 → annet-0.15.2}/annet/adapters/netbox/v37/storage.py

@@ -1,5 +1,5 @@
 from logging import getLogger
-from typing import Optional, List, Union, Dict
+from typing import Any, Optional, List, Union, Dict
 from ipaddress import ip_interface
 from collections import defaultdict
 
@@ -145,6 +145,7 @@ class NetboxStorageV37(Storage):
     def _load_devices(self, query: NetboxQuery) -> List[api_models.Device]:
         if not query.globs:
             return []
+        query = _hostname_dot_hack(query)
         return [
             device
             for device in self.netbox.dcim_all_devices(
@@ -223,3 +224,23 @@ def _match_query(query: NetboxQuery, device_data: api_models.Device) -> bool:
         if subquery.strip() in device_data.name:
             return True
     return False
+
+
+def _hostname_dot_hack(netbox_query: NetboxQuery) -> NetboxQuery:
+    # there is no proper way to lookup host by its hostname
+    # ie find "host" with fqdn "host.example.com"
+    # besides using name__ic (ie startswith)
+    # since there is no direct analogue for this field in netbox
+    # so we need to add a dot to hostnames (top-level fqdn part)
+    # so we would not receive devices with a common name prefix
+    def add_dot(raw_query: Any) -> Any:
+        if isinstance(raw_query, str) and "." not in raw_query:
+            raw_query = raw_query + "."
+        return raw_query
+
+    raw_query = netbox_query.query
+    if isinstance(raw_query, list):
+        for i, name in enumerate(raw_query):
+            raw_query[i] = add_dot(name)
+
+    return NetboxQuery(raw_query)

{annet-0.15.1 → annet-0.15.2}/annet/annlib/netdev/devdb/data/devdb.json

@@ -6,18 +6,19 @@
     "Cisco.ASR": " ASR",
     "Cisco.ASR.ASR9000": " 9\\d{3}",
     "Cisco.XRV": "XRv",
-    "Cisco.Catalyst": "Catalyst",
-    "Cisco.Catalyst.C2900": " 29\\d\\d",
-    "Cisco.Catalyst.C2900.C2950": " 2950",
-    "Cisco.Catalyst.C2900.C2960": " 2960",
-    "Cisco.Catalyst.C2900.C2960.C2960Plus": " 2960-Plus",
-    "Cisco.Catalyst.C2900.C2960.C2960S": " 2960S",
-    "Cisco.Catalyst.C2900.C2960.C2960X": " 2960X",
-    "Cisco.Catalyst.C3500": " 35\\d\\d",
-    "Cisco.Catalyst.C3600": " 36\\d\\d",
-    "Cisco.Catalyst.C3700": " 37\\d\\d",
-    "Cisco.Catalyst.C4900": " 49\\d\\d",
-    "Cisco.Catalyst.C6500": " 65\\d\\d",
+    "Cisco.Catalyst": " (Catalyst |WS-C)",
+    "Cisco.Catalyst.C2900": "29\\d\\d",
+    "Cisco.Catalyst.C2900.C2950": "2950",
+    "Cisco.Catalyst.C2900.C2960": "2960",
+    "Cisco.Catalyst.C2900.C2960.C2960Plus": "2960-Plus",
+    "Cisco.Catalyst.C2900.C2960.C2960S": "2960S",
+    "Cisco.Catalyst.C2900.C2960.C2960X": "2960X",
+    "Cisco.Catalyst.C2900.C2960.C2960G": "2960G",
+    "Cisco.Catalyst.C3500": "35\\d\\d",
+    "Cisco.Catalyst.C3600": "36\\d\\d",
+    "Cisco.Catalyst.C3700": "37\\d\\d",
+    "Cisco.Catalyst.C4900": "49\\d\\d",
+    "Cisco.Catalyst.C6500": "65\\d\\d",
     "Cisco.Nexus": " [Nn]exus",
     "Cisco.Nexus.N3x": " 3\\d\\d\\d",
     "Cisco.Nexus.N3x.N3100": " 31\\d\\d",
@@ -52,13 +53,13 @@
     "Huawei.CE.CE8800.CE8850": " CE8850",
     "Huawei.CE.CE8800.CE8851": " CE8851",
     "Huawei.CE.CE9800": " CE98\\d\\d",
-    "Huawei.Quidway": " S\\d+",
-    "Huawei.Quidway.S2x": " S2\\d{3}",
-    "Huawei.Quidway.S2x.S2300": " S23\\d\\d",
-    "Huawei.Quidway.S2x.S2700": " S27\\d\\d",
-    "Huawei.Quidway.S5300": " S53\\d\\d",
-    "Huawei.Quidway.S5700": " S57\\d\\d",
-    "Huawei.Quidway.S6700": " S67\\d\\d",
+    "Huawei.Quidway": " (LS-)?S",
+    "Huawei.Quidway.S2x": "2\\d{3}",
+    "Huawei.Quidway.S2x.S2300": "23\\d\\d",
+    "Huawei.Quidway.S2x.S2700": "27\\d\\d",
+    "Huawei.Quidway.S5300": "53\\d\\d",
+    "Huawei.Quidway.S5700": "57\\d\\d",
+    "Huawei.Quidway.S6700": "67\\d\\d",
     "Huawei.NE": " NE\\d+",
     "Huawei.NE.NE40E": " NE40E",
     "Huawei.NE.NE8000": " NE8000",
@@ -111,6 +112,9 @@
     "PC.Whitebox.Edgecore": "[Ee]dge-?[Cc]ore",
     "PC.Whitebox.Edgecore.AS": "AS",
     "PC.Whitebox.Edgecore.AS9736": "AS9736",
+    "PC.Whitebox.NVIDIA": "NVIDIA",
+    "PC.Whitebox.NVIDIA.SN": " SN",
+    "PC.Whitebox.NVIDIA.SN.SN5600": " SN5600",
     "PC.Moxa": "[Mm]oxa",
     "PC.Moxa.NPort": " [Nn][Pp]ort",
     "PC.Moxa.NPort.6610": "6610",

{annet-0.15.1 → annet-0.15.2}/annet/argparse.py

@@ -107,6 +107,8 @@ class Arg:
         default = self.kwargs.get("default", None)
         if isinstance(default, ConvertibleDefault) and "type" in self.kwargs:
             default = self.kwargs["default"] = default.convert(self.kwargs["type"])
+        elif isinstance(default, Callable):
+            default = self.kwargs["default"] = default()
         elif default is False and "action" not in self.kwargs:
             self.kwargs["action"] = "store_true"
         self.default = default

{annet-0.15.1 → annet-0.15.2}/annet/cli.py

@@ -273,7 +273,7 @@ def file_patch(args: cli_args.FilePatchOptions):
 def context():
     """ A group of commands for manipulating context.
 
-    By default, the context file is located in '~/.annushka/context.yml',
+    By default, the context file is located in '~/.annet/context.yml',
     but it can be set with the ANN_CONTEXT_CONFIG_PATH environment variable.
     """
     context_touch()

{annet-0.15.1 → annet-0.15.2}/annet/cli_args.py

@@ -8,6 +8,7 @@ import os
 
 from valkit.common import valid_string_list
 
+import annet.lib
 from annet.argparse import Arg, ArgGroup, DefaultFromEnv
 from annet.hardware import hardware_connector
 from annet.storage import Query, get_storage
@@ -69,6 +70,11 @@ opt_expand_path = Arg(
     help="Use full paths of Entire-generators and no just names when writing them to the file system"
 )
 
+opt_dest_force_create_dir = Arg(
+    "--dest-force-create-dir", default=False,
+    help="Output generated data to dir, even for blackboxes"
+)
+
 opt_old = Arg(
     "old",
     help="A path to a file (or a directory with a batch of files) that contains the old config"
@@ -228,7 +234,7 @@ opt_log_json = Arg(
 )
 
 opt_log_dest = Arg(
-    "--log-dest", default="deploy/",
+    "--log-dest", default=annet.lib.get_default_log_dest,
     help="Log to a specified file, directory, or '-' (stdout)"
 )
 
@@ -425,6 +431,7 @@ class FileOutOptions(ArgGroup):
     expand_path = opt_expand_path
     no_label = opt_no_label
     no_color = opt_no_color
+    dest_force_create_dir = opt_dest_force_create_dir
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

{annet-0.15.1 → annet-0.15.2}/annet/lib.py

@@ -37,8 +37,20 @@ from annet.annlib.lib import (  # pylint: disable=unused-import
 from contextlog import get_logger
 
 
-_TEMPLATE_CONTEXT_PATH: Optional[str] = None
-_DEFAULT_CONTEXT_PATH: Optional[str] = None
+_HOMEDIR_PATH: Optional[str] = None           # defaults to ~/.annet
+_TEMPLATE_CONTEXT_PATH: Optional[str] = None  # defaults to annet/configs/context.yml
+_DEFAULT_CONTEXT_PATH: Optional[str] = None   # defaults to ~/.annet/context.yml
+
+
+def get_homedir_path() -> str:
+    if _HOMEDIR_PATH is None:
+        set_homedir_path("~/.annet/")
+    return _HOMEDIR_PATH
+
+
+def set_homedir_path(path: str) -> None:
+    global _HOMEDIR_PATH  # pylint: disable=global-statement
+    _HOMEDIR_PATH = path
 
 
 def get_template_context_path() -> str:
@@ -63,6 +75,11 @@ def set_default_context_path(path: str) -> None:
     _DEFAULT_CONTEXT_PATH = path
 
 
+def get_default_log_dest() -> str:
+    homedir = get_homedir_path()
+    return os.path.join(homedir, "deploy/")
+
+
 @lru_cache(maxsize=1)
 def _get_template_context():
     with open(get_template_context_path()) as f:

{annet-0.15.1 → annet-0.15.2}/annet/output.py

@@ -24,6 +24,9 @@ from annet.connectors import Connector
 from annet.storage import Device, storage_connector
 
 
+BLACKBOX_FILENAME = "config.cfg"
+
+
 class _DriverConnector(Connector["OutputDriver"]):
     name = "OutputDriver"
     ep_name = "output"
@@ -77,7 +80,8 @@ class OutputDriverBasic(OutputDriver):
             yield from items_iter
 
         dest = arg_out.dest
-        dir_mode = dir_or_file_output(dest, query_result_count, suggest_dir=(os.sep in first_result[0]))
+        suggest_dir = arg_out.dest_force_create_dir or os.sep in first_result[0]
+        dir_mode = dir_or_file_output(dest, query_result_count, suggest_dir=suggest_dir)
         _reassembled_items = list(_reassemble_items())
 
         for output_no, (label, output, is_fail) in enumerate(_reassembled_items):
@@ -99,6 +103,9 @@ class OutputDriverBasic(OutputDriver):
                         print_label(label, back_color=label_color)
                     writer.write(sys.stdout)
             elif dir_mode:
+                if arg_out.dest_force_create_dir and os.sep not in label:
+                    label = os.path.join(label, BLACKBOX_FILENAME)
+
                 if label.startswith(LABEL_NEW_PREFIX):
                     label = label[len(LABEL_NEW_PREFIX):]
                 if label.startswith(os.sep):
@@ -114,7 +121,7 @@ class OutputDriverBasic(OutputDriver):
                     label = os.sep.join(parts[1:])
                     if not arg_out.expand_path:
                         label = os.path.basename(label)
-                    if query_result_count > 1:
+                    if query_result_count > 1 or arg_out.dest_force_create_dir:
                         label = os.path.join(hostname, label)
                 file_dest = os.path.join(dest, "errors") if is_fail else dest
                 out_file = os.path.normpath(os.path.join(file_dest, label))

{annet-0.15.1 → annet-0.15.2/annet.egg-info}/PKG-INFO

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