annet 0.16.11__tar.gz → 0.16.13__tar.gz

{annet-0.16.11/annet.egg-info → annet-0.16.13}/PKG-INFO

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

{annet-0.16.11 → annet-0.16.13}/annet/adapters/netbox/common/client.py

@@ -79,9 +79,11 @@ def collect(func: Func, field: str = "", batch_size: int = 100) -> Func:
 
 
 class BaseNetboxClient(RequestsClient):
-    def __init__(self, url: str, token: str):
+    def __init__(self, url: str, token: str, insecure: bool = False):
         url = url.rstrip("/") + "/api/"
         session = Session()
+        if insecure:
+            session.verify = False
         if token:
             session.headers["Authorization"] = f"Token {token}"
         super().__init__(url, session)

{annet-0.16.11 → annet-0.16.13}/annet/adapters/netbox/common/storage_opts.py

@@ -5,12 +5,18 @@ DEFAULT_URL = "http://localhost"
 
 
 class NetboxStorageOpts:
-    def __init__(self, url: str, token: str):
+    def __init__(self, url: str, token: str, insecure: bool = False):
         self.url = url
         self.token = token
+        self.insecure = insecure
 
     @classmethod
     def parse_params(cls, conf_params: Optional[dict[str, str]], cli_opts: Any):
         url = os.getenv("NETBOX_URL") or conf_params.get("url") or DEFAULT_URL
         token = os.getenv("NETBOX_TOKEN", "").strip() or conf_params.get("token") or ""
-        return cls(url=url, token=token)
+        insecure = False
+        if insecure_env := os.getenv("NETBOX_INSECURE", "").lower():
+            insecure = insecure_env in ("true", "1", "t")
+        else:
+            insecure = bool(conf_params.get("insecure") or False)
+        return cls(url=url, token=token, insecure=insecure)

{annet-0.16.11 → annet-0.16.13}/annet/adapters/netbox/provider.py

@@ -12,7 +12,7 @@ from .v37.storage import NetboxStorageV37
 
 
 def storage_factory(opts: NetboxStorageOpts) -> Storage:
-    client = NetboxStatusClient(opts.url, opts.token)
+    client = NetboxStatusClient(opts.url, opts.token, opts.insecure)
     try:
         status = client.status()
     except ClientError as e:
@@ -27,9 +27,10 @@ def storage_factory(opts: NetboxStorageOpts) -> Storage:
 
 
 class NetboxProvider(StorageProvider, AdapterWithName, AdapterWithConfig):
-    def __init__(self, url: Optional[str] = None, token: Optional[str] = None):
+    def __init__(self, url: Optional[str] = None, token: Optional[str] = None, insecure: bool = False):
         self.url = url
         self.token = token
+        self.insecure = insecure
 
     @classmethod
     def with_config(cls, **kwargs: Dict[str, Any]) -> T:

{annet-0.16.11 → annet-0.16.13}/annet/adapters/netbox/v37/storage.py

@@ -2,6 +2,7 @@ from logging import getLogger
 from typing import Any, Optional, List, Union, Dict
 from ipaddress import ip_interface
 from collections import defaultdict
+import ssl
 
 from adaptix import P
 from adaptix.conversion import impl_converter, link, link_constant
@@ -86,9 +87,15 @@ def extend_ip_address(
 
 class NetboxStorageV37(Storage):
     def __init__(self, opts: Optional[NetboxStorageOpts] = None):
+        ctx: ssl.con | ssl.SSLContext = None
+        if opts.insecure:
+            ctx = ssl.create_default_context()
+            ctx.check_hostname = False
+            ctx.verify_mode = ssl.CERT_NONE
         self.netbox = NetboxV37(
             url=opts.url,
             token=opts.token,
+            ssl_context=ctx,
         )
         self._all_fqdns: Optional[list[str]] = None
 

{annet-0.16.11 → annet-0.16.13}/annet/implicit.py

@@ -46,6 +46,7 @@ def _implicit_tree(device):
                 !user-interface vty ~
                     protocol inbound all
                 netconf
+                port link-flap trigger error-down
             """
         elif device.hw.Huawei.NE:
             text = """
@@ -136,7 +137,6 @@ def _implicit_tree(device):
         text += r"""
             !interface
                 no shutdown
-                no ip address
         """
         if device.hw.Cisco.Catalyst:
             # this configuration is not visible in running-config when enabled

{annet-0.16.11 → annet-0.16.13}/annet/output.py

@@ -2,9 +2,12 @@ import abc
 import os
 import posixpath
 import sys
-from typing import List, Optional, Tuple, Type, Dict
+from typing import Dict, List, Optional, Tuple, Type
+from urllib.parse import urlparse
 
 import colorama
+from contextlog import get_logger
+
 from annet.annlib.output import (  # pylint: disable=unused-import
     LABEL_NEW_PREFIX,
     OutputWriter,
@@ -17,8 +20,6 @@ from annet.annlib.output import (  # pylint: disable=unused-import
     print_err_label,
     print_label,
 )
-from contextlog import get_logger
-
 from annet.cli_args import FileOutOptions, QueryOptions
 from annet.connectors import Connector
 from annet.storage import Device, storage_connector
@@ -112,9 +113,11 @@ class OutputDriverBasic(OutputDriver):
                 if label.startswith(os.sep):
                     # just in case.
                     label = label.lstrip(os.sep)
+
                 if os.sep not in label:
                     # vendor config
                     label = os.path.basename(label)
+
                 else:
                     # entire generated file
                     parts = label.split(os.sep)
@@ -125,6 +128,7 @@ class OutputDriverBasic(OutputDriver):
                     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))
                 logger.info("writing '%s'", out_file)
                 dirname = os.path.dirname(out_file)
@@ -164,12 +168,22 @@ class OutputDriverBasic(OutputDriver):
         >>>
         ```
         """
+
         # NOTE: с полученным `config_path` работаем через `posixpath`, а не через `os.path`, потому что
         #       entire-путь POSIX-специфичный; но в конце формируем путь через `os.path` для текущей платформы
         if not posixpath.abspath(config_path):
             raise RuntimeError(f"Want absolute config path, but relative received: {config_path}")
+
         cfg_files = self.cfg_file_names(device)
-        # NOTE: получаем путь без "/" в начале, например, "etc/frr/frr.conf"
+
+        parsed_config_path = urlparse(config_path)
+        scheme, config_path = parsed_config_path.scheme or "file", parsed_config_path.path
+
         relative_config_path = posixpath.relpath(config_path, "/")
+        if scheme != "file":
+            host = parsed_config_path.hostname + f":{parsed_config_path.port}" if parsed_config_path.port else ""
+            relative_config_path = os.path.join(host, relative_config_path)
+
         dest_config_path_parts = [cfg_files[0]] + relative_config_path.split(posixpath.sep)
+
         return os.path.join(*dest_config_path_parts)

{annet-0.16.11 → annet-0.16.13}/annet/rulebook/texts/cisco.rul

@@ -45,6 +45,7 @@ no snmp-server sysobjectid type stack-oid
 interface Loopback
     ipv6 address *
     ip address ~
+    ! no ip address
 
 # SVI/Subifs/Lagg
 interface */(Vlan|Ethernet.*\.|port-channel.*\.?)\d+$/ %diff_logic=cisco.iface.diff
@@ -53,6 +54,7 @@ interface */(Vlan|Ethernet.*\.|port-channel.*\.?)\d+$/ %diff_logic=cisco.iface.d
     ipv6 address *
     ipv6 nd ~                      %logic=cisco.misc.no_ipv6_nd_suppress_ra
     ip address ~
+    ! no ip address
     mtu
 
 # Physical
@@ -65,6 +67,7 @@ interface */\w*Ethernet[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.
     ipv6 link-local
     ipv6 address *
     ip address ~
+    ! no ip address
     channel-group
     mtu
     storm-control * level

{annet-0.16.11 → annet-0.16.13/annet.egg-info}/PKG-INFO

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