annet 3.9.2__py3-none-any.whl → 3.10.0__py3-none-any.whl

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

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

@@ -20,7 +20,7 @@ annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
 annet/storage.py,sha256=44f2aHNFOsQMSJwFvGxyu26oRcs3QmS24TKivcfPlxU,4064
 annet/text_term_format.py,sha256=y0U6VuFEAEil8Ab3HB8DBbVHisu31EHiRV7AOVruCeA,2816
-annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
+annet/tracing.py,sha256=GpFULDQroXREXzRkXvotA15O1QRcia15kGOqGeBQDig,5668
 annet/types.py,sha256=f2HwqoKa6AucwFwDMszoouB6m1B8n6VmdjHMktO30Kc,7175
 annet/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/fetchers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -64,7 +64,7 @@ annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/db.py,sha256=fI_u5aya4l61mbYSjj4JwlVfi3s7obt2jqERSuXGRUI,1634
 annet/annlib/netdev/devdb/__init__.py,sha256=aKYjjLbJebdKBjnGDpVLQdSqrV2JL24spGm58tmMWVU,892
-annet/annlib/netdev/devdb/data/devdb.json,sha256=Z-WCeDo9hoEZ19t1kkA8N5AbVC6OqvWJTwKTaPCcfxg,7077
+annet/annlib/netdev/devdb/data/devdb.json,sha256=HI43va6tlOAFRSRnjXR7Ex32B4ZbRH0yvrjzud2apJM,7198
 annet/annlib/netdev/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/views/dump.py,sha256=rIlyvnA3uM8bB_7oq1nS2KDxTp6dQh2hz-FbNhYIpOU,4630
 annet/annlib/netdev/views/hardware.py,sha256=XvHtRn29SROKtxqMyr86oc1ItUKy36N98ppfuJQL8PY,3235
@@ -113,7 +113,7 @@ annet/rpl_generators/community.py,sha256=vvjBupVrMn3B2OFDLXxgUq0QQBpp5TWdlJOAYpU
 annet/rpl_generators/cumulus_frr.py,sha256=eABVCpn4ru_BFQJDcPZZEi1EL1cBwfNhtC1mDmC6BwA,21548
 annet/rpl_generators/entities.py,sha256=uO78iG2zHAGra5DqzpfnBgoc6slHEc6wDLvlnoySvJc,3750
 annet/rpl_generators/execute.py,sha256=wS6e6fwcPWywsHB0gBMqZ17eF0s4YOBgDgwPB_cr5Rw,431
-annet/rpl_generators/policy.py,sha256=8ScDUy4zBd-358Bbkd1FZ3EpGsbLzgu6JbjfOzGMDtQ,52341
+annet/rpl_generators/policy.py,sha256=a0xuLJ7duYT0YrXipLe2_KvBRJlUt-npM4PM4O5IFqg,52158
 annet/rpl_generators/prefix_lists.py,sha256=sxTPeOJufwogguuhjjMbrGSgW3wm2HNboX9tN3qLitU,6910
 annet/rpl_generators/rd.py,sha256=-l0Dy-t1lIFCLLIzRb_okwU1jxr_kNEds92FyoVS7qs,1999
 annet/rulebook/__init__.py,sha256=AmcqrLYaoU1-sO2vmtjWZbzsZ44_w7nXncoEVa_hpyk,3997
@@ -200,8 +200,8 @@ annet/vendors/library/optixtrans.py,sha256=VdME69Ca4HAEgoaKN21fZxnmmsqqaxOe_HZja
 annet/vendors/library/pc.py,sha256=vfv31_NPi7M-4AUDL89UcpawK2E6xvCpELA209cd1ho,1086
 annet/vendors/library/ribbon.py,sha256=DDOBq-_-FL9dCxqXs2inEWZ-pvw-dJ-A-prA7cKMhec,1216
 annet/vendors/library/routeros.py,sha256=iQa7m_4wjuvcgBOI9gyZwlw1BvzJfOkvUbyoEk-NI9I,1254
-annet-3.9.2.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.9.2.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.10.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.10.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
 annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
@@ -214,8 +214,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=HPgxScDvSqJPdz0c2SppDrH82DZYC4zUaniQwcWmh4A,1176
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-3.9.2.dist-info/METADATA,sha256=3eXSTqu-H74ODjsnBYQcAG6K1tSrIZ0sj0a4Vht_Mp4,815
-annet-3.9.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-annet-3.9.2.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.9.2.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.9.2.dist-info/RECORD,,
+annet-3.10.0.dist-info/METADATA,sha256=vNT4cNxluWuvug1t-yfWrqYFXmoijXsZNzXM2UUysUk,816
+annet-3.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+annet-3.10.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.10.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.10.0.dist-info/RECORD,,