Add ssh client for nbs and nfs tests (#61)

ydb-platform · Jan 8, 2024 · d14cba1 · d14cba1
1 parent a45bd5b
commit d14cba1
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 13 deletions.
diff --git a/cloud/blockstore/tools/ci/check_emptiness_test/__main__.py b/cloud/blockstore/tools/ci/check_emptiness_test/__main__.py
@@ -13,7 +13,12 @@ def main():
         run_test_suite(common.ModuleFactories(
             common.make_test_result_processor_stub,
             common.fetch_server_version_stub,
-            common.make_config_generator_stub), args, logger)
+            common.make_config_generator_stub,
+            make_ssh_client=common.make_ssh_client,
+            make_helpers=common.make_helpers,
+            make_sftp_client=common.make_sftp_client,
+            make_ssh_channel=common.make_ssh_channel,
+        ), args, logger)
     except Error as e:
         logger.fatal(f'Failed to check disk for emptiness: {e}')
         sys.exit(1)

diff --git a/cloud/blockstore/tools/ci/checkpoint_validation_test/__main__.py b/cloud/blockstore/tools/ci/checkpoint_validation_test/__main__.py
@@ -13,7 +13,12 @@ def main():
         TestRunner(common.ModuleFactories(
             common.make_test_result_processor_stub,
             common.fetch_server_version_stub,
-            common.make_config_generator_stub), args, logger).run_test()
+            common.make_config_generator_stub,
+            make_ssh_client=common.make_ssh_client,
+            make_helpers=common.make_helpers,
+            make_sftp_client=common.make_sftp_client,
+            make_ssh_channel=common.make_ssh_channel,
+        ), args, logger).run_test()
     except Exception as e:
         logger.fatal(f'Test failed: {e}')
         sys.exit(1)

diff --git a/cloud/blockstore/tools/ci/corruption_test_suite/__main__.py b/cloud/blockstore/tools/ci/corruption_test_suite/__main__.py
@@ -15,7 +15,12 @@ def main():
             common.ModuleFactories(
                 common.make_test_result_processor_stub,
                 common.fetch_server_version_stub,
-                common.make_config_generator_stub),
+                common.make_config_generator_stub,
+                make_ssh_client=common.make_ssh_client,
+                make_helpers=common.make_helpers,
+                make_sftp_client=common.make_sftp_client,
+                make_ssh_channel=common.make_ssh_channel,
+            ),
             args,
             logger)
     except (Error, YcpWrapper.Error) as e:

diff --git a/cloud/blockstore/tools/ci/fio_performance_test_suite/__main__.py b/cloud/blockstore/tools/ci/fio_performance_test_suite/__main__.py
@@ -39,7 +39,12 @@ def main():
             common.ModuleFactories(
                 make_test_result_processor,
                 common.fetch_server_version_stub,
-                common.make_config_generator_stub),
+                common.make_config_generator_stub,
+                make_ssh_client=common.make_ssh_client,
+                make_helpers=common.make_helpers,
+                make_sftp_client=common.make_sftp_client,
+                make_ssh_channel=common.make_ssh_channel,
+            ),
             args,
             profiler,
             logger)

diff --git a/cloud/blockstore/tools/ci/migration_test/__main__.py b/cloud/blockstore/tools/ci/migration_test/__main__.py
@@ -10,10 +10,17 @@ def main():
     logger = common.create_logger('yc-nbs-ci-migration-test', args)
 
     try:
-        TestRunner(common.ModuleFactories(
-            common.make_test_result_processor_stub,
-            common.fetch_server_version_stub,
-            common.make_config_generator_stub), args, logger).run()
+        TestRunner(
+            common.ModuleFactories(
+                common.make_test_result_processor_stub,
+                common.fetch_server_version_stub,
+                common.make_config_generator_stub,
+                make_ssh_client=common.make_ssh_client,
+                make_helpers=common.make_helpers,
+                make_sftp_client=common.make_sftp_client,
+                make_ssh_channel=common.make_ssh_channel,
+            ), args, logger
+        ).run()
     except Error as e:
         logger.fatal(f'Failed to run test: \n {e}')
         sys.exit(1)

diff --git a/cloud/blockstore/tools/ci/relocation_test/__main__.py b/cloud/blockstore/tools/ci/relocation_test/__main__.py
@@ -13,7 +13,12 @@ def main():
         TestRunner(common.ModuleFactories(
             common.make_test_result_processor_stub,
             common.fetch_server_version_stub,
-            common.make_config_generator_stub), args, logger).run()
+            common.make_config_generator_stub,
+            make_ssh_client=common.make_ssh_client,
+            make_helpers=common.make_helpers,
+            make_sftp_client=common.make_sftp_client,
+            make_ssh_channel=common.make_ssh_channel,
+        ), args, logger).run()
     except Error as e:
         logger.fatal(f'Failed to run test: \n {e}')
         sys.exit(1)

diff --git a/cloud/blockstore/tools/testing/eternal_tests/test_runner/__main__.py b/cloud/blockstore/tools/testing/eternal_tests/test_runner/__main__.py
@@ -16,7 +16,12 @@ def main():
             common.ModuleFactories(
                 common.make_test_result_processor_stub,
                 common.fetch_server_version_stub,
-                common.make_config_generator_stub),
+                common.make_config_generator_stub,
+                make_ssh_client=common.make_ssh_client,
+                make_helpers=common.make_helpers,
+                make_sftp_client=common.make_sftp_client,
+                make_ssh_channel=common.make_ssh_channel,
+            ),
             parser,
             logger,
             loader_path,

diff --git a/cloud/disk_manager/test/acceptance/test_runner/lib/ut/test.py b/cloud/disk_manager/test/acceptance/test_runner/lib/ut/test.py
@@ -22,5 +22,10 @@ def test_create_ycp():
         module_factory=common.ModuleFactories(
             common.make_test_result_processor_stub,
             common.fetch_server_version_stub,
-            common.make_config_generator_stub),
+            common.make_config_generator_stub,
+            make_ssh_client=common.make_ssh_client,
+            make_helpers=common.make_helpers,
+            make_sftp_client=common.make_sftp_client,
+            make_ssh_channel=common.make_ssh_channel,
+        ),
         dry_run=True)
diff --git a/cloud/filestore/tests/build_arcadia_test/__main__.py b/cloud/filestore/tests/build_arcadia_test/__main__.py
@@ -14,6 +14,10 @@
         common.ModuleFactories(
             common.make_test_result_processor_stub,
             common.fetch_server_version_stub,
-            common.make_config_generator_stub
+            common.make_config_generator_stub,
+            make_ssh_client=common.make_ssh_client,
+            make_helpers=common.make_helpers,
+            make_sftp_client=common.make_sftp_client,
+            make_ssh_channel=common.make_ssh_channel,
         ),
     )
diff --git a/cloud/filestore/tests/xfs_suite/__main__.py b/cloud/filestore/tests/xfs_suite/__main__.py
@@ -13,7 +13,12 @@ def main():
             common.ModuleFactories(
                 common.make_test_result_processor_stub,
                 common.fetch_server_version_stub,
-                common.make_config_generator_stub),
+                common.make_config_generator_stub,
+                make_ssh_client=common.make_ssh_client,
+                make_helpers=common.make_helpers,
+                make_sftp_client=common.make_sftp_client,
+                make_ssh_channel=common.make_ssh_channel,
+            ),
             parser,
             args,
             logger)