annet 3.14.1__tar.gz → 3.14.2__tar.gz

{annet-3.14.1/annet.egg-info → annet-3.14.2}/PKG-INFO

@@ -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 → annet-3.14.2}/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-3.14.1 → annet-3.14.2}/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-3.14.1 → annet-3.14.2}/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-3.14.1 → annet-3.14.2}/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-3.14.1 → annet-3.14.2}/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-3.14.1 → annet-3.14.2}/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-3.14.1 → annet-3.14.2}/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 → annet-3.14.2/annet.egg-info}/PKG-INFO

@@ -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