From 17a44bdb9e5045f48f6d908db66e48b0d0b9878c Mon Sep 17 00:00:00 2001
From: Kirill Sosnovskikh <k.sosnovskikh@yadro.com>
Date: Tue, 22 Oct 2024 15:38:13 +0300
Subject: [PATCH] [#307] Add shell command to report

Signed-off-by: Kirill Sosnovskikh <k.sosnovskikh@yadro.com>
---
 src/frostfs_testlib/shell/local_shell.py |  1 +
 src/frostfs_testlib/shell/ssh_shell.py   | 24 ++++++++----------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/frostfs_testlib/shell/local_shell.py b/src/frostfs_testlib/shell/local_shell.py
index 746070f..5b769e0 100644
--- a/src/frostfs_testlib/shell/local_shell.py
+++ b/src/frostfs_testlib/shell/local_shell.py
@@ -144,3 +144,4 @@ class LocalShell(Shell):
             f"Start / End / Elapsed\t {start_time.time()} / {end_time.time()} / {elapsed_time}"
         )
         reporter.attach(command_attachment, "Command execution.txt")
+        reporter.attach(command, "Command.txt")
diff --git a/src/frostfs_testlib/shell/ssh_shell.py b/src/frostfs_testlib/shell/ssh_shell.py
index e718b4d..349f151 100644
--- a/src/frostfs_testlib/shell/ssh_shell.py
+++ b/src/frostfs_testlib/shell/ssh_shell.py
@@ -68,8 +68,7 @@ class SshConnectionProvider:
             try:
                 if creds.ssh_key_path:
                     logger.info(
-                        f"Trying to connect to host {host} as {creds.ssh_login} using SSH key "
-                        f"{creds.ssh_key_path} (attempt {attempt})"
+                        f"Trying to connect to host {host} as {creds.ssh_login} using SSH key " f"{creds.ssh_key_path} (attempt {attempt})"
                     )
                     connection.connect(
                         hostname=host,
@@ -79,9 +78,7 @@ class SshConnectionProvider:
                         timeout=self.CONNECTION_TIMEOUT,
                     )
                 else:
-                    logger.info(
-                        f"Trying to connect to host {host} as {creds.ssh_login} using password " f"(attempt {attempt})"
-                    )
+                    logger.info(f"Trying to connect to host {host} as {creds.ssh_login} using password " f"(attempt {attempt})")
                     connection.connect(
                         hostname=host,
                         port=port,
@@ -104,9 +101,7 @@ class SshConnectionProvider:
                 connection.close()
                 can_retry = attempt + 1 < self.SSH_CONNECTION_ATTEMPTS
                 if can_retry:
-                    logger.warn(
-                        f"Can't connect to host {host}, will retry after {self.SSH_ATTEMPTS_INTERVAL}s. Error: {exc}"
-                    )
+                    logger.warn(f"Can't connect to host {host}, will retry after {self.SSH_ATTEMPTS_INTERVAL}s. Error: {exc}")
                     sleep(self.SSH_ATTEMPTS_INTERVAL)
                     continue
                 logger.exception(f"Can't connect to host {host}")
@@ -145,7 +140,8 @@ def log_command(func):
             if not options.no_log:
                 logger.info(log_message)
 
-            reporter.attach(log_message, "SSH command.txt")
+            reporter.attach(log_message, "SSH Command execution.txt")
+            reporter.attach(command, "SSH Command.txt")
         return result
 
     return wrapper
@@ -185,13 +181,11 @@ class SSHShell(Shell):
         private_key_passphrase: Optional[str] = None,
         port: str = "22",
         command_inspectors: Optional[list[CommandInspector]] = None,
-        custom_environment: Optional[dict] = None
+        custom_environment: Optional[dict] = None,
     ) -> None:
         super().__init__()
         self.connection_provider = SshConnectionProvider()
-        self.connection_provider.store_creds(
-            host, SshCredentials(login, password, private_key_path, private_key_passphrase)
-        )
+        self.connection_provider.store_creds(host, SshCredentials(login, password, private_key_path, private_key_passphrase))
         self.host = host
         self.port = port
 
@@ -220,9 +214,7 @@ class SSHShell(Shell):
             result = self._exec_non_interactive(command, options)
 
         if options.check and result.return_code != 0:
-            raise RuntimeError(
-                f"Command: {command}\nreturn code: {result.return_code}\nOutput: {result.stdout}\nStderr: {result.stderr}\n"
-            )
+            raise RuntimeError(f"Command: {command}\nreturn code: {result.return_code}\nOutput: {result.stdout}\nStderr: {result.stderr}\n")
         return result
 
     @log_command