annet 0.16.31__tar.gz → 0.16.33__tar.gz

{annet-0.16.31/annet.egg-info → annet-0.16.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 0.16.31
+Version: 0.16.33
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.16.31 → annet-0.16.33}/annet/adapters/netbox/common/models.py

@@ -214,7 +214,7 @@ class NetboxDevice(Entity):
         return type(self) is type(other) and self.url == other.url
 
     def is_pc(self) -> bool:
-        return self.device_type.manufacturer.name in ("Mellanox", "Moxa") or self.breed == "pc"
+        return self.device_type.manufacturer.name in ("Mellanox", "NVIDIA", "Moxa") or self.breed == "pc"
 
     def _make_interface(self, name: str, type: InterfaceType) -> Interface:
         return Interface(

{annet-0.16.31 → annet-0.16.33}/annet/adapters/netbox/common/status_client.py

@@ -20,6 +20,6 @@ class NetboxStatusClient(BaseNetboxClient):
             name_mapping(name_style=NameStyle.LOWER_KEBAB)
         ])
 
-    @get("status")
+    @get("status/")
     def status(self) -> Status:
         ...

{annet-0.16.31 → annet-0.16.33}/annet/bgp_models.py

@@ -68,7 +68,7 @@ class BFDTimers:
     multiplier: int = 4
 
 
-Family = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast"]
+Family = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast", "l2vpn_evpn"]
 
 
 @dataclass(frozen=True)
@@ -207,7 +207,7 @@ class PeerGroup:
     auth_key: bool = False
     add_path: bool = False
     multipath: bool = False
-    multihop: bool = False
+    multihop: Optional[int] = None
     multihop_no_nexthop_change: bool = False
     af_no_install: bool = False
     bfd: bool = False
@@ -243,8 +243,10 @@ class VrfOptions:
     ipv6_unicast: FamilyOptions
     ipv4_labeled_unicast: FamilyOptions
     ipv6_labeled_unicast: FamilyOptions
+    l2vpn_evpn: FamilyOptions
 
     vrf_name_global: Optional[str] = None
+    l3vni: Optional[int] = None
     as_path_relax: bool = False
     rt_import: list[str] = field(default_factory=list)
     rt_export: list[str] = field(default_factory=list)
@@ -262,6 +264,7 @@ class GlobalOptions:
     ipv6_unicast: FamilyOptions
     ipv4_labeled_unicast: FamilyOptions
     ipv6_labeled_unicast: FamilyOptions
+    l2vpn_evpn: FamilyOptions
 
     as_path_relax: bool = False
     local_as: ASN = ASN(None)
@@ -299,6 +302,9 @@ def _used_redistribute_policies(opts: Union[GlobalOptions, VrfOptions]) -> Itera
     for red in opts.ipv6_labeled_unicast.redistributes:
         if red.policy:
             yield red.policy
+    for red in opts.l2vpn_evpn.redistributes:
+        if red.policy:
+            yield red.policy
 
 
 def extract_policies(config: BgpConfig) -> Sequence[str]:

{annet-0.16.31 → annet-0.16.33}/annet/mesh/device_models.py

@@ -43,11 +43,13 @@ class _FamiliesMixin:
         kwargs.setdefault("ipv6_unicast", FamilyOptions(family="ipv6_unicast"))
         kwargs.setdefault("ipv4_labeled_unicast", FamilyOptions(family="ipv4_labeled_unicast"))
         kwargs.setdefault("ipv6_labeled_unicast", FamilyOptions(family="ipv6_labeled_unicast"))
+        kwargs.setdefault("l2vpn_evpn", FamilyOptions(family="l2vpn_evpn"))
         super().__init__(**kwargs)
     ipv4_unicast: Annotated[FamilyOptions, Merge()]
     ipv6_unicast: Annotated[FamilyOptions, Merge()]
     ipv4_labeled_unicast: Annotated[FamilyOptions, Merge()]
     ipv6_labeled_unicast: Annotated[FamilyOptions, Merge()]
+    l2vpn_evpn: Annotated[FamilyOptions, Merge()]
 
 
 class VrfOptions(_FamiliesMixin, BaseMeshModel):
@@ -56,6 +58,7 @@ class VrfOptions(_FamiliesMixin, BaseMeshModel):
         kwargs.setdefault("ipv6_unicast", FamilyOptions(family="ipv6_unicast", 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("l2vpn_evpn", FamilyOptions(family="l2vpn_evpn", vrf_name=vrf_name))
         kwargs.setdefault("groups", KeyDefaultDict(lambda x: MeshPeerGroup(name=x)))
         super().__init__(vrf_name=vrf_name, **kwargs)
 
@@ -64,6 +67,7 @@ class VrfOptions(_FamiliesMixin, BaseMeshModel):
     as_path_relax: bool
     import_policy: Optional[str]
     export_policy: Optional[str]
+    l3vni: Optional[int]
     rt_import: Annotated[tuple[str, ...], Concat()]
     rt_export: Annotated[tuple[str, ...], Concat()]
     rt_import_v4: Annotated[tuple[str, ...], Concat()]

{annet-0.16.31 → annet-0.16.33}/annet/mesh/peer_models.py

@@ -3,7 +3,7 @@ from typing import Literal, Annotated, Union, Optional
 from .basemodel import BaseMeshModel, Concat, Unite
 from ..bgp_models import BFDTimers
 
-FamilyName = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast"]
+FamilyName = Literal["ipv4_unicast", "ipv6_unicast", "ipv4_labeled_unicast", "ipv6_labeled_unicast", "l2vpn_evpn"]
 
 
 class _SharedOptionsDTO(BaseMeshModel):
@@ -53,7 +53,7 @@ class _OptionsDTO(_SharedOptionsDTO):
     advertise_bgp_static: bool
     allowas_in: bool
     auth_key: bool
-    multihop: bool
+    multihop: Optional[int]
     multihop_no_nexthop_change: bool
     af_no_install: bool
     rib: bool
@@ -101,7 +101,7 @@ class IndirectPeerDTO(MeshSession, _OptionsDTO):
 
 
 class VirtualLocalDTO(_OptionsDTO):
-    asnum: int
+    asnum: Union[int, str]
     pod: int
     addr: str
     description: str

{annet-0.16.31 → annet-0.16.33}/annet/rpl_generators/cumulus_frr.py

@@ -100,7 +100,7 @@ class CumulusPolicyGenerator(ABC):
                 ip_type,
                 "prefix-list",
                 name,
-                f"seq {i * 10 + 5}",
+                f"seq {i * 5 + 5}",
                 "permit", f"{addr_mask.ip}/{addr_mask.network.prefixlen}",
             ) + (
                 ("ge", str(match.greater_equal)) if match.greater_equal is not None else ()
@@ -151,13 +151,14 @@ class CumulusPolicyGenerator(ABC):
         return get_used_united_community_lists(communities=communities.values(), policies=policies)
 
     def _cumulus_community(
-            self, name: str, cmd: str, member: str, use_regex: bool,
+            self, name: str, cmd: str, member: str, use_regex: bool, seq: int,
     ) -> Iterable[Sequence[str]]:
         if use_regex:
             yield (
                 cmd,
                 "expanded",
                 name,
+                f"seq {seq}",
                 "permit",
                 member,
             )
@@ -166,6 +167,7 @@ class CumulusPolicyGenerator(ABC):
                 cmd,
                 "standard",
                 name,
+                f"seq {seq}",
                 "permit",
                 member,
             )
@@ -182,6 +184,7 @@ class CumulusPolicyGenerator(ABC):
             return
         for community_list_union in community_unions:
             name = mangle_united_community_list_name([c.name for c in community_list_union])
+            comm_number = 0
 
             for clist in community_list_union:
                 if clist.type is CommunityType.BASIC:
@@ -207,13 +210,15 @@ class CumulusPolicyGenerator(ABC):
                     else:
                         member = " ".join(f"{member_prefix}{m}" for m in clist.members)
                     yield from self._cumulus_community(
-                        name=name, cmd=cmd, member=member, use_regex=clist.use_regex,
+                        name=name, cmd=cmd, member=member, use_regex=clist.use_regex, seq=(comm_number + 1) * 10,
                     )
                 else:
-                    for member_value in clist.members:
+                    for comm_number, member_value in enumerate(clist.members, start=comm_number):
                         yield from self._cumulus_community(
                             name=name, cmd=cmd, member=member_prefix + member_value, use_regex=clist.use_regex,
+                            seq=(comm_number + 1) * 10,
                         )
+                comm_number += 1
         yield "!"
 
     def _get_match_community_names(self, condition: SingleCondition[Sequence[str]]) -> Sequence[str]:
@@ -278,7 +283,7 @@ class CumulusPolicyGenerator(ABC):
             action: SingleAction[CommunityActionValue],
     ) -> Iterator[Sequence[str]]:
         if action.value.replaced is not None:
-            if action.value.added or action.value.replaced:
+            if action.value.added or action.value.removed:
                 raise NotImplementedError(
                     "Cannot set community together with add/replace on cumulus",
                 )

{annet-0.16.31 → annet-0.16.33}/annet/rpl_generators/prefix_lists.py

@@ -65,7 +65,7 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
                 "ip",
                 prefix_type,
                 name,
-                f"index {i * 10 + 5}",
+                f"index {i * 5 + 5}",
                 "permit",
                 str(addr_mask.ip).upper(),
                 str(addr_mask.network.prefixlen),
@@ -126,7 +126,7 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
                 prefix_type,
                 "prefix-list",
                 name,
-                f"seq {i * 10 + 5}",
+                f"seq {i * 5 + 5}",
                 "permit",
                 str(addr_mask.ip).upper(),
                 str(addr_mask.network.prefixlen),

{annet-0.16.31 → annet-0.16.33/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: annet
-Version: 0.16.31
+Version: 0.16.33
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT