annet 2.0.0__tar.gz → 2.0.1__tar.gz

{annet-2.0.0/annet.egg-info → annet-2.0.1}/PKG-INFO

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

{annet-2.0.0 → annet-2.0.1}/annet/adapters/netbox/provider.py

@@ -28,11 +28,12 @@ def storage_factory(opts: NetboxStorageOpts) -> Storage:
 
 class NetboxProvider(StorageProvider, AdapterWithName, AdapterWithConfig):
     def __init__(self, url: Optional[str] = None, token: Optional[str] = None, insecure: bool = False,
-                 exact_host_filter: bool = False):
+                 exact_host_filter: bool = False, threads: int = 1):
         self.url = url
         self.token = token
         self.insecure = insecure
         self.exact_host_filter = exact_host_filter
+        self.threads = threads
 
     @classmethod
     def with_config(cls, **kwargs: Dict[str, Any]) -> T:

{annet-2.0.0 → annet-2.0.1}/annet/annlib/filter_acl.py

@@ -32,7 +32,6 @@ def filter_config(acl: Acl, fmtr: tabparser.CommonFormatter, input_config: Input
         config = patching.apply_acl(config, acl, fatal_acl=False)
         config = fmtr.join(config)
     else:
-        config = typing.cast(input_config, FileConfigTree)
         config = apply_acl_fileconfig(input_config, acl)
     return config
 
@@ -47,7 +46,6 @@ def filter_diff(acl: Acl, fmtr: tabparser.CommonFormatter, input_config: InputCo
         config = unshift_op(config)
         config = config.rstrip()
     else:
-        config = typing.cast(input_config, FileConfigTree)
         config = apply_acl_fileconfig(input_config, acl)
     return config
 
@@ -108,17 +106,23 @@ def get_op(line: str) -> typing.Tuple[str, str, str]:
     indent = ""
     opidx = -1
     rowstart = 0
+
     for rowstart in range(len(line)):
+        if line[rowstart] != " " and line[0:rowstart].strip():
+            break
         if line[rowstart] not in diff_ops:
             break
+
     for opidx in range(rowstart):
         if line[opidx] != " ":
             break
+
     if opidx >= 0:
         op = line[opidx]
         indent = line[:opidx] + line[opidx + 1:rowstart]
     if op != " ":
         indent = indent + " "
+
     return op, indent, line[rowstart:]
 
 

{annet-2.0.0 → annet-2.0.1}/annet/rpl/statement_builder.py

@@ -1,3 +1,4 @@
+import warnings
 from collections.abc import Callable
 from dataclasses import dataclass
 from dataclasses import field
@@ -14,6 +15,7 @@ class ThenField(str, Enum):
     large_community = "large_community"
     extcommunity_rt = "extcommunity_rt"
     extcommunity_soo = "extcommunity_soo"
+    extcommunity = "extcommunity"
     as_path = "as_path"
     local_pref = "local_pref"
     metric = "metric"
@@ -144,6 +146,7 @@ class StatementBuilder:
         self._added_as_path: list[int] = []
         self._community = CommunityActionValue()
         self._large_community = CommunityActionValue()
+        self._extcommunity = CommunityActionValue()
         self._extcommunity_rt = CommunityActionValue()
         self._extcommunity_soo = CommunityActionValue()
         self._as_path = AsPathActionValue()
@@ -165,12 +168,18 @@ class StatementBuilder:
     def large_community(self) -> CommunityActionBuilder:
         return CommunityActionBuilder(self._large_community)
 
+    @property
+    def extcommunity(self) -> CommunityActionBuilder:
+        return CommunityActionBuilder(self._extcommunity)
+
     @property
     def extcommunity_rt(self) -> CommunityActionBuilder:
+        warnings.warn("extcommunity_rt is deprecated, use extcommunity", DeprecationWarning, stacklevel=2)
         return CommunityActionBuilder(self._extcommunity_rt)
 
     @property
     def extcommunity_soo(self) -> CommunityActionBuilder:
+        warnings.warn("extcommunity_soo is deprecated, use extcommunity", DeprecationWarning, stacklevel=2)
         return CommunityActionBuilder(self._extcommunity_soo)
 
     def _set(self, field: str, value: ValueT) -> None:
@@ -244,7 +253,13 @@ class StatementBuilder:
             self._statement.then.append(SingleAction(
                 field=ThenField.large_community,
                 type=ActionType.CUSTOM,
-                value=self._extcommunity_rt,
+                value=self._large_community,
+            ))
+        if self._extcommunity:
+            self._statement.then.append(SingleAction(
+                field=ThenField.extcommunity,
+                type=ActionType.CUSTOM,
+                value=self._extcommunity,
             ))
         if self._extcommunity_rt:
             self._statement.then.append(SingleAction(
@@ -256,7 +271,7 @@ class StatementBuilder:
             self._statement.then.append(SingleAction(
                 field=ThenField.extcommunity_soo,
                 type=ActionType.CUSTOM,
-                value=self._extcommunity_rt,
+                value=self._extcommunity_soo,
             ))
         if self._as_path:
             self._statement.then.append(SingleAction(

{annet-2.0.0 → annet-2.0.1}/annet/rpl_generators/cumulus_frr.py

@@ -1,4 +1,5 @@
 from abc import abstractmethod, ABC
+from collections import defaultdict
 from collections.abc import Sequence
 from ipaddress import ip_interface
 from typing import Any, Literal, Iterable, Iterator, Optional, cast
@@ -12,7 +13,7 @@ from .aspath import get_used_as_path_filters
 from .community import get_used_united_community_lists
 from .entities import (
     AsPathFilter, IpPrefixList, CommunityList, CommunityLogic, CommunityType,
-    mangle_united_community_list_name, PrefixListNameGenerator,
+    mangle_united_community_list_name, PrefixListNameGenerator, group_community_members,
 )
 
 
@@ -307,9 +308,44 @@ class CumulusPolicyGenerator(ABC):
             raise NotImplementedError("Replacing SOO extcommunity is not supported for Cumulus")
         for community_name in action.value.added:
             yield "set", "extcommunity soo", community_name, "additive"
-        for community_name in action.value.removed:
+        if action.value.removed:
             raise NotImplementedError("SOO extcommunity remove is not supported for Cumulus")
 
+    def _cumulus_extcommunity_type_str(self, comm_type: CommunityType) -> str:
+        if comm_type is CommunityType.SOO:
+            return "soo"
+        elif comm_type is CommunityType.RT:
+            return "rt"
+        elif comm_type is CommunityType.LARGE:
+            raise ValueError("Large community is not subtype of extcommunity")
+        elif comm_type is CommunityType.BASIC:
+            raise ValueError("Basic community is not subtype of extcommunity")
+        else:
+            raise NotImplementedError(f"Community type {comm_type} is not supported on cumulus")
+
+    def _cumulus_then_extcommunity(
+            self,
+            communities: dict[str, CommunityList],
+            device: Any,
+            action: SingleAction[CommunityActionValue],
+    ):
+        if action.value.replaced is not None:
+            if action.value.added or action.value.removed:
+                raise NotImplementedError(
+                    "Cannot set extcommunity together with add/delete on cumulus",
+                )
+            if not action.value.replaced:
+                yield "set", "extcommunity", "none"
+                return
+            members = group_community_members(communities, action.value.replaced)
+            for community_type, replaced_members in members.items():
+                type_str = self._cumulus_extcommunity_type_str(community_type)
+                yield "set", "extcommunity", type_str, *replaced_members
+        if action.value.added:
+            raise NotImplementedError("extcommunity add is not supported for Cumulus")
+        if action.value.removed:
+            raise NotImplementedError("extcommunity remove is not supported for Cumulus")
+
     def _cumulus_then_as_path(
             self,
             device: Any,
@@ -350,6 +386,9 @@ class CumulusPolicyGenerator(ABC):
                 cast(SingleAction[CommunityActionValue], action),
             )
             return
+        if action.field == ThenField.extcommunity:
+            yield from self._cumulus_then_extcommunity(communities, device, action)
+            return
         if action.field == ThenField.extcommunity_rt:
             yield from self._cumulus_then_rt_community(
                 communities,

{annet-2.0.0 → annet-2.0.1}/annet/rpl_generators/entities.py

@@ -1,4 +1,5 @@
 from ipaddress import IPv4Network, IPv6Network, ip_network
+from collections import defaultdict
 from collections.abc import Sequence
 from dataclasses import dataclass
 from enum import Enum
@@ -124,3 +125,13 @@ class PrefixListNameGenerator:
                 for x in orig_prefix.members
             ],
         )
+
+
+def group_community_members(
+    all_communities: dict[str, CommunityList], communities: list[str],
+) -> dict[CommunityType, list[str]]:
+    members: dict[CommunityType, list[str]] = defaultdict(list)
+    for community_name in communities:
+        community = all_communities[community_name]
+        members[community.type].extend(community.members)
+    return members

{annet-2.0.0 → annet-2.0.1}/annet/rpl_generators/policy.py

@@ -12,7 +12,7 @@ from annet.rpl.statement_builder import AsPathActionValue, NextHopActionValue, T
 from annet.rpl_generators.entities import (
     arista_well_known_community,
     CommunityList, RDFilter, PrefixListNameGenerator, CommunityLogic, mangle_united_community_list_name,
-    IpPrefixList,
+    IpPrefixList, group_community_members, CommunityType,
 )
 
 
@@ -245,6 +245,52 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
         if action.value.removed:
             raise NotImplementedError("Extcommunity_soo remove is not supported for huawei")
 
+    def _huawei_render_ext_community_members(
+            self, comm_type: CommunityType, members: list[str]
+    ) -> Sequence[Sequence[str]]:
+        if comm_type is CommunityType.SOO:
+            return "soo", *members
+        if comm_type is CommunityType.RT:
+            return [f"rt {member}" for member in members]
+        elif comm_type is CommunityType.LARGE:
+            raise ValueError("Large community is not subtype of extcommunity")
+        elif comm_type is CommunityType.BASIC:
+            raise ValueError("Basic community is not subtype of extcommunity")
+        else:
+            raise NotImplementedError(f"Community type {comm_type} is not supported on huawei")
+
+    def _huawei_then_extcommunity(
+            self,
+            communities: dict[str, CommunityList],
+            device: Any,
+            action: SingleAction[CommunityActionValue],
+    ):
+        if action.value.replaced is not None:
+            if action.value.added or action.value.removed:
+                raise NotImplementedError(
+                    "Cannot set extcommunity together with add/delete on huawei",
+                )
+            if not action.value.replaced:
+                raise NotImplementedError(
+                    "Cannot reset extcommunity on huawei",
+                )
+
+            members = group_community_members(communities, action.value.replaced)
+            for community_type, replaced_members in members.items():
+                if community_type is CommunityType.SOO:
+                    raise NotImplementedError(
+                        "Cannot set extcommunity soo on huawei",
+                    )
+                rendered_memebers = self._huawei_render_ext_community_members(community_type, replaced_members)
+                yield "apply", "extcommunity", *rendered_memebers
+        if action.value.added:
+            members = group_community_members(communities, action.value.added)
+            for community_type, added_members in members.items():
+                rendered_memebers = self._huawei_render_ext_community_members(community_type, added_members)
+                yield "apply", "extcommunity", *rendered_memebers, "additive"
+        if action.value.removed:
+            raise NotImplementedError("Cannot remove extcommunity on huawei")
+
     def _huawei_then_as_path(
             self,
             device: Any,
@@ -283,6 +329,10 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             yield from self._huawei_then_large_community(communities, device,
                                                          cast(SingleAction[CommunityActionValue], action))
             return
+        if action.field == ThenField.extcommunity:
+            yield from self._huawei_then_extcommunity(communities, device,
+                                                      cast(SingleAction[CommunityActionValue], action))
+            return
         if action.field == ThenField.extcommunity_rt:
             yield from self._huawei_then_extcommunity_rt(communities, device,
                                                          cast(SingleAction[CommunityActionValue], action))
@@ -564,6 +614,51 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             ]
             yield "set", "extcommunity", *members, "delete"
 
+    def _arista_extcommunity_type_str(self, comm_type: CommunityType) -> str:
+        if comm_type is CommunityType.SOO:
+            return "soo"
+        elif comm_type is CommunityType.RT:
+            return "rt"
+        elif comm_type is CommunityType.LARGE:
+            raise ValueError("Large community is not subtype of extcommunity")
+        elif comm_type is CommunityType.BASIC:
+            raise ValueError("Basic community is not subtype of extcommunity")
+        else:
+            raise NotImplementedError(f"Community type {comm_type} is not supported on arista")
+
+    def _arista_render_ext_community_members(
+            self, all_communities: dict[str, CommunityList], communities: list[str],
+    ) -> Iterator[str]:
+        for community_name in communities:
+            community = all_communities[community_name]
+            comm_type = self._arista_extcommunity_type_str(community.type)
+            for member in community.members:
+                yield f"{comm_type} {member}"
+
+    def _arista_then_extcommunity(
+            self,
+            communities: dict[str, CommunityList],
+            device: Any,
+            action: SingleAction[CommunityActionValue],
+    ):
+        if action.value.replaced is not None:
+            if action.value.added or action.value.removed:
+                raise NotImplementedError(
+                    "Cannot set extcommunity together with add/delete on arista",
+                )
+            if not action.value.replaced:
+                yield "set", "extcommunity", "none"
+                return
+            members = list(self._arista_render_ext_community_members(communities, action.value.replaced))
+            yield "set extcommunity", *members
+            return
+        if action.value.added:
+            members = list(self._arista_render_ext_community_members(communities, action.value.added))
+            yield "set extcommunity", *members, "additive"
+        if action.value.removed:
+            members = list(self._arista_render_ext_community_members(communities, action.value.removed))
+            yield "set extcommunity", *members, "delete"
+
     def _arista_then_as_path(
             self,
             device: Any,
@@ -610,6 +705,9 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
                 communities, device, cast(SingleAction[CommunityActionValue], action),
             )
             return
+        if action.field == ThenField.extcommunity:
+            yield from self._arista_then_extcommunity(communities, device, action)
+            return
         if action.field == ThenField.extcommunity_rt:
             yield from self._arista_then_extcommunity_rt(
                 communities, device, cast(SingleAction[CommunityActionValue], action),

{annet-2.0.0 → annet-2.0.1/annet.egg-info}/PKG-INFO

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