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

annet/adapters/netbox/common/manufacturer.py

@@ -54,6 +54,8 @@ def get_breed(manufacturer: str, model: str):
         return "bcom-os"
     elif manufacturer == "MikroTik":
         return "routeros"
+    elif manufacturer == "Moxa":
+        return "moxa"
     elif manufacturer == "PC":
         return "pc"
     return ""

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 == "Mellanox" or self.breed == "pc"
+        return self.device_type.manufacturer.name in ("Mellanox", "Moxa") or self.breed == "pc"
 
     def _make_interface(self, name: str, type: InterfaceType) -> Interface:
         return Interface(

annet/api/__init__.py

@@ -274,12 +274,14 @@ def patch(args: cli_args.ShowPatchOptions, loader: ann_gen.Loader):
 
 def _patch_worker(device_id, args: cli_args.ShowPatchOptions, stdin, loader: ann_gen.Loader, filterer: filtering.Filterer):
     for res, _, patch_tree in res_diff_patch(device_id, args, stdin, loader, filterer):
+        old_files = res.old_files
         new_files = res.get_new_files(args.acl_safe)
         new_json_fragment_files = res.get_new_file_fragments(args.acl_safe)
         if new_files:
             for path, (cfg_text, _cmds) in new_files.items():
                 label = res.device.hostname + os.sep + path
-                yield label, cfg_text, False
+                if old_files.get(path) != cfg_text:
+                    yield label, cfg_text, False
         elif res.old_json_fragment_files or new_json_fragment_files:
             for path, (new_json_cfg, _cmds) in new_json_fragment_files.items():
                 label = res.device.hostname + os.sep + path
@@ -468,6 +470,9 @@ class PCDeployerJob(DeployerJob):
         elif not new_files and not new_json_fragment_files:
             return
 
+        enable_reload = self.args.entire_reload is not cli_args.EntireReloadFlag.no
+        force_reload = self.args.entire_reload is cli_args.EntireReloadFlag.force
+
         upload_files: Dict[str, bytes] = {}
         reload_cmds: Dict[str, bytes] = {}
         generator_types: Dict[str, GeneratorType] = {}
@@ -483,18 +488,23 @@ class PCDeployerJob(DeployerJob):
                     old_text = jsontools.format_json(old_json_cfg)
                     new_text = jsontools.format_json(file_content_or_json_cfg)
                     diff_content = "\n".join(_diff_file(old_text, new_text))
-                if diff_content:
-                    self._has_diff = True
-                upload_files[file], reload_cmds[file] = file_content.encode(), cmds.encode()
-                generator_types[file] = generator_type
-                self.cmd_lines.append("= Deploy cmds %s/%s " % (device.hostname, file))
-                self.cmd_lines.extend([cmds, ""])
-                self.cmd_lines.append("= %s/%s " % (device.hostname, file))
-                self.cmd_lines.extend([file_content, ""])
-                self.diff_lines.append("= %s/%s " % (device.hostname, file))
-                self.diff_lines.extend([diff_content, ""])
-
-        if upload_files:
+
+                if diff_content or force_reload:
+                    self._has_diff |= True
+
+                    upload_files[file] = file_content.encode()
+                    generator_types[file] = generator_type
+                    self.cmd_lines.append("= %s/%s " % (device.hostname, file))
+                    self.cmd_lines.extend([file_content, ""])
+                    self.diff_lines.append("= %s/%s " % (device.hostname, file))
+                    self.diff_lines.extend([diff_content, ""])
+
+                    if enable_reload:
+                        reload_cmds[file] = cmds.encode()
+                        self.cmd_lines.append("= Deploy cmds %s/%s " % (device.hostname, file))
+                        self.cmd_lines.extend([cmds, ""])
+
+        if self._has_diff:
             self.deploy_cmds[device] = {
                 "files": upload_files,
                 "cmds": reload_cmds,
@@ -534,13 +544,12 @@ class Deployer:
         self._filterer = filtering.filterer_connector.get()
 
     def parse_result(self, job: DeployerJob, result: ann_gen.OldNewResult):
-        entire_reload = self.args.entire_reload
         logger = get_logger(job.device.hostname)
 
         job.parse_result(result)
         self.failed_configs.update(job.failed_configs)
 
-        if job.has_diff() or entire_reload is entire_reload.force:
+        if job.has_diff():
             self.cmd_lines.extend(job.cmd_lines)
             self.deploy_cmds.update(job.deploy_cmds)
             self.diffs.update(job.diffs)

annet/mesh/basemodel.py

@@ -133,6 +133,9 @@ class BaseMeshModel:
             raise AttributeError(f"{self.__class__.__name__} has no field {key}")
         super().__setattr__(key, value)
 
+    def is_empty(self):
+        return not self.__dict__
+
 
 ModelT = TypeVar("ModelT", bound=BaseMeshModel)
 

annet/mesh/executor.py

@@ -57,6 +57,11 @@ class MeshExecutor:
             rule_global_opts = MeshGlobalOptions(rule.match, device)
             logger.debug("Running device handler: %s", handler_name)
             rule.handler(rule_global_opts)
+
+            if rule_global_opts.is_empty():
+                # nothing was set
+                continue
+
             try:
                 global_opts = merge(global_opts, rule_global_opts)
             except MergeForbiddenError as e:
@@ -79,7 +84,7 @@ class MeshExecutor:
             rule: MatchedDirectPair,
             ports: list[tuple[str, str]],
             all_connected_ports: list[tuple[str, str]],
-    ) -> Pair:
+    ) -> Optional[Pair]:
         session = MeshSession()
         handler_name = self._handler_name(rule.handler)
         logger.debug("Running direct handler: %s", handler_name)
@@ -102,6 +107,10 @@ class MeshExecutor:
         else:
             rule.handler(peer_neighbor, peer_device, session)
 
+        if peer_neighbor.is_empty() and peer_device.is_empty() and session.is_empty():
+            # nothing was set
+            return None
+
         try:
             neighbor_dto = merge(DirectPeerDTO(), peer_neighbor, session)
         except MergeForbiddenError as e:
@@ -144,6 +153,9 @@ class MeshExecutor:
             ]
             for ports in rule.port_processor(all_connected_ports):
                 pair = self._execute_direct_pair(device, neighbor_device, rule, ports, all_connected_ports)
+                if pair is None:
+                    # nothing was set
+                    continue
                 addr = getattr(pair.connected, "addr", None)
                 if addr is None:
                     raise ValueError(f"Handler `{handler_name}` returned no peer addr")
@@ -179,6 +191,9 @@ class MeshExecutor:
                 peer_virtual = VirtualPeer(num=order_number)
 
                 rule.handler(peer_device, peer_virtual, session)
+                if peer_virtual.is_empty() and peer_device.is_empty() and session.is_empty():
+                    # nothing was set
+                    continue
 
                 try:
                     virtual_dto = merge(VirtualPeerDTO(), peer_virtual, session)
@@ -232,6 +247,10 @@ class MeshExecutor:
                 peer_device = IndirectPeer(rule.match_right, device)
                 rule.handler(peer_connected, peer_device, session)
 
+            if peer_connected.is_empty() and peer_device.is_empty() and session.is_empty():
+                # nothing was set
+                continue
+
             try:
                 connected_dto = merge(IndirectPeerDTO(), peer_connected, session)
             except MergeForbiddenError as e:

annet/mesh/registry.py

@@ -21,6 +21,9 @@ class DirectPeer(DirectPeerDTO):
         self.ports = ports
         self.all_connected_ports = all_connected_ports
 
+    def is_empty(self):
+        return self.__dict__.keys() == {"match", "device", "ports", "all_connected_ports"}
+
 
 class IndirectPeer(IndirectPeerDTO):
     match: MatchedArgs
@@ -31,6 +34,9 @@ class IndirectPeer(IndirectPeerDTO):
         self.match = match
         self.device = device
 
+    def is_empty(self):
+        return self.__dict__.keys() == {"match", "device"}
+
 
 class VirtualLocal(VirtualLocalDTO):
     match: MatchedArgs
@@ -41,10 +47,16 @@ class VirtualLocal(VirtualLocalDTO):
         self.match = match
         self.device = device
 
+    def is_empty(self):
+        return self.__dict__.keys() == {"match", "device"}
+
 
 class VirtualPeer(VirtualPeerDTO):
     num: int
 
+    def is_empty(self):
+        return self.__dict__.keys() == {"num"}
+
 
 class GlobalOptions(GlobalOptionsDTO):
     match: MatchedArgs
@@ -55,6 +67,9 @@ class GlobalOptions(GlobalOptionsDTO):
         self.match = match
         self.device = device
 
+    def is_empty(self):
+        return self.__dict__.keys() == {"match", "device"}
+
 
 GlobalHandler = Callable[[GlobalOptions], None]
 

annet/rpl_generators/cumulus_frr.py

@@ -11,10 +11,10 @@ from annet.rpl.statement_builder import NextHopActionValue, AsPathActionValue, C
 from .aspath import get_used_as_path_filters
 from .community import get_used_united_community_lists
 from .entities import (
-    AsPathFilter, IpPrefixList, mangle_ranged_prefix_list_name, CommunityList, CommunityLogic, CommunityType,
-    mangle_united_community_list_name,
+    AsPathFilter, IpPrefixList, CommunityList, CommunityLogic, CommunityType,
+    mangle_united_community_list_name, PrefixListNameGenerator,
 )
-from .prefix_lists import get_used_prefix_lists
+from .prefix_lists import get_used_prefix_lists, new_prefix_list_name_generator
 
 FRR_RESULT_MAP = {
     ResultType.ALLOW: "permit",
@@ -51,6 +51,12 @@ class CumulusPolicyGenerator(ABC):
     def get_prefix_lists(self, device: Any) -> Sequence[IpPrefixList]:
         raise NotImplementedError()
 
+    def get_used_prefix_lists(self, device: Any, name_generator: PrefixListNameGenerator) -> Sequence[IpPrefixList]:
+        return get_used_prefix_lists(
+            prefix_lists=self.get_prefix_lists(device),
+            name_generator=name_generator,
+        )
+
     @abstractmethod
     def get_community_lists(self, device: Any) -> list[CommunityList]:
         raise NotImplementedError()
@@ -61,11 +67,13 @@ class CumulusPolicyGenerator(ABC):
 
     def generate_cumulus_rpl(self, device: Any) -> Iterator[Sequence[str]]:
         policies = self.get_policies(device)
+        prefix_list_name_generator = new_prefix_list_name_generator(policies)
+
         communities = {c.name: c for c in self.get_community_lists(device)}
         yield from self._cumulus_as_path_filters(device, policies)
         yield from self._cumulus_communities(device, communities, policies)
-        yield from self._cumulus_prefix_lists(device, policies)
-        yield from self._cumulus_policy_config(device, communities, policies)
+        yield from self._cumulus_prefix_lists(device, policies, prefix_list_name_generator)
+        yield from self._cumulus_policy_config(device, communities, policies, prefix_list_name_generator)
 
     def _cumulus_as_path_filters(
             self,
@@ -100,11 +108,12 @@ class CumulusPolicyGenerator(ABC):
                 ("le", str(match.less_equal)) if match.less_equal is not None else ()
             )
 
-    def _cumulus_prefix_lists(self, device: Any, policies: list[RoutingPolicy]) -> Iterable[Sequence[str]]:
-        plists = {p.name: p for p in get_used_prefix_lists(
-            prefix_lists=self.get_prefix_lists(device),
-            policies=policies,
-        )}
+    def _cumulus_prefix_lists(
+            self, device: Any,
+            policies: list[RoutingPolicy],
+            prefix_list_name_generator: PrefixListNameGenerator,
+    ) -> Iterable[Sequence[str]]:
+        plists = {p.name: p for p in self.get_used_prefix_lists(device, prefix_list_name_generator)}
         if not plists.values():
             return
 
@@ -114,7 +123,7 @@ class CumulusPolicyGenerator(ABC):
                 cond: SingleCondition[PrefixMatchValue]
                 for cond in statement.match.find_all(MatchField.ip_prefix):
                     for name in cond.value.names:
-                        mangled_name = mangle_ranged_prefix_list_name(
+                        mangled_name = prefix_list_name_generator.get_prefix_name(
                             name=name,
                             greater_equal=cond.value.greater_equal,
                             less_equal=cond.value.less_equal,
@@ -125,7 +134,7 @@ class CumulusPolicyGenerator(ABC):
                         precessed_names.add(mangled_name)
                 for cond in statement.match.find_all(MatchField.ipv6_prefix):
                     for name in cond.value.names:
-                        mangled_name = mangle_ranged_prefix_list_name(
+                        mangled_name = prefix_list_name_generator.get_prefix_name(
                             name=name,
                             greater_equal=cond.value.greater_equal,
                             less_equal=cond.value.less_equal,
@@ -217,6 +226,7 @@ class CumulusPolicyGenerator(ABC):
             self,
             device: Any,
             condition: SingleCondition[Any],
+            prefix_list_name_generator: PrefixListNameGenerator,
     ) -> Iterator[Sequence[str]]:
         if condition.field == MatchField.community:
             for comm_name in self._get_match_community_names(condition):
@@ -236,7 +246,7 @@ class CumulusPolicyGenerator(ABC):
             return
         if condition.field == MatchField.ip_prefix:
             for name in condition.value.names:
-                mangled_name = mangle_ranged_prefix_list_name(
+                mangled_name = prefix_list_name_generator.get_prefix_name(
                     name=name,
                     greater_equal=condition.value.greater_equal,
                     less_equal=condition.value.less_equal,
@@ -245,7 +255,7 @@ class CumulusPolicyGenerator(ABC):
             return
         if condition.field == MatchField.ipv6_prefix:
             for name in condition.value.names:
-                mangled_name = mangle_ranged_prefix_list_name(
+                mangled_name = prefix_list_name_generator.get_prefix_name(
                     name=name,
                     greater_equal=condition.value.greater_equal,
                     less_equal=condition.value.less_equal,
@@ -421,11 +431,12 @@ class CumulusPolicyGenerator(ABC):
             device: Any,
             policy: RoutingPolicy,
             statement: RoutingPolicyStatement,
+            prefix_list_name_generator: PrefixListNameGenerator,
     ) -> Iterable[Sequence[str]]:
         yield "route-map", policy.name, FRR_RESULT_MAP[statement.result], str(statement.number)
 
         for condition in statement.match:
-            for row in self._cumulus_policy_match(device, condition):
+            for row in self._cumulus_policy_match(device, condition, prefix_list_name_generator):
                 yield FRR_INDENT, *row
         for action in statement.then:
             for row in self._cumulus_policy_then(communities, device, action):
@@ -439,6 +450,7 @@ class CumulusPolicyGenerator(ABC):
             device: Any,
             communities: dict[str, CommunityList],
             policies: list[RoutingPolicy],
+            prefix_list_name_generator: PrefixListNameGenerator,
     ) -> Iterable[Sequence[str]]:
         """ Route maps configuration """
 
@@ -454,5 +466,7 @@ class CumulusPolicyGenerator(ABC):
                     raise RuntimeError(
                         f"Multiple statements have same number {statement.number} for policy `{policy.name}`: "
                         f"`{statement.name}` and `{applied_stmts[statement.number]}`")
-                yield from self._cumulus_policy_statement(communities, device, policy, statement)
+                yield from self._cumulus_policy_statement(
+                    communities, device, policy, statement, prefix_list_name_generator,
+                )
                 applied_stmts[statement.number] = statement.name

annet/rpl_generators/entities.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 from collections.abc import Sequence
 from dataclasses import dataclass
 from enum import Enum
@@ -56,15 +57,27 @@ def mangle_united_community_list_name(values: Sequence[str]) -> str:
     return "_OR_".join(values)
 
 
-def mangle_ranged_prefix_list_name(name: str, greater_equal: Optional[int], less_equal: Optional[int]) -> str:
-    if greater_equal is less_equal is None:
-        return name
-    if greater_equal is None:
-        ge_str = "unset"
-    else:
-        ge_str = str(greater_equal)
-    if less_equal is None:
-        le_str = "unset"
-    else:
-        le_str = str(less_equal)
-    return f"{name}_{ge_str}_{le_str}"
+class PrefixListNameGenerator:
+    def __init__(self):
+        self._prefix_lists = defaultdict(set)
+
+    def add_prefix(self, name: str, greater_equal: Optional[int], less_equal: Optional[int]) -> None:
+        self._prefix_lists[name].add((greater_equal, less_equal))
+
+    def is_used(self, name: str):
+        return name in self._prefix_lists
+
+    def get_prefix_name(self, name: str, greater_equal: Optional[int], less_equal: Optional[int]) -> str:
+        if len(self._prefix_lists[name]) == 1:
+            return name
+        if greater_equal is less_equal is None:
+            return name
+        if greater_equal is None:
+            ge_str = "unset"
+        else:
+            ge_str = str(greater_equal)
+        if less_equal is None:
+            le_str = "unset"
+        else:
+            le_str = str(less_equal)
+        return f"{name}_{ge_str}_{le_str}"

annet/rpl_generators/policy.py

@@ -6,13 +6,14 @@ from annet.generators import PartialGenerator
 from annet.rpl import (
     CommunityActionValue,
     ResultType, RoutingPolicyStatement, RoutingPolicy, ConditionOperator, SingleCondition, SingleAction, ActionType,
-    RouteMap, MatchField,
+    MatchField,
 )
 from annet.rpl.statement_builder import AsPathActionValue, NextHopActionValue, ThenField
 from annet.rpl_generators.entities import (
     arista_well_known_community,
-    CommunityList, RDFilter, mangle_ranged_prefix_list_name, CommunityLogic, mangle_united_community_list_name,
+    CommunityList, RDFilter, PrefixListNameGenerator, CommunityLogic, mangle_united_community_list_name,
 )
+from annet.rpl_generators.prefix_lists import new_prefix_list_name_generator
 
 HUAWEI_MATCH_COMMAND_MAP: dict[str, str] = {
     MatchField.as_path_filter: "as-path-filter {option_value}",
@@ -86,6 +87,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             condition: SingleCondition[Any],
             communities: dict[str, CommunityList],
             rd_filters: dict[str, RDFilter],
+            prefix_name_generator: PrefixListNameGenerator,
     ) -> Iterator[Sequence[str]]:
         if condition.field == MatchField.community:
             if condition.operator is ConditionOperator.HAS:
@@ -134,7 +136,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             return
         if condition.field == MatchField.ip_prefix:
             for name in condition.value.names:
-                mangled_name = mangle_ranged_prefix_list_name(
+                mangled_name = prefix_name_generator.get_prefix_name(
                     name=name,
                     greater_equal=condition.value.greater_equal,
                     less_equal=condition.value.less_equal,
@@ -143,7 +145,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             return
         if condition.field == MatchField.ipv6_prefix:
             for name in condition.value.names:
-                mangled_name = mangle_ranged_prefix_list_name(
+                mangled_name = prefix_name_generator.get_prefix_name(
                     name=name,
                     greater_equal=condition.value.greater_equal,
                     less_equal=condition.value.less_equal,
@@ -180,7 +182,7 @@ class RoutingPolicyGenerator(PartialGenerator, 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/remove on huawei",
                 )
@@ -202,7 +204,7 @@ class RoutingPolicyGenerator(PartialGenerator, 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 large-community together with add/remove on huawei",
                 )
@@ -334,6 +336,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             device: Any,
             policy: RoutingPolicy,
             statement: RoutingPolicyStatement,
+            prefix_name_generator: PrefixListNameGenerator,
     ) -> Iterator[Sequence[str]]:
         if statement.number is None:
             raise RuntimeError(f"Statement number should not be empty on Huawei (found for policy: {policy.name})")
@@ -343,19 +346,21 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
                 "node", statement.number
         ):
             for condition in statement.match:
-                yield from self._huawei_match(device, condition, communities, rd_filters)
+                yield from self._huawei_match(device, condition, communities, rd_filters, prefix_name_generator)
             for action in statement.then:
                 yield from self._huawei_then(communities, device, action)
             if statement.result is ResultType.NEXT:
                 yield "goto next-node"
 
     def run_huawei(self, device):
+        policies = self.get_policies(device)
         communities = {c.name: c for c in self.get_community_lists(device)}
         rd_filters = {f.name: f for f in self.get_rd_filters(device)}
+        prefix_name_generator = new_prefix_list_name_generator(policies)
 
         for policy in self.get_policies(device):
             for statement in policy.statements:
-                yield from self._huawei_statement(communities, rd_filters, device, policy, statement)
+                yield from self._huawei_statement(communities, rd_filters, device, policy, statement, prefix_name_generator)
 
     # arista
     def acl_arista(self, device):
@@ -378,6 +383,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             condition: SingleCondition[Any],
             communities: dict[str, CommunityList],
             rd_filters: dict[str, RDFilter],
+            prefix_name_generator: PrefixListNameGenerator,
     ) -> Iterator[Sequence[str]]:
         if condition.field == MatchField.community:
             if condition.operator is ConditionOperator.HAS_ANY:
@@ -430,7 +436,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             return
         if condition.field == MatchField.ip_prefix:
             for name in condition.value.names:
-                mangled_name = mangle_ranged_prefix_list_name(
+                mangled_name = prefix_name_generator.get_prefix_name(
                     name=name,
                     greater_equal=condition.value.greater_equal,
                     less_equal=condition.value.less_equal,
@@ -439,7 +445,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             return
         if condition.field == MatchField.ipv6_prefix:
             for name in condition.value.names:
-                mangled_name = mangle_ranged_prefix_list_name(
+                mangled_name = prefix_name_generator.get_prefix_name(
                     name=name,
                     greater_equal=condition.value.greater_equal,
                     less_equal=condition.value.less_equal,
@@ -477,7 +483,7 @@ class RoutingPolicyGenerator(PartialGenerator, 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/remove on arista",
                 )
@@ -500,7 +506,7 @@ class RoutingPolicyGenerator(PartialGenerator, 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 large-community together with add/remove on arista",
                 )
@@ -653,6 +659,7 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             device: Any,
             policy: RoutingPolicy,
             statement: RoutingPolicyStatement,
+            prefix_name_generator: PrefixListNameGenerator,
     ) -> Iterator[Sequence[str]]:
         with self.block(
                 "route-map",
@@ -661,16 +668,20 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
                 statement.number,
         ):
             for condition in statement.match:
-                yield from self._arista_match(device, condition, communities, rd_filters)
+                yield from self._arista_match(device, condition, communities, rd_filters, prefix_name_generator)
             for action in statement.then:
                 yield from self._arista_then(communities, device, action)
             if statement.result is ResultType.NEXT:
                 yield "continue"
 
     def run_arista(self, device):
+        policies = self.get_policies(device)
+        prefix_name_generator = new_prefix_list_name_generator(policies)
         communities = {c.name: c for c in self.get_community_lists(device)}
         rd_filters = {f.name: f for f in self.get_rd_filters(device)}
 
-        for policy in self.get_policies(device):
+        for policy in policies:
             for statement in policy.statements:
-                yield from self._arista_statement(communities, rd_filters, device, policy, statement)
+                yield from self._arista_statement(
+                    communities, rd_filters, device, policy, statement, prefix_name_generator,
+                )

annet/rpl_generators/prefix_lists.py

@@ -4,20 +4,28 @@ from ipaddress import ip_interface
 from typing import Any, Literal
 
 from annet.generators import PartialGenerator
-from annet.rpl import RouteMap, PrefixMatchValue, MatchField, SingleCondition, RoutingPolicy
-from .entities import IpPrefixList, mangle_ranged_prefix_list_name
+from annet.rpl import PrefixMatchValue, MatchField, SingleCondition, RoutingPolicy
+from .entities import IpPrefixList, PrefixListNameGenerator
 
 
-def get_used_prefix_lists(prefix_lists: Sequence[IpPrefixList], policies: list[RoutingPolicy]) -> list[IpPrefixList]:
-    plist_map = {c.name: c for c in prefix_lists}
-    used_names = set()
+def get_used_prefix_lists(
+        prefix_lists: Sequence[IpPrefixList], name_generator: PrefixListNameGenerator,
+) -> list[IpPrefixList]:
+    return [c for c in prefix_lists if name_generator.is_used(c.name)]
+
+
+def new_prefix_list_name_generator(policies: list[RoutingPolicy]) -> PrefixListNameGenerator:
+    name_gen = PrefixListNameGenerator()
     for policy in policies:
         for statement in policy.statements:
+            condition: SingleCondition[PrefixMatchValue]
             for condition in statement.match.find_all(MatchField.ipv6_prefix):
-                used_names.update(condition.value.names)
+                for name in condition.value.names:
+                    name_gen.add_prefix(name, condition.value.greater_equal, condition.value.less_equal)
             for condition in statement.match.find_all(MatchField.ip_prefix):
-                used_names.update(condition.value.names)
-    return [plist_map[name] for name in sorted(used_names)]
+                for name in condition.value.names:
+                    name_gen.add_prefix(name, condition.value.greater_equal, condition.value.less_equal)
+    return name_gen
 
 
 class PrefixListFilterGenerator(PartialGenerator, ABC):
@@ -31,10 +39,10 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
     def get_prefix_lists(self, device: Any) -> Sequence[IpPrefixList]:
         raise NotImplementedError()
 
-    def get_used_prefix_lists(self, device: Any) -> Sequence[IpPrefixList]:
+    def get_used_prefix_lists(self, device: Any, name_generator: PrefixListNameGenerator) -> Sequence[IpPrefixList]:
         return get_used_prefix_lists(
             prefix_lists=self.get_prefix_lists(device),
-            policies=self.get_policies(device),
+            name_generator=name_generator,
         )
 
     # huawei
@@ -68,15 +76,16 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
             )
 
     def run_huawei(self, device: Any):
-        plists = {p.name: p for p in self.get_used_prefix_lists(device)}
         policies = self.get_policies(device)
+        name_generator = new_prefix_list_name_generator(policies)
+        plists = {p.name: p for p in self.get_used_prefix_lists(device, name_generator)}
         precessed_names = set()
         for policy in policies:
             for statement in policy.statements:
                 cond: SingleCondition[PrefixMatchValue]
                 for cond in statement.match.find_all(MatchField.ip_prefix):
                     for name in cond.value.names:
-                        mangled_name = mangle_ranged_prefix_list_name(
+                        mangled_name = name_generator.get_prefix_name(
                             name=name,
                             greater_equal=cond.value.greater_equal,
                             less_equal=cond.value.less_equal,
@@ -87,7 +96,7 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
                         precessed_names.add(mangled_name)
                 for cond in statement.match.find_all(MatchField.ipv6_prefix):
                     for name in cond.value.names:
-                        mangled_name = mangle_ranged_prefix_list_name(
+                        mangled_name = name_generator.get_prefix_name(
                             name=name,
                             greater_equal=cond.value.greater_equal,
                             less_equal=cond.value.less_equal,
@@ -128,15 +137,16 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
             )
 
     def run_arista(self, device: Any):
-        plists = {p.name: p for p in self.get_used_prefix_lists(device)}
         policies = self.get_policies(device)
+        name_generator = new_prefix_list_name_generator(policies)
+        plists = {p.name: p for p in self.get_used_prefix_lists(device, name_generator)}
         precessed_names = set()
         for policy in policies:
             for statement in policy.statements:
                 cond: SingleCondition[PrefixMatchValue]
                 for cond in statement.match.find_all(MatchField.ip_prefix):
                     for name in cond.value.names:
-                        mangled_name = mangle_ranged_prefix_list_name(
+                        mangled_name = name_generator.get_prefix_name(
                             name=name,
                             greater_equal=cond.value.greater_equal,
                             less_equal=cond.value.less_equal,
@@ -147,7 +157,7 @@ class PrefixListFilterGenerator(PartialGenerator, ABC):
                         precessed_names.add(mangled_name)
                 for cond in statement.match.find_all(MatchField.ipv6_prefix):
                     for name in cond.value.names:
-                        mangled_name = mangle_ranged_prefix_list_name(
+                        mangled_name = name_generator.get_prefix_name(
                             name=name,
                             greater_equal=cond.value.greater_equal,
                             less_equal=cond.value.less_equal,

annet/rulebook/texts/cisco.deploy

@@ -20,7 +20,7 @@
 crypto key generate rsa %timeout=60
     dialog: Do you really want to replace them? [yes/no]: ::: no
     dialog: How many bits in the modulus [512]: ::: 2048
-no username * privilege * secret 5 *
+no username * privilege * secret * *
     dialog: This operation will remove all username related configurations with same name.Do you want to continue? [confirm] ::: Y  %send_nl=0
 
 copy running-config startup-config

{annet-0.16.30.dist-info → annet-0.16.31.dist-info}/METADATA

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

{annet-0.16.30.dist-info → annet-0.16.31.dist-info}/RECORD

@@ -32,8 +32,8 @@ annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 annet/adapters/netbox/provider.py,sha256=3IrfZ6CfCxf-lTnJlIC2TQ8M_rDxOB_B7HGXZ92vAgA,1643
 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=1kmw3YzitXwOh4zitsWfZda4CQiMr4CnAxkUkUm_z3A,1678
-annet/adapters/netbox/common/models.py,sha256=E-w1ptCpcrJcdAENcgJjXF-sVhUu2_7fZPNaDuhYnuw,7364
+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/query.py,sha256=ziUFM7cUEbEIf3k1szTll4aO-OCUa-2Ogxbebi7Tegs,646
 annet/adapters/netbox/common/status_client.py,sha256=W4nTb2yvBlJ2UkWUmUhKQ2PaSQb1shjhHj5ebb4s2s4,591
 annet/adapters/netbox/common/storage_opts.py,sha256=5tt6wxUUJTIzNbOVXMnYBwZedNAIqYlve3YWl6GdbZM,1197
@@ -67,7 +67,7 @@ annet/annlib/rbparser/platform.py,sha256=hnxznTfV9txXi1PkR1hZrprTrQJvlwgqXVL8vXk
 annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=bx_Iwui-JJeyctUPF1OsEll0Aa-IQZadBPQjaeuoWgw,16638
-annet/api/__init__.py,sha256=dgdyBDeFhBVBwKB8QVOOTZ2LZvi0fEcVGfOQEUQyDHo,33863
+annet/api/__init__.py,sha256=WGpVMfIxVy9F_jH6nqHSQypEEcsSNa9yF2WFEwhUVwI,34156
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
 annet/generators/__init__.py,sha256=rVHHDTPKHPZsml1eNEAj3o-8RweFTN8J7LX3tKMXdIY,16402
@@ -82,14 +82,14 @@ annet/generators/result.py,sha256=zMAvGOYQU803bGy6datZduHLgrEqK2Zba_Jcf9Qn9p0,49
 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=TXVINzmvKlyxiVcIdOaoewY_c4TvuMstluqfzlbNmPU,4859
+annet/mesh/basemodel.py,sha256=E6NTOneiMDwB1NCpjDRECoaeQ0f3n_fmTLnKTrSHTU4,4917
 annet/mesh/device_models.py,sha256=YcL6_vGjnt67BTovN8Eq38U5wGcbJDhqiq8613WpYtQ,3381
-annet/mesh/executor.py,sha256=V5GR_m9T6hVWR5sFY-x4JkS0LpI6UH5Q7HxuhC8KXFE,16299
+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/port_processor.py,sha256=RHiMS5W8qoDkTKiarQ748bcr8bNx4g_R4Y4vZg2k4TU,478
-annet/mesh/registry.py,sha256=VvZKZ5ujGcRXvWFP051rr2KoXI8OrTivkhpTOrUm33A,9087
+annet/mesh/registry.py,sha256=BCRIOrINP0krcgvF59uFJqyhmSviQ03GSzWpxLVYlIg,9527
 annet/rpl/__init__.py,sha256=0kcIktE3AmS0rlm9xzVDf53xk08OeZXgD-6ZLCt_KCs,731
 annet/rpl/action.py,sha256=PY6W66j908RuqQ1_ioxayqVN-70rxDk5Z59EGHtxI98,1246
 annet/rpl/condition.py,sha256=MJri4MbWtPkLHIsLMAtsIEF7e8IAS9dIImjmJs5vS5U,3418
@@ -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=yMxm264PZq8MnSYQ2jmLv2CSa2Jl2ais_7XBTXKowj0,20053
-annet/rpl_generators/entities.py,sha256=052ggNCGbEE-m--MdzLJhJ-1ch6IxDsL6xnMH0OHgtg,1491
+annet/rpl_generators/cumulus_frr.py,sha256=D8JnnXTXYaIUayPwL_KORUCkpBV32-CHatlyKQSSJWw,20855
+annet/rpl_generators/entities.py,sha256=DIpgAQ8Tslo2hq6iFBaYkJX12BFBiccN8GOaRVxR1Uk,1985
 annet/rpl_generators/execute.py,sha256=wS6e6fwcPWywsHB0gBMqZ17eF0s4YOBgDgwPB_cr5Rw,431
-annet/rpl_generators/policy.py,sha256=YbhlTHNdv-GrpWv05iXMtbX-AdylWSZgJuTuzQREz7E,31896
-annet/rpl_generators/prefix_lists.py,sha256=bLacWP4M303mefZXK04VL7R_uIukZJ4itB5hKpFzCwY,6692
+annet/rpl_generators/policy.py,sha256=NeqB0reRN_KuY8LYkeGT3dRPe2HFDT9RfmVy5fcA3zw,32570
+annet/rpl_generators/prefix_lists.py,sha256=2x2NO52npcB3VKcQ4tthsWFwirVpexLdLtWPA5sHzjg,7246
 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
@@ -143,7 +143,7 @@ annet/rulebook/texts/aruba.rul,sha256=zvGVpoYyJvMoL0fb1NQ8we_GCLZXno8nwWpZIOScLQ
 annet/rulebook/texts/b4com.deploy,sha256=SVX8-yLHM90tJC4M-ekpGuGM1aQZW3euSGyg67l--R0,781
 annet/rulebook/texts/b4com.order,sha256=G3aToAIHHzKzDCM3q7_lyr9wJvuVOXVbVvF3wm5PiTE,707
 annet/rulebook/texts/b4com.rul,sha256=5mqyUg_oLRSny2iH6QdhfDWVu6kzgDURtlSATD7DFno,1056
-annet/rulebook/texts/cisco.deploy,sha256=XvXWeOMahE8Uc9RF0xkJj8jGknD4vit8H_f24ubPX7w,1226
+annet/rulebook/texts/cisco.deploy,sha256=Hu0NkcGv3f1CWUrnbzI3eQOPXJxtH4NNOPRV68IrW4U,1226
 annet/rulebook/texts/cisco.order,sha256=OvNHMNqkCc-DN2dEjLCTKv_7ZhiaHt4q2X4Y4Z8dvR4,1901
 annet/rulebook/texts/cisco.rul,sha256=jgL5_xnSwd_H4E8cx4gcneSvJC5W1zz6_BWSb64iuxI,3017
 annet/rulebook/texts/huawei.deploy,sha256=azEC6_jQRzwnTSrNgag0hHh6L7hezS_eMk6ZDZfWyXI,10444
@@ -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.30.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.30.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.30.dist-info/METADATA,sha256=HEQle9FUcien2kzE20RedAMAzPAfatx1Hw852aelJiA,854
-annet-0.16.30.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-annet-0.16.30.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.30.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.30.dist-info/RECORD,,
+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,,