annet 3.9.2__tar.gz → 3.10.0__tar.gz

{annet-3.9.2/annet.egg-info → annet-3.10.0}/PKG-INFO

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

{annet-3.9.2 → annet-3.10.0}/annet/annlib/netdev/devdb/data/devdb.json

@@ -96,21 +96,21 @@
     "Juniper.PTX": " PTX",
 
     "Arista": "^[Aa]rista",
-    "Arista.A7368": " 7368",
+    "Arista.A7368": " (DCS-)?7368",
     "Arista.A7368.X4": "X4",
-    "Arista.A7280": " DCS-7280",
-    "Arista.A7260": " DCS-7260",
+    "Arista.A7280": " (DCS-)?7280",
+    "Arista.A7260": " (DCS-)?7260",
     "Arista.A7260.CX3": "CX3",
-    "Arista.A7050": " 7050",
+    "Arista.A7050": " (DCS-)?7050",
     "Arista.A7050.SX3": "SX3",
-    "Arista.A7060": " DCS-7060",
+    "Arista.A7060": " (DCS-)?7060",
     "Arista.A7060.DX4": "DX4",
 
     "Nokia": "^[Nn]okia",
     "Nokia.NS7750": " 7750",
     "Nokia.SR_1s": "SR-1s",
 
-    "PC": "^(PC|pc|[Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Mm]oxa|NVIDIA|Nebius|[Aa]sterfusion CX|[Uu]fi[Ss]pace)",
+    "PC": "^(PC|pc|[Mm]ellanox SN|[Ee]dge-?[Cc]ore|[Mm]oxa|NVIDIA|Nebius|[Aa]sterfusion CX|[Uu]fi[Ss]pace|(VERTIV )?[Aa]vocent)",
 
     "PC.Whitebox": "([Mm]ellanox SN|[Ee]dge-?[Cc]ore|NVIDIA|[Aa]sterfusion CX|[Uu]fi[Ss]pace)",
     "PC.Whitebox.Mellanox": "[Mm]ellanox",
@@ -145,6 +145,8 @@
     "PC.Whitebox.Ufispace.S.S9300.S9321_64EO": " S9321-64EO",
     "PC.Nebius": "^Nebius",
     "PC.Nebius.NB-E-BR-DCU-AST2600": "^Nebius NB-E-BR-DCU-AST2600",
+    "PC.Avocent": " [Aa]vocent",
+    "PC.Avocent.ACS8000": " (ACS|acs)8000",
 
     "RouterOS": "^([Rr]outer[Oo][Ss]|[Mm]ikro[Tt]ik)",
 

{annet-3.9.2 → annet-3.10.0}/annet/rpl_generators/policy.py

@@ -696,16 +696,11 @@ class RoutingPolicyGenerator(PartialGenerator, ABC):
             else:
                 yield "set", "as-path match all replacement", *action.value.set
 
+        if action.value.prepend:
+            yield "set", "as-path prepend", *action.value.prepend
         if action.value.expand_last_as:
-            last_as_suffix: Sequence[str] = "last-as", action.value.expand_last_as
-        else:
-            last_as_suffix = ()
+            yield "set", "as-path prepend last-as", action.value.expand_last_as
 
-        if action.value.prepend:
-            for path_item in action.value.prepend:
-                yield "set", "as-path prepend", path_item, *last_as_suffix
-        else:
-            yield "set", "as-path prepend", *last_as_suffix
         if action.value.expand:
             raise RuntimeError("as_path.expand is not supported for arista")
         if action.value.delete:

{annet-3.9.2 → annet-3.10.0}/annet/tracing.py

@@ -6,7 +6,6 @@ from typing import Optional, Type, Union
 
 from annet.connectors import CachedConnector
 
-
 MinDurationT = Optional[Union[str, int]]
 
 
@@ -145,9 +144,9 @@ def function(arg=None, /, **outer_kwargs):
 
 def contextmanager(arg=None, /, **outer_kwargs):
     def decorator(cls_or_func):
-        if inspect.isfunction(cls_or_func):
-            cache = None
+        cache = None
 
+        if inspect.isfunction(cls_or_func):
             @contextlib.contextmanager
             @wraps(cls_or_func)
             def wrapper(*args, **kwargs):
@@ -159,12 +158,61 @@ def contextmanager(arg=None, /, **outer_kwargs):
 
             return wrapper
         else:
-            @wraps(cls_or_func.__enter__)
-            def enter(*args, **kwargs):
-                tracing_connector.get().contextmanager(cls_or_func, **outer_kwargs)  # redefine __enter__ and __exit__
-                return cls_or_func.__enter__(*args, **kwargs)  # pylint: disable=unnecessary-dunder-call
+            original_enter = cls_or_func.__enter__
+            original_exit = cls_or_func.__exit__
+
+            @wraps(original_enter)
+            def one_shot_enter(*args, **kwargs):
+                """Wrap after first call, tracing_connector was set up"""
+                nonlocal cache
+                if cache is None:
+                    cls_or_func.__enter__ = original_enter
+                    cls_or_func.__exit__ = original_exit
+                    cache = tracing_connector.get().contextmanager(cls_or_func, **outer_kwargs)
+                return cache.__enter__(*args, **kwargs)  # pylint: disable=unnecessary-dunder-call
+
+            @wraps(original_exit)
+            def one_shot_exit(*args, **kwargs):
+                nonlocal cache
+                return cache.__exit__(*args, **kwargs)
+
+            setattr(cls_or_func, "__enter__", one_shot_enter)
+            setattr(cls_or_func, "__exit__", one_shot_exit)
 
-            setattr(cls_or_func, "__enter__", enter)
             return cls_or_func
 
     return decorator if arg is None else decorator(arg)
+
+
+def class_methods(arg=None, /, **outer_kwargs):
+    def decorator(cls):
+        has_enter, has_exit = False, False
+
+        for name, attr in inspect.getmembers(cls, lambda x: (
+            inspect.isroutine(x)
+            and not inspect.ismethoddescriptor(x)
+            and not inspect.isbuiltin(x)
+        )):
+            if getattr(attr, "_disable_class_methods", False):
+                continue
+            if name == "__enter__":
+                has_enter = True
+            elif name == "__exit__":
+                has_exit = True
+            else:
+                method = function(**outer_kwargs)(attr)
+                if isinstance(inspect.getattr_static(cls, name), staticmethod):
+                    method = staticmethod(method)
+                setattr(cls, name, method)
+
+        if all((has_enter, has_exit)):
+            cls = contextmanager(**outer_kwargs)(cls)
+
+        return cls
+
+    return decorator if arg is None else decorator(arg)
+
+
+def disable_class_methods(func):
+    setattr(func, "_disable_class_methods", True)
+    return func

{annet-3.9.2 → annet-3.10.0/annet.egg-info}/PKG-INFO

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