annet 3.14.1__py3-none-any.whl → 3.14.2__py3-none-any.whl

annet/api/__init__.py

@@ -683,7 +683,7 @@ async def adeploy(
 ) -> ExitCode:
     """ Сгенерировать конфиг для устройств и задеплоить его """
     ret: ExitCode = 0
-    ann_gen.live_configs = await fetcher.fetch(devices=loader.devices, processes=args.parallel)
+    ann_gen.live_configs = await fetcher.fetch(devices=loader.devices, processes=args.parallel, max_slots=args.max_slots)
 
     device_ids = [d.id for d in loader.devices]
     for res in ann_gen.old_new(

annet/bgp_models.py

@@ -201,6 +201,24 @@ class PeerOptions:
     not_active: Optional[bool] = None
     mtu: Optional[int] = None
     password: Optional[str] = None
+    cluster_id: Optional[str] = None
+
+
+@dataclass
+class PeerFamilyOption:
+    af_loops: Optional[int] = None
+    import_limit: Optional[int] = None
+
+
+@dataclass
+class PeerFamilyOptions:
+    ipv4_unicast: PeerFamilyOption = field(default_factory=PeerFamilyOption)
+    ipv6_unicast: PeerFamilyOption = field(default_factory=PeerFamilyOption)
+    ipv4_vpn_unicast: PeerFamilyOption = field(default_factory=PeerFamilyOption)
+    ipv6_vpn_unicast: PeerFamilyOption = field(default_factory=PeerFamilyOption)
+    ipv4_labeled_unicast: PeerFamilyOption = field(default_factory=PeerFamilyOption)
+    ipv6_labeled_unicast: PeerFamilyOption = field(default_factory=PeerFamilyOption)
+    l2vpn_evpn: PeerFamilyOption = field(default_factory=PeerFamilyOption)
 
 
 @dataclass
@@ -209,6 +227,7 @@ class Peer:
     interface: Optional[str]
     remote_as: ASN
     families: set[Family] = field(default_factory=set)
+    family_options: PeerFamilyOptions = field(default_factory=PeerFamilyOptions)
     description: str = ""
     vrf_name: str = ""
     group_name: str = ""
@@ -264,6 +283,7 @@ class PeerGroup:
     name: str
     remote_as: ASN = ASN(None)
     families: set[Family] = field(default_factory=set)
+    family_options: PeerFamilyOptions = field(default_factory=PeerFamilyOptions)
     internal_name: str = ""
     description: str = ""
     update_source: str = ""
@@ -320,6 +340,7 @@ class PeerGroup:
     not_active: bool = False
     mtu: int = 0
     password: Optional[str] = None
+    cluster_id: Optional[str] = None
 
 
 @dataclass
@@ -371,6 +392,8 @@ class GlobalOptions:
     loops: int = 0
     multipath: int = 0
     router_id: str = ""
+    cluster_id: Optional[str] = None
+
     vrf: dict[str, VrfOptions] = field(default_factory=dict)
     groups: list[PeerGroup] = field(default_factory=list)
     l2vpn: dict[str, L2VpnOptions] = field(default_factory=dict)

annet/mesh/basemodel.py

@@ -1,8 +1,9 @@
 from abc import ABC
 from copy import copy
 from enum import Enum
+from dataclasses import is_dataclass, replace, fields, MISSING
 from typing import (
-    TypeVar, Any, Annotated, get_origin, get_type_hints, get_args, Callable, Union, ClassVar, overload,
+    TypeVar, Any, Annotated, get_origin, get_type_hints, get_args, Callable, Union, ClassVar, overload, cast,
 )
 
 
@@ -143,13 +144,15 @@ ModelT = TypeVar("ModelT", bound=BaseMeshModel)
 def _merge(a: ModelT, b: BaseMeshModel) -> ModelT:
     result = copy(a)
     for attr_name, merger in a._field_mergers.items():
-        new_value = merger(
-            attr_name,
-            getattr(a, attr_name, Special.NOT_SET),
-            getattr(b, attr_name, Special.NOT_SET),
-        )
-        if new_value is not Special.NOT_SET:
-            setattr(result, attr_name, new_value)
+        aval = getattr(a, attr_name, Special.NOT_SET)
+        bval = getattr(b, attr_name, Special.NOT_SET)
+        if is_dataclass(aval) and is_dataclass(bval):
+            new_dto = merge_dataclass(aval, bval)
+            setattr(result, attr_name, new_dto)
+        else:
+            new_value = merger(attr_name, aval, bval)
+            if new_value is not Special.NOT_SET:
+                setattr(result, attr_name, new_value)
     return result
 
 
@@ -178,6 +181,64 @@ def merge(first: Any, /, *others: Any) -> Any:
     return first
 
 
+def merge_dataclass(a: Any, b: Any) -> Any:
+    if a.__class__ != b.__class__:
+        raise MergeForbiddenError(
+            f"Dataclasses belonging to different instaces can't be merged:\n"
+            f"Old: {a}\n"
+            f"New: {b}"
+        )
+
+    if a == b:
+        return replace(a)
+
+    empty = dataclass_default(a.__class__)
+    merged = {}
+    for f in fields(empty):
+        default = getattr(empty, f.name)
+        aval = getattr(a, f.name)
+        bval = getattr(b, f.name)
+        if aval == default:
+            merged[f.name] = bval
+        elif bval == default:
+            merged[f.name] = aval
+        elif aval == bval:
+            merged[f.name] = aval
+        elif is_dataclass(aval) and is_dataclass(bval):
+            merged[f.name] = merge_dataclass(aval, bval)
+        else:
+            raise MergeForbiddenError(
+                f"Dataclasses with non-equal field {f.name} can't be merged:\n"
+                f"Old: {aval}\n"
+                f"New: {bval}"
+            )
+
+    return replace(empty, **merged)
+
+
+def is_dataclass_empty(a: Any) -> bool:
+    try:
+        dataclass_default(a.__class__)
+    except ValueError:
+        return False
+    return True
+
+
+def dataclass_default(dataclass_cls: type[T]) -> T:
+    if not is_dataclass(dataclass_cls):
+        raise TypeError(f"Class {dataclass_cls} is not a dataclass")
+
+    non_default_fields = []
+    for f in fields(dataclass_cls):
+        if f.default == MISSING and f.default_factory == MISSING:
+            non_default_fields.append(f.name)
+
+    if non_default_fields:
+        raise ValueError(f"Class {dataclass_cls} has non-default fields: {' '.join(non_default_fields)}")
+
+    return cast(T, dataclass_cls())
+
+
 class KeyDefaultDict(dict):
     def __init__(self, factory: Callable[[str], Any]):
         super().__init__()

annet/mesh/device_models.py

@@ -108,6 +108,7 @@ class GlobalOptionsDTO(_FamiliesMixin, BaseMeshModel):
     loops: int
     multipath: int
     router_id: str
+    cluster_id: Optional[str]
     vrf: Annotated[dict[str, VrfOptions], DictMerge(Merge())]
     groups: Annotated[dict[str, MeshPeerGroup], DictMerge(Merge())]
     l2vpn: Annotated[dict[str, L2VpnOptions], DictMerge(Merge())]

annet/mesh/models_converter.py

@@ -7,7 +7,7 @@ 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,
-    Redistribute, BFDTimers, L2VpnOptions, VidCollection,
+    Redistribute, BFDTimers, L2VpnOptions, VidCollection, PeerFamilyOptions, PeerFamilyOption
 )
 
 
@@ -56,6 +56,8 @@ retort = Retort(
         loader(FamilyOptions, ObjMapping, Chain.FIRST),
         loader(Aggregate, ObjMapping, Chain.FIRST),
         loader(PeerOptions, ObjMapping, Chain.FIRST),
+        loader(PeerFamilyOptions, ObjMapping, Chain.FIRST),
+        loader(PeerFamilyOption, ObjMapping, Chain.FIRST),
         as_is_loader(Redistribute),
         as_is_loader(BFDTimers),
         name_mapping(PeerOptions, map={
@@ -98,4 +100,5 @@ def to_bgp_peer(local: LocalDTO, connected: PeerDTO, connected_hostname: str, in
     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)
+    result.family_options = getattr(local, "family_options", result.family_options)
     return result

annet/mesh/peer_models.py

@@ -1,7 +1,7 @@
 from typing import Literal, Annotated, Union, Optional
 
 from .basemodel import BaseMeshModel, Concat, Unite
-from ..bgp_models import BFDTimers
+from ..bgp_models import BFDTimers, PeerFamilyOptions
 
 FamilyName = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast", "l2vpn_evpn"]
 
@@ -39,6 +39,9 @@ class _OptionsDTO(_SharedOptionsDTO):
     """
     Options which can be set on group of peers or peer itself
     """
+    def __init__(self, **kwargs):
+        kwargs.setdefault("family_options", PeerFamilyOptions())
+        super().__init__(**kwargs)
     unnumbered: bool
     rr_client: bool
     next_hop_self: bool
@@ -77,6 +80,8 @@ class _OptionsDTO(_SharedOptionsDTO):
     soft_reconfiguration_inbound: bool
     not_active: bool
     mtu: int
+    family_options: PeerFamilyOptions
+    cluster_id: Optional[str]
 
 
 class DirectPeerDTO(MeshSession, _OptionsDTO):

annet/mesh/registry.py

@@ -6,6 +6,7 @@ from .match_args import MatchedArgs
 from .device_models import GlobalOptionsDTO
 from .peer_models import MeshSession, IndirectPeerDTO, VirtualLocalDTO, VirtualPeerDTO, DirectPeerDTO
 from .port_processor import PortProcessor, united_ports
+from .basemodel import is_dataclass_empty
 
 
 class DirectPeer(DirectPeerDTO):
@@ -22,7 +23,9 @@ class DirectPeer(DirectPeerDTO):
         self.all_connected_ports = all_connected_ports
 
     def is_empty(self):
-        return self.__dict__.keys() == {"match", "device", "ports", "all_connected_ports"}
+        if not is_dataclass_empty(self.family_options):
+            return False
+        return self.__dict__.keys() == {"match", "device", "ports", "all_connected_ports", "family_options"}
 
 
 class IndirectPeer(IndirectPeerDTO):
@@ -35,7 +38,9 @@ class IndirectPeer(IndirectPeerDTO):
         self.device = device
 
     def is_empty(self):
-        return self.__dict__.keys() == {"match", "device"}
+        if not is_dataclass_empty(self.family_options):
+            return False
+        return self.__dict__.keys() == {"match", "device", "family_options"}
 
 
 class VirtualLocal(VirtualLocalDTO):
@@ -48,7 +53,9 @@ class VirtualLocal(VirtualLocalDTO):
         self.device = device
 
     def is_empty(self):
-        return self.__dict__.keys() == {"match", "device"}
+        if not is_dataclass_empty(self.family_options):
+            return False
+        return self.__dict__.keys() == {"match", "device", "family_options"}
 
 
 class VirtualPeer(VirtualPeerDTO):

{annet-3.14.1.dist-info → annet-3.14.2.dist-info}/METADATA

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

{annet-3.14.1.dist-info → annet-3.14.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 annet/__init__.py,sha256=eDQub3o0HdHcTWU4ZJpySrJuffGkbWts5CHXZYwVV9A,1915
 annet/annet.py,sha256=vyQ__n5hkjub3aWO8tksHPoUSbTeK97MyMcR_U8_BSU,1016
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
-annet/bgp_models.py,sha256=QTzA6wu2_XWIr-Omq303LOfaNo3z_pHbc5g_zm0vz7g,13062
+annet/bgp_models.py,sha256=roSDKhxzcg9N8iEh9zI4Jww1vOObWcwRVzMl9FJnh1M,14046
 annet/cli.py,sha256=shq3hHzrTxFL3x1_zTOR43QHo0JYs8QSwyOvGtL86Co,12733
 annet/cli_args.py,sha256=d0WuGiZfe42-nMvurX1bOb3iUMg0TSK-hxk8J1THxSY,13728
 annet/connectors.py,sha256=aoiDVLPizx8CW2p8SAwGCzyO_WW8H9xc2aujbGC4bDg,4882
@@ -75,7 +75,7 @@ annet/annlib/rbparser/platform.py,sha256=d1jFH8hGMOf_qiveKE4H-c0OfNnzwmt2VYpSiSO
 annet/annlib/rbparser/syntax.py,sha256=PlKyWqS3zwPwumILmKIci-DmEAbfZp8YycpW1mNqADM,3602
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=6A3sOkOanDRTuR7F426zakShGaGKRBmBLDCnqBbBJr8,13531
-annet/api/__init__.py,sha256=yVF4742g45sdvVDtJrM4pIwchy5AsxROEmXcz31xFno,34090
+annet/api/__init__.py,sha256=5YzScmeCDsHiDhtT3RwY_lMuikRZ6o7CVrlnJCln2A8,34116
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
 annet/generators/__init__.py,sha256=LnW6G_7K5ScGYkFjFk7_QfuUaFAk5oTSHYaTaL6xUwA,16735
@@ -90,14 +90,14 @@ annet/generators/result.py,sha256=8fBfKQ7vWi9DlGOUFYz0y47UlCI1gTqix3riX2CgQng,50
 annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/generators/common/initial.py,sha256=qYBxXFhyOPy34cxc6hsIXseod-lYCmmbuNHpM0uteY0,1244
 annet/mesh/__init__.py,sha256=lcgdnBIxc2MAN7Er1bcErEKPqrjWO4uIp_1FldMXTYg,557
-annet/mesh/basemodel.py,sha256=E6NTOneiMDwB1NCpjDRECoaeQ0f3n_fmTLnKTrSHTU4,4917
-annet/mesh/device_models.py,sha256=K_JqI03GyikROM6MmfV03jjA1Raxr8btuAoANOY0aEo,4895
+annet/mesh/basemodel.py,sha256=zq-ffVYS4gOs49BFdLCHQtLGJhGuQjHCJogbBQ4bXpI,6859
+annet/mesh/device_models.py,sha256=uJrWwExq8fyD-cbcxlDvImaRLAXKxOeHAMT5S6YEO7g,4925
 annet/mesh/executor.py,sha256=gfRQXSTivL0DJrhnGH-4kmCTiIxDS_vReQyle3bF2FI,17970
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
-annet/mesh/models_converter.py,sha256=nCtzFR3s65MVkCE_xJm1Ci5c2hUwsr6ajfBiSmy3r_8,3565
-annet/mesh/peer_models.py,sha256=9fx-JiLTJ6E-CVBmu0BpkJwH4JwpdTOozJYlY2uH_Q4,2796
+annet/mesh/models_converter.py,sha256=1S6D80jrpJNNRa1dq9UrTi-n-tc7L9mX_s6zIsXss70,3804
+annet/mesh/peer_models.py,sha256=4QRQ4HSImEhru83k8-VH1fbAm7Ih71VRwMfKZRIyLsY,3017
 annet/mesh/port_processor.py,sha256=RHiMS5W8qoDkTKiarQ748bcr8bNx4g_R4Y4vZg2k4TU,478
-annet/mesh/registry.py,sha256=xmWF7yxWXmwqX2_jyMAKrbGd2G9sjb4rYDx4Xk61QKc,9607
+annet/mesh/registry.py,sha256=PiopHMYXXxxGDtajPIz4mivcYROXtOFPEX1rMwehD0w,9946
 annet/rpl/__init__.py,sha256=8nSiFpXH4OhzRGKr-013nHwwKk5Y50uh2gL7d_IoV8U,757
 annet/rpl/action.py,sha256=PY6W66j908RuqQ1_ioxayqVN-70rxDk5Z59EGHtxI98,1246
 annet/rpl/condition.py,sha256=MJri4MbWtPkLHIsLMAtsIEF7e8IAS9dIImjmJs5vS5U,3418
@@ -199,8 +199,8 @@ annet/vendors/library/optixtrans.py,sha256=VdME69Ca4HAEgoaKN21fZxnmmsqqaxOe_HZja
 annet/vendors/library/pc.py,sha256=vfv31_NPi7M-4AUDL89UcpawK2E6xvCpELA209cd1ho,1086
 annet/vendors/library/ribbon.py,sha256=DDOBq-_-FL9dCxqXs2inEWZ-pvw-dJ-A-prA7cKMhec,1216
 annet/vendors/library/routeros.py,sha256=iQa7m_4wjuvcgBOI9gyZwlw1BvzJfOkvUbyoEk-NI9I,1254
-annet-3.14.1.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.14.1.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.14.2.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.14.2.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
 annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
@@ -213,8 +213,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=HPgxScDvSqJPdz0c2SppDrH82DZYC4zUaniQwcWmh4A,1176
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-3.14.1.dist-info/METADATA,sha256=BKLGnMeB4wRe5P-wSYsu3zPFBxoTIS6_y75rZJ6lz04,816
-annet-3.14.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-annet-3.14.1.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.14.1.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.14.1.dist-info/RECORD,,
+annet-3.14.2.dist-info/METADATA,sha256=W7z1V9FFPyhkXMT0zfV_ImQC4McCZO7RwlEqzmBS0jE,816
+annet-3.14.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+annet-3.14.2.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.14.2.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.14.2.dist-info/RECORD,,