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

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

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

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

@@ -142,6 +142,8 @@ atexit.register(cleanup)
 
 
 async def gather_with_concurrency(n: int, *coros: list[asyncio.Task]):
+    if n == 0:
+        return await asyncio.gather(*coros)
     semaphore = asyncio.Semaphore(n)
 
     async def sem_coro(coro):
@@ -400,10 +402,13 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
         except Exception:
             pass
         deploy_items = deploy_cmds.items()
-        result = await gather_with_concurrency(
-            max_parallel,
-            *[asyncio.Task(self.deploy(device, cmds, args, progress_bar)) for device, cmds in deploy_items],
-        )
+        if max_parallel == 1:
+            result = await self.serial_deploy(deploy_items, args, progress_bar)
+        else:
+            result = await gather_with_concurrency(
+                max_parallel,
+                *[self.deploy(device, cmds, args, progress_bar) for device, cmds in deploy_items],
+            )
         res = DeployResult(hostnames=[], results={}, durations={}, original_states={})
         res.add_results(results={dev.fqdn: dev_res for (dev, _), dev_res in zip(deploy_items, result)})
         return res
@@ -440,6 +445,22 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
             tracker.add_tracker(FileProgressTracker(device, self.logs_dir))
         return tracker
 
+    async def serial_deploy(self, deploy_items, args, progress_bar: ProgressBar | None = None):
+        res = {}
+        for device, cmds in deploy_items:
+            if progress_bar:
+                try:
+                    # hack, no way to do this using interface ProgressBar
+                    for no, fqdn in enumerate(progress_bar.tiles_params):
+                        if fqdn == device.fqdn:
+                            progress_bar._set_active_tile(no)
+                            break
+                except Exception:
+                    pass
+            dev_res = await self.deploy(device, cmds, args, progress_bar)
+            res[device] = dev_res
+        return res
+
     async def deploy(
             self,
             device: Device,