SIMPLE-6967 - add pubkey for user create and update, add testbed key_… (#151)

* SIMPLE-6967 - add pubkey for user create and update, add testbed key_path setting

Author: virlos

virl2_client/models/cl_pyats.py

@@ -21,6 +21,7 @@
 from __future__ import annotations
 
 import io
+from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 try:
@@ -116,10 +117,23 @@ def sync_testbed(self, username: str, password: str) -> None:
         """
         self._check_pyats_installed()
         testbed_yaml = self._lab.get_pyats_testbed(self._hostname)
-        testbed = self._load_pyats_testbed(testbed_yaml)
-        testbed.devices.terminal_server.credentials.default.username = username
-        testbed.devices.terminal_server.credentials.default.password = password
-        self._testbed = testbed
+        self._testbed = self._load_pyats_testbed(testbed_yaml)
+        self.set_termserv_credentials(username, password)
+
+    def set_termserv_credentials(
+        self,
+        username: str | None = None,
+        password: str | None = None,
+        key_path: Path | str | None = None,
+    ) -> None:
+        terminal = self._testbed.devices.terminal_server
+        if username is not None:
+            terminal.credentials.default.username = username
+        if password is not None:
+            terminal.credentials.default.password = password
+        if key_path is not None:
+            ssh_options = f"-o IdentitiesOnly=yes -o IdentityFile={key_path}"
+            terminal.connections.cli.ssh_options = ssh_options
 
     def _prepare_params(
         self,

virl2_client/models/user.py

@@ -94,6 +94,7 @@ def create_user(self, username: str, pwd: str, **kwargs: Any) -> dict:
             - resource_pool: Resource pool to which the user should be added.
             - opt_in: Whether the user has seen the initial contact dialog.
             - tour_version: The version of the Workbench tour the user has completed.
+            - pubkey: An SSH public key for terminal server. Empty string to clear.
 
         :returns: User object.
         """
@@ -120,6 +121,7 @@ def update_user(self, user_id: str, **kwargs: Any) -> dict:
             - resource_pool: Resource pool to which the user should be added.
             - opt_in: Whether the user has seen the initial contact dialog.
             - tour_version: The version of the Workbench tour the user has completed.
+            - pubkey: An SSH public key for terminal server. Empty string to clear.
 
         :returns: User object.
         """
@@ -138,6 +140,7 @@ def _prepare_body(
         associations: list[dict[str, list[str]]] | None = None,
         admin: bool | None = None,
         password_dict: dict[str, str] | None = None,
+        pubkey: str | None = None,
         resource_pool: str | None | _Sentinel = UNCHANGED,
         opt_in: bool | None | _Sentinel = UNCHANGED,
         tour_version: str | None = None,
@@ -150,6 +153,7 @@ def _prepare_body(
             "groups": groups,
             "associations": associations,
             "password": password_dict,
+            "pubkey": pubkey,
             "tour_version": tour_version,
         }
         sentinel_data = {