annet 0.16.14__tar.gz → 0.16.15__tar.gz

{annet-0.16.14/annet.egg-info → annet-0.16.15}/PKG-INFO

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

{annet-0.16.14 → annet-0.16.15}/annet/adapters/netbox/common/models.py

@@ -139,6 +139,13 @@ class Interface(Entity):
             family = IpFamily(value=6, label="IPv6")
         else:
             family = IpFamily(value=4, label="IPv4")
+
+        for existing_addr in self.ip_addresses:
+            if existing_addr.address == address_mask and (
+                (existing_addr.vrf is None and vrf is None) or
+                (existing_addr.vrf is not None and existing_addr.vrf.name == vrf)
+            ):
+                return
         self.ip_addresses.append(IpAddress(
             id=0,
             display=address_mask,

{annet-0.16.14 → annet-0.16.15}/annet/annlib/netdev/devdb/data/devdb.json

@@ -54,6 +54,8 @@
     "Huawei.CE.CE8800.CE8851": " CE8851",
     "Huawei.CE.CE8800.CE8855": " CE8855",
     "Huawei.CE.CE9800": " CE98\\d\\d",
+    "Huawei.CE.CE9800.CE9855": " CE9855",
+    "Huawei.CE.CE9800.CE9860": " CE9860",
     "Huawei.Quidway": " (LS-)?S",
     "Huawei.Quidway.S2x": "2\\d{3}",
     "Huawei.Quidway.S2x.S2300": "23\\d\\d",

{annet-0.16.14 → annet-0.16.15}/annet/bgp_models.py

@@ -178,6 +178,7 @@ class FamilyOptions:
 class PeerGroup:
     name: str
     remote_as: ASN = ASN(None)
+    families: set[Family] = field(default_factory=set)
     internal_name: str = ""
     description: str = ""
     update_source: str = ""

{annet-0.16.14 → annet-0.16.15}/annet/implicit.py

@@ -71,14 +71,14 @@ def _implicit_tree(device):
                 netconf
             """
     elif device.hw.Arista:
-        # эта часть конфигурации будет не видна в конфиге, если она включена с таким набором полей:
+        # This part of configuration will not be visible in configuration
         text = r"""
                 ip load-sharing trident fields ipv6 destination-port source-ip ingress-interface destination-ip source-port flow-label
                 ip load-sharing trident fields ip source-ip source-port destination-ip destination-port ingress-interface
         """
     elif device.hw.Nexus:
         text = r"""
-                # часть конфигурации скрытая если включена
+                # This part of configuration will not be visible in configuration if enabled
                 snmp-server enable traps link linkDown
                 snmp-server enable traps link linkUp
         """
@@ -107,25 +107,24 @@ def _implicit_tree(device):
             """
 
         elif device.hw.Nexus.N3x:
-            # У нексуса сложные взаимоотношения с
-            # shutdown командой вездe
-            # в данный момент поведение проверенно для Cisco Nexus 3132Q 6.0(2)U6(7)
+            # Cisco Nexus has some specific related to "shutdown" command
+            # Behavior is cheked on Cisco Nexus 3132Q 6.0(2)U6(7)
             text += r"""
                 # SVI
                 !interface Vlan*
                     !shutdown
                 !interface mgmt[0-9]*
                     no shutdown
-                # Физические НЕ сплитованные интерфейсы и subif'ы
+                # Physical and NOT splitted interfaces and subifs
                 !interface */Ethernet1\/[0-9.]*/
                     no shutdown
-                # Физические НЕ сплитованные интерфейсы и subif'ы
+                # Physical and NOT splitted interfaces and subifs
                 !interface */Ethernet1\/[0-9]+\/[0-9.]+/
                     # только explicit
-                # Лупбеки
+                # Loopbacks
                 !interface */Loopback[0-9.]+/
                     no shutdown
-                # Агрегаты
+                # Port-Channels
                 !interface */port-channel[0-9.]+/
                     no shutdown
                 # BGP
@@ -135,11 +134,15 @@ def _implicit_tree(device):
             """
     elif device.hw.Cisco:
         text += r"""
-            !interface *Ethernet*
+            !interface */\S*Ethernet\S+/
+                mtu 1500
+                no shutdown
+            !interface */Loopback[0-9.]+/
+                mtu 1500
+                no shutdown
+            !interface */port-channel[0-9.]+/
                 mtu 1500
                 no shutdown
-
-
         """
         if device.hw.Cisco.Catalyst:
             # this configuration is not visible in running-config when enabled

{annet-0.16.14 → annet-0.16.15}/annet/mesh/models_converter.py

@@ -2,11 +2,13 @@ from dataclasses import dataclass
 from ipaddress import ip_interface
 from typing import Optional, Union
 
-from adaptix import Retort, loader, Chain, name_mapping
+from adaptix import Retort, loader, Chain, name_mapping, as_is_loader
 
 from .peer_models import DirectPeerDTO, IndirectPeerDTO, VirtualPeerDTO, VirtualLocalDTO
-from ..bgp_models import Aggregate, GlobalOptions, VrfOptions, FamilyOptions, Peer, PeerGroup, ASN, PeerOptions
-from ..storage import Device
+from ..bgp_models import (
+    Aggregate, GlobalOptions, VrfOptions, FamilyOptions, Peer, PeerGroup, ASN, PeerOptions,
+    Redistribute, BFDTimers,
+)
 
 
 PeerDTO = Union[DirectPeerDTO, IndirectPeerDTO, VirtualPeerDTO]
@@ -52,6 +54,8 @@ retort = Retort(
         loader(FamilyOptions, ObjMapping, Chain.FIRST),
         loader(Aggregate, ObjMapping, Chain.FIRST),
         loader(PeerOptions, ObjMapping, Chain.FIRST),
+        as_is_loader(Redistribute),
+        as_is_loader(BFDTimers),
         name_mapping(PeerOptions, map={
             "local_as": "asnum",
         }),
@@ -82,7 +86,7 @@ def to_bgp_peer(local: LocalDTO, connected: PeerDTO, connected_hostname: str, in
     result.description = getattr(connected, "description", result.description)
     result.families = getattr(connected, "families", result.families)
     # local
-    result.import_policy = getattr(connected, "import_policy", result.import_policy)
-    result.export_policy = getattr(connected, "export_policy", result.export_policy)
-    result.update_source = getattr(connected, "update_source", result.update_source)
+    result.import_policy = getattr(local, "import_policy", result.import_policy)
+    result.export_policy = getattr(local, "export_policy", result.export_policy)
+    result.update_source = getattr(local, "update_source", result.update_source)
     return result

{annet-0.16.14 → annet-0.16.15}/annet/mesh/peer_models.py

@@ -96,7 +96,7 @@ class IndirectPeerDTO(MeshSession, _OptionsDTO):
     update_source: str
 
 
-class VirtualLocalDTO(BaseMeshModel):
+class VirtualLocalDTO(_OptionsDTO):
     asnum: int
     pod: int
     addr: str
@@ -109,13 +109,14 @@ class VirtualLocalDTO(BaseMeshModel):
     svi: int
 
 
-class VirtualPeerDTO(MeshSession, _OptionsDTO):
+class VirtualPeerDTO(MeshSession):
     addr: str
     description: str
 
 
 class MeshPeerGroup(_OptionsDTO):
     name: str
+    families: Annotated[set[FamilyName], Concat()]
     remote_as: Union[int, str]
     internal_name: str
     update_source: str

{annet-0.16.14 → annet-0.16.15/annet.egg-info}/PKG-INFO

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

{annet-0.16.14 → annet-0.16.15}/annet_generators/mesh_example/mesh_logic.py

@@ -1,3 +1,4 @@
+from annet.bgp_models import Redistribute, BFDTimers
 from annet.mesh import Right, MeshRulesRegistry, GlobalOptions, MeshSession, DirectPeer, VirtualLocal, VirtualPeer
 
 registry = MeshRulesRegistry()
@@ -6,6 +7,9 @@ registry = MeshRulesRegistry()
 @registry.device("{name:.*}")
 def device_handler(global_opts: GlobalOptions):
     global_opts.local_as = 12345
+    global_opts.ipv4_unicast.redistributes = (Redistribute(
+        protocol="ipv4", policy="sss",
+    ),)
     global_opts.groups["GROP_NAME"].remote_as = 11111
 
 
@@ -21,6 +25,7 @@ def virtual_handler(device: VirtualLocal, peer: VirtualPeer, session: MeshSessio
     session.asnum = 12345
     device.svi = 1
     device.addr = "192.168.1.254"
+    device.listen_network = ["10.0.0.0/8"]
     peer.addr = f"192.168.127.{peer.num}"