annet 0.12.5__py3-none-any.whl → 0.12.7__py3-none-any.whl

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

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

@@ -8,7 +8,7 @@ annet/deploy.py,sha256=B8E0P_VvCrS2URjFvgmUiIkHp95g7pAWfmT34igaDeo,18893
 annet/diff.py,sha256=zLcaCnb4lZRUb7frpH1CstQ3kacRcCblZs1uLG8J5lk,3391
 annet/executor.py,sha256=bw7COJNtssuxIqbQehlHYJnkdUeYvvL8WO5B-c67XE0,19040
 annet/filtering.py,sha256=F4ZKUCU3Yb1RlL2zKdyHtVUaWPzjWF4vWyMcdygKNYk,852
-annet/gen.py,sha256=f2Prqn0MMEkNT-CdqI_Zb7R9_iaUA8dBS5nr67ShUws,32502
+annet/gen.py,sha256=aVq2QkOG42KvHzSMKpiPXP7Awp8naVViqp46fz2IuwI,32795
 annet/hardware.py,sha256=HYPDfji_GdRn5S0_0fl4rvM7byOY9aHxG6VMAtsLaxE,1090
 annet/implicit.py,sha256=QigK4uoxvrFho2h9yFjOq1d9rLsC5xFlAU4bKkCuMWk,5139
 annet/lib.py,sha256=zQIfNBg7fAAk2BHbHAqy_McAiXhz0RqpBAcfdU-6pAA,3742
@@ -65,10 +65,10 @@ annet/annlib/rbparser/platform.py,sha256=iyqy4A-6vUKM4j6hrOA6tsgWBXk7LcvkFrS2QHg
 annet/annlib/rbparser/syntax.py,sha256=eEUmszwPjdw57aofUYNQVcaxHPNV9yx9JNapjYY-BGM,3572
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=9kCZwZpsH5UliF2OzaN9nLs2eLlz_d__4L7_oZ3SrCw,16054
-annet/api/__init__.py,sha256=LDl_JB_azU3v-sI5EwsJkiMDm_zZ7zYFBx8FHDW3Eag,33180
+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.5.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.12.5.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.12.5.dist-info/METADATA,sha256=kFuaps_0RVxV1AnE5VK3Q1wwCl7p21QD5t1MzJZVp74,694
-annet-0.12.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-annet-0.12.5.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
-annet-0.12.5.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.12.5.dist-info/RECORD,,
+annet-0.12.7.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.12.7.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.12.7.dist-info/METADATA,sha256=_zMFNJ1-PhNI0li0_MMPpsy25mkJ-ZwBHbGeMJQOha4,694
+annet-0.12.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+annet-0.12.7.dist-info/entry_points.txt,sha256=yHimujIzR2bwNIbb--MTs_GpXiAve89Egpu2LlgTEkg,119
+annet-0.12.7.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.12.7.dist-info/RECORD,,