annet 0.12.5__tar.gz → 0.12.7__tar.gz

{annet-0.12.5/annet.egg-info → annet-0.12.7}/PKG-INFO

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

{annet-0.12.5 → annet-0.12.7}/annet/api/__init__.py

@@ -221,9 +221,8 @@ def log_host_progress_cb(pool: Parallel, task_result: TaskResult):
     connector = storage_connector.get()
     storage_opts = connector.opts().from_cli_opts(args)
     with connector.storage()(storage_opts) as storage:
-        hosts = storage.resolve_fdnds_by_query(args.query)
-    fqdn = hosts[task_result.device_id]
-    PoolProgressLogger(device_fqdns=fqdn)(pool, task_result)
+        fqdns = storage.resolve_fdnds_by_query(args.query)
+    PoolProgressLogger(device_fqdns=fqdns)(pool, task_result)
 
 
 # =====

{annet-0.12.5 → annet-0.12.7}/annet/gen.py

@@ -378,7 +378,11 @@ def old_new(
     do_files_download=False,
     do_print_perf=True,
 ):
-    devices = loader.devices
+    if device_ids is None:
+        devices = loader.devices
+    else:
+        devices = [loader.get_device(device_id) for device_id in device_ids]
+
     gens = loader.resolve_gens(devices)
     running, failed_running = _old_resolve_running(config, devices)
     downloaded_files, failed_files = _old_resolve_files(config, devices, gens, do_files_download)
@@ -705,8 +709,7 @@ 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)
             raise exc
@@ -819,7 +822,7 @@ class Loader:
         self._args = args
         self._storages = storages
         self._no_empty_warning = no_empty_warning
-        self._devices_map: Dict[int, Device] = {}
+        self._devices_map: Dict[Any, Device] = {}
         self._gens: DeviceGenerators = DeviceGenerators()
 
         self._preload()
@@ -843,14 +846,19 @@ class Loader:
             return
 
     @property
-    def device_fqdns(self):
+    def device_fqdns(self) -> Dict[Any, str]:
         return {
             device_id: d.fqdn
             for device_id, d in self._devices_map.items()
         }
 
+    def get_device(self, device_id: Any) -> Device:
+        if device_id not in self._devices_map:
+            raise KeyError(f"Unknown device with id {device_id}")
+        return self._devices_map[device_id]
+
     @property
-    def device_ids(self):
+    def device_ids(self) -> List[Any]:
         return list(self._devices_map)
 
     @property

{annet-0.12.5 → annet-0.12.7}/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.5 → annet-0.12.7}/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.5 → annet-0.12.7/annet.egg-info}/PKG-INFO

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