gnetcli-adapter 2.4.2__tar.gz → 2.5.1__tar.gz

{gnetcli_adapter-2.4.2 → gnetcli_adapter-2.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gnetcli_adapter
-Version: 2.4.2
+Version: 2.5.1
 Summary: Gnetcli-server adapter for Annet
 Author-email: Aleksandr Balezin <gescheit12@gmail.com>
 Requires-Python: >=3.10
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 License-File: LICENSE
+Requires-Dist: exceptiongroup>=1.1.3; python_version<'3.11'
 Requires-Dist: annet>=3.2.0
 Requires-Dist: gnetclisdk>=1.0.90
 Requires-Dist: pydantic_settings

{gnetcli_adapter-2.4.2 → gnetcli_adapter-2.5.1}/pyproject.toml

@@ -5,6 +5,7 @@ build-backend = "flit_core.buildapi"
 [project]
 name =  "gnetcli_adapter"
 dependencies = [
+  "exceptiongroup>=1.1.3; python_version<'3.11'",
   "annet>=3.2.0",
   "gnetclisdk>=1.0.90",
   "pydantic_settings",

{gnetcli_adapter-2.4.2 → gnetcli_adapter-2.5.1}/src/gnetcli_adapter/gnetcli_adapter.py

@@ -32,6 +32,14 @@ import threading
 import atexit
 import shutil
 import os.path
+try:
+    from builtins import (  # type: ignore[attr-defined, unused-ignore]
+        ExceptionGroup,
+    )
+except ImportError:
+    from exceptiongroup import (  # type: ignore[no-redef, import-not-found, unused-ignore]
+        ExceptionGroup,
+    )
 
 breed_to_device = {
     "routeros": "ros",
@@ -160,6 +168,16 @@ def get_device_ip(dev: Device) -> Optional[str]:
         for iface in dev.interfaces:
             for ip in iface.ip_addresses:
                 return ip.address.split("/")[0]
+    else:
+        try:
+            if dev.primary_ip:
+                return dev.primary_ip.address.split("/")[0]
+            if dev.interfaces:
+                for iface in dev.interfaces:
+                    for ip in iface.ip_addresses:
+                        return ip.address.split("/")[0]
+        except Exception as e:
+            _logger.warning("get device ip error: %s", e)
     return None
 
 
@@ -467,7 +485,7 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
             cmds: CommandList,
             args: DeployOptions,
             progress_bar: ProgressBar | None = None,
-    ) -> tuple[list[Exception], list[pb.CMDResult]]:
+    ) -> Exception | None:
         gnetcli_device = breed_to_device.get(device.breed, device.breed)
         ip = get_device_ip(device)
         host_params = HostParams(
@@ -506,7 +524,10 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
                 tracker.finish_err(f"Seen {len(seen_exc)} exceptions")
             else:
                 tracker.finish_ok("All done")
-            return seen_exc, results
+
+            if seen_exc:
+                return ExceptionGroup("Deploy failed with exceptions", seen_exc)
+            return None
 
     async def _deploy(
             self,