gnetcli-adapter 2.0.0__tar.gz → 2.0.2__tar.gz

{gnetcli_adapter-2.0.0 → gnetcli_adapter-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gnetcli_adapter
-Version: 2.0.0
+Version: 2.0.2
 Summary: Gnetcli-server adapter for Annet
 Author-email: Aleksandr Balezin <gescheit12@gmail.com>
 Requires-Python: >=3.10

{gnetcli_adapter-2.0.0 → gnetcli_adapter-2.0.2}/src/gnetcli_adapter/gnetcli_adapter.py

@@ -15,6 +15,7 @@ from annet.connectors import AdapterWithConfig, AdapterWithName
 from typing import Dict, List, Any, Optional, Tuple
 from annet.storage import Device
 from gnetclisdk.client import Credentials, Gnetcli, HostParams, QA, File
+from gnetclisdk.exceptions import EOFError
 import gnetclisdk.proto.server_pb2 as pb
 from pydantic import Field, field_validator, FieldValidationInfo
 from pydantic_core import PydanticUndefined
@@ -307,6 +308,7 @@ def make_api(conf: AppSettings) -> Gnetcli:
             while time.monotonic() - start < 5:
                 if _local_gnetcli_p is not None and _local_gnetcli_p.returncode is not None:
                     raise Exception("gnetcli server died with code %s" % _local_gnetcli_p.returncode)
+        gnetcli_url = _local_gnetcli_url
     else:
         gnetcli_url = conf.url
     auth_token = conf.make_server_credentials()
@@ -318,6 +320,16 @@ def make_api(conf: AppSettings) -> Gnetcli:
     )
     return api
 
+def format_trace(trace: list[pb.CMDTraceItem]) -> str:
+    res:list[str] = []
+    for t in trace:
+        op = "unknown" # TODO: get from pb
+        if t.operation == 2:
+            op = "write"
+        elif t.operation == 3:
+            op = "read"
+        res.append(f"{op}={t.data}")
+    return "\n".join(res)
 
 class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
     def __init__(
@@ -391,12 +403,26 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
         async with self.api.cmd_session(hostname=device.fqdn) as sess:
             result: List[pb.CMDResult] = []
             for cmd in run_cmds:
-                res = await sess.cmd(
-                    cmd=cmd.cmd,
-                    cmd_timeout=cmd.timeout,
-                    host_params=host_params,
-                    qa=parse_annet_qa(cmd.questions or []),
-                )
+                if progress_bar:
+                    progress_bar.set_progress(device.fqdn, done_cmds, total_cmds, suffix=cmd.cmd)
+                try:
+                    res = await sess.cmd(
+                        cmd=cmd.cmd,
+                        cmd_timeout=cmd.timeout,
+                        host_params=host_params,
+                        qa=parse_annet_qa(cmd.questions or []),
+                        trace=True,
+                    )
+                    time.sleep(1)
+                except EOFError as e:
+                    if cmd.suppress_eof:
+                        if progress_bar:
+                            progress_bar.set_progress(device.fqdn, total_cmds, total_cmds, suffix=f"suppressed EOF: {cmd.cmd}")
+                        break  # we can't exec subsequent cmds
+                    raise e
+                if progress_bar:
+                    tr = format_trace(res.trace)
+                    progress_bar.set_content(device.fqdn, f"cmd={cmd.cmd} out={res.out_str} status={res.status}\n{tr}")
                 done_cmds += 1
                 if res.status != 0:
                     if cmd.suppress_nonzero:
@@ -406,10 +432,10 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
                     raise Exception("cmd %s error %s status %s", cmd, res.error, res.status)
                 result.append(res)
                 if progress_bar:
-                    progress_bar.set_progress(device.fqdn, len(cmds), total_cmds)
+                    progress_bar.set_progress(device.fqdn, done_cmds, total_cmds)
             if do_reload:
                 for file, cmds in reload_cmds.items():
-                    _logger.debug("reload %s", file, cmds)
+                    _logger.debug("reload %s %s", file, cmds)
                     for cmd in cmds:
                         if progress_bar:
                             progress_bar.set_progress(device.fqdn, done_cmds, total_cmds, suffix=f"{file}:{cmd.cmd}")
@@ -431,7 +457,7 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
                                 break # break on command for current file
                             raise Exception("cmd %s error %s status %s", cmd, res.error, res.status)
                         result.append(res)
-                if progress_bar:
+                if reload_cmds and progress_bar:
                     progress_bar.set_progress(device.fqdn, total_cmds, total_cmds)
             if seen_exc and progress_bar:
                 progress_bar.set_exception(device.fqdn, "seen exception", str(seen_exc), total_cmds)