customize mon_port for local ydb

Author: zverevgeny

ydb/tests/olap/lib/ydb_cluster.py

@@ -154,9 +154,10 @@ def _create_ydb_driver(endpoint, database, oauth=None, iam_file=None):
             raise
 
     @classmethod
-    def reset(cls, ydb_endpoint, ydb_database):
+    def reset(cls, ydb_endpoint, ydb_database, ydb_mon_port):
         cls.ydb_endpoint = ydb_endpoint
         cls.ydb_database = ydb_database
+        cls.ydb_mon_port = ydb_mon_port
         cls._ydb_driver = None
 
     @classmethod

ydb/tests/olap/scenario/conftest.py

@@ -29,13 +29,15 @@ def __init__(self, endpoint, database):
         if endpoint is not None:
             self._endpoint = endpoint
             self._database = database
+            self._mon_port = 8765
         else:
             config = KikimrConfigGenerator()
             cluster = KiKiMR(configurator=config)
             cluster.start()
             node = cluster.nodes[1]
             self._endpoint = "grpc://%s:%d" % (node.host, node.port)
             self._database = config.domain_name
+            self._mon_port = node.mon_port
             self._temp_ydb_cluster = cluster
         LOGGER.info(f'Using YDB, endpoint:{self._endpoint}, database:{self._database}')
 
@@ -45,6 +47,9 @@ def endpoint(self):
     def database(self):
         return self._database
 
+    def mon_port(self):
+        return self._mon_port
+
     def stop(self):
         if self._temp_ydb_cluster is not None:
             self._temp_ydb_cluster.stop()
@@ -61,7 +66,7 @@ def setup_class(cls):
         ydb_endpoint = get_external_param('ydb-endpoint', None)
         ydb_database = get_external_param('ydb-db', "").lstrip('/')
         cls._ydb_instance = YdbClusterInstance(ydb_endpoint, ydb_database)
-        YdbCluster.reset(cls._ydb_instance.endpoint(), cls._ydb_instance.database())
+        YdbCluster.reset(cls._ydb_instance.endpoint(), cls._ydb_instance.database(), cls._ydb_instance.mon_port())
         if not external_param_is_true('reuse-tables'):
             ScenarioTestHelper(None).remove_path(cls.get_suite_name())