annet 3.12.1__tar.gz → 3.13.0__tar.gz

{annet-3.12.1/annet.egg-info → annet-3.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.12.1
+Version: 3.13.0
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-3.12.1 → annet-3.13.0}/annet/adapters/netbox/common/models.py

@@ -189,6 +189,8 @@ class Interface(Entity, Generic[_IpAddressT, _FHRPGroupAssignmentT]):
     lag_min_links: int | None = None
     speed: int | None = None
 
+    custom_fields: Dict[str, Any] = field(default_factory=dict)
+
     ip_addresses: List[_IpAddressT] = field(default_factory=list)
     count_ipaddresses: int = 0
     fhrp_groups: List[_FHRPGroupAssignmentT] = field(default_factory=list)

{annet-3.12.1 → annet-3.13.0}/annet/adapters/netbox/provider.py

@@ -45,12 +45,13 @@ 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, threads: int = 1):
+                 exact_host_filter: bool = False, threads: int = 1, all_hosts_filter: dict[str, list[str]] | None = None):
         self.url = url
         self.token = token
         self.insecure = insecure
         self.exact_host_filter = exact_host_filter
         self.threads = threads
+        self.all_hosts_filter = all_hosts_filter
 
     @classmethod
     def with_config(cls, **kwargs: Dict[str, Any]) -> T:

{annet-3.12.1 → annet-3.13.0}/annet/bgp_models.py

@@ -255,6 +255,8 @@ class FamilyOptions:
     rib_group: bool = False
     loops: int = 0
     advertise_bgp_static: bool = False
+    import_policy: Optional[str] = None
+    export_policy: Optional[str] = None
 
 
 @dataclass(frozen=True)
@@ -387,7 +389,7 @@ def _used_policies(peer: Union[Peer, PeerGroup, VrfOptions]) -> Iterable[str]:
         yield peer.export_policy
 
 
-def _used_redistribute_policies(opts: Union[GlobalOptions, VrfOptions]) -> Iterable[str]:
+def _used_families_policies(opts: Union[GlobalOptions, VrfOptions]) -> Iterable[str]:
     for family_opts in (
         opts.ipv4_unicast,
         opts.ipv6_unicast,
@@ -400,6 +402,13 @@ def _used_redistribute_policies(opts: Union[GlobalOptions, VrfOptions]) -> Itera
                 yield red.policy
         if family_opts.aggregate and family_opts.aggregate.policy:
             yield family_opts.aggregate.policy
+        for aggregate in family_opts.aggregates:
+            if aggregate.policy:
+                yield aggregate.policy
+        if family_opts.export_policy:
+            yield family_opts.export_policy
+        if family_opts.import_policy:
+            yield family_opts.import_policy
 
 
 def extract_policies(config: BgpConfig) -> Sequence[str]:
@@ -407,11 +416,11 @@ def extract_policies(config: BgpConfig) -> Sequence[str]:
     for vrf in config.global_options.vrf.values():
         for group in vrf.groups:
             result.extend(_used_policies(group))
-        result.extend(_used_redistribute_policies(vrf))
+        result.extend(_used_families_policies(vrf))
         result.extend(_used_policies(vrf))
     for group in config.global_options.groups:
         result.extend(_used_policies(group))
     for peer in config.peers:
         result.extend(_used_policies(peer))
-    result.extend(_used_redistribute_policies(config.global_options))
+    result.extend(_used_families_policies(config.global_options))
     return result

{annet-3.12.1 → annet-3.13.0}/annet/mesh/device_models.py

@@ -36,6 +36,8 @@ class FamilyOptions(BaseMeshModel):
     rib_group: bool
     loops: int
     advertise_bgp_static: bool
+    import_policy: Optional[str]
+    export_policy: Optional[str]
 
 
 class _FamiliesMixin:

{annet-3.12.1 → annet-3.13.0}/annet/rulebook/texts/huawei.rul

@@ -72,6 +72,11 @@ bfd
 
 observe-port *
 
+drop-profile *
+    color *
+    ecn weight
+    ecn
+
 qos local-precedence-queue-map *
 
 qos group %logic=huawei.misc.undo_children

{annet-3.12.1 → annet-3.13.0}/annet/vendors/tabparser.py

@@ -823,41 +823,23 @@ class RosFormatter(CommonFormatter):
             (re.compile(r"^add "), ""),
             (re.compile(r"^print file="), "name="),
         )
-        patch_items = []
+
+        commands = odict()
         for item in patch.itms:
             key, childs, context = item.row, item.child, item.context
             if childs:
-                patch_items.append((key, childs, context))
+                childs_prev = f"{_prev} {key.strip()}".lstrip()
+                commands.update(self.cmd_paths(childs, _prev=childs_prev))
             else:
-                patch_items.append((key, None, context))
+                if key.startswith("remove"):
+                    find_cmd = key.removeprefix("remove").strip()
+                    for regex, repl_line in rm_regexs:
+                        find_cmd = regex.sub(repl_line, find_cmd)
+                    cmd = f"/{_prev} remove [ find {find_cmd} ]"
+                else:
+                    cmd = f"/{_prev} {key}"
+                commands[(cmd,)] = context
 
-        commands = odict()
-        prev_cmd = None
-        prev_context = None
-        for childs, items in itertools.groupby(patch_items, lambda x: x[1]):
-            if childs is None:
-                if prev_cmd:
-                    commands[(prev_cmd,)] = prev_context
-                for key, _, context in items:
-                    if key.startswith("remove"):
-                        find_cmd = key.replace("remove", "", 1).strip()
-                        for (regex, repl_line) in rm_regexs:
-                            find_cmd = regex.sub(repl_line, find_cmd)
-                        cmd = "remove [ find " + find_cmd + " ]"
-                    else:
-                        cmd = key
-                    commands[(cmd,)] = context
-            else:
-                for key, _, context in items:
-                    if _prev:
-                        prev_cmd = _prev
-                        prev_context = context
-                        block_cmd = f"{_prev} {key}"
-                    else:
-                        block_cmd = f"/{key}"
-                    commands[(block_cmd,)] = context
-                    for k, v in self.cmd_paths(childs, block_cmd).items():
-                        commands[k] = v
         return commands
 
 

{annet-3.12.1 → annet-3.13.0/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.12.1
+Version: 3.13.0
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT