annet 0.12.6__tar.gz → 0.12.8__tar.gz

{annet-0.12.6/annet.egg-info → annet-0.12.8}/PKG-INFO

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

{annet-0.12.6 → annet-0.12.8}/annet/executor.py

@@ -359,7 +359,7 @@ async def bulk(
     tasks = []
     res = {}
     pending = set()
-    tasks_to_hostname = {}
+    tasks_to_device = {}
     time_of_start = {}
     deploy_durations = {}
     now = None
@@ -391,10 +391,15 @@ async def bulk(
             return task.result()
 
     for device in devices:
-        conn = await executor.amake_connection(device=device)
+        try:
+            conn = await executor.amake_connection(device=device)
+        except Exception as exc:
+            _logger.error("failed to connect to %s %r", device.hostname, exc)
+            res[device] = exc
+            continue
         start_hook(device)
         task = asyncio.create_task(coro_gen(conn=conn, device=device, **kwargs))
-        tasks_to_hostname[task] = device
+        tasks_to_device[task] = device
         tasks.append(task)
     try:
         ndone = 0
@@ -415,21 +420,21 @@ async def bulk(
 
                 now = time.monotonic()
                 for task in done:
-                    hostname = tasks_to_hostname[task]
-                    res[hostname] = end_hook(hostname, task)
+                    device = tasks_to_device[task]
+                    res[device] = end_hook(device, task)
                     ndone += 1
     except CancelAllTasks:
         exc = asyncio.CancelledError()
 
         now = time.monotonic()
-        for hostname, task in _get_remaining(tasks, pending, tasks_to_hostname):
-            res[hostname] = exc
+        for device, task in _get_remaining(tasks, pending, tasks_to_device):
+            res[device] = exc
 
-            if hostname in time_of_start:
-                duration = now - time_of_start[hostname]
+            if device.hostname in time_of_start:
+                duration = now - time_of_start[device.hostname]
             else:
                 duration = None
-            deploy_durations[hostname] = duration
+            deploy_durations[device.hostname] = duration
 
             if not asyncio.iscoroutine(task):
                 _logger.info("task %s", task)
@@ -471,11 +476,11 @@ class CancelAllTasks(Exception):
     pass
 
 
-def _get_remaining(tasks, pending, tasks_to_hostname):
+def _get_remaining(tasks, pending, tasks_to_device):
     for task in pending:
-        yield (tasks_to_hostname[task], task)
+        yield (tasks_to_device[task], task)
     for task in tasks:
-        yield (tasks_to_hostname[task], task)
+        yield (tasks_to_device[task], task)
 
 
 _platform = platform.system()

{annet-0.12.6 → annet-0.12.8}/annet/gen.py

@@ -709,10 +709,9 @@ def _old_new_get_config_cli(ctx: OldNewDeviceContext, device: Device) -> str:
     elif ctx.config == "running":
         text = ctx.running.get(device)
         if text is None:
-            exc = (ctx.failed_running.get(device.fqdn) or
-                   ctx.failed_running.get(device.hostname) or
+            exc = (ctx.failed_running.get(device) or
                    Exception("I can't get device config and I don't know why"))
-            get_logger(host=device.hostname).error("config error %s", exc)
+            get_logger(host=device.hostname).error("config error %r", exc)
             raise exc
     elif ctx.config == "-":
         text = ctx.stdin["config"]

{annet-0.12.6 → annet-0.12.8}/annet/generators/__init__.py

@@ -120,7 +120,7 @@ def run_partial_initial(device):
     tracing_connector.get().set_device_attributes(tracing_connector.get().get_current_span(), device)
 
     run_args = GeneratorPartialRunArgs(device)
-    return run_partial_generators([InitialConfig(storage=device.storage)], [], run_args)
+    return run_partial_generators([InitialConfig(storage=device.storage, do_run=True)], [], run_args)
 
 
 @tracing.function

{annet-0.12.6 → annet-0.12.8}/annet/generators/common/initial.py

@@ -12,9 +12,9 @@ class InitialConfig(PartialGenerator):
     Acl для данного генератора не нужен, он будет генерировать
     конфиг целиком.
     """
-    def __init__(self, storage=None):
-        self._do_run = not storage
+    def __init__(self, storage, do_run: bool = False):
         super().__init__(storage=storage)
+        self._do_run = do_run
 
     def run_huawei(self, device):
         if not self._do_run:

{annet-0.12.6 → annet-0.12.8/annet.egg-info}/PKG-INFO

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