annet 0.12.6__py3-none-any.whl → 0.12.8__py3-none-any.whl

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/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/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/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.dist-info → annet-0.12.8.dist-info}/METADATA

@@ -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.dist-info → annet-0.12.8.dist-info}/RECORD

@@ -6,9 +6,9 @@ annet/cli_args.py,sha256=Wv2X2wk6trTsGpKpcaZacGqVbDxMzEJvN8uYIJOq4D0,16071
 annet/connectors.py,sha256=FLFJlhb73g2c8e61zYnGn8dTkIiaaWYqeUCsZd48AWg,2471
 annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
-annet/executor.py,sha256=bw7COJNtssuxIqbQehlHYJnkdUeYvvL8WO5B-c67XE0,19040
+annet/executor.py,sha256=EaeQ_JeRFuUUHUoR2LXDcNvY7IVg0eA2d6zSmQVJt-M,19216
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=j8ldncYAGTUmuQermnAuP8lt278Mz5ubPx0JSkeGWgc,32862
+annet/gen.py,sha256=J3TKaD61HzHo2etEpStpTFcC19pbVwYUNSKX5YycpHg,32795
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
 annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
 annet/lib.py,sha256=zQIfNBg7fAAk2BHbHAqy_McAiXhz0RqpBAcfdU-6pAA,3742
@@ -68,7 +68,7 @@ annet/annlib/rulebook/common.py,sha256=9kCZwZpsH5UliF2OzaN9nLs2eLlz_d__4L7_oZ3Sr
 annet/api/__init__.py,sha256=nrtPSDGLk5GO6nKSXDx9PNrCyiDBCJRXuUG1ua_y9MM,33141
 annet/configs/context.yml,sha256=nt4QnzYzrG2hqmaWOUsab2wgFl-CXmFSzbto6rqqFt4,291
 annet/configs/logging.yaml,sha256=Hu42lRK248dssp9TgkbHCaZNl0E6f4IChGb0XaQnTVo,970
-annet/generators/__init__.py,sha256=ZWKdxy6XbANW8vO6Tz7TMP_5rkHHKPBiBhPK2g-NOvI,15609
+annet/generators/__init__.py,sha256=tk20umBuMEcd8QKET3mxJQsDj-dvjlwGnrlgTw0wbRY,15622
 annet/generators/base.py,sha256=rgQLcQBPZm4ecbKmRhVOpBR-GFJAiVfdb_y5f2-LUR8,3670
 annet/generators/entire.py,sha256=7WySkVaXNT3ZAiHcQ0JUKdlhGJAN8cNUxF6c7ilYnO8,2928
 annet/generators/exceptions.py,sha256=GPXTBgn2xZ3Ev_bdOPlfCLGRC1kQHe_dEq88S-uyi5s,151
@@ -78,7 +78,7 @@ annet/generators/perf.py,sha256=K72ivUuXbNXrsHrLeKWhGmczGYWsB7kUDdDzqOX6j3c,2370
 annet/generators/ref.py,sha256=QVdeL8po1D0kBsVLOpCjFR81D8yNTk-kaQj5WUM4hng,438
 annet/generators/result.py,sha256=boMG4mwvitBLlHdPM8rPOqlKPrrNAqdV6NAM9wwIZHc,4765
 annet/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/generators/common/initial.py,sha256=TDkY-ZNaL3yMxGGATVD76uR-nsNTmZrXs2_56MyndxM,1232
+annet/generators/common/initial.py,sha256=qYBxXFhyOPy34cxc6hsIXseod-lYCmmbuNHpM0uteY0,1244
 annet/rulebook/__init__.py,sha256=14IpOfTbeJtre7JKrfXVYiH0qAXsUSOL7AatUFmSQs0,3847
 annet/rulebook/common.py,sha256=zK1s2c5lc5HQbIlMUQ4HARQudXSgOYiZ_Sxc2I_tHqg,721
 annet/rulebook/deploying.py,sha256=XV0XQvc3YvwM8SOgOQlc-fCW4bnjQg_1CTZkTwMp14A,2972
@@ -128,10 +128,10 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=zVd8_DrXuOASrNzg2Ab94rPyvJff83L-_HppDFxnUjM,228
 annet_generators/example/lldp.py,sha256=68CLrK7vxTQQy9XIBxtywuEdBNlIlfXGYj8_wYWs5UI,1146
-annet-0.12.6.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.12.6.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.12.6.dist-info/METADATA,sha256=T6AvsDaqSWsBAZ0Q2MyGJzdyWnUhb-GtI7OV0pefjxg,694
-annet-0.12.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-annet-0.12.6.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.12.6.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.12.6.dist-info/RECORD,,
+annet-0.12.8.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.12.8.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.12.8.dist-info/METADATA,sha256=QV1U3C_eS9t_pCWA0arAfZqULlZCqE9_oteoCCv68vc,694
+annet-0.12.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+annet-0.12.8.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.12.8.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.12.8.dist-info/RECORD,,