annet 0.16.0__py3-none-any.whl → 0.16.2__py3-none-any.whl

annet/adapters/netbox/common/models.py

@@ -52,17 +52,17 @@ class DeviceIp(DumpableView):
 class Prefix(DumpableView):
     id: int
     prefix: str
-    site: Entity | None
-    vrf: Entity | None
-    tenant: Entity | None
-    vlan: Entity | None
-    role: Entity | None
+    site: Optional[Entity]
+    vrf: Optional[Entity]
+    tenant: Optional[Entity]
+    vlan: Optional[Entity]
+    role: Optional[Entity]
     status: Label
     is_pool: bool
     custom_fields: dict[str, Any]
     created: datetime
     last_updated: datetime
-    description: str | None = ""
+    description: Optional[str] = ""
 
     @property
     def _dump__list_key(self):
@@ -123,6 +123,7 @@ class Interface(Entity):
     display: str = ""
     ip_addresses: List[IpAddress] = field(default_factory=list)
     vrf: Optional[Entity] = None
+    mtu: int | None = None
 
 
 @dataclass

annet/adapters/netbox/common/storage_opts.py

@@ -1,5 +1,5 @@
 import os
-from typing import Any
+from typing import Any, Optional
 
 DEFAULT_URL = "http://localhost"
 
@@ -10,7 +10,7 @@ class NetboxStorageOpts:
         self.token = token
 
     @classmethod
-    def parse_params(cls, conf_params: dict[str, str] | None, cli_opts: Any):
+    def parse_params(cls, conf_params: Optional[dict[str, str]], cli_opts: Any):
         url = os.getenv("NETBOX_URL") or conf_params.get("url") or DEFAULT_URL
         token = os.getenv("NETBOX_TOKEN", "").strip() or conf_params.get("token") or ""
         return cls(url=url, token=token)

annet/adapters/netbox/provider.py

@@ -31,8 +31,9 @@ class NetboxProvider(StorageProvider, AdapterWithName, AdapterWithConfig):
         self.url = url
         self.token = token
 
-    def with_config(self, **kwargs: Dict[str, Any]) -> T:
-        return NetboxProvider(**kwargs)
+    @classmethod
+    def with_config(cls, **kwargs: Dict[str, Any]) -> T:
+        return cls(**kwargs)
 
     def storage(self):
         return storage_factory
@@ -43,5 +44,6 @@ class NetboxProvider(StorageProvider, AdapterWithName, AdapterWithConfig):
     def query(self):
         return NetboxQuery
 
-    def name(self) -> str:
+    @classmethod
+    def name(cls) -> str:
         return "netbox"

annet/annlib/netdev/devdb/data/devdb.json

@@ -52,6 +52,7 @@
     "Huawei.CE.CE8800": " CE88\\d\\d",
     "Huawei.CE.CE8800.CE8850": " CE8850",
     "Huawei.CE.CE8800.CE8851": " CE8851",
+    "Huawei.CE.CE8800.CE8855": " CE8855",
     "Huawei.CE.CE9800": " CE98\\d\\d",
     "Huawei.Quidway": " (LS-)?S",
     "Huawei.Quidway.S2x": "2\\d{3}",

annet/cli.py

@@ -8,7 +8,7 @@ import subprocess
 import shutil
 import sys
 from contextlib import ExitStack, contextmanager
-from typing import Tuple, Iterable
+from typing import Optional, Tuple, Iterable
 
 import tabulate
 import yaml
@@ -129,7 +129,7 @@ def show_generators(args: cli_args.ShowGeneratorsOptions):
     """ List applicable generators (for a device if query is set) """
     arg_gens = cli_args.GenOptions(args)
     with get_loader(arg_gens, args) as loader:
-        device: Device | None = None
+        device: Optional[Device] = None
         devices = loader.devices
         if len(devices) == 1:
             device = devices[0]

annet/connectors.py

@@ -42,11 +42,11 @@ class Connector(ABC, Generic[T]):
         res = self._classes[0]
         return res(*args, **kwargs)
 
-    def get_all(self, *args, **kwargs) -> List[T]:
+    def get_all(self) -> List[T]:
         if self._classes is None:
             self._classes = self._entry_point or [self._get_default()]
 
-        return [cls(*args, **kwargs) for cls in self._classes]
+        return self._classes.copy()
 
     def set(self, cls: Type[T]):
         if self._classes is not None:
@@ -97,18 +97,20 @@ def load_entry_point_new(group: str) -> List:
 
 
 class AdapterWithConfig(ABC, Generic[T]):
+    @classmethod
     @abstractmethod
-    def with_config(self, **kwargs: Dict[str, Any]) -> T:
+    def with_config(cls, **kwargs: Dict[str, Any]) -> T:
         pass
 
 
 class AdapterWithName(ABC):
+    @classmethod
     @abstractmethod
-    def name(self) -> str:
+    def name(cls) -> str:
         pass
 
 
-def get_connector_from_config(config_key: str, connectors: List[Connector]) -> Tuple[Connector, Dict[str, Any]]:
+def get_connector_from_config(config_key: str, connectors: List[Type[Connector]]) -> Tuple[Connector, Dict[str, Any]]:
     seen: list[str] = []
     if not connectors:
         raise Exception("empty connectors")
@@ -119,8 +121,8 @@ def get_connector_from_config(config_key: str, connectors: List[Connector]) -> T
         connector_params = context_storage.get("params", {})
         if adapter_name:
             for con in connectors:
-                con_name = connector.__class__.__name__
-                if isinstance(con, AdapterWithName):
+                con_name = connector.__name__
+                if issubclass(con, AdapterWithName):
                     con_name = con.name()
                 seen.append(con_name)
                 if adapter_name == con_name:
@@ -136,8 +138,10 @@ def get_connector_from_config(config_key: str, connectors: List[Connector]) -> T
         connector = connectors[0]
         if len(connectors) > 1:
             warnings.warn(f"Please specify '{config_key}'. Found more than one classes {connectors}", UserWarning)
-    if isinstance(connector, AdapterWithConfig):
-        connector = connector.with_config(**connector_params)
+    if issubclass(connector, AdapterWithConfig):
+        connector_ins = connector.with_config(**connector_params)
+    else:
+        connector_ins = connector()
     # return connector_params only for storage
     # TODO: switch storage interface to AdapterWithConfig
-    return connector, connector_params
+    return connector_ins, connector_params

annet/deploy.py

@@ -481,7 +481,7 @@ def make_cmd_params(rule: Dict[str, Any]) -> Dict[str, Any]:
     }
 
 
-def make_apply_commands(rule: dict, hw: HardwareView, do_commit: bool, do_finalize: bool, path: str | None = None):
+def make_apply_commands(rule: dict, hw: HardwareView, do_commit: bool, do_finalize: bool, path: Optional[str] = None):
     apply_logic = rule["attrs"]["apply_logic"]
     before, after = apply_logic(hw, do_commit=do_commit, do_finalize=do_finalize, path=path)
     return before, after

{annet-0.16.0.dist-info → annet-0.16.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.0
+Version: 0.16.2
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.16.0.dist-info → annet-0.16.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 annet/__init__.py,sha256=k2dq8aOYjkjZszKoOlxEmR49uYoKh-8_HC2K8FeqLwA,2139
 annet/annet.py,sha256=TMdEuM7GJQ4TjRVmuK3bCTZN-21lxjQ9sXqEdILUuBk,725
 annet/argparse.py,sha256=v1MfhjR0B8qahza0WinmXClpR8UiDFhmwDDWtNroJPA,12855
-annet/cli.py,sha256=ugxI_NFi-yuMn4RIlFKlqCDUurPXlSAa7kR9hkd1OxA,12329
+annet/cli.py,sha256=hDpjIr3w47lgQ_CvCQS1SXFDK-SJrf5slbT__5u6GIA,12342
 annet/cli_args.py,sha256=KQlihxSl-Phhq1-9oJDdNSbIllEX55LlPfH6viEKOuw,13483
-annet/connectors.py,sha256=_DY5JwR_uU_obOpzo2a_JsexIE-lbNjG1Hq2nOpQm4w,5067
-annet/deploy.py,sha256=JLS9F67QHOccm-EEEzM8JlfIITmlx0D__XoOL4lEcD8,18953
+annet/connectors.py,sha256=-Lghz3PtWCBU8Ohrp0KKQcmm1AUZtN0EnOaZ6IQgCQI,5105
+annet/deploy.py,sha256=pM7r8ipk7y-b4OIenc8FMqZpy5F6TmKdo8DDUJNRBlY,18956
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=FrYAUuh2TpSVX42SlTN_PhuSHmXG4Wj1nieY9Wqv9so,19122
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
@@ -23,14 +23,14 @@ annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
 annet/types.py,sha256=f2HwqoKa6AucwFwDMszoouB6m1B8n6VmdjHMktO30Kc,7175
 annet/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/adapters/netbox/provider.py,sha256=mnvxSy3vTwdEHvzfy_Tfji4J4-BDmiKwkcF0s-EAs2M,1449
+annet/adapters/netbox/provider.py,sha256=IIs37QFHuJHxq4A0WfBS4JENk--v3BxqgNPal1Or4Xc,1470
 annet/adapters/netbox/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/common/client.py,sha256=-lWZmphD-OPuLIHNKhW_h2bnjrVaiyKYAD_MUPasEbo,2483
 annet/adapters/netbox/common/manufacturer.py,sha256=WZsBfHq6kohbbkszxPARjMdXB5rWGBO4Gz1rA-IlqL8,1555
-annet/adapters/netbox/common/models.py,sha256=enTd2c3pcs6KIMAeRquDMGtq-lZ_2_68JkF_mCKedoc,3271
+annet/adapters/netbox/common/models.py,sha256=zWxsChKZiJ_VQ5_K-l_o-iyDQgxNLvYpk4EvVSoga5o,3316
 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=afBMiIOOHFRJLh4KCLPflCCXKxh7D7VX9EL5wxFkuZI,494
+annet/adapters/netbox/common/storage_opts.py,sha256=iadgWGMb-rfSp3SnFAw8SH5bMKjwvcAsJ74v_z0CCXQ,507
 annet/adapters/netbox/v24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/netbox/v24/storage.py,sha256=THI592VLx3ehixsPZQ1Ko3mYIAZQbnDY-toIziqBbL8,6005
 annet/adapters/netbox/v37/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -49,7 +49,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=GEKBY3Mx1wjLmhlN9h6VIj5RoTCA2thmDIEXBvv6EVg,5898
+annet/annlib/netdev/devdb/data/devdb.json,sha256=Qph7WxZBEbgBqbCFeYu6ZM0qkEBn80WmJEjfJkcaZ-0,5940
 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=1JdTkrumOTYd5GKz4_LKg8G-B6ccrzl5VdNT-JhX40A,3495
@@ -133,10 +133,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
 annet_generators/example/lldp.py,sha256=24bGvShxbio-JxUdaehyPRu31LhH9YwSwFDrWVRn6yo,2100
-annet-0.16.0.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.0.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.0.dist-info/METADATA,sha256=EAGnX05mQrFRr9TUWUKNUWlrP53XGcPPURku-e3llFw,694
-annet-0.16.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-annet-0.16.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.0.dist-info/RECORD,,
+annet-0.16.2.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.2.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.2.dist-info/METADATA,sha256=YdQdLWLVxedQwFGAEbcsgOd3arNJ0M2DdRV8K9NxE_k,694
+annet-0.16.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+annet-0.16.2.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.2.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.2.dist-info/RECORD,,