Clean up code in harness (#9076)

Author: maximyurchuk

ydb/public/tools/lib/cmds/__init__.py

@@ -17,7 +17,7 @@
 from ydb.tests.library.common.types import Erasure
 from ydb.tests.library.harness.daemon import Daemon
 from ydb.tests.library.harness.util import LogLevels
-from ydb.tests.library.harness.kikimr_port_allocator import KikimrFixedPortAllocator, KikimrFixedNodePortAllocator
+from ydb.tests.library.harness.kikimr_port_allocator import KikimrFixedPortAllocator
 from library.python.testing.recipe import set_env
 
 
@@ -332,7 +332,7 @@ def deploy(arguments):
     port_allocator = None
     if getattr(arguments, 'fixed_ports', False):
         base_port_offset = getattr(arguments, 'base_port_offset', 0)
-        port_allocator = KikimrFixedPortAllocator(base_port_offset, [KikimrFixedNodePortAllocator(base_port_offset=base_port_offset)])
+        port_allocator = KikimrFixedPortAllocator(base_port_offset)
 
     optionals = {}
     if enable_tls():

ydb/tests/library/harness/blockstore.py

@@ -13,7 +13,6 @@
 from . import param_constants
 from .kikimr_runner import KiKiMR, KikimrExternalNode
 from .kikimr_cluster_interface import KiKiMRClusterInterface
-from . import blockstore
 import yaml
 
 logger = logging.getLogger(__name__)
@@ -45,7 +44,6 @@ def __init__(self, config_path, binary_path=None, output_path=None):
         self.__yaml_config = load_yaml(config_path)
         self.__hosts = [host['name'] for host in self.__yaml_config.get('hosts')]
         self._slots = None
-        self._nbs = None
         self.__binary_path = binary_path if binary_path is not None else param_constants.kikimr_driver_path()
         self.__output_path = output_path
         self.__slot_count = 0
@@ -199,15 +197,6 @@ def nodes(self):
             ) for node_id, host in zip(itertools.count(start=1), self.__hosts)
         }
 
-    @property
-    def nbs(self):
-        return {}
-        if self._nbs is None:
-            self._nbs = {}
-            for node_id, host in zip(itertools.count(start=1), self.__hosts):
-                self._nbs[node_id] = blockstore.ExternalNetworkBlockStoreNode(host)
-        return self._nbs
-
     @property
     def slots(self):
         if self._slots is None:

ydb/tests/library/harness/kikimr_cluster.py

@@ -34,10 +34,6 @@ def ic_port(self):
     def sqs_port(self):
         pass
 
-    @abc.abstractproperty
-    def ext_port(self):
-        pass
-
     @abc.abstractproperty
     def public_http_port(self):
         pass
@@ -122,12 +118,6 @@ def sqs_port(self):
             self.__sqs_port = self.__port_manager.get_port()
         return self.__sqs_port
 
-    @property
-    def ext_port(self):
-        if self.__ext_port is None:
-            self.__ext_port = self.__port_manager.get_port()
-        return self.__ext_port
-
     @property
     def pgwire_port(self):
         if self.__pgwire_port is None:
@@ -169,40 +159,18 @@ def release_ports(self):
 class KikimrFixedNodePortAllocator(KikimrNodePortAllocatorInterface):
 
     def __init__(self, base_port_offset, mon_port=8765, grpc_port=2135, mbus_port=2134, ic_port=19001, sqs_port=8771, grpc_ssl_port=2137,
-                 ext_port=2237, public_http_port=8766, pgwire_port=5432):
+                 public_http_port=8766, pgwire_port=5432):
         super(KikimrFixedNodePortAllocator, self).__init__()
 
         self.base_port_offset = base_port_offset
-        if os.getenv('MON_PORT') is not None:
-            self.__mon_port = int(os.getenv('MON_PORT'))
-        else:
-            self.__mon_port = mon_port
-        if os.getenv('GRPC_PORT') is not None:
-            self.__grpc_port = int(os.getenv('GRPC_PORT'))
-        else:
-            self.__grpc_port = grpc_port
+        self.__mon_port = int(os.getenv('MON_PORT', mon_port))
+        self.__grpc_port = int(os.getenv('GRPC_PORT', grpc_port))
         self.__mbus_port = mbus_port
-        if os.getenv('IC_PORT') is not None:
-            self.__ic_port = int(os.getenv('IC_PORT'))
-        else:
-            self.__ic_port = ic_port
+        self.__ic_port = int(os.getenv('IC_PORT', ic_port))
         self.__sqs_port = sqs_port
-        if os.getenv('GRPC_TLS_PORT') is not None:
-            self.__grpc_ssl_port = int(os.getenv('GRPC_TLS_PORT'))
-        else:
-            self.__grpc_ssl_port = grpc_ssl_port
-        if os.getenv('GRPC_EXT_PORT') is not None:
-            self.__ext_port = int(os.getenv('GRPC_EXT_PORT'))
-        else:
-            self.__ext_port = ext_port
-        if os.getenv('PUBLIC_HTTP_PORT') is not None:
-            self.__public_http_port = int(os.getenv('PUBLIC_HTTP_PORT'))
-        else:
-            self.__public_http_port = public_http_port
-        if os.getenv('YDB_PGWIRE_PORT') is not None:
-            self.__pgwire_port = int(os.getenv('YDB_PGWIRE_PORT'))
-        else:
-            self.__pgwire_port = pgwire_port
+        self.__grpc_ssl_port = int(os.getenv('GRPC_TLS_PORT', grpc_ssl_port))
+        self.__public_http_port = int(os.getenv('PUBLIC_HTTP_PORT', public_http_port))
+        self.__pgwire_port = int(os.getenv('YDB_PGWIRE_PORT', pgwire_port))
 
     @property
     def mon_port(self):
@@ -229,9 +197,6 @@ def sqs_port(self):
         return self.__sqs_port + self.base_port_offset
 
     @property
-    def ext_port(self):
-        return self.__ext_port + self.base_port_offset
-
     def public_http_port(self):
         return self.__public_http_port + self.base_port_offset
 
@@ -242,25 +207,15 @@ def pgwire_port(self):
 
 class KikimrFixedPortAllocator(KikimrPortAllocatorInterface):
     def __init__(self,
-                 base_port_offset,
-                 nodes_port_allocators_list=(),
-                 slots_port_allocators_list=()):
+                 base_port_offset):
         super(KikimrFixedPortAllocator, self).__init__()
-        self.__nodes_port_allocators_list = nodes_port_allocators_list
-        self.__slots_port_allocators_list = slots_port_allocators_list
         self.__default_value = KikimrFixedNodePortAllocator(base_port_offset)
 
     def get_node_port_allocator(self, node_index):
-        if node_index <= len(self.__nodes_port_allocators_list):
-            return self.__nodes_port_allocators_list[node_index - 1]
-        else:
-            return self.__default_value
+        return self.__default_value
 
     def get_slot_port_allocator(self, slot_index):
-        if slot_index <= len(self.__slots_port_allocators_list):
-            return self.__slots_port_allocators_list[slot_index - 1]
-        else:
-            return self.__default_value
+        return self.__default_value
 
     def release_ports(self):
         pass

ydb/tests/library/harness/kikimr_port_allocator.py

@@ -23,7 +23,6 @@ PY_SRCS(
     serializability/__init__.py
     serializability/checker.py
     harness/__init__.py
-    harness/blockstore.py
     harness/daemon.py
     harness/kikimr_client.py
     harness/kikimr_node_interface.py