annet 0.16.14__py3-none-any.whl → 0.16.16__py3-none-any.whl

annet/__init__.py

@@ -56,6 +56,6 @@ def init(options: Namespace):
 
 
 def assert_python_version():
-    if sys.version_info < (3, 9, 0):
-        sys.stderr.write("Error: you need python 3.9.0 or higher\n")
+    if sys.version_info < (3, 10, 0):
+        sys.stderr.write("Error: you need python 3.10.0 or higher\n")
         sys.exit(1)

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/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/bgp_models.py

@@ -67,7 +67,7 @@ class BFDTimers:
     multiplier: int = 4
 
 
-Family = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled", "ipv6_labeled"]
+Family = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast"]
 
 
 @dataclass(frozen=True)
@@ -178,9 +178,12 @@ 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 = ""
+    import_policy: str = ""
+    export_policy: str = ""
 
     # more strict version of PeerOptions
     local_as: ASN = ASN(None)
@@ -241,8 +244,6 @@ class VrfOptions:
     ipv6_labeled_unicast: FamilyOptions
 
     vrf_name_global: Optional[str] = None
-    import_policy: Optional[str] = None
-    export_policy: Optional[str] = None
     rt_import: list[str] = field(default_factory=list)
     rt_export: list[str] = field(default_factory=list)
     rt_import_v4: list[str] = field(default_factory=list)

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/mesh/device_models.py

@@ -41,8 +41,8 @@ class _FamiliesMixin:
     def __init__(self, **kwargs):
         kwargs.setdefault("ipv4_unicast", FamilyOptions(family="ipv4_unicast"))
         kwargs.setdefault("ipv6_unicast", FamilyOptions(family="ipv6_unicast"))
-        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled"))
-        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled"))
+        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled_unicast"))
+        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled_unicast"))
         super().__init__(**kwargs)
     ipv4_unicast: Annotated[FamilyOptions, Merge()]
     ipv6_unicast: Annotated[FamilyOptions, Merge()]
@@ -54,8 +54,8 @@ class VrfOptions(_FamiliesMixin, BaseMeshModel):
     def __init__(self, vrf_name: str, **kwargs):
         kwargs.setdefault("ipv4_unicast", FamilyOptions(family="ipv4_unicast", vrf_name=vrf_name))
         kwargs.setdefault("ipv6_unicast", FamilyOptions(family="ipv6_unicast", vrf_name=vrf_name))
-        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled", vrf_name=vrf_name))
-        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled", vrf_name=vrf_name))
+        kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled_unicast", vrf_name=vrf_name))
+        kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled_unicast", vrf_name=vrf_name))
         kwargs.setdefault("groups", KeyDefaultDict(lambda x: MeshPeerGroup(name=x)))
         super().__init__(vrf_name=vrf_name, **kwargs)
 

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,14 +54,13 @@ 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",
         }),
         loader(list[PeerGroup], lambda x: list(x.values()), Chain.FIRST),
         loader(PeerGroup, ObjMapping, Chain.FIRST),
-        name_mapping(PeerGroup, map={
-            "local_as": "asnum",
-        }),
     ]
 )
 
@@ -82,7 +83,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/mesh/peer_models.py

@@ -3,7 +3,7 @@ from typing import Literal, Annotated, Union, Optional
 from .basemodel import BaseMeshModel, Concat
 from ..bgp_models import BFDTimers
 
-FamilyName = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled", "ipv6_labeled"]
+FamilyName = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast"]
 
 
 class _SharedOptionsDTO(BaseMeshModel):
@@ -96,7 +96,7 @@ class IndirectPeerDTO(MeshSession, _OptionsDTO):
     update_source: str
 
 
-class VirtualLocalDTO(BaseMeshModel):
+class VirtualLocalDTO(_OptionsDTO):
     asnum: int
     pod: int
     addr: str
@@ -109,14 +109,19 @@ 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()]
+    local_as: Union[int, str]
     remote_as: Union[int, str]
     internal_name: str
     update_source: str
     description: str
+
+    import_policy: str
+    export_policy: str

{annet-0.16.14.dist-info → annet-0.16.16.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.14
+Version: 0.16.16
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: colorama >=0.4.6

{annet-0.16.14.dist-info → annet-0.16.16.dist-info}/RECORD

@@ -1,7 +1,7 @@
-annet/__init__.py,sha256=k2dq8aOYjkjZszKoOlxEmR49uYoKh-8_HC2K8FeqLwA,2139
+annet/__init__.py,sha256=W8kkZ3Axu-6VJwgQ0cn4UeOVNy6jab0cqgHKLQny1D0,2141
 annet/annet.py,sha256=TMdEuM7GJQ4TjRVmuK3bCTZN-21lxjQ9sXqEdILUuBk,725
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
-annet/bgp_models.py,sha256=LEPlAuXaPpsQKL0s5QUlYhV5JE4yNKDCP9FX09Bdh_c,7986
+annet/bgp_models.py,sha256=1qDMUFO6GNMIw5HVcIhRcQuOZ4JoelNlTmlcNpbYiGI,8033
 annet/cli.py,sha256=hDpjIr3w47lgQ_CvCQS1SXFDK-SJrf5slbT__5u6GIA,12342
 annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
 annet/connectors.py,sha256=-Lghz3PtWCBU8Ohrp0KKQcmm1AUZtN0EnOaZ6IQgCQI,5105
@@ -11,7 +11,7 @@ annet/executor.py,sha256=Jny-hm0otZA1naPpFWR-R16SbaZioSQ8pkx-Yd2PYlM,19004
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
 annet/gen.py,sha256=rOAveprvBaEXbLyaQUhQ0QtOvcDfndlIOpchNhu8M1U,33499
 annet/hardware.py,sha256=_iR28dWiPtt6ZYdk-qg1sxazkSRJE3ukqKB-fFFfQak,1141
-annet/implicit.py,sha256=H8dABp2XlHecESojf6g4kxwReU8YUGBL5lfHlXoJUkc,5611
+annet/implicit.py,sha256=kGKO-mdvPw4HROx4VhnQWxbNlnbG2LuSYEzZbQX2Elo,5518
 annet/lib.py,sha256=lOdz3UJFYkO0wnuzIRRq3FpULQliqBtfmGmKOGVFO4Q,4238
 annet/output.py,sha256=FYMcWCc43-b51KsCiKnXPZHawhgWNoVtY9gRqw__Ce0,7473
 annet/parallel.py,sha256=hLkzEht0KhzmzUWDdO4QFYQHzhxs3wPlTA8DxbB2ziw,17160
@@ -33,7 +33,7 @@ annet/adapters/netbox/provider.py,sha256=3IrfZ6CfCxf-lTnJlIC2TQ8M_rDxOB_B7HGXZ92
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/client.py,sha256=PaxHG4W9H8_uunIwMBNYkLq4eQJYoO6p6gY-ciQs7Nc,2563
 annet/adapters/netbox/common/manufacturer.py,sha256=QoTjmuBAg5klOJqeo8HuS2HybIUGsjTkknLkQL_Tiec,1606
-annet/adapters/netbox/common/models.py,sha256=SeWQZV-zvaKvK2YT2Bwf-iapkIs5pr7I7rAI7vlFMB8,6886
+annet/adapters/netbox/common/models.py,sha256=JAAtbUB6UOzA3-VF5Fa33XktgKC3C2csareTZnHyqd0,7177
 annet/adapters/netbox/common/query.py,sha256=ziUFM7cUEbEIf3k1szTll4aO-OCUa-2Ogxbebi7Tegs,646
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
 annet/adapters/netbox/common/storage_opts.py,sha256=5tt6wxUUJTIzNbOVXMnYBwZedNAIqYlve3YWl6GdbZM,1197
@@ -55,7 +55,7 @@ annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/db.py,sha256=fI_u5aya4l61mbYSjj4JwlVfi3s7obt2jqERSuXGRUI,1634
 annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm58tmMWVU,892
-annet/annlib/netdev/devdb/data/devdb.json,sha256=Qph7WxZBEbgBqbCFeYu6ZM0qkEBn80WmJEjfJkcaZ-0,5940
+annet/annlib/netdev/devdb/data/devdb.json,sha256=_apUe1EsJORxD5CfAvBcpPlnIf_H7I_hjLuVTgS5-H0,6024
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=rIlyvnA3uM8bB_7oq1nS2KDxTp6dQh2hz-FbNhYIpOU,4630
 annet/annlib/netdev/views/hardware.py,sha256=3JCZLH7deIHhCguwPJTUX-WDvWjG_xt6BdSEZSO6zkQ,4226
@@ -83,11 +83,11 @@ annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 annet/generators/common/initial.py,sha256=qYBxXFhyOPy34cxc6hsIXseod-lYCmmbuNHpM0uteY0,1244
 annet/mesh/__init__.py,sha256=ZVFPnNOBgP42d7dUnCypGh3RKy0Ne_ObWVzROlE1nFA,423
 annet/mesh/basemodel.py,sha256=bBBx1wu3ftENgf_4PGCV-SkEcxH3tFekvoointT3894,4739
-annet/mesh/device_models.py,sha256=Jv6g9blnvTVxHGgHhnGd3b_8C3EHGpV7txyyR0Yt_Rg,3301
+annet/mesh/device_models.py,sha256=nh2SX6-j_xsM-3rzp5JlzZGjJD9HjUkiac4-hzXpy2k,3333
 annet/mesh/executor.py,sha256=iDarSYfq9H6MSf-M1HkQOFIaUb8j-nG0sQNbgzq4XIo,13726
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
-annet/mesh/models_converter.py,sha256=Wot-uxsHEg2QgBuYEntKkpXRq8P3kg_u-Xx9L3oAHI0,3088
-annet/mesh/peer_models.py,sha256=CgfMlUcIl3O06hQNFkZjqZB4_Ihm9Fi4tZdIxCE2K5M,2536
+annet/mesh/models_converter.py,sha256=3q2zs7K8S3pfYSUKKRdtl5CJGbeg4TtYxofAVs_MBsk,3085
+annet/mesh/peer_models.py,sha256=xyLbWtwJ5Y4OLf-OVZeHwRn2qyWhipOvhD4pDHTbvTE,2665
 annet/mesh/registry.py,sha256=G-FszWc_VKeN3eVpb-MRGbAGzbcSuEVAzbDC2k747XA,8611
 annet/rulebook/__init__.py,sha256=14IpOfTbeJtre7JKrfXVYiH0qAXsUSOL7AatUFmSQs0,3847
 annet/rulebook/common.py,sha256=zK1s2c5lc5HQbIlMUQ4HARQudXSgOYiZ_Sxc2I_tHqg,721
@@ -151,11 +151,11 @@ annet_generators/example/__init__.py,sha256=1z030I00c9KeqW0ntkT1IRLYKD5LZAHYjiNH
 annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn6yo,2100
 annet_generators/mesh_example/__init__.py,sha256=NfNWgXn1TNiWI6A5tmU6Y-4QV2i33td0Qs3re0MNNMo,218
 annet_generators/mesh_example/bgp.py,sha256=jzyDndSSGYyYBquDnLlR-7P5lzmUKcSyYCml3VsoMC0,1385
-annet_generators/mesh_example/mesh_logic.py,sha256=4-gAgdQwO_2v8UF6UEGKpiLTTyzwge9YLel-Jup6H6c,1251
-annet-0.16.14.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.14.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.14.dist-info/METADATA,sha256=egMj4TY9XuOV5Spjb_3AW-OVTI84wuD7524-Ii_ZISw,745
-annet-0.16.14.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-annet-0.16.14.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.14.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.14.dist-info/RECORD,,
+annet_generators/mesh_example/mesh_logic.py,sha256=DJS5JMCTs0rs0LN__0LulNgo2ekUcWiOMe02BlOeFas,1454
+annet-0.16.16.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.16.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.16.dist-info/METADATA,sha256=HWT2ARwNTk_WK4FcwEtWOa2FrkPAYRZ5BUwr3--hrNA,746
+annet-0.16.16.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+annet-0.16.16.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.16.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.16.dist-info/RECORD,,

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}"