Merge 23b3e56 into 26c9911

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

@@ -513,7 +513,6 @@ def produce_arguments(args):
     parser.add_argument("--fixed-ports", action='store_true', default=False)
     parser.add_argument("--base-port-offset", action="store", type=int, default=0)
     parser.add_argument("--pq-client-service-type", action='append', default=[])
-    parser.add_argument("--enable-datastreams", action='store_true', default=False)
     parser.add_argument("--enable-pqcd", action='store_true', default=False)
     parsed, _ = parser.parse_known_args(args)
     arguments = EmptyArguments()
@@ -527,7 +526,6 @@ def produce_arguments(args):
         arguments.debug_logging = parsed.debug_logging
     arguments.enable_pq = parsed.enable_pq
     arguments.pq_client_service_types = parsed.pq_client_service_type
-    arguments.enable_datastreams = parsed.enable_datastreams
     arguments.enable_pqcd = parsed.enable_pqcd
     return arguments
 

ydb/public/tools/local_ydb/__main__.py

@@ -145,10 +145,6 @@
             '--enable-pq', default=False, action='store_true',
             help='Enable pqv1 service in kikimr'
         )
-        sub_parser.add_argument(
-            '--enable-datastreams', default=False, action='store_true',
-            help='Enable datastreams service'
-        )
         sub_parser.add_argument(
             '--public-http-config-path', default=None,
             help='The path to public HTTP config'

ydb/tests/library/harness/kikimr_config.py

@@ -115,7 +115,6 @@ def __init__(
             nodes=None,
             additional_log_configs=None,
             port_allocator=None,
-            has_cluster_uuid=True,
             load_udfs=False,
             udfs_path=None,
             output_path=None,
@@ -124,7 +123,6 @@ def __init__(
             slot_count=0,
             pdisk_store_path=None,
             version=None,
-            enable_nbs=False,
             enable_sqs=False,
             domain_name='Root',
             suppress_version_check=True,
@@ -144,7 +142,6 @@ def __init__(
             fq_config_path=None,
             public_http_config_path=None,
             public_http_config=None,
-            enable_datastreams=False,
             auth_config_path=None,
             enable_public_api_external_blobs=False,
             node_kind=None,
@@ -181,9 +178,6 @@ def __init__(
         erasure = Erasure.NONE if erasure is None else erasure
         self.__grpc_ssl_enable = grpc_ssl_enable
         self.__grpc_tls_data_path = None
-        self.__grpc_ca_file = None
-        self.__grpc_cert_file = None
-        self.__grpc_key_file = None
         self.__grpc_tls_ca = None
         self.__grpc_tls_key = None
         self.__grpc_tls_cert = None
@@ -200,7 +194,6 @@ def __init__(
         if nodes is None:
             nodes = rings_count * erasure.min_fail_domains
         self._rings_count = rings_count
-        self._enable_nbs = enable_nbs
         self.__node_ids = list(range(1, nodes + 1))
         self.n_to_select = n_to_select
         if self.n_to_select is None:
@@ -526,10 +519,6 @@ def metering_file_path(self):
     def audit_file_path(self):
         return self.yaml_config.get('audit_config', {}).get('file_backend', {}).get('file_path')
 
-    @property
-    def nbs_enable(self):
-        return self._enable_nbs
-
     @property
     def sqs_service_enabled(self):
         return self.yaml_config['sqs_config']['enable_sqs']
@@ -538,10 +527,6 @@ def sqs_service_enabled(self):
     def output_path(self):
         return self.__output_path
 
-    def set_binary_path(self, binary_path):
-        self.__binary_path = binary_path
-        return self
-
     @property
     def binary_path(self):
         if self.__binary_path is not None: