From 3d39cae603a64f7326b192d8d2d575d61de4cc6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Fri, 25 Feb 2022 13:21:02 +0100 Subject: [PATCH] first mongodb to tarantool transitions --- planetmint/backend/connection_tarantool.py | 8 +++++--- planetmint/backend/schema.py | 3 ++- planetmint/commands/planetmint.py | 12 ++++++------ planetmint/lib.py | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/planetmint/backend/connection_tarantool.py b/planetmint/backend/connection_tarantool.py index 15b10ef..046ae2c 100644 --- a/planetmint/backend/connection_tarantool.py +++ b/planetmint/backend/connection_tarantool.py @@ -54,13 +54,15 @@ class TarantoolDB: commands = self.__read_commands(file_path=f_path) run(commands=commands, config=config) - def connect(host: str = None, port: int = None, username: str = "admin", password: str = "pass", - backend: str = None, reset_database: bool = False): + backend: str = None, reset_database: bool = False, name=None, max_tries=None, + connection_timeout=None, replicaset=None, ssl=None, login: str = "admin", ctl_config=None, + ca_cert=None, certfile=None, keyfile=None, keyfile_passphrase=None, reconnect_delay=None, + crlfile=None, connect_now=True, encoding=None): backend = backend or get_planetmint_config_value_or_key_error('backend') # TODO Rewrite Configs host = host or get_planetmint_config_value_or_key_error('host') port = port or get_planetmint_config_value_or_key_error('port') - username = username or get_planetmint_config_value('login') + username = username or login or get_planetmint_config_value('login') password = password or get_planetmint_config_value('password') try: # Here we get class using getattr function diff --git a/planetmint/backend/schema.py b/planetmint/backend/schema.py index cb7bbcf..49586bf 100644 --- a/planetmint/backend/schema.py +++ b/planetmint/backend/schema.py @@ -9,7 +9,8 @@ from functools import singledispatch import logging import planetmint -from planetmint.backend.connection import connect +from planetmint.backend.connection import connect as connect_mongo +from planetmint.backend.connection_tarantool import connect from planetmint.common.exceptions import ValidationError from planetmint.common.utils import validate_all_values_for_key_in_obj, validate_all_values_for_key_in_list diff --git a/planetmint/commands/planetmint.py b/planetmint/commands/planetmint.py index 7db13a6..c44afa8 100644 --- a/planetmint/commands/planetmint.py +++ b/planetmint/commands/planetmint.py @@ -26,7 +26,7 @@ import planetmint from planetmint import (backend, ValidatorElection, Planetmint) from planetmint.backend import schema -from planetmint.backend.tarantool import tarantool +from planetmint.backend import tarantool from planetmint.commands import utils from planetmint.commands.utils import (configure_planetmint, input_on_stderr) @@ -291,7 +291,7 @@ def run_start(args): from planetmint.start import start start(args) - + def run_tendermint_version(args): """Show the supported Tendermint version(s)""" supported_tm_ver = { @@ -318,12 +318,12 @@ def create_parser(): help='Prepare the config file.') config_parser.add_argument('backend', - choices=['localmongodb'], - default='localmongodb', - const='localmongodb', + choices=['tarantool_db'], + default='tarantool_db', + const='tarantool_db', nargs='?', help='The backend to use. It can only be ' - '"localmongodb", currently.') + '"tarantool_db", currently.') # parser for managing elections election_parser = subparsers.add_parser('election', diff --git a/planetmint/lib.py b/planetmint/lib.py index 4c59b26..179f23d 100644 --- a/planetmint/lib.py +++ b/planetmint/lib.py @@ -75,8 +75,8 @@ class Planetmint(object): self.validation = config_utils.load_validation_plugin(validationPlugin) else: self.validation = BaseValidationRules - - self.connection = connection if connection else backend.connect(**planetmint.config['database']) + + self.connection = connection if connection else backend.connection_tarantool.connect(**planetmint.config['database']) def post_transaction(self, transaction, mode): """Submit a valid transaction to the mempool."""