gnetcli-adapter 2.0.3__tar.gz → 2.0.5__tar.gz

gnetcli_adapter-2.0.5/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 annetutil
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{gnetcli_adapter-2.0.3 → gnetcli_adapter-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: gnetcli_adapter
-Version: 2.0.3
+Version: 2.0.5
 Summary: Gnetcli-server adapter for Annet
 Author-email: Aleksandr Balezin <gescheit12@gmail.com>
 Requires-Python: >=3.10
@@ -11,6 +11,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+License-File: LICENSE
 Requires-Dist: annet>=1.0.0
 Requires-Dist: gnetclisdk>=1.0.31
 Requires-Dist: pydantic_settings

{gnetcli_adapter-2.0.3 → gnetcli_adapter-2.0.5}/src/gnetcli_adapter/gnetcli_adapter.py

@@ -33,6 +33,7 @@ breed_to_device = {
     "bcom-os": "bcomos",
     "pc": "pc",
     "cuml2": "pc",
+    "moxa": "pc",
     "jun10": "juniper",
     "eos4": "arista",
     "h3c": "h3c",
@@ -231,23 +232,34 @@ class GnetcliFetcher(Fetcher, AdapterWithConfig, AdapterWithName):
                     devices: List[Device],
                     files_to_download: Optional[Dict[Device, List[str]]] = None,
                     processes: int = 1,
-        max_slots: int = 0,):
+                    max_slots: int = 0,
+    ):
         running = {}
         failed_running = {}
+
+        tasks = {}
         for device in devices:
-            try:
-                if files_to_download or device.is_pc():
-                    if files_to_download:
-                        files =files_to_download.get(device, [])
-                        dev_res = await self.adownload_dev(device=device, files=files)
-                    else:
-                        dev_res = {}
+            if files_to_download or device.is_pc():
+                if files_to_download:
+                    files = files_to_download.get(device, [])
+                    task = asyncio.create_task(self.adownload_dev(device=device, files=files))
+                    tasks[task] = device
                 else:
-                    dev_res = await self.afetch_dev(device=device)
-            except Exception as e:
-                failed_running[device] = e
+                    running[device] = {}
+            else:
+                task = asyncio.create_task(self.afetch_dev(device=device))
+                tasks[task] = device
+
+        if not tasks:
+            return running, failed_running
+
+        done, pending = await asyncio.wait(list(tasks), return_when=asyncio.ALL_COMPLETED)
+        for task in done:
+            device = tasks[task]
+            if (exc := task.exception()) is not None:
+                failed_running[device] = exc
             else:
-                running[device] = dev_res
+                running[device] = task.result()
         return running, failed_running
 
     async def afetch_dev(self, device: Device) -> str:
@@ -272,13 +284,14 @@ class GnetcliFetcher(Fetcher, AdapterWithConfig, AdapterWithName):
         return b"\n".join(dev_result).decode()
 
     async def adownload_dev(self, device: Device, files: List[str]) -> Dict[str, str]:
+        gnetcli_device = breed_to_device.get(device.breed, device.breed)
         ip = get_device_ip(device)
         downloaded = await self.api.download(
             hostname=device.fqdn,
             paths=files,
             host_params=HostParams(
                 credentials=self.conf.make_dev_credentials(),
-                device="pc",
+                device=gnetcli_device,
                 ip=ip,
             ),
         )