replace ydb sdk import

34 files changed, 37 insertions, 39 deletions

diff --git a/ydb/tests/functional/api/test_crud.py b/ydb/tests/functional/api/test_crud.py
index 3768a9f9341..54d27dfe5e8 100644
--- a/ydb/tests/functional/api/test_crud.py
+++ b/ydb/tests/functional/api/test_crud.py
@@ -7,7 +7,7 @@ from hamcrest import assert_that, equal_to, raises
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 logger = logging.getLogger(__name__)
diff --git a/ydb/tests/functional/api/test_discovery.py b/ydb/tests/functional/api/test_discovery.py
index 9b8b10de9ea..a59434fb6f6 100644
--- a/ydb/tests/functional/api/test_discovery.py
+++ b/ydb/tests/functional/api/test_discovery.py
@@ -9,7 +9,7 @@ from hamcrest import assert_that, is_, not_
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.common import types
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 logger = logging.getLogger(__name__)
diff --git a/ydb/tests/functional/api/test_execute_scheme.py b/ydb/tests/functional/api/test_execute_scheme.py
index c0fe12ce067..440a4388d1e 100644
--- a/ydb/tests/functional/api/test_execute_scheme.py
+++ b/ydb/tests/functional/api/test_execute_scheme.py
@@ -3,7 +3,7 @@ import logging
 from hamcrest import assert_that, raises
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 logger = logging.getLogger(__name__)
 
diff --git a/ydb/tests/functional/api/test_indexes.py b/ydb/tests/functional/api/test_indexes.py
index 145ecea483b..5374b20e4e2 100644
--- a/ydb/tests/functional/api/test_indexes.py
+++ b/ydb/tests/functional/api/test_indexes.py
@@ -4,7 +4,7 @@ import logging
 from hamcrest import assert_that, is_
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 logger = logging.getLogger(__name__)
 
diff --git a/ydb/tests/functional/api/test_insert.py b/ydb/tests/functional/api/test_insert.py
index bc223cd7798..a5102819f04 100644
--- a/ydb/tests/functional/api/test_insert.py
+++ b/ydb/tests/functional/api/test_insert.py
@@ -4,7 +4,7 @@ import logging
 from hamcrest import assert_that, raises, equal_to
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 logger = logging.getLogger(__name__)
diff --git a/ydb/tests/functional/api/test_isolation.py b/ydb/tests/functional/api/test_isolation.py
index 0b4cacecadf..bb5ef73cb75 100644
--- a/ydb/tests/functional/api/test_isolation.py
+++ b/ydb/tests/functional/api/test_isolation.py
@@ -2,7 +2,7 @@
 from hamcrest import assert_that, equal_to, raises, contains_string
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 class TestTransactionIsolation(object):
diff --git a/ydb/tests/functional/api/test_public_api.py b/ydb/tests/functional/api/test_public_api.py
index f41be7fd500..eb4e440a391 100644
--- a/ydb/tests/functional/api/test_public_api.py
+++ b/ydb/tests/functional/api/test_public_api.py
@@ -17,7 +17,7 @@ from ydb.public.api.protos import ydb_scheme_pb2
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.harness.util import LogLevels
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 from ydb.public.api.protos import ydb_status_codes_pb2
 
 
diff --git a/ydb/tests/functional/api/test_read_table.py b/ydb/tests/functional/api/test_read_table.py
index 8b001e175e7..2c8146c54d4 100644
--- a/ydb/tests/functional/api/test_read_table.py
+++ b/ydb/tests/functional/api/test_read_table.py
@@ -7,7 +7,7 @@ from concurrent import futures
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.common.types import TabletTypes
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 # call this as soon as possible to patch grpc event_handler implementation with additional calls
 ydb.interceptor.monkey_patch_event_handler()
 
diff --git a/ydb/tests/functional/api/test_session_grace_shutdown.py b/ydb/tests/functional/api/test_session_grace_shutdown.py
index de5ac6a7fc9..583b8d834a3 100644
--- a/ydb/tests/functional/api/test_session_grace_shutdown.py
+++ b/ydb/tests/functional/api/test_session_grace_shutdown.py
@@ -2,7 +2,7 @@
 import logging
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 import requests
 
 logger = logging.getLogger(__name__)
diff --git a/ydb/tests/functional/api/test_session_pool.py b/ydb/tests/functional/api/test_session_pool.py
index 5ff675cff50..c145730d3dd 100644
--- a/ydb/tests/functional/api/test_session_pool.py
+++ b/ydb/tests/functional/api/test_session_pool.py
@@ -5,7 +5,7 @@ import time
 from hamcrest import assert_that, is_, raises
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 logger = logging.getLogger(__name__)
 
diff --git a/ydb/tests/functional/canonical/test_sql.py b/ydb/tests/functional/canonical/test_sql.py
index d418c7566d7..938364b20d0 100644
--- a/ydb/tests/functional/canonical/test_sql.py
+++ b/ydb/tests/functional/canonical/test_sql.py
@@ -10,8 +10,7 @@ from ydb.tests.library.common import yatest_common
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.oss.canonical import set_canondata_root, is_oss
-import ydb
-import ydb.issues
+from ydb.tests.oss.ydb_sdk_import import ydb
 from ydb.public.api.protos import ydb_table_pb2
 from google.protobuf import text_format
 import logging
diff --git a/ydb/tests/functional/clickbench/test.py b/ydb/tests/functional/clickbench/test.py
index ec46d972456..843b79eaa02 100644
--- a/ydb/tests/functional/clickbench/test.py
+++ b/ydb/tests/functional/clickbench/test.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 import json
 from json import encoder
 import yatest.common
diff --git a/ydb/tests/functional/dynumber/test_dynumber.py b/ydb/tests/functional/dynumber/test_dynumber.py
index bc6229ad899..deb742b9230 100644
--- a/ydb/tests/functional/dynumber/test_dynumber.py
+++ b/ydb/tests/functional/dynumber/test_dynumber.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 def test_dynumber():
diff --git a/ydb/tests/functional/encryption/test_encryption.py b/ydb/tests/functional/encryption/test_encryption.py
index 58c1c93d459..d993deeb755 100644
--- a/ydb/tests/functional/encryption/test_encryption.py
+++ b/ydb/tests/functional/encryption/test_encryption.py
@@ -5,7 +5,7 @@ import random
 import time
 import threading
 import yatest.common
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 from ydb.tests.library.common.types import Erasure
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
diff --git a/ydb/tests/functional/limits/test_schemeshard_limits.py b/ydb/tests/functional/limits/test_schemeshard_limits.py
index 430e853b2c0..570701c8249 100644
--- a/ydb/tests/functional/limits/test_schemeshard_limits.py
+++ b/ydb/tests/functional/limits/test_schemeshard_limits.py
@@ -7,7 +7,7 @@ from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.harness.util import LogLevels
 from ydb.tests.library.common.types import Erasure
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 class Base(object):
diff --git a/ydb/tests/functional/query_cache/test_query_cache.py b/ydb/tests/functional/query_cache/test_query_cache.py
index 137b73d438e..a0cee3bfc30 100644
--- a/ydb/tests/functional/query_cache/test_query_cache.py
+++ b/ydb/tests/functional/query_cache/test_query_cache.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
diff --git a/ydb/tests/functional/rename/common.py b/ydb/tests/functional/rename/common.py
index 92daa2bbab1..a5c1af2b7fe 100644
--- a/ydb/tests/functional/rename/common.py
+++ b/ydb/tests/functional/rename/common.py
@@ -3,7 +3,7 @@ import logging
 import six
 import asyncio
 
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 logger = logging.getLogger(__name__)
 
diff --git a/ydb/tests/functional/rename/test.py b/ydb/tests/functional/rename/test.py
index 9b9769fbf8e..40f60a1b9b2 100644
--- a/ydb/tests/functional/rename/test.py
+++ b/ydb/tests/functional/rename/test.py
@@ -5,8 +5,7 @@ import asyncio
 
 import pytest
 
-import ydb
-import ydb.aio
+from ydb.tests.oss.ydb_sdk_import import ydb
 from ydb.tests.library.common.types import Erasure, from_bytes
 from ydb.tests.library.harness.util import LogLevels
 
diff --git a/ydb/tests/functional/scheme_shard/test_alter_ops.py b/ydb/tests/functional/scheme_shard/test_alter_ops.py
index 60e11f0fffe..ac3567723bb 100644
--- a/ydb/tests/functional/scheme_shard/test_alter_ops.py
+++ b/ydb/tests/functional/scheme_shard/test_alter_ops.py
@@ -10,7 +10,7 @@ from ydb.tests.library.common.protobuf_ss import TPartitionConfig, SchemeDescrib
 from ydb.tests.library.common.types import PType
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.matchers.response_matchers import ProtobufWithStatusMatcher
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 class TestSchemeShardAlterTest(object):
diff --git a/ydb/tests/functional/scheme_shard/test_copy_ops.py b/ydb/tests/functional/scheme_shard/test_copy_ops.py
index e55a985fd11..b1e588f12d1 100644
--- a/ydb/tests/functional/scheme_shard/test_copy_ops.py
+++ b/ydb/tests/functional/scheme_shard/test_copy_ops.py
@@ -5,7 +5,7 @@ from hamcrest import assert_that, has_length, has_property, equal_to
 
 from ydb.tests.library.common.protobuf_ss import SchemeDescribeRequest
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 class TestSchemeShardCopyOps(object):
diff --git a/ydb/tests/functional/scheme_shard/test_scheme_shard_operations.py b/ydb/tests/functional/scheme_shard/test_scheme_shard_operations.py
index 2d3aad828cc..a57e0926bd7 100644
--- a/ydb/tests/functional/scheme_shard/test_scheme_shard_operations.py
+++ b/ydb/tests/functional/scheme_shard/test_scheme_shard_operations.py
@@ -3,7 +3,7 @@ import os
 
 from hamcrest import assert_that, raises
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 class TestSchemeShardSimpleOps(object):
diff --git a/ydb/tests/functional/serverless/test.py b/ydb/tests/functional/serverless/test.py
index 2c00f2d21ac..fefe1a2d77c 100644
--- a/ydb/tests/functional/serverless/test.py
+++ b/ydb/tests/functional/serverless/test.py
@@ -10,7 +10,7 @@ from hamcrest import assert_that, contains_inanyorder, not_none
 from tornado import gen
 from tornado.ioloop import IOLoop
 
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 from ydb.tests.library.common.types import Erasure
 from ydb.tests.library.harness.util import LogLevels
 
diff --git a/ydb/tests/functional/sqs/common/test_queues_managing.py b/ydb/tests/functional/sqs/common/test_queues_managing.py
index 992e3d37fee..af8510b459b 100644
--- a/ydb/tests/functional/sqs/common/test_queues_managing.py
+++ b/ydb/tests/functional/sqs/common/test_queues_managing.py
@@ -9,7 +9,7 @@ from ydb.tests.library.sqs.matchers import ReadResponseMatcher
 
 from ydb.tests.library.sqs.test_base import KikimrSqsTestBase, get_test_with_sqs_installation_by_path, get_test_with_sqs_tenant_installation
 from ydb.tests.library.sqs.test_base import to_bytes, IS_FIFO_PARAMS, TABLES_FORMAT_PARAMS
-from ydb import issues as ydb_issues
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 class QueuesManagingTest(KikimrSqsTestBase):
@@ -159,7 +159,7 @@ class QueuesManagingTest(KikimrSqsTestBase):
         assert_that(
             describe_queue_path,
             raises(
-                ydb_issues.SchemeError
+                ydb.issues.SchemeError
             )
         )
 
diff --git a/ydb/tests/functional/sqs/merge_split_common_table/test.py b/ydb/tests/functional/sqs/merge_split_common_table/test.py
index 0fe0beefc79..6bfa1e28bdd 100644
--- a/ydb/tests/functional/sqs/merge_split_common_table/test.py
+++ b/ydb/tests/functional/sqs/merge_split_common_table/test.py
@@ -3,7 +3,7 @@
 import logging

 import time

 

-import ydb

+from ydb.tests.oss.ydb_sdk_import import ydb

 import random

 import string

 

diff --git a/ydb/tests/functional/sqs/with_quotas/test_quoting.py b/ydb/tests/functional/sqs/with_quotas/test_quoting.py
index 60d08cc3780..acafe878b57 100644
--- a/ydb/tests/functional/sqs/with_quotas/test_quoting.py
+++ b/ydb/tests/functional/sqs/with_quotas/test_quoting.py
@@ -10,7 +10,7 @@ from ydb.tests.library.sqs.requests_client import SqsSendMessageParams
 
 from ydb.tests.library.sqs.test_base import KikimrSqsTestBase, IS_FIFO_PARAMS, TABLES_FORMAT_PARAMS
 
-from ydb import issues as ydb_issues
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 class TestSqsQuotingWithKesus(KikimrSqsTestBase):
@@ -46,7 +46,7 @@ class TestSqsQuotingWithKesus(KikimrSqsTestBase):
         assert_that(
             describe_queue_path,
             raises(
-                ydb_issues.SchemeError
+                ydb.issues.SchemeError
             )
         )
 
@@ -83,7 +83,7 @@ class TestSqsQuotingWithLocalRateLimiter(KikimrSqsTestBase):
         assert_that(
             call_describe,
             raises(
-                ydb_issues.SchemeError
+                ydb.issues.SchemeError
             )
         )
 
diff --git a/ydb/tests/functional/suite_tests/test_base.py b/ydb/tests/functional/suite_tests/test_base.py
index cdb571ce2a6..738ae502709 100644
--- a/ydb/tests/functional/suite_tests/test_base.py
+++ b/ydb/tests/functional/suite_tests/test_base.py
@@ -17,7 +17,7 @@ import ydb.tests.library.common.yatest_common as yatest_common
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 logger = logging.getLogger()
 logger.setLevel(logging.DEBUG)
diff --git a/ydb/tests/functional/tenants/conftest.py b/ydb/tests/functional/tenants/conftest.py
index fa7acf71159..96f02d2692e 100644
--- a/ydb/tests/functional/tenants/conftest.py
+++ b/ydb/tests/functional/tenants/conftest.py
@@ -1,6 +1,6 @@
 import pytest
 
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 from ydb.tests.library.harness.kikimr_http_client import HiveClient
 
 # XXX: setting of pytest_plugins should work if specified directly in test modules
diff --git a/ydb/tests/functional/tenants/test_db_counters.py b/ydb/tests/functional/tenants/test_db_counters.py
index b8e3c9baa35..7d323486c3a 100644
--- a/ydb/tests/functional/tenants/test_db_counters.py
+++ b/ydb/tests/functional/tenants/test_db_counters.py
@@ -14,7 +14,7 @@ from hamcrest import (
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.harness.util import LogLevels
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 logger = logging.getLogger(__name__)
 
diff --git a/ydb/tests/functional/tenants/test_dynamic_tenants.py b/ydb/tests/functional/tenants/test_dynamic_tenants.py
index 147d0789ce2..0391f6f9062 100644
--- a/ydb/tests/functional/tenants/test_dynamic_tenants.py
+++ b/ydb/tests/functional/tenants/test_dynamic_tenants.py
@@ -13,7 +13,7 @@ from hamcrest import (
     raises,
 )
 
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 from ydb.tests.library.harness.util import LogLevels
 
 
diff --git a/ydb/tests/functional/tenants/test_publish_into_schemeboard_with_common_ssring.py b/ydb/tests/functional/tenants/test_publish_into_schemeboard_with_common_ssring.py
index 59a4607df0c..d97c1eb9ebf 100644
--- a/ydb/tests/functional/tenants/test_publish_into_schemeboard_with_common_ssring.py
+++ b/ydb/tests/functional/tenants/test_publish_into_schemeboard_with_common_ssring.py
@@ -2,7 +2,7 @@
 import os
 import logging
 
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
diff --git a/ydb/tests/functional/tenants/test_storage_config.py b/ydb/tests/functional/tenants/test_storage_config.py
index e5915b1f1f0..62e8eb62330 100644
--- a/ydb/tests/functional/tenants/test_storage_config.py
+++ b/ydb/tests/functional/tenants/test_storage_config.py
@@ -14,7 +14,7 @@ from ydb.tests.library.common.protobuf_ss import CreateTableRequest
 
 import ydb.tests.library.matchers.scheme_ops as scheme_operations
 from ydb.tests.library.common.types import PType
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 logger = logging.getLogger(__name__)
 
diff --git a/ydb/tests/functional/tenants/test_system_views.py b/ydb/tests/functional/tenants/test_system_views.py
index b0fc5640f62..534ef40146d 100644
--- a/ydb/tests/functional/tenants/test_system_views.py
+++ b/ydb/tests/functional/tenants/test_system_views.py
@@ -14,7 +14,7 @@ from hamcrest import (
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.harness.util import LogLevels
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 logger = logging.getLogger(__name__)
 
diff --git a/ydb/tests/functional/tenants/test_tenants.py b/ydb/tests/functional/tenants/test_tenants.py
index e941faeae09..1d5d214bcf6 100644
--- a/ydb/tests/functional/tenants/test_tenants.py
+++ b/ydb/tests/functional/tenants/test_tenants.py
@@ -8,7 +8,7 @@ import pytest
 
 from hamcrest import assert_that, greater_than, is_, not_, none
 
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 from ydb.tests.library.harness.util import LogLevels
 from ydb.tests.library.harness.ydb_fixtures import ydb_database_ctx
 
diff --git a/ydb/tests/functional/ttl/test_ttl.py b/ydb/tests/functional/ttl/test_ttl.py
index a822a2d61fb..f345c82686b 100644
--- a/ydb/tests/functional/ttl/test_ttl.py
+++ b/ydb/tests/functional/ttl/test_ttl.py
@@ -16,7 +16,7 @@ from hamcrest import (
 from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
 from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
 from ydb.tests.library.harness.util import LogLevels
-import ydb
+from ydb.tests.oss.ydb_sdk_import import ydb
 
 
 class TestTTL(object):