Harness refactor 3 (#11222)

maximyurchuk · web-flow · commit d354357245b5 · 2024-11-02T23:23:23.000+03:00
diff --git a/ydb/tests/functional/blobstorage/test_tablet_channel_migration.py b/ydb/tests/functional/blobstorage/test_tablet_channel_migration.py
@@ -4,7 +4,7 @@
 from hamcrest import assert_that
 
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
-from ydb.tests.library.harness.kikimr_http_client import HiveClient, SwaggerClient
+from ydb.tests.library.clients.kikimr_http_client import HiveClient, SwaggerClient
 from ydb.tests.library.kv.helpers import create_kv_tablets_and_wait_for_start
 from ydb.public.api.protos.ydb_status_codes_pb2 import StatusIds
 
diff --git a/ydb/tests/functional/blobstorage/ya.make b/ydb/tests/functional/blobstorage/ya.make
@@ -29,6 +29,7 @@ DEPENDS(
 
 PEERDIR(
     ydb/tests/library
+    ydb/tests/library/clients
     contrib/python/PyHamcrest
 )
 
diff --git a/ydb/tests/functional/cms/test_cms_erasure.py b/ydb/tests/functional/cms/test_cms_erasure.py
@@ -7,7 +7,7 @@
 
 from ydb.tests.library.common.types import Erasure
 import ydb.tests.library.common.cms as cms
-from ydb.tests.library.harness.kikimr_http_client import SwaggerClient
+from ydb.tests.library.clients.kikimr_http_client import SwaggerClient
 from ydb.tests.library.harness.util import LogLevels
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
diff --git a/ydb/tests/functional/cms/test_cms_restart.py b/ydb/tests/functional/cms/test_cms_restart.py
@@ -9,7 +9,7 @@
 from ydb.tests.library.common.types import Erasure
 import ydb.tests.library.common.cms as cms
 
-from ydb.tests.library.harness.kikimr_http_client import SwaggerClient
+from ydb.tests.library.clients.kikimr_http_client import SwaggerClient
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.harness.util import LogLevels
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
diff --git a/ydb/tests/functional/cms/test_cms_state_storage.py b/ydb/tests/functional/cms/test_cms_state_storage.py
@@ -7,7 +7,7 @@
 import ydb.tests.library.common.cms as cms
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.harness.util import LogLevels
-from ydb.tests.library.harness.kikimr_http_client import SwaggerClient
+from ydb.tests.library.clients.kikimr_http_client import SwaggerClient
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
 from ydb.tests.library.kv.helpers import create_kv_tablets_and_wait_for_start
 from ydb.tests.library.common.delayed import wait_tablets_are_active
diff --git a/ydb/tests/functional/cms/utils.py b/ydb/tests/functional/cms/utils.py
@@ -1,6 +1,6 @@
-from ydb.tests.library.harness.kikimr_client import kikimr_client_factory
-from ydb.tests.library.harness.kikimr_keyvalue_client import keyvalue_client_factory
-from ydb.tests.library.harness.kikimr_scheme_client import scheme_client_factory
+from ydb.tests.library.clients.kikimr_client import kikimr_client_factory
+from ydb.tests.library.clients.kikimr_keyvalue_client import keyvalue_client_factory
+from ydb.tests.library.clients.kikimr_scheme_client import scheme_client_factory
 
 
 def value_for(key, tablet_id):
diff --git a/ydb/tests/functional/cms/ya.make b/ydb/tests/functional/cms/ya.make
@@ -32,6 +32,7 @@ DEPENDS(
 
 PEERDIR(
     ydb/tests/library
+    ydb/tests/library/clients
 )
 
 FORK_SUBTESTS()
diff --git a/ydb/tests/functional/hive/test_create_tablets.py b/ydb/tests/functional/hive/test_create_tablets.py
@@ -6,7 +6,7 @@
 from ydb.tests.library.common.types import Erasure, TabletTypes
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
-from ydb.tests.library.harness.kikimr_http_client import SwaggerClient
+from ydb.tests.library.clients.kikimr_http_client import SwaggerClient
 
 from ydb.tests.library.kv.helpers import get_kv_tablet_ids, create_kv_tablets_and_wait_for_start
 
diff --git a/ydb/tests/functional/hive/test_drain.py b/ydb/tests/functional/hive/test_drain.py
@@ -4,7 +4,7 @@
 import yatest
 from ydb.tests.library.common.delayed import wait_tablets_are_active
 from ydb.tests.library.common.types import Erasure
-from ydb.tests.library.harness.kikimr_http_client import SwaggerClient
+from ydb.tests.library.clients.kikimr_http_client import SwaggerClient
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.harness.util import LogLevels
diff --git a/ydb/tests/functional/hive/test_kill_tablets.py b/ydb/tests/functional/hive/test_kill_tablets.py
@@ -4,7 +4,7 @@
 from ydb.tests.library.common.delayed import wait_tablets_state_by_id
 from ydb.tests.library.common.types import TabletTypes, TabletStates
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
-from ydb.tests.library.harness.kikimr_http_client import SwaggerClient
+from ydb.tests.library.clients.kikimr_http_client import SwaggerClient
 from ydb.tests.library.matchers.response import is_valid_response_with_field
 from ydb.tests.library.kv.helpers import create_kv_tablets_and_wait_for_start
 
diff --git a/ydb/tests/functional/hive/ya.make b/ydb/tests/functional/hive/ya.make
@@ -29,6 +29,7 @@ DEPENDS(
 
 PEERDIR(
     ydb/tests/library
+    ydb/tests/library/clients
 )
 
 FORK_SUBTESTS()
diff --git a/ydb/tests/functional/restarts/test_restarts.py b/ydb/tests/functional/restarts/test_restarts.py
@@ -7,7 +7,7 @@
 from ydb.tests.library.common.types import Erasure
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
-from ydb.tests.library.harness.kikimr_client import kikimr_client_factory
+from ydb.tests.library.clients.kikimr_client import kikimr_client_factory
 from ydb.tests.library.kv.helpers import create_tablets_and_wait_for_start
 
 TIMEOUT_SECONDS = 480
diff --git a/ydb/tests/functional/restarts/ya.make b/ydb/tests/functional/restarts/ya.make
@@ -26,6 +26,7 @@ DEPENDS(
 
 PEERDIR(
     ydb/tests/library
+    ydb/tests/library/clients
 )
 
 FORK_SUBTESTS()
diff --git a/ydb/tests/functional/tenants/conftest.py b/ydb/tests/functional/tenants/conftest.py
@@ -1,7 +1,7 @@
 import pytest
 
 from ydb.tests.oss.ydb_sdk_import import ydb
-from ydb.tests.library.harness.kikimr_http_client import HiveClient
+from ydb.tests.library.clients.kikimr_http_client import HiveClient
 
 # XXX: setting of pytest_plugins should work if specified directly in test modules
 # but somehow it does not
diff --git a/ydb/tests/functional/tenants/ya.make b/ydb/tests/functional/tenants/ya.make
@@ -21,6 +21,7 @@ DEPENDS(
 PEERDIR(
     contrib/python/requests
     ydb/tests/library
+    ydb/tests/library/clients
     ydb/tests/oss/ydb_sdk_import
     ydb/public/sdk/python
 )
diff --git a/ydb/tests/functional/wardens/test_liveness_wardens.py b/ydb/tests/functional/wardens/test_liveness_wardens.py
@@ -6,7 +6,7 @@
 
 from ydb.tests.library.wardens.factories import hive_liveness_warden_factory, transactions_processing_liveness_warden
 from ydb.tests.library.harness.kikimr_runner import KiKiMR
-from ydb.tests.library.harness.kikimr_http_client import HiveClient
+from ydb.tests.library.clients.kikimr_http_client import HiveClient
 from ydb.tests.library.common.wait_for import wait_for_and_assert
 
 
diff --git a/ydb/tests/functional/wardens/ya.make b/ydb/tests/functional/wardens/ya.make
@@ -12,6 +12,7 @@ DEPENDS(
 PEERDIR(
     ydb/public/sdk/python
     ydb/tests/library
+    ydb/tests/library/clients
 )
 
 SIZE(MEDIUM)
diff --git a/ydb/tests/library/clients/__init__.py b/ydb/tests/library/clients/__init__.py
diff --git a/ydb/tests/library/clients/kikimr_client.py b/ydb/tests/library/clients/kikimr_client.py
diff --git a/ydb/tests/library/clients/kikimr_http_client.py b/ydb/tests/library/clients/kikimr_http_client.py
diff --git a/ydb/tests/library/clients/kikimr_keyvalue_client.py b/ydb/tests/library/clients/kikimr_keyvalue_client.py
diff --git a/ydb/tests/library/clients/kikimr_monitoring.py b/ydb/tests/library/clients/kikimr_monitoring.py
diff --git a/ydb/tests/library/clients/kikimr_scheme_client.py b/ydb/tests/library/clients/kikimr_scheme_client.py
diff --git a/ydb/tests/library/clients/ya.make b/ydb/tests/library/clients/ya.make
@@ -0,0 +1,19 @@
+PY23_LIBRARY()
+
+PY_SRCS(
+    __init__.py
+    kikimr_client.py
+    kikimr_http_client.py
+    kikimr_keyvalue_client.py
+    kikimr_monitoring.py
+    kikimr_scheme_client.py
+)
+
+PEERDIR(
+    ydb/core/protos
+    # ydb/tests/library  # TODO: remove dependency, commented because of loop. Needed because protobuf_ss
+    ydb/public/api/protos
+    ydb/public/api/grpc
+)
+
+END()
diff --git a/ydb/tests/library/harness/kikimr_cluster_interface.py b/ydb/tests/library/harness/kikimr_cluster_interface.py
@@ -5,9 +5,9 @@
 import time
 
 from ydb.tests.library.common.wait_for import wait_for
-from .kikimr_client import kikimr_client_factory
-from .kikimr_keyvalue_client import keyvalue_client_factory
-from .kikimr_scheme_client import scheme_client_factory
+from ydb.tests.library.clients.kikimr_client import kikimr_client_factory
+from ydb.tests.library.clients.kikimr_keyvalue_client import keyvalue_client_factory
+from ydb.tests.library.clients.kikimr_scheme_client import scheme_client_factory
 from ydb.tests.library.common.protobuf_console import (
     CreateTenantRequest, AlterTenantRequest, GetTenantStatusRequest,
     RemoveTenantRequest, GetOperationRequest)
diff --git a/ydb/tests/library/harness/kikimr_node_interface.py b/ydb/tests/library/harness/kikimr_node_interface.py
@@ -2,7 +2,7 @@
 import abc
 import signal
 
-from ydb.tests.library.harness import kikimr_monitoring as monitoring
+from ydb.tests.library.clients.kikimr_monitoring import KikimrMonitor
 
 
 class NodeInterface(object):
@@ -41,7 +41,7 @@ def unfreeze(self):
 
     @property
     def monitor(self):
-        return monitoring.KikimrMonitor(self.host, self.mon_port)
+        return KikimrMonitor(self.host, self.mon_port)
 
     @abc.abstractproperty
     def cwd(self):
diff --git a/ydb/tests/library/wardens/disk.py b/ydb/tests/library/wardens/disk.py
@@ -4,7 +4,7 @@
 
 from ydb.tests.library.nemesis.safety_warden import SafetyWarden
 
-from ydb.tests.library.harness.kikimr_http_client import SwaggerClient
+from ydb.tests.library.clients.kikimr_http_client import SwaggerClient
 from ydb.tests.library.harness.util import PDiskState
 
 
diff --git a/ydb/tests/library/wardens/ya.make b/ydb/tests/library/wardens/ya.make
@@ -11,4 +11,8 @@ PY_SRCS(
     schemeshard.py
 )
 
+PEERDIR(
+    ydb/tests/library/clients
+)
+
 END()
diff --git a/ydb/tests/library/ya.make b/ydb/tests/library/ya.make
@@ -22,15 +22,10 @@ PY_SRCS(
     kv/helpers.py
     harness/__init__.py
     harness/daemon.py
-    harness/kikimr_client.py
-    harness/kikimr_keyvalue_client.py
-    harness/kikimr_scheme_client.py
     harness/kikimr_node_interface.py
-    harness/kikimr_monitoring.py
     harness/kikimr_cluster_interface.py
     harness/kikimr_cluster.py
     harness/kikimr_config.py
-    harness/kikimr_http_client.py
     harness/kikimr_port_allocator.py
     harness/kikimr_runner.py
     harness/param_constants.py
@@ -102,6 +97,7 @@ PEERDIR(
     ydb/public/api/protos
     ydb/public/sdk/python/enable_v3_new_behavior
     ydb/tests/library/wardens
+    ydb/tests/library/clients
     ydb/tests/oss/canonical
     ydb/tests/oss/ydb_sdk_import
 )
@@ -110,6 +106,7 @@ END()
 
 RECURSE(
     compatibility
+    clients
     serializability
     wardens
     sqs
diff --git a/ydb/tests/tools/nemesis/library/tablet.py b/ydb/tests/tools/nemesis/library/tablet.py
@@ -5,8 +5,8 @@
 
 from ydb.tests.library.nemesis.nemesis_core import Nemesis
 from ydb.tests.library.common.types import TabletTypes
-from ydb.tests.library.harness.kikimr_client import kikimr_client_factory
-from ydb.tests.library.harness.kikimr_http_client import HiveClient
+from ydb.tests.library.clients.kikimr_client import kikimr_client_factory
+from ydb.tests.library.clients.kikimr_http_client import HiveClient
 from ydb.tests.tools.nemesis.library.base import AbstractMonitoredNemesis
 
 
diff --git a/ydb/tests/tools/nemesis/library/ya.make b/ydb/tests/tools/nemesis/library/ya.make
@@ -15,6 +15,7 @@ PY_SRCS(
 PEERDIR(
     contrib/python/Flask
     ydb/tests/library
+    ydb/tests/library/clients
     library/python/monlib
     ydb/core/protos
 )
diff --git a/ydb/tools/statistics_workload/__main__.py b/ydb/tools/statistics_workload/__main__.py
@@ -6,7 +6,7 @@
 import os
 import random
 import string
-from ydb.tests.library.harness.kikimr_client import kikimr_client_factory
+from ydb.tests.library.clients.kikimr_client import kikimr_client_factory
 from ydb.tests.library.common.protobuf_ss import SchemeDescribeRequest
 
 ydb.interceptor.monkey_patch_event_handler()

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ DEPENDS(`
`29`	`29`
`30`	`30`	`PEERDIR(`
`31`	`31`	`ydb/tests/library`
	`32`	`+ ydb/tests/library/clients`
`32`	`33`	`contrib/python/PyHamcrest`
`33`	`34`	`)`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ DEPENDS(`
`32`	`32`
`33`	`33`	`PEERDIR(`
`34`	`34`	`ydb/tests/library`
	`35`	`+ ydb/tests/library/clients`
`35`	`36`	`)`
`36`	`37`
`37`	`38`	`FORK_SUBTESTS()`