Remove obsolete from harness (#12774)

1 files changed, 16 insertions, 59 deletions

diff --git a/ydb/tests/library/harness/kikimr_cluster.py b/ydb/tests/library/harness/kikimr_cluster.py
index 219754f6480..73b25c92738 100644
--- a/ydb/tests/library/harness/kikimr_cluster.py
+++ b/ydb/tests/library/harness/kikimr_cluster.py
@@ -2,12 +2,9 @@
 # -*- coding: utf-8 -*-
 import itertools
 import logging
-import subprocess
 import time
 from concurrent import futures
 
-import ydb
-
 from .kikimr_runner import KiKiMR, KikimrExternalNode
 from .kikimr_cluster_interface import KiKiMRClusterInterface
 import yaml
@@ -98,26 +95,24 @@ class ExternalKiKiMRCluster(KiKiMRClusterInterface):
                 for _ in results:
                     pass
 
-    def _deploy_secrets(self):
-        self._run_on(
-            self.nodes,
-            lambda x: x.ssh_command(
-                "sudo mkdir -p /Berkanavt/kikimr/secrets && "
-                "yav get version ver-01dsxdr7ghq7cnn7mvm66gqkxq -o auth_file | "
-                "sudo tee /Berkanavt/kikimr/secrets/auth.txt"
-            )
-        )
-
-        self._run_on(
-            self.nodes,
-            lambda x: x.ssh_command(
-                "yav get version ver-01dsxdr7ghq7cnn7mvm66gqkxq -o tvm_secret | "
-                "sudo tee /Berkanavt/kikimr/secrets/tvm_secret"
+    def _rename_obsolete_files(self):
+        obsolete_files = [
+            "/Berkanavt/kikimr/secrets/tvm_secret",
+            "/Berkanavt/kikimr/secrets/auth.txt",
+            "/Berkanavt/kikimr/cfg/auth.txt",
+        ]
+        for path in obsolete_files:
+            self._run_on(
+                self.nodes,
+                lambda x: x.ssh_command(
+                    "sudo mv {path} {path}.delete_me".format(path=path)
+                )
             )
-        )
 
     def _initialize(self):
         node = list(self.nodes.values())[0]
+        # Initilize, these scripts are generated by ydb/tools/cfg
+        # TODO: do something like "ydb admin config replace -f config.yaml" instead
         node.ssh_command(['bash /Berkanavt/kikimr/cfg/init_storage.bash'], raise_on_error=True)
         node.ssh_command(['bash /Berkanavt/kikimr/cfg/init_cms.bash'], raise_on_error=True)
         node.ssh_command(['bash /Berkanavt/kikimr/cfg/init_compute.bash'], raise_on_error=True)
@@ -125,8 +120,7 @@ class ExternalKiKiMRCluster(KiKiMRClusterInterface):
 
     def _prepare_cluster(self):
         self._stop()
-
-        self._deploy_secrets()
+        self._rename_obsolete_files()
 
         for inst_set in [self.nodes]:
             self._run_on(
@@ -136,14 +130,7 @@ class ExternalKiKiMRCluster(KiKiMRClusterInterface):
                 )
             )
 
-        # creating symlinks, to attach auth.txt to node
-        self._run_on(
-            self.nodes,
-            lambda x: x.ssh_command(
-                "sudo ln -f /Berkanavt/kikimr/secrets/auth.txt /Berkanavt/kikimr/cfg/auth.txt"
-            )
-        )
-
+        # enctyption key for pdisk
         self._run_on(
             self.nodes,
             lambda x: x.ssh_command(
@@ -238,39 +225,9 @@ class ExternalKiKiMRCluster(KiKiMRClusterInterface):
 
         return self._slots
 
-    def _run_discovery_command(self, tenant_name):
-        discovery_cmd = [
-            self.__kikimr_path, '--server', self.nodes[1].host, 'discovery', 'list', '-d', tenant_name
-        ]
-        logger.info('Executing discovery command: %s' % ' '.join(list(discovery_cmd)))
-        ds_result = subprocess.check_output(discovery_cmd)
-        logger.info('Discovery command result: "{}"'.format(ds_result))
-        return ds_result
-
     def _get_node(self, host, grpc_port):
         nodes = self._slots if self._slots else self.nodes
         for node in nodes.values():
             if node.host == host and str(node.grpc_port) == str(grpc_port):
                 return node
         logger.error('Cant find node with host {} and grpc_port {}'.format(host, grpc_port))
-
-    def get_active_tenant_nodes(self, tenant_name):
-        node_to_connect_to = self.nodes[1]
-        dc = ydb.DriverConfig('%s:%d' % (node_to_connect_to.host, node_to_connect_to.grpc_port), tenant_name)
-        resolver = ydb.DiscoveryEndpointsResolver(dc)
-        for try_num in range(5):
-            resolve_result = resolver.resolve()
-            if resolve_result is None:
-                logger.error('Got None result from DiscoveryEndpointsResolver')
-                time.sleep(1)
-                continue
-            endpoints = resolve_result.endpoints
-            logger.info(
-                'DiscoveryEndpointsResolver returned {} nodes: {}'.format(len(endpoints), endpoints)
-            )
-            nodes = []
-            for endpoint in endpoints:
-                node = self._get_node(endpoint.address, endpoint.port)
-                if node is not None:
-                    nodes.append(node)
-            return nodes