annet 3.4.2__tar.gz → 3.5.0__tar.gz

{annet-3.4.2/annet.egg-info → annet-3.5.0}/PKG-INFO

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

{annet-3.4.2 → annet-3.5.0}/annet/adapters/netbox/common/models.py

@@ -101,7 +101,7 @@ class IpAddress(DumpableView, Generic[_PrefixT]):
 
 @dataclass
 class InterfaceConnectedEndpoint(Entity):
-    device: Entity
+    device: Entity | None
 
 
 @dataclass

{annet-3.4.2 → annet-3.5.0}/annet/annlib/command.py

@@ -19,7 +19,8 @@ class Command:
     cmd: str
     questions: Optional[List[Question]] = None
     exc_handler: Optional[List[Question]] = None
-    timeout: Optional[int] = None
+    timeout: Optional[int] = None  # total timeout
+    read_timeout: Optional[int] = None  # timeout between consecutive reads
     suppress_nonzero: bool = False
     suppress_eof: bool = False
 

{annet-3.4.2 → annet-3.5.0}/annet/deploy_ui.py

@@ -5,6 +5,7 @@ import os
 import sys
 import math
 import asyncio
+import platform
 import textwrap
 import time
 import traceback
@@ -23,7 +24,7 @@ try:
 except ImportError:
     curses = None
 
-uname = os.uname()[0]
+uname = platform.uname()[0]
 NCURSES_SIZE_T = 2 ** 15 - 1
 MIN_CONTENT_HEIGHT = 20
 

{annet-3.4.2 → annet-3.5.0}/annet/executor.py

@@ -162,7 +162,7 @@ class DeferredFileWrite:
             raise Exception()
 
     def write(self, data):
-        with open(self._file, self._mode) as fh:
+        with open(self._file, self._mode, encoding="utf-8") as fh:
             fh.write(data)
 
     def close(self):

{annet-3.4.2 → annet-3.5.0}/annet/implicit.py

@@ -133,9 +133,9 @@ def _implicit_tree(device):
                         no shutdown
             """
     elif device.hw.Cisco:
-        # C2900/C3500/C3600 does not support the MTU on a per-interface basis
+        # C2900/C3500/C3600/AIR does not support the MTU on a per-interface basis
         if device.hw.Cisco.Catalyst.C2900 or device.hw.Cisco.Catalyst.C3500 \
-           or device.hw.Cisco.Catalyst.C3600:
+           or device.hw.Cisco.Catalyst.C3600 or device.hw.Cisco.AIR:
             text += r"""
                 !interface */\S*Ethernet\S+/
                     no shutdown

{annet-3.4.2 → annet-3.5.0}/annet/mesh/executor.py

@@ -370,7 +370,7 @@ class MeshExecutor:
                 device,
                 direct_pair.device,
                 direct_pair.ports,
-                to_interface_changes(direct_pair.local),
+                to_interface_changes(direct_pair.local, direct_pair.connected),
             )
             peers.append(self._to_bgp_peer(direct_pair, target_interface))
 
@@ -378,7 +378,7 @@ class MeshExecutor:
             target_interface = self._apply_nondirect_interface_changes(
                 device,
                 getattr(virtual_pair.local, "ifname", None),
-                to_interface_changes(virtual_pair.local),
+                to_interface_changes(virtual_pair.local, virtual_pair.connected),
             )
             peers.append(self._virtual_to_bgp_peer(virtual_pair, target_interface))
 
@@ -386,7 +386,7 @@ class MeshExecutor:
             target_interface = self._apply_nondirect_interface_changes(
                 device,
                 getattr(connected_pair.local, "ifname", None),
-                to_interface_changes(connected_pair.local),
+                to_interface_changes(connected_pair.local, connected_pair.connected),
             )
             peers.append(self._to_bgp_peer(connected_pair, target_interface))
 

{annet-3.4.2 → annet-3.5.0}/annet/mesh/models_converter.py

@@ -67,7 +67,17 @@ retort = Retort(
 )
 
 to_bgp_global_options = retort.get_loader(GlobalOptions)
-to_interface_changes = retort.get_loader(InterfaceChanges)
+
+
+def to_interface_changes(local: LocalDTO, peer: PeerDTO) -> InterfaceChanges:
+    return InterfaceChanges(
+        addr=getattr(local, "addr", None),
+        lag_links_min=getattr(local, "lag_links_min", None),
+        svi=getattr(local, "svi", None),
+        subif=getattr(local, "subif", None),
+        vrf=getattr(peer, "vrf", None),
+        lag=getattr(local, "lag", None),
+    )
 
 
 def to_bgp_peer(local: LocalDTO, connected: PeerDTO, connected_hostname: str, interface: Optional[str]) -> Peer:

{annet-3.4.2 → annet-3.5.0}/annet/rulebook/__init__.py

@@ -99,7 +99,7 @@ class DefaultRulebookProvider(RulebookProvider):
             return self._escaped_rul_cache[name]
         for root_dir in self.root_dir:
             try:
-                with open(path.join(root_dir, "texts", name), "r") as f:
+                with open(path.join(root_dir, "texts", name), "r", encoding="utf-8") as f:
                     self._escaped_rul_cache[name] = self._escape_mako(f.read())
                     return self._escaped_rul_cache[name]
             except FileNotFoundError:

{annet-3.4.2 → annet-3.5.0}/annet/rulebook/b4com/iface.py

@@ -42,11 +42,15 @@ def sflow(rule, key, diff, **kwargs):
 
 def lldp(rule, key, diff, **kwargs):
     """
-    Не удаляем все что начинается с set, т.к. set перезаписывает предыдущий конфиг
+    Обрабатываем блок lldp-agent
     """
     result = common.default(rule, key, diff, **kwargs)
     for op, cmd, ch in result:
+        # Не удаляем все что начинается с set, т.к. set перезаписывает предыдущий конфиг
         if diff[Op.REMOVED] and "set lldp" in cmd:
             pass
+        # В случае lldp tlv ... select удаляем все что до select
+        elif diff[Op.REMOVED] and cmd.endswith("select"):
+            yield (op, " ".join(cmd.split()[:-1]), ch)
         else:
             yield (op, cmd, ch)

{annet-3.4.2 → annet-3.5.0}/annet/rulebook/texts/b4com.order

@@ -6,6 +6,7 @@
 # Фичи должны быть включены прежде всего
 feature
 # Далее нужно будет указать команды и их порядок
+sflow
 interface *
     description
     ip vrf forwarding

{annet-3.4.2 → annet-3.5.0}/annet/rulebook/texts/b4com.rul

@@ -13,11 +13,12 @@
 # Physical
 sflow *
 
-interface */(ce|xe|eth)[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
+interface */(ce|xe|eth|vlan)[0-9\/]+$/     %logic=common.permanent %diff_logic=cisco.iface.diff
     description *                 %logic=b4com.iface.description
     ip vrf forwarding *
     ip address *
     ipv6 address *
+    ipv6 nd *
     mtu *                         %logic=b4com.iface.mtu
     sflow *                       %logic=b4com.iface.sflow
     lldp-agent

{annet-3.4.2 → annet-3.5.0}/annet/rulebook/texts/huawei.rul

@@ -55,6 +55,11 @@ dhcp snooping user-bind http
 
 ntp server disable
 ntp ipv6 server disable
+ntp unicast-server domain *
+ntp unicast-server ipv6 *
+ntp unicast-server *
+ntp-service unicast-server ipv6 *
+ntp-service unicast-server *
 ntp ~
 dns snooping ttl delay-time
 dns ~

{annet-3.4.2 → annet-3.5.0}/annet/rulebook/texts/juniper.rul

@@ -18,6 +18,11 @@ system
     ntp
         server *
         source-address *
+    syslog
+        host *
+            match
+        file messages
+            match
 
 routing-options
     autonomous-system *

{annet-3.4.2 → annet-3.5.0/annet.egg-info}/PKG-INFO

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