gnetcli-adapter 2.2.3__tar.gz → 2.4.0__tar.gz

{gnetcli_adapter-2.2.3 → gnetcli_adapter-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gnetcli_adapter
-Version: 2.2.3
+Version: 2.4.0
 Summary: Gnetcli-server adapter for Annet
 Author-email: Aleksandr Balezin <gescheit12@gmail.com>
 Requires-Python: >=3.10
@@ -12,8 +12,8 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 License-File: LICENSE
-Requires-Dist: annet>=2.2.0
-Requires-Dist: gnetclisdk>=1.0.31
+Requires-Dist: annet>=3.2.0
+Requires-Dist: gnetclisdk>=1.0.90
 Requires-Dist: pydantic_settings
 Requires-Dist: pydantic
 Requires-Dist: bandit[toml]==1.7.5 ; extra == "test"

{gnetcli_adapter-2.2.3 → gnetcli_adapter-2.4.0}/pyproject.toml

@@ -5,8 +5,8 @@ build-backend = "flit_core.buildapi"
 [project]
 name =  "gnetcli_adapter"
 dependencies = [
-  "annet>=2.2.0",
-  "gnetclisdk>=1.0.31",
+  "annet>=3.2.0",
+  "gnetclisdk>=1.0.90",
   "pydantic_settings",
   "pydantic"
 ]

{gnetcli_adapter-2.2.3 → gnetcli_adapter-2.4.0}/src/gnetcli_adapter/gnetcli_adapter.py

@@ -109,7 +109,7 @@ class AppSettings(BaseSettings):
 async def get_config(breed: str) -> List[str]:
     if breed == "routeros":
         return ["/export verbose", "/user export verbose", "/file print terse detail", "/user ssh-keys print terse"]
-    elif breed.startswith("ios") or breed.startswith("bcom") or breed.startswith("eltex"):
+    elif breed.startswith("ios") or breed.startswith("bcom") or breed.startswith("eltex") or breed.startswith("nxos"):
         return ["show running-config"]
     elif breed.startswith("jun"):
         return ["show configuration"]
@@ -141,6 +141,16 @@ def cleanup():
 atexit.register(cleanup)
 
 
+async def gather_with_concurrency(n: int, *coros: list[asyncio.Task]):
+    semaphore = asyncio.Semaphore(n)
+
+    async def sem_coro(coro):
+        async with semaphore:
+            return await coro
+
+    return await asyncio.gather(*(sem_coro(c) for c in coros))
+
+
 def get_device_ip(dev: Device) -> Optional[str]:
     if isinstance(dev, NetboxDevice):
         if dev.primary_ip:
@@ -315,7 +325,7 @@ def parse_annet_qa(qa: list[annet.annlib.command.Question]) -> list[QA]:
         q = annet_qa.question
         if annet_qa.is_regexp:
             q = f"/{annet_qa.question}/"
-        res.append(QA(question=q, answer=annet_qa.answer))
+        res.append(QA(question=q, answer=annet_qa.answer, not_send_nl=annet_qa.not_send_nl))
     return res
 
 
@@ -381,8 +391,19 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
         if progress_bar:
             for host, cmds in deploy_cmds.items():
                 progress_bar.set_progress(host.fqdn, 0, len(cmds))
+        max_parallel = 1000
+        try:
+            # temporary, for supporting of old annet
+            arg_max_parallel = args.max_parallel
+            if arg_max_parallel > 0:
+                max_parallel = arg_max_parallel
+        except Exception:
+            pass
         deploy_items = deploy_cmds.items()
-        result = await asyncio.gather(*[asyncio.Task(self.deploy(device, cmds, args, progress_bar)) for device, cmds in deploy_items])
+        result = await gather_with_concurrency(
+            max_parallel,
+            *[asyncio.Task(self.deploy(device, cmds, args, progress_bar)) for device, cmds in deploy_items],
+        )
         res = DeployResult(hostnames=[], results={}, durations={}, original_states={})
         res.add_results(results={dev.fqdn: dev_res for (dev, _), dev_res in zip(deploy_items, result)})
         return res
@@ -533,8 +554,10 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
         res = apply_deploy_rulebook(hw=hw, cmd_paths=cmd_paths, do_finalize=do_finalize, do_commit=do_commit)
         return res
 
-    def build_configuration_cmdlist(self, hw: HardwareView, do_finalize: bool = True, do_commit: bool = True):
-        res = common.apply(hw, do_commit=do_commit, do_finalize=do_finalize)
+    def build_configuration_cmdlist(
+        self, hw: HardwareView, do_finalize: bool = True, do_commit: bool = True, path: str = None,
+    ):
+        res = common.apply(hw, do_commit=do_commit, do_finalize=do_finalize, path=path)
         return res
 
     def build_exit_cmdlist(self, hw: HardwareView) -> CommandList: