annet 0.16.0__tar.gz → 0.16.2__tar.gz

{annet-0.16.0/annet.egg-info → annet-0.16.2}/PKG-INFO

@@ -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 → annet-0.16.2}/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-0.16.0 → annet-0.16.2}/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-0.16.0 → annet-0.16.2}/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-0.16.0 → annet-0.16.2}/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-0.16.0 → annet-0.16.2}/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-0.16.0 → annet-0.16.2}/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-0.16.0 → annet-0.16.2}/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 → annet-0.16.2/annet.egg-info}/PKG-INFO

@@ -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