annet 0.16.31__py3-none-any.whl → 0.16.33__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → annet-0.16.33.dist-info}/METADATA

@@ -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.dist-info → annet-0.16.33.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=5FnXMeIbZJIQRdUk6Jf2f3YlkQSLAgmBH8bq2o94MUM,9457
+annet/bgp_models.py,sha256=I9DQpf3LU71RBk9kCUdA-RnGkA3eORngYkC3_obsLmk,9669
 annet/cli.py,sha256=hDpjIr3w47lgQ_CvCQS1SXFDK-SJrf5slbT__5u6GIA,12342
 annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
 annet/connectors.py,sha256=-Lghz3PtWCBU8Ohrp0KKQcmm1AUZtN0EnOaZ6IQgCQI,5105
@@ -33,9 +33,9 @@ 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=LAPT6OlV_ew96GhtwNrCpeiT0IGrg2_9__MMdZk431U,1733
-annet/adapters/netbox/common/models.py,sha256=TnWEKI6_MxuZe24xfpkAijofkn-dOXwWe_ZOCWaYX58,7374
+annet/adapters/netbox/common/models.py,sha256=Xq6Dc3kY9_QyvS9DiKEq1AxjTxiF4qEKhs1EMtBw-k4,7384
 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/status_client.py,sha256=XXx0glomaBaglmkUEy6YtFOxQQkHb59CDA0h1I-IhxM,592
 annet/adapters/netbox/common/storage_opts.py,sha256=5tt6wxUUJTIzNbOVXMnYBwZedNAIqYlve3YWl6GdbZM,1197
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/v24/storage.py,sha256=THI592VLx3ehixsPZQ1Ko3mYIAZQbnDY-toIziqBbL8,6005
@@ -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=lcgdnBIxc2MAN7Er1bcErEKPqrjWO4uIp_1FldMXTYg,557
 annet/mesh/basemodel.py,sha256=E6NTOneiMDwB1NCpjDRECoaeQ0f3n_fmTLnKTrSHTU4,4917
-annet/mesh/device_models.py,sha256=YcL6_vGjnt67BTovN8Eq38U5wGcbJDhqiq8613WpYtQ,3381
+annet/mesh/device_models.py,sha256=KkbD8tuWfnh4gR8iOV9C7ihLR4jxjyuF52AU2DPPLXA,3627
 annet/mesh/executor.py,sha256=0RLsdtldozoFgDGFuhU5mdckuMwGg0y_DFIji1RfTQg,16969
 annet/mesh/match_args.py,sha256=CR3kdIV9NGtyk9E2JbcOQ3TRuYEryTWP3m2yCo2VCWg,5751
 annet/mesh/models_converter.py,sha256=3q2zs7K8S3pfYSUKKRdtl5CJGbeg4TtYxofAVs_MBsk,3085
-annet/mesh/peer_models.py,sha256=uD3h7HWl9_zNdBlQqZCMcjCnzjr8dTbSFqc8216JDu0,2735
+annet/mesh/peer_models.py,sha256=9vn5ENiEZqOZFRFSOJReT8E3E2GzBte628mkmS3cplI,2770
 annet/mesh/port_processor.py,sha256=RHiMS5W8qoDkTKiarQ748bcr8bNx4g_R4Y4vZg2k4TU,478
 annet/mesh/registry.py,sha256=BCRIOrINP0krcgvF59uFJqyhmSviQ03GSzWpxLVYlIg,9527
 annet/rpl/__init__.py,sha256=0kcIktE3AmS0rlm9xzVDf53xk08OeZXgD-6ZLCt_KCs,731
@@ -101,11 +101,11 @@ annet/rpl/statement_builder.py,sha256=sVGOYsCV0s_SFQUy2WtUyQqKy5H4MOfmRCJWGj-UOJ
 annet/rpl_generators/__init__.py,sha256=ZLWs-flcpyIbdhxSDfNt-ORDrLe8ins25sWdXTWeUoA,748
 annet/rpl_generators/aspath.py,sha256=kZakwPLfGGiXu9fC6I1z-pvy7Fe-4dy93_-lYcx39_4,2038
 annet/rpl_generators/community.py,sha256=SWpaOvoQUNISuRm41-IvGPFmntvgFv9ee4zegsMyeo0,11496
-annet/rpl_generators/cumulus_frr.py,sha256=D8JnnXTXYaIUayPwL_KORUCkpBV32-CHatlyKQSSJWw,20855
+annet/rpl_generators/cumulus_frr.py,sha256=F-LRT-UPnztUqinp3KYKqh796L9dqkzPKBUxMkiFjF8,21111
 annet/rpl_generators/entities.py,sha256=DIpgAQ8Tslo2hq6iFBaYkJX12BFBiccN8GOaRVxR1Uk,1985
 annet/rpl_generators/execute.py,sha256=wS6e6fwcPWywsHB0gBMqZ17eF0s4YOBgDgwPB_cr5Rw,431
 annet/rpl_generators/policy.py,sha256=NeqB0reRN_KuY8LYkeGT3dRPe2HFDT9RfmVy5fcA3zw,32570
-annet/rpl_generators/prefix_lists.py,sha256=2x2NO52npcB3VKcQ4tthsWFwirVpexLdLtWPA5sHzjg,7246
+annet/rpl_generators/prefix_lists.py,sha256=GyNbqXvRVGiuetLSXG2kQidRUXPMEAhR74AJJFSDQZc,7244
 annet/rpl_generators/rd.py,sha256=YGXgx1D2D0-pixgspXJzA6NvW8lx3AmHMxIY2l5rraI,1457
 annet/rulebook/__init__.py,sha256=oafL5HC8QHdkO9CH2q_fxohPMxOgjn-dNQa5kPjuqsA,3942
 annet/rulebook/common.py,sha256=zK1s2c5lc5HQbIlMUQ4HARQudXSgOYiZ_Sxc2I_tHqg,721
@@ -175,10 +175,10 @@ annet_generators/rpl_example/generator.py,sha256=zndIGfV4ZlTxPgAGYs7bMQvTc_tYScO
 annet_generators/rpl_example/items.py,sha256=Ez1RF5YhcXNCusBmeApIjRL3rBlMazNZd29Gpw1_IsA,766
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-0.16.31.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.31.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.31.dist-info/METADATA,sha256=CpR6RlgdzRXD13wUkktgrcw2nuWeqI0dZNJ1dyNn7hE,854
-annet-0.16.31.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-annet-0.16.31.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.31.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.31.dist-info/RECORD,,
+annet-0.16.33.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.33.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.33.dist-info/METADATA,sha256=4FDrHTUVwwM6GIzoAZ96e3XHrSiSHvSShAY7v7jw4qg,854
+annet-0.16.33.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+annet-0.16.33.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.33.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.33.dist-info/RECORD,,