Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove some from kikimr_config #9032

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ydb/public/tools/lib/cmds/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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

Expand Down
4 changes: 0 additions & 4 deletions ydb/public/tools/local_ydb/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
15 changes: 0 additions & 15 deletions ydb/tests/library/harness/kikimr_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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']
Expand All @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions ydb/tests/library/harness/kikimr_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,6 @@ def binary_path(self):
def command(self):
return self.__make_run_command()

def set_binary_path(self, binary_path):
self.__binary_path = binary_path
return self.__binary_path

def format_pdisk(self, pdisk_path, disk_size, **kwargs):
logger.debug("Formatting pdisk %s on node %s, disk_size %s" % (pdisk_path, self, disk_size))
if pdisk_path.startswith('SectorMap'):
Expand Down
Loading