gnetcli-adapter 2.8.2__tar.gz → 2.8.3__tar.gz

{gnetcli_adapter-2.8.2 → gnetcli_adapter-2.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gnetcli_adapter
-Version: 2.8.2
+Version: 2.8.3
 Summary: Gnetcli-server adapter for Annet
 Author-email: Aleksandr Balezin <gescheit12@gmail.com>
 Requires-Python: >=3.10
@@ -84,4 +84,30 @@ Host mybastion
 
 `~/.annet/context.yml` the same because gnetcli read .ssh/config by default.
 
+## Connecting to an externally-running gnetcli_server
+
+If `gnetcli_server` is already running on a bastion host, set `url` and the
+adapter will connect to it instead of spawning a local server binary. `login`
+and `password` authenticate to the gnetcli server itself (Basic auth);
+`dev_login`/`dev_password` are still the network device credentials.
+
+```yaml
+fetcher:
+  default:
+    adapter: gnetcli
+    params: &gnetcli
+      url: 192.0.2.10:50051
+      login: gnetcli-user
+      password: gnetcli-secret
+      dev_login: mylogin
+      dev_password: mypassword
+deployer:
+  default:
+    adapter: gnetcli
+    params:
+      <<: *gnetcli
+```
+
+When `url` is unset, the adapter starts a local `gnetcli_server` subprocess
+(`server_path` defaults to `gnetcli_server` on `$PATH`).
 

{gnetcli_adapter-2.8.2 → gnetcli_adapter-2.8.3}/README.md

@@ -43,3 +43,29 @@ Host mybastion
 
 `~/.annet/context.yml` the same because gnetcli read .ssh/config by default.
 
+## Connecting to an externally-running gnetcli_server
+
+If `gnetcli_server` is already running on a bastion host, set `url` and the
+adapter will connect to it instead of spawning a local server binary. `login`
+and `password` authenticate to the gnetcli server itself (Basic auth);
+`dev_login`/`dev_password` are still the network device credentials.
+
+```yaml
+fetcher:
+  default:
+    adapter: gnetcli
+    params: &gnetcli
+      url: 192.0.2.10:50051
+      login: gnetcli-user
+      password: gnetcli-secret
+      dev_login: mylogin
+      dev_password: mypassword
+deployer:
+  default:
+    adapter: gnetcli
+    params:
+      <<: *gnetcli
+```
+
+When `url` is unset, the adapter starts a local `gnetcli_server` subprocess
+(`server_path` defaults to `gnetcli_server` on `$PATH`).

{gnetcli_adapter-2.8.2 → gnetcli_adapter-2.8.3}/src/gnetcli_adapter/gnetcli_adapter.py

@@ -7,6 +7,7 @@ from collections.abc import AsyncIterator, Iterable
 from contextlib import asynccontextmanager
 import logging
 from typing import Any, Dict, List, Optional, Tuple
+import getpass
 
 import annet.annlib.command
 
@@ -52,6 +53,7 @@ breed_to_device = {
     "h3c": "h3c",
     "vrp85": "huawei",
     "vrp55": "huawei",
+    "ipn": "sitonica",
 }
 
 
@@ -76,6 +78,9 @@ class AppSettings(BaseSettings):
     def make_dev_credentials(self) -> Optional[Credentials]:
         if not self.dev_login and not self.dev_password:
             return None
+        if self.dev_login == 'ask_for_login' and self.dev_password == 'ask_for_password':
+            self.dev_login = input('Login: ')
+            self.dev_password = getpass.getpass('Password: ')
         return Credentials(self.dev_login, self.dev_password)
 
     def make_server_credentials(self) -> Optional[str]:
@@ -110,7 +115,7 @@ async def get_config(breed: str) -> List[str]:
         return ["show configuration"]
     elif breed.startswith("eos4"):
         return ["show running-config | no-more"]
-    elif breed.startswith(("h3c", "vrp")):
+    elif breed.startswith(("h3c", "vrp", "ipn")):
         return ["display current-configuration"]
     elif breed.startswith("aruos"):
         return ["show ap-env", "show running-config no-encrypt"]
@@ -153,14 +158,21 @@ class ApiMaker(metaclass=abc.ABCMeta):
 
     @asynccontextmanager
     async def make_api(self) -> AsyncIterator[Gnetcli]:
-        async with GnetcliStarter(self.conf.server_path, self.conf.server_conf) as gnetcli_url:
-            yield Gnetcli(
-                server=gnetcli_url,
+        def _client(server_url: str) -> Gnetcli:
+            return Gnetcli(
+                server=server_url,
                 auth_token=self.conf.make_server_credentials(),
                 insecure_grpc=self.conf.insecure_grpc,
                 user_agent="annet",
             )
 
+        if self.conf.url:
+            yield _client(self.conf.url)
+            return
+
+        async with GnetcliStarter(self.conf.server_path, self.conf.server_conf) as gnetcli_url:
+            yield _client(gnetcli_url)
+
 
 class GnetcliFetcher(Fetcher, AdapterWithConfig, AdapterWithName, ApiMaker):
     def __init__(