From: Aleš Mrázek Date: Tue, 6 Aug 2024 13:16:54 +0000 (+0200) Subject: manager: reorganizing python modules X-Git-Tag: v6.0.9~18^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19fb522ac0e743813bdb60f583f3446eb3f01e18;p=thirdparty%2Fknot-resolver.git manager: reorganizing python modules --- diff --git a/build_c_extensions.py b/build_c_extensions.py index ad63013a3..0e078cfba 100644 --- a/build_c_extensions.py +++ b/build_c_extensions.py @@ -8,8 +8,8 @@ def build(setup_kwargs: Dict[Any, Any]) -> None: { "ext_modules": [ Extension( - name="knot_resolver_manager.kresd_controller.supervisord.plugin.notify", - sources=["python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c"], + name="knot_resolver_manager.controller.supervisord.plugin.notify", + sources=["python/knot_resolver_manager/controller/supervisord/plugin/notifymodule.c"], ), ] } diff --git a/pyproject.toml b/pyproject.toml index 013b300d0..80a219011 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,8 +65,8 @@ breathe = "^4.35.0" json-schema-for-humans = "^0.47" [tool.poetry.scripts] -kresctl = 'knot_resolver_manager.cli.main:main' -knot-resolver = 'knot_resolver_manager.__main__:run' +kresctl = 'knot_resolver_manager.client.main:main' +knot-resolver = 'knot_resolver_manager.manager.__main__:run' [tool.poe.tasks] # tasks runed through scripts located in 'scripts/poe-tasks/' diff --git a/python/knot_resolver_manager/cli/__init__.py b/python/knot_resolver_manager/cli/__init__.py deleted file mode 100644 index d3c6280d4..000000000 --- a/python/knot_resolver_manager/cli/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from pathlib import Path - -from knot_resolver_manager.datamodel.globals import Context, set_global_validation_context - -set_global_validation_context(Context(Path("."), False)) diff --git a/python/knot_resolver_manager/cli/__main__.py b/python/knot_resolver_manager/cli/__main__.py deleted file mode 100644 index 88a83a675..000000000 --- a/python/knot_resolver_manager/cli/__main__.py +++ /dev/null @@ -1,4 +0,0 @@ -from knot_resolver_manager.cli.main import main - -if __name__ == "__main__": - main() diff --git a/python/knot_resolver_manager/client/__init__.py b/python/knot_resolver_manager/client/__init__.py new file mode 100644 index 000000000..2b1eb0f6d --- /dev/null +++ b/python/knot_resolver_manager/client/__init__.py @@ -0,0 +1,5 @@ +from pathlib import Path + +from knot_resolver_manager.manager.datamodel.globals import Context, set_global_validation_context + +set_global_validation_context(Context(Path("."), False)) diff --git a/python/knot_resolver_manager/client/__main__.py b/python/knot_resolver_manager/client/__main__.py new file mode 100644 index 000000000..e26a454e1 --- /dev/null +++ b/python/knot_resolver_manager/client/__main__.py @@ -0,0 +1,4 @@ +from knot_resolver_manager.client.main import main + +if __name__ == "__main__": + main() diff --git a/python/knot_resolver_manager/cli/command.py b/python/knot_resolver_manager/client/command.py similarity index 93% rename from python/knot_resolver_manager/cli/command.py rename to python/knot_resolver_manager/client/command.py index 72154a408..18cf4a224 100644 --- a/python/knot_resolver_manager/cli/command.py +++ b/python/knot_resolver_manager/client/command.py @@ -5,9 +5,9 @@ from pathlib import Path from typing import Dict, List, Optional, Tuple, Type, TypeVar from urllib.parse import quote -from knot_resolver_manager.constants import API_SOCK_ENV_VAR, CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE -from knot_resolver_manager.datamodel.config_schema import DEFAULT_MANAGER_API_SOCK -from knot_resolver_manager.datamodel.types import IPAddressPort +from knot_resolver_manager.manager.constants import API_SOCK_ENV_VAR, CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE +from knot_resolver_manager.manager.datamodel.config_schema import DEFAULT_MANAGER_API_SOCK +from knot_resolver_manager.manager.datamodel.types import IPAddressPort from knot_resolver_manager.utils.modeling import parsing from knot_resolver_manager.utils.modeling.exceptions import DataValidationError from knot_resolver_manager.utils.requests import SocketDesc diff --git a/python/knot_resolver_manager/cli/cmd/cache.py b/python/knot_resolver_manager/client/commands/cache.py similarity index 96% rename from python/knot_resolver_manager/cli/cmd/cache.py rename to python/knot_resolver_manager/client/commands/cache.py index e5a150358..daef251d3 100644 --- a/python/knot_resolver_manager/cli/cmd/cache.py +++ b/python/knot_resolver_manager/client/commands/cache.py @@ -3,8 +3,8 @@ import sys from enum import Enum from typing import Any, Dict, List, Optional, Tuple, Type -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command -from knot_resolver_manager.datamodel.cache_schema import CacheClearRPCSchema +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.manager.datamodel.cache_schema import CacheClearRPCSchema from knot_resolver_manager.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError from knot_resolver_manager.utils.modeling.parsing import DataFormat, parse_json from knot_resolver_manager.utils.requests import request diff --git a/python/knot_resolver_manager/cli/cmd/completion.py b/python/knot_resolver_manager/client/commands/completion.py similarity index 97% rename from python/knot_resolver_manager/cli/cmd/completion.py rename to python/knot_resolver_manager/client/commands/completion.py index 87a918388..b79c1d44f 100644 --- a/python/knot_resolver_manager/cli/cmd/completion.py +++ b/python/knot_resolver_manager/client/commands/completion.py @@ -2,7 +2,7 @@ import argparse from enum import Enum from typing import List, Tuple, Type -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command class Shells(Enum): diff --git a/python/knot_resolver_manager/cli/cmd/config.py b/python/knot_resolver_manager/client/commands/config.py similarity index 98% rename from python/knot_resolver_manager/cli/cmd/config.py rename to python/knot_resolver_manager/client/commands/config.py index f0be2cbc6..8ef7b545d 100644 --- a/python/knot_resolver_manager/cli/cmd/config.py +++ b/python/knot_resolver_manager/client/commands/config.py @@ -5,7 +5,7 @@ from typing import List, Optional, Tuple, Type from typing_extensions import Literal -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command from knot_resolver_manager.utils.modeling.parsing import DataFormat, parse_json, try_to_parse from knot_resolver_manager.utils.requests import request diff --git a/python/knot_resolver_manager/cli/cmd/convert.py b/python/knot_resolver_manager/client/commands/convert.py similarity index 92% rename from python/knot_resolver_manager/cli/cmd/convert.py rename to python/knot_resolver_manager/client/commands/convert.py index 7bb2858fd..157e07312 100644 --- a/python/knot_resolver_manager/cli/cmd/convert.py +++ b/python/knot_resolver_manager/client/commands/convert.py @@ -3,9 +3,9 @@ import sys from pathlib import Path from typing import List, Optional, Tuple, Type -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command -from knot_resolver_manager.datamodel import KresConfig -from knot_resolver_manager.datamodel.globals import ( +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.manager.datamodel import KresConfig +from knot_resolver_manager.manager.datamodel.globals import ( Context, reset_global_validation_context, set_global_validation_context, diff --git a/python/knot_resolver_manager/cli/cmd/help.py b/python/knot_resolver_manager/client/commands/help.py similarity index 87% rename from python/knot_resolver_manager/cli/cmd/help.py rename to python/knot_resolver_manager/client/commands/help.py index d374005ea..93b458555 100644 --- a/python/knot_resolver_manager/cli/cmd/help.py +++ b/python/knot_resolver_manager/client/commands/help.py @@ -1,7 +1,7 @@ import argparse from typing import List, Tuple, Type -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command @register_command diff --git a/python/knot_resolver_manager/cli/cmd/metrics.py b/python/knot_resolver_manager/client/commands/metrics.py similarity index 96% rename from python/knot_resolver_manager/cli/cmd/metrics.py rename to python/knot_resolver_manager/client/commands/metrics.py index 7f466ec30..2d3378d00 100644 --- a/python/knot_resolver_manager/cli/cmd/metrics.py +++ b/python/knot_resolver_manager/client/commands/metrics.py @@ -2,7 +2,7 @@ import argparse import sys from typing import List, Optional, Tuple, Type -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command from knot_resolver_manager.utils.modeling.parsing import DataFormat, parse_json from knot_resolver_manager.utils.requests import request diff --git a/python/knot_resolver_manager/cli/cmd/reload.py b/python/knot_resolver_manager/client/commands/reload.py similarity index 92% rename from python/knot_resolver_manager/cli/cmd/reload.py rename to python/knot_resolver_manager/client/commands/reload.py index 89782f4ee..c800ca2fa 100644 --- a/python/knot_resolver_manager/cli/cmd/reload.py +++ b/python/knot_resolver_manager/client/commands/reload.py @@ -2,7 +2,7 @@ import argparse import sys from typing import List, Tuple, Type -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command from knot_resolver_manager.utils.requests import request diff --git a/python/knot_resolver_manager/cli/cmd/schema.py b/python/knot_resolver_manager/client/commands/schema.py similarity index 91% rename from python/knot_resolver_manager/cli/cmd/schema.py rename to python/knot_resolver_manager/client/commands/schema.py index 253699466..8e48022be 100644 --- a/python/knot_resolver_manager/cli/cmd/schema.py +++ b/python/knot_resolver_manager/client/commands/schema.py @@ -3,8 +3,8 @@ import json import sys from typing import List, Optional, Tuple, Type -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command -from knot_resolver_manager.datamodel.config_schema import KresConfig +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.manager.datamodel.config_schema import KresConfig from knot_resolver_manager.utils.requests import request diff --git a/python/knot_resolver_manager/cli/cmd/stop.py b/python/knot_resolver_manager/client/commands/stop.py similarity index 90% rename from python/knot_resolver_manager/cli/cmd/stop.py rename to python/knot_resolver_manager/client/commands/stop.py index a3f463542..7bd6d21c2 100644 --- a/python/knot_resolver_manager/cli/cmd/stop.py +++ b/python/knot_resolver_manager/client/commands/stop.py @@ -2,7 +2,7 @@ import argparse import sys from typing import List, Tuple, Type -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command from knot_resolver_manager.utils.requests import request diff --git a/python/knot_resolver_manager/cli/cmd/validate.py b/python/knot_resolver_manager/client/commands/validate.py similarity index 90% rename from python/knot_resolver_manager/cli/cmd/validate.py rename to python/knot_resolver_manager/client/commands/validate.py index aacd19896..0b327b346 100644 --- a/python/knot_resolver_manager/cli/cmd/validate.py +++ b/python/knot_resolver_manager/client/commands/validate.py @@ -3,9 +3,9 @@ import sys from pathlib import Path from typing import List, Tuple, Type -from knot_resolver_manager.cli.command import Command, CommandArgs, CompWords, register_command -from knot_resolver_manager.datamodel import KresConfig -from knot_resolver_manager.datamodel.globals import ( +from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command +from knot_resolver_manager.manager.datamodel import KresConfig +from knot_resolver_manager.manager.datamodel.globals import ( Context, reset_global_validation_context, set_global_validation_context, diff --git a/python/knot_resolver_manager/cli/kresctl.py b/python/knot_resolver_manager/client/kresctl.py similarity index 95% rename from python/knot_resolver_manager/cli/kresctl.py rename to python/knot_resolver_manager/client/kresctl.py index cbcc12a34..1d52564d8 100644 --- a/python/knot_resolver_manager/cli/kresctl.py +++ b/python/knot_resolver_manager/client/kresctl.py @@ -1,6 +1,6 @@ import argparse -from knot_resolver_manager.cli.command import CommandArgs +from knot_resolver_manager.client.command import CommandArgs class Kresctl: diff --git a/python/knot_resolver_manager/cli/main.py b/python/knot_resolver_manager/client/main.py similarity index 90% rename from python/knot_resolver_manager/cli/main.py rename to python/knot_resolver_manager/client/main.py index 301a9539e..50e08203f 100644 --- a/python/knot_resolver_manager/cli/main.py +++ b/python/knot_resolver_manager/client/main.py @@ -2,13 +2,13 @@ import argparse import importlib import os -from knot_resolver_manager.cli.command import install_commands_parsers -from knot_resolver_manager.cli.kresctl import Kresctl +from knot_resolver_manager.client.command import install_commands_parsers +from knot_resolver_manager.client.kresctl import Kresctl def autoimport_commands() -> None: - prefix = "knot_resolver_manager.cli.cmd." - for module_name in os.listdir(os.path.dirname(__file__) + "/cmd"): + prefix = "knot_resolver_manager.client.commands." + for module_name in os.listdir(os.path.dirname(__file__) + "/commands"): if module_name[-3:] != ".py": continue importlib.import_module(f"{prefix}{module_name[:-3]}") diff --git a/python/knot_resolver_manager/kresd_controller/__init__.py b/python/knot_resolver_manager/controller/__init__.py similarity index 92% rename from python/knot_resolver_manager/kresd_controller/__init__.py rename to python/knot_resolver_manager/controller/__init__.py index a21bc44cd..621ea7023 100644 --- a/python/knot_resolver_manager/kresd_controller/__init__.py +++ b/python/knot_resolver_manager/controller/__init__.py @@ -12,8 +12,8 @@ import asyncio import logging from typing import List, Optional -from knot_resolver_manager.datamodel.config_schema import KresConfig -from knot_resolver_manager.kresd_controller.interface import SubprocessController +from knot_resolver_manager.manager.datamodel.config_schema import KresConfig +from knot_resolver_manager.controller.interface import SubprocessController logger = logging.getLogger(__name__) @@ -29,7 +29,7 @@ def try_supervisord(): Attempt to load supervisord controllers. """ try: - from knot_resolver_manager.kresd_controller.supervisord import SupervisordSubprocessController + from knot_resolver_manager.controller.supervisord import SupervisordSubprocessController _registered_controllers.append(SupervisordSubprocessController()) except ImportError: diff --git a/python/knot_resolver_manager/kresd_controller/interface.py b/python/knot_resolver_manager/controller/interface.py similarity index 96% rename from python/knot_resolver_manager/kresd_controller/interface.py rename to python/knot_resolver_manager/controller/interface.py index 63caea493..f5ca8c154 100644 --- a/python/knot_resolver_manager/kresd_controller/interface.py +++ b/python/knot_resolver_manager/controller/interface.py @@ -10,10 +10,10 @@ from pathlib import Path from typing import Dict, Iterable, Optional, Type, TypeVar from weakref import WeakValueDictionary -from knot_resolver_manager.constants import kresd_config_file, policy_loader_config_file -from knot_resolver_manager.datamodel.config_schema import KresConfig -from knot_resolver_manager.exceptions import SubprocessControllerException -from knot_resolver_manager.kresd_controller.registered_workers import register_worker, unregister_worker +from knot_resolver_manager.manager.constants import kresd_config_file, policy_loader_config_file +from knot_resolver_manager.manager.datamodel.config_schema import KresConfig +from knot_resolver_manager.manager.exceptions import SubprocessControllerException +from knot_resolver_manager.controller.registered_workers import register_worker, unregister_worker from knot_resolver_manager.utils.async_utils import writefile logger = logging.getLogger(__name__) diff --git a/python/knot_resolver_manager/kresd_controller/registered_workers.py b/python/knot_resolver_manager/controller/registered_workers.py similarity index 89% rename from python/knot_resolver_manager/kresd_controller/registered_workers.py rename to python/knot_resolver_manager/controller/registered_workers.py index b6ea834ed..87066dcf7 100644 --- a/python/knot_resolver_manager/kresd_controller/registered_workers.py +++ b/python/knot_resolver_manager/controller/registered_workers.py @@ -2,10 +2,10 @@ import asyncio import logging from typing import TYPE_CHECKING, Dict, List, Tuple -from knot_resolver_manager.exceptions import SubprocessControllerException +from knot_resolver_manager.manager.exceptions import SubprocessControllerException if TYPE_CHECKING: - from knot_resolver_manager.kresd_controller.interface import KresID, Subprocess + from knot_resolver_manager.controller.interface import KresID, Subprocess logger = logging.getLogger(__name__) diff --git a/python/knot_resolver_manager/kresd_controller/supervisord/__init__.py b/python/knot_resolver_manager/controller/supervisord/__init__.py similarity index 95% rename from python/knot_resolver_manager/kresd_controller/supervisord/__init__.py rename to python/knot_resolver_manager/controller/supervisord/__init__.py index 5fb4d81d5..1d6f586cd 100644 --- a/python/knot_resolver_manager/kresd_controller/supervisord/__init__.py +++ b/python/knot_resolver_manager/controller/supervisord/__init__.py @@ -7,17 +7,17 @@ from xmlrpc.client import Fault, ServerProxy import supervisor.xmlrpc # type: ignore[import] from knot_resolver_manager.compat.asyncio import async_in_a_thread -from knot_resolver_manager.constants import supervisord_config_file, supervisord_pid_file, supervisord_sock_file -from knot_resolver_manager.datamodel.config_schema import KresConfig -from knot_resolver_manager.exceptions import CancelStartupExecInsteadException, SubprocessControllerException -from knot_resolver_manager.kresd_controller.interface import ( +from knot_resolver_manager.manager.constants import supervisord_config_file, supervisord_pid_file, supervisord_sock_file +from knot_resolver_manager.manager.datamodel.config_schema import KresConfig +from knot_resolver_manager.manager.exceptions import CancelStartupExecInsteadException, SubprocessControllerException +from knot_resolver_manager.controller.interface import ( KresID, Subprocess, SubprocessController, SubprocessStatus, SubprocessType, ) -from knot_resolver_manager.kresd_controller.supervisord.config_file import SupervisordKresID, write_config_file +from knot_resolver_manager.controller.supervisord.config_file import SupervisordKresID, write_config_file from knot_resolver_manager.utils import which from knot_resolver_manager.utils.async_utils import call, readfile diff --git a/python/knot_resolver_manager/kresd_controller/supervisord/config_file.py b/python/knot_resolver_manager/controller/supervisord/config_file.py similarity index 96% rename from python/knot_resolver_manager/kresd_controller/supervisord/config_file.py rename to python/knot_resolver_manager/controller/supervisord/config_file.py index 2fb7a99b5..388ac94dc 100644 --- a/python/knot_resolver_manager/kresd_controller/supervisord/config_file.py +++ b/python/knot_resolver_manager/controller/supervisord/config_file.py @@ -6,7 +6,7 @@ from pathlib import Path from jinja2 import Template from typing_extensions import Literal -from knot_resolver_manager.constants import ( +from knot_resolver_manager.manager.constants import ( kres_gc_executable, kresd_cache_dir, kresd_config_file_supervisord_pattern, @@ -19,9 +19,9 @@ from knot_resolver_manager.constants import ( supervisord_subprocess_log_dir, user_constants, ) -from knot_resolver_manager.datamodel.config_schema import KresConfig -from knot_resolver_manager.datamodel.logging_schema import LogTargetEnum -from knot_resolver_manager.kresd_controller.interface import KresID, SubprocessType +from knot_resolver_manager.manager.datamodel.config_schema import KresConfig +from knot_resolver_manager.manager.datamodel.logging_schema import LogTargetEnum +from knot_resolver_manager.controller.interface import KresID, SubprocessType from knot_resolver_manager.utils.async_utils import read_resource, writefile logger = logging.getLogger(__name__) diff --git a/python/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py b/python/knot_resolver_manager/controller/supervisord/plugin/fast_rpcinterface.py similarity index 100% rename from python/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py rename to python/knot_resolver_manager/controller/supervisord/plugin/fast_rpcinterface.py diff --git a/python/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py b/python/knot_resolver_manager/controller/supervisord/plugin/manager_integration.py similarity index 100% rename from python/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py rename to python/knot_resolver_manager/controller/supervisord/plugin/manager_integration.py diff --git a/python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c b/python/knot_resolver_manager/controller/supervisord/plugin/notifymodule.c similarity index 100% rename from python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c rename to python/knot_resolver_manager/controller/supervisord/plugin/notifymodule.c diff --git a/python/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py b/python/knot_resolver_manager/controller/supervisord/plugin/patch_logger.py similarity index 100% rename from python/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py rename to python/knot_resolver_manager/controller/supervisord/plugin/patch_logger.py diff --git a/python/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py b/python/knot_resolver_manager/controller/supervisord/plugin/sd_notify.py similarity index 99% rename from python/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py rename to python/knot_resolver_manager/controller/supervisord/plugin/sd_notify.py index cffe6fd37..a3fb31801 100644 --- a/python/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py +++ b/python/knot_resolver_manager/controller/supervisord/plugin/sd_notify.py @@ -13,7 +13,7 @@ from supervisor.process import Subprocess from supervisor.states import ProcessStates from supervisor.supervisord import Supervisor -from knot_resolver_manager.kresd_controller.supervisord.plugin import notify +from knot_resolver_manager.controller.supervisord.plugin import notify starting_processes: List[Subprocess] = [] diff --git a/python/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 b/python/knot_resolver_manager/controller/supervisord/supervisord.conf.j2 similarity index 82% rename from python/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 rename to python/knot_resolver_manager/controller/supervisord/supervisord.conf.j2 index b1fed1aa1..d187fc645 100644 --- a/python/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 +++ b/python/knot_resolver_manager/controller/supervisord/supervisord.conf.j2 @@ -20,21 +20,21 @@ serverurl = unix://{{ config.unix_http_server }} {# Extensions to changing the supervisord behavior #} [rpcinterface:patch_logger] -supervisor.rpcinterface_factory = knot_resolver_manager.kresd_controller.supervisord.plugin.patch_logger:inject +supervisor.rpcinterface_factory = knot_resolver_manager.controller.supervisord.plugin.patch_logger:inject target = {{ config.target }} [rpcinterface:manager_integration] -supervisor.rpcinterface_factory = knot_resolver_manager.kresd_controller.supervisord.plugin.manager_integration:inject +supervisor.rpcinterface_factory = knot_resolver_manager.controller.supervisord.plugin.manager_integration:inject [rpcinterface:sd_notify] -supervisor.rpcinterface_factory = knot_resolver_manager.kresd_controller.supervisord.plugin.sd_notify:inject +supervisor.rpcinterface_factory = knot_resolver_manager.controller.supervisord.plugin.sd_notify:inject {# Extensions for actual API control #} [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface [rpcinterface:fast] -supervisor.rpcinterface_factory = knot_resolver_manager.kresd_controller.supervisord.plugin.fast_rpcinterface:make_main_rpcinterface +supervisor.rpcinterface_factory = knot_resolver_manager.controller.supervisord.plugin.fast_rpcinterface:make_main_rpcinterface [program:manager] redirect_stderr=false diff --git a/python/knot_resolver_manager/manager/__init__.py b/python/knot_resolver_manager/manager/__init__.py new file mode 100644 index 000000000..3dc1f76bc --- /dev/null +++ b/python/knot_resolver_manager/manager/__init__.py @@ -0,0 +1 @@ +__version__ = "0.1.0" diff --git a/python/knot_resolver_manager/__main__.py b/python/knot_resolver_manager/manager/__main__.py similarity index 79% rename from python/knot_resolver_manager/__main__.py rename to python/knot_resolver_manager/manager/__main__.py index 89eabd564..22eb960b5 100644 --- a/python/knot_resolver_manager/__main__.py +++ b/python/knot_resolver_manager/manager/__main__.py @@ -6,7 +6,7 @@ def run(): # throws nice syntax error on old Python versions: 0_0 # Python >= 3.7 required - from knot_resolver_manager import main + from knot_resolver_manager.manager import main main.main() diff --git a/python/knot_resolver_manager/config_store.py b/python/knot_resolver_manager/manager/config_store.py similarity index 96% rename from python/knot_resolver_manager/config_store.py rename to python/knot_resolver_manager/manager/config_store.py index e5fbaf60d..93786e962 100644 --- a/python/knot_resolver_manager/config_store.py +++ b/python/knot_resolver_manager/manager/config_store.py @@ -2,8 +2,8 @@ import asyncio from asyncio import Lock from typing import Any, Awaitable, Callable, List, Tuple -from knot_resolver_manager.datamodel import KresConfig -from knot_resolver_manager.exceptions import KresManagerException +from knot_resolver_manager.manager.datamodel import KresConfig +from knot_resolver_manager.manager.exceptions import KresManagerException from knot_resolver_manager.utils.functional import Result from knot_resolver_manager.utils.modeling.exceptions import DataParsingError from knot_resolver_manager.utils.modeling.types import NoneType diff --git a/python/knot_resolver_manager/constants.py b/python/knot_resolver_manager/manager/constants.py similarity index 92% rename from python/knot_resolver_manager/constants.py rename to python/knot_resolver_manager/manager/constants.py index 9253c2db1..e83a777ba 100644 --- a/python/knot_resolver_manager/constants.py +++ b/python/knot_resolver_manager/manager/constants.py @@ -11,9 +11,9 @@ else: knot_resolver = None if TYPE_CHECKING: - from knot_resolver_manager.config_store import ConfigStore - from knot_resolver_manager.datamodel.config_schema import KresConfig - from knot_resolver_manager.kresd_controller.interface import KresID + from knot_resolver_manager.manager.config_store import ConfigStore + from knot_resolver_manager.manager.datamodel.config_schema import KresConfig + from knot_resolver_manager.controller.interface import KresID STARTUP_LOG_LEVEL = logging.DEBUG DEFAULT_MANAGER_CONFIG_FILE = Path("/etc/knot-resolver/config.yaml") diff --git a/python/knot_resolver_manager/datamodel/__init__.py b/python/knot_resolver_manager/manager/datamodel/__init__.py similarity index 100% rename from python/knot_resolver_manager/datamodel/__init__.py rename to python/knot_resolver_manager/manager/datamodel/__init__.py diff --git a/python/knot_resolver_manager/datamodel/cache_schema.py b/python/knot_resolver_manager/manager/datamodel/cache_schema.py similarity index 97% rename from python/knot_resolver_manager/datamodel/cache_schema.py rename to python/knot_resolver_manager/manager/datamodel/cache_schema.py index 4ed9fc3a8..fd0247aac 100644 --- a/python/knot_resolver_manager/datamodel/cache_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/cache_schema.py @@ -2,8 +2,8 @@ from typing import List, Optional, Union from typing_extensions import Literal -from knot_resolver_manager.datamodel.templates import template_from_str -from knot_resolver_manager.datamodel.types import ( +from knot_resolver_manager.manager.datamodel.templates import template_from_str +from knot_resolver_manager.manager.datamodel.types import ( DNSRecordTypeEnum, DomainName, EscapedStr, diff --git a/python/knot_resolver_manager/datamodel/config_schema.py b/python/knot_resolver_manager/manager/datamodel/config_schema.py similarity index 86% rename from python/knot_resolver_manager/datamodel/config_schema.py rename to python/knot_resolver_manager/manager/datamodel/config_schema.py index c8398569e..4201447b0 100644 --- a/python/knot_resolver_manager/datamodel/config_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/config_schema.py @@ -5,22 +5,22 @@ from typing import Any, Dict, List, Optional, Tuple, Union from typing_extensions import Literal -from knot_resolver_manager.constants import MAX_WORKERS -from knot_resolver_manager.datamodel.cache_schema import CacheSchema -from knot_resolver_manager.datamodel.dns64_schema import Dns64Schema -from knot_resolver_manager.datamodel.dnssec_schema import DnssecSchema -from knot_resolver_manager.datamodel.forward_schema import ForwardSchema -from knot_resolver_manager.datamodel.local_data_schema import LocalDataSchema, RPZSchema, RuleSchema -from knot_resolver_manager.datamodel.logging_schema import LoggingSchema -from knot_resolver_manager.datamodel.lua_schema import LuaSchema -from knot_resolver_manager.datamodel.management_schema import ManagementSchema -from knot_resolver_manager.datamodel.monitoring_schema import MonitoringSchema -from knot_resolver_manager.datamodel.network_schema import NetworkSchema -from knot_resolver_manager.datamodel.options_schema import OptionsSchema -from knot_resolver_manager.datamodel.templates import POLICY_CONFIG_TEMPLATE, WORKER_CONFIG_TEMPLATE -from knot_resolver_manager.datamodel.types import EscapedStr, IntPositive, WritableDir -from knot_resolver_manager.datamodel.view_schema import ViewSchema -from knot_resolver_manager.datamodel.webmgmt_schema import WebmgmtSchema +from knot_resolver_manager.manager.constants import MAX_WORKERS +from knot_resolver_manager.manager.datamodel.cache_schema import CacheSchema +from knot_resolver_manager.manager.datamodel.dns64_schema import Dns64Schema +from knot_resolver_manager.manager.datamodel.dnssec_schema import DnssecSchema +from knot_resolver_manager.manager.datamodel.forward_schema import ForwardSchema +from knot_resolver_manager.manager.datamodel.local_data_schema import LocalDataSchema, RPZSchema, RuleSchema +from knot_resolver_manager.manager.datamodel.logging_schema import LoggingSchema +from knot_resolver_manager.manager.datamodel.lua_schema import LuaSchema +from knot_resolver_manager.manager.datamodel.management_schema import ManagementSchema +from knot_resolver_manager.manager.datamodel.monitoring_schema import MonitoringSchema +from knot_resolver_manager.manager.datamodel.network_schema import NetworkSchema +from knot_resolver_manager.manager.datamodel.options_schema import OptionsSchema +from knot_resolver_manager.manager.datamodel.templates import POLICY_CONFIG_TEMPLATE, WORKER_CONFIG_TEMPLATE +from knot_resolver_manager.manager.datamodel.types import EscapedStr, IntPositive, WritableDir +from knot_resolver_manager.manager.datamodel.view_schema import ViewSchema +from knot_resolver_manager.manager.datamodel.webmgmt_schema import WebmgmtSchema from knot_resolver_manager.utils.modeling import ConfigSchema from knot_resolver_manager.utils.modeling.base_schema import lazy_default from knot_resolver_manager.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError diff --git a/python/knot_resolver_manager/datamodel/design-notes.yml b/python/knot_resolver_manager/manager/datamodel/design-notes.yml similarity index 100% rename from python/knot_resolver_manager/datamodel/design-notes.yml rename to python/knot_resolver_manager/manager/datamodel/design-notes.yml diff --git a/python/knot_resolver_manager/datamodel/dns64_schema.py b/python/knot_resolver_manager/manager/datamodel/dns64_schema.py similarity index 85% rename from python/knot_resolver_manager/datamodel/dns64_schema.py rename to python/knot_resolver_manager/manager/datamodel/dns64_schema.py index 60b92f2b9..35eb1fa6d 100644 --- a/python/knot_resolver_manager/datamodel/dns64_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/dns64_schema.py @@ -1,6 +1,6 @@ from typing import List, Optional -from knot_resolver_manager.datamodel.types import IPv6Network, IPv6Network96, TimeUnit +from knot_resolver_manager.manager.datamodel.types import IPv6Network, IPv6Network96, TimeUnit from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/dnssec_schema.py b/python/knot_resolver_manager/manager/datamodel/dnssec_schema.py similarity index 94% rename from python/knot_resolver_manager/datamodel/dnssec_schema.py rename to python/knot_resolver_manager/manager/datamodel/dnssec_schema.py index e51500e18..44f7ee313 100644 --- a/python/knot_resolver_manager/datamodel/dnssec_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/dnssec_schema.py @@ -1,6 +1,6 @@ from typing import List, Optional -from knot_resolver_manager.datamodel.types import DomainName, EscapedStr, IntNonNegative, ReadableFile, TimeUnit +from knot_resolver_manager.manager.datamodel.types import DomainName, EscapedStr, IntNonNegative, ReadableFile, TimeUnit from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/forward_schema.py b/python/knot_resolver_manager/manager/datamodel/forward_schema.py similarity index 94% rename from python/knot_resolver_manager/datamodel/forward_schema.py rename to python/knot_resolver_manager/manager/datamodel/forward_schema.py index 52a05f36d..923217f46 100644 --- a/python/knot_resolver_manager/datamodel/forward_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/forward_schema.py @@ -2,7 +2,13 @@ from typing import Any, List, Optional, Union from typing_extensions import Literal -from knot_resolver_manager.datamodel.types import DomainName, IPAddressOptionalPort, ListOrItem, PinSha256, ReadableFile +from knot_resolver_manager.manager.datamodel.types import ( + DomainName, + IPAddressOptionalPort, + ListOrItem, + PinSha256, + ReadableFile, +) from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/globals.py b/python/knot_resolver_manager/manager/datamodel/globals.py similarity index 100% rename from python/knot_resolver_manager/datamodel/globals.py rename to python/knot_resolver_manager/manager/datamodel/globals.py diff --git a/python/knot_resolver_manager/datamodel/local_data_schema.py b/python/knot_resolver_manager/manager/datamodel/local_data_schema.py similarity index 98% rename from python/knot_resolver_manager/datamodel/local_data_schema.py rename to python/knot_resolver_manager/manager/datamodel/local_data_schema.py index fafa7ebe2..6e1a966c9 100644 --- a/python/knot_resolver_manager/datamodel/local_data_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/local_data_schema.py @@ -2,7 +2,7 @@ from typing import Dict, List, Optional from typing_extensions import Literal -from knot_resolver_manager.datamodel.types import ( +from knot_resolver_manager.manager.datamodel.types import ( DomainName, EscapedStr, IDPattern, diff --git a/python/knot_resolver_manager/datamodel/logging_schema.py b/python/knot_resolver_manager/manager/datamodel/logging_schema.py similarity index 98% rename from python/knot_resolver_manager/datamodel/logging_schema.py rename to python/knot_resolver_manager/manager/datamodel/logging_schema.py index 601cd4a54..46f36d5af 100644 --- a/python/knot_resolver_manager/datamodel/logging_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/logging_schema.py @@ -3,7 +3,7 @@ from typing import Any, List, Optional, Set, Type, Union, cast from typing_extensions import Literal -from knot_resolver_manager.datamodel.types import TimeUnit, WritableFilePath +from knot_resolver_manager.manager.datamodel.types import TimeUnit, WritableFilePath from knot_resolver_manager.utils.modeling import ConfigSchema from knot_resolver_manager.utils.modeling.base_schema import is_obj_type_valid diff --git a/python/knot_resolver_manager/datamodel/lua_schema.py b/python/knot_resolver_manager/manager/datamodel/lua_schema.py similarity index 90% rename from python/knot_resolver_manager/datamodel/lua_schema.py rename to python/knot_resolver_manager/manager/datamodel/lua_schema.py index 079333ae8..0dccc1849 100644 --- a/python/knot_resolver_manager/datamodel/lua_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/lua_schema.py @@ -1,6 +1,6 @@ from typing import Optional -from knot_resolver_manager.datamodel.types import ReadableFile +from knot_resolver_manager.manager.datamodel.types import ReadableFile from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/management_schema.py b/python/knot_resolver_manager/manager/datamodel/management_schema.py similarity index 86% rename from python/knot_resolver_manager/datamodel/management_schema.py rename to python/knot_resolver_manager/manager/datamodel/management_schema.py index 44f8f3e83..4df4afa15 100644 --- a/python/knot_resolver_manager/datamodel/management_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/management_schema.py @@ -1,6 +1,6 @@ from typing import Optional -from knot_resolver_manager.datamodel.types import WritableFilePath, IPAddressPort +from knot_resolver_manager.manager.datamodel.types import WritableFilePath, IPAddressPort from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/monitoring_schema.py b/python/knot_resolver_manager/manager/datamodel/monitoring_schema.py similarity index 85% rename from python/knot_resolver_manager/datamodel/monitoring_schema.py rename to python/knot_resolver_manager/manager/datamodel/monitoring_schema.py index dfc4a1167..6e33b2f57 100644 --- a/python/knot_resolver_manager/datamodel/monitoring_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/monitoring_schema.py @@ -2,7 +2,7 @@ from typing import Union from typing_extensions import Literal -from knot_resolver_manager.datamodel.types import DomainName, EscapedStr, IPAddress, PortNumber, TimeUnit +from knot_resolver_manager.manager.datamodel.types import DomainName, EscapedStr, IPAddress, PortNumber, TimeUnit from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/network_schema.py b/python/knot_resolver_manager/manager/datamodel/network_schema.py similarity index 99% rename from python/knot_resolver_manager/datamodel/network_schema.py rename to python/knot_resolver_manager/manager/datamodel/network_schema.py index b9a35090f..ae006f411 100644 --- a/python/knot_resolver_manager/datamodel/network_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/network_schema.py @@ -2,7 +2,7 @@ from typing import List, Optional, Union from typing_extensions import Literal -from knot_resolver_manager.datamodel.types import ( +from knot_resolver_manager.manager.datamodel.types import ( EscapedStr32B, WritableFilePath, Int0_512, diff --git a/python/knot_resolver_manager/datamodel/options_schema.py b/python/knot_resolver_manager/manager/datamodel/options_schema.py similarity index 100% rename from python/knot_resolver_manager/datamodel/options_schema.py rename to python/knot_resolver_manager/manager/datamodel/options_schema.py diff --git a/python/knot_resolver_manager/datamodel/policy_schema.py b/python/knot_resolver_manager/manager/datamodel/policy_schema.py similarity index 94% rename from python/knot_resolver_manager/datamodel/policy_schema.py rename to python/knot_resolver_manager/manager/datamodel/policy_schema.py index bbc61cd1b..fb215188f 100644 --- a/python/knot_resolver_manager/datamodel/policy_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/policy_schema.py @@ -1,8 +1,8 @@ from typing import List, Optional, Union -from knot_resolver_manager.datamodel.forward_schema import ForwardServerSchema -from knot_resolver_manager.datamodel.network_schema import AddressRenumberingSchema -from knot_resolver_manager.datamodel.types import ( +from knot_resolver_manager.manager.datamodel.forward_schema import ForwardServerSchema +from knot_resolver_manager.manager.datamodel.network_schema import AddressRenumberingSchema +from knot_resolver_manager.manager.datamodel.types import ( DNSRecordTypeEnum, IPAddressOptionalPort, PolicyActionEnum, diff --git a/python/knot_resolver_manager/datamodel/rpz_schema.py b/python/knot_resolver_manager/manager/datamodel/rpz_schema.py similarity index 89% rename from python/knot_resolver_manager/datamodel/rpz_schema.py rename to python/knot_resolver_manager/manager/datamodel/rpz_schema.py index bf98bd0ca..e5dfe60ef 100644 --- a/python/knot_resolver_manager/datamodel/rpz_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/rpz_schema.py @@ -1,6 +1,6 @@ from typing import List, Optional -from knot_resolver_manager.datamodel.types import PolicyActionEnum, PolicyFlagEnum, ReadableFile +from knot_resolver_manager.manager.datamodel.types import PolicyActionEnum, PolicyFlagEnum, ReadableFile from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/slice_schema.py b/python/knot_resolver_manager/manager/datamodel/slice_schema.py similarity index 87% rename from python/knot_resolver_manager/datamodel/slice_schema.py rename to python/knot_resolver_manager/manager/datamodel/slice_schema.py index 0c7cdea19..3dacde989 100644 --- a/python/knot_resolver_manager/datamodel/slice_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/slice_schema.py @@ -2,7 +2,7 @@ from typing import List, Optional from typing_extensions import Literal -from knot_resolver_manager.datamodel.policy_schema import ActionSchema +from knot_resolver_manager.manager.datamodel.policy_schema import ActionSchema from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/static_hints_schema.py b/python/knot_resolver_manager/manager/datamodel/static_hints_schema.py similarity index 91% rename from python/knot_resolver_manager/datamodel/static_hints_schema.py rename to python/knot_resolver_manager/manager/datamodel/static_hints_schema.py index 89db49bbb..7a14aab3d 100644 --- a/python/knot_resolver_manager/datamodel/static_hints_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/static_hints_schema.py @@ -1,6 +1,6 @@ from typing import Dict, List, Optional -from knot_resolver_manager.datamodel.types import DomainName, IPAddress, ReadableFile, TimeUnit +from knot_resolver_manager.manager.datamodel.types import DomainName, IPAddress, ReadableFile, TimeUnit from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/stub_zone_schema.py b/python/knot_resolver_manager/manager/datamodel/stub_zone_schema.py similarity index 87% rename from python/knot_resolver_manager/datamodel/stub_zone_schema.py rename to python/knot_resolver_manager/manager/datamodel/stub_zone_schema.py index b9945ecc5..9e48efe8a 100644 --- a/python/knot_resolver_manager/datamodel/stub_zone_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/stub_zone_schema.py @@ -1,6 +1,6 @@ from typing import List, Optional, Union -from knot_resolver_manager.datamodel.types import DomainName, IPAddressOptionalPort, PolicyFlagEnum +from knot_resolver_manager.manager.datamodel.types import DomainName, IPAddressOptionalPort, PolicyFlagEnum from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/templates/__init__.py b/python/knot_resolver_manager/manager/datamodel/templates/__init__.py similarity index 87% rename from python/knot_resolver_manager/datamodel/templates/__init__.py rename to python/knot_resolver_manager/manager/datamodel/templates/__init__.py index 832503b7d..dc7b91e02 100644 --- a/python/knot_resolver_manager/datamodel/templates/__init__.py +++ b/python/knot_resolver_manager/manager/datamodel/templates/__init__.py @@ -5,13 +5,13 @@ from jinja2 import Environment, FileSystemLoader, Template def _get_templates_dir() -> str: - module = sys.modules["knot_resolver_manager.datamodel"].__file__ + module = sys.modules["knot_resolver_manager.manager.datamodel"].__file__ if module: templates_dir = os.path.join(os.path.dirname(module), "templates") if os.path.isdir(templates_dir): return templates_dir raise NotADirectoryError(f"the templates dir '{templates_dir}' is not a directory or does not exist") - raise OSError("package 'knot_resolver_manager.datamodel' cannot be located or loaded") + raise OSError("package 'knot_resolver_manager.manager.datamodel' cannot be located or loaded") _TEMPLATES_DIR = _get_templates_dir() diff --git a/python/knot_resolver_manager/datamodel/templates/cache.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/cache.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/cache.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/cache.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/dns64.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/dns64.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/dns64.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/dns64.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/dnssec.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/dnssec.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/forward.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/forward.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/forward.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/forward.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/local_data.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/local_data.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/local_data.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/local_data.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/logging.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/logging.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/logging.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/logging.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/macros/cache_macros.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/macros/cache_macros.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/macros/common_macros.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/macros/common_macros.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/macros/forward_macros.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/macros/forward_macros.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/macros/local_data_macros.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/macros/local_data_macros.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/macros/network_macros.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/macros/network_macros.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/macros/policy_macros.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/macros/policy_macros.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/macros/view_macros.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/macros/view_macros.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/monitoring.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/monitoring.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/network.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/network.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/network.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/network.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/options.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/options.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/options.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/options.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/policy-config.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/policy-config.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/static_hints.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/static_hints.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/views.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/views.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/views.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/views.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/webmgmt.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/webmgmt.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 b/python/knot_resolver_manager/manager/datamodel/templates/worker-config.lua.j2 similarity index 100% rename from python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 rename to python/knot_resolver_manager/manager/datamodel/templates/worker-config.lua.j2 diff --git a/python/knot_resolver_manager/datamodel/types/__init__.py b/python/knot_resolver_manager/manager/datamodel/types/__init__.py similarity index 100% rename from python/knot_resolver_manager/datamodel/types/__init__.py rename to python/knot_resolver_manager/manager/datamodel/types/__init__.py diff --git a/python/knot_resolver_manager/datamodel/types/base_types.py b/python/knot_resolver_manager/manager/datamodel/types/base_types.py similarity index 100% rename from python/knot_resolver_manager/datamodel/types/base_types.py rename to python/knot_resolver_manager/manager/datamodel/types/base_types.py diff --git a/python/knot_resolver_manager/datamodel/types/enums.py b/python/knot_resolver_manager/manager/datamodel/types/enums.py similarity index 100% rename from python/knot_resolver_manager/datamodel/types/enums.py rename to python/knot_resolver_manager/manager/datamodel/types/enums.py diff --git a/python/knot_resolver_manager/datamodel/types/files.py b/python/knot_resolver_manager/manager/datamodel/types/files.py similarity index 97% rename from python/knot_resolver_manager/datamodel/types/files.py rename to python/knot_resolver_manager/manager/datamodel/types/files.py index 4c6e7186f..94ce04dee 100644 --- a/python/knot_resolver_manager/datamodel/types/files.py +++ b/python/knot_resolver_manager/manager/datamodel/types/files.py @@ -6,8 +6,8 @@ from pathlib import Path from pwd import getpwnam from typing import Any, Dict, Tuple, Type, TypeVar -from knot_resolver_manager.constants import kresd_group, kresd_user -from knot_resolver_manager.datamodel.globals import get_resolve_root, get_strict_validation +from knot_resolver_manager.manager.constants import kresd_group, kresd_user +from knot_resolver_manager.manager.datamodel.globals import get_resolve_root, get_strict_validation from knot_resolver_manager.utils.modeling.base_value_type import BaseValueType diff --git a/python/knot_resolver_manager/datamodel/types/generic_types.py b/python/knot_resolver_manager/manager/datamodel/types/generic_types.py similarity index 100% rename from python/knot_resolver_manager/datamodel/types/generic_types.py rename to python/knot_resolver_manager/manager/datamodel/types/generic_types.py diff --git a/python/knot_resolver_manager/datamodel/types/types.py b/python/knot_resolver_manager/manager/datamodel/types/types.py similarity index 99% rename from python/knot_resolver_manager/datamodel/types/types.py rename to python/knot_resolver_manager/manager/datamodel/types/types.py index d9a0b9105..1d0199b75 100644 --- a/python/knot_resolver_manager/datamodel/types/types.py +++ b/python/knot_resolver_manager/manager/datamodel/types/types.py @@ -2,7 +2,7 @@ import ipaddress import re from typing import Any, Dict, Optional, Type, Union -from knot_resolver_manager.datamodel.types.base_types import ( +from knot_resolver_manager.manager.datamodel.types.base_types import ( IntRangeBase, PatternBase, StrBase, diff --git a/python/knot_resolver_manager/datamodel/view_schema.py b/python/knot_resolver_manager/manager/datamodel/view_schema.py similarity index 95% rename from python/knot_resolver_manager/datamodel/view_schema.py rename to python/knot_resolver_manager/manager/datamodel/view_schema.py index ad44eb3b3..166306dfd 100644 --- a/python/knot_resolver_manager/datamodel/view_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/view_schema.py @@ -2,7 +2,7 @@ from typing import List, Optional from typing_extensions import Literal -from knot_resolver_manager.datamodel.types import IDPattern, IPNetwork +from knot_resolver_manager.manager.datamodel.types import IDPattern, IPNetwork from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/datamodel/webmgmt_schema.py b/python/knot_resolver_manager/manager/datamodel/webmgmt_schema.py similarity index 88% rename from python/knot_resolver_manager/datamodel/webmgmt_schema.py rename to python/knot_resolver_manager/manager/datamodel/webmgmt_schema.py index 2e75c3b74..54a561f35 100644 --- a/python/knot_resolver_manager/datamodel/webmgmt_schema.py +++ b/python/knot_resolver_manager/manager/datamodel/webmgmt_schema.py @@ -1,6 +1,6 @@ from typing import Optional -from knot_resolver_manager.datamodel.types import WritableFilePath, InterfacePort, ReadableFile +from knot_resolver_manager.manager.datamodel.types import WritableFilePath, InterfacePort, ReadableFile from knot_resolver_manager.utils.modeling import ConfigSchema diff --git a/python/knot_resolver_manager/exceptions.py b/python/knot_resolver_manager/manager/exceptions.py similarity index 100% rename from python/knot_resolver_manager/exceptions.py rename to python/knot_resolver_manager/manager/exceptions.py diff --git a/python/knot_resolver_manager/kres_manager.py b/python/knot_resolver_manager/manager/kres_manager.py similarity index 97% rename from python/knot_resolver_manager/kres_manager.py rename to python/knot_resolver_manager/manager/kres_manager.py index f916dfaaa..78459bd2b 100644 --- a/python/knot_resolver_manager/kres_manager.py +++ b/python/knot_resolver_manager/manager/kres_manager.py @@ -7,20 +7,24 @@ from subprocess import SubprocessError from typing import Any, Callable, List, Optional from knot_resolver_manager.compat.asyncio import create_task -from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes_update, only_on_real_changes_verifier -from knot_resolver_manager.constants import ( +from knot_resolver_manager.manager.config_store import ( + ConfigStore, + only_on_real_changes_update, + only_on_real_changes_verifier, +) +from knot_resolver_manager.manager.constants import ( FIX_COUNTER_DECREASE_INTERVAL_SEC, MANAGER_FIX_ATTEMPT_MAX_COUNTER, WATCHDOG_INTERVAL, ) -from knot_resolver_manager.exceptions import SubprocessControllerException -from knot_resolver_manager.kresd_controller.interface import ( +from knot_resolver_manager.manager.exceptions import SubprocessControllerException +from knot_resolver_manager.controller.interface import ( Subprocess, SubprocessController, SubprocessStatus, SubprocessType, ) -from knot_resolver_manager.kresd_controller.registered_workers import ( +from knot_resolver_manager.controller.registered_workers import ( command_registered_workers, get_registered_workers_kresids, ) diff --git a/python/knot_resolver_manager/log.py b/python/knot_resolver_manager/manager/log.py similarity index 91% rename from python/knot_resolver_manager/log.py rename to python/knot_resolver_manager/manager/log.py index 19271c526..95043f89c 100644 --- a/python/knot_resolver_manager/log.py +++ b/python/knot_resolver_manager/manager/log.py @@ -4,10 +4,10 @@ import os import sys from typing import Optional -from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes_update -from knot_resolver_manager.constants import STARTUP_LOG_LEVEL -from knot_resolver_manager.datamodel.config_schema import KresConfig -from knot_resolver_manager.datamodel.logging_schema import LogTargetEnum +from knot_resolver_manager.manager.config_store import ConfigStore, only_on_real_changes_update +from knot_resolver_manager.manager.constants import STARTUP_LOG_LEVEL +from knot_resolver_manager.manager.datamodel.config_schema import KresConfig +from knot_resolver_manager.manager.datamodel.logging_schema import LogTargetEnum logger = logging.getLogger(__name__) diff --git a/python/knot_resolver_manager/main.py b/python/knot_resolver_manager/manager/main.py similarity index 84% rename from python/knot_resolver_manager/main.py rename to python/knot_resolver_manager/manager/main.py index 9428c880e..2240c1aab 100644 --- a/python/knot_resolver_manager/main.py +++ b/python/knot_resolver_manager/manager/main.py @@ -10,9 +10,9 @@ from pathlib import Path from typing import NoReturn from knot_resolver_manager import compat -from knot_resolver_manager.constants import CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE -from knot_resolver_manager.log import logger_startup -from knot_resolver_manager.server import start_server +from knot_resolver_manager.manager.constants import CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE +from knot_resolver_manager.manager.log import logger_startup +from knot_resolver_manager.manager.server import start_server def parse_args() -> argparse.Namespace: diff --git a/python/knot_resolver_manager/server.py b/python/knot_resolver_manager/manager/server.py similarity index 96% rename from python/knot_resolver_manager/server.py rename to python/knot_resolver_manager/manager/server.py index b27cadb33..9570f5362 100644 --- a/python/knot_resolver_manager/server.py +++ b/python/knot_resolver_manager/manager/server.py @@ -19,17 +19,17 @@ from aiohttp.web_runner import AppRunner, TCPSite, UnixSite from typing_extensions import Literal import knot_resolver_manager.utils.custom_atexit as atexit -from knot_resolver_manager import log, statistics +from knot_resolver_manager.manager import log, statistics from knot_resolver_manager.compat import asyncio as asyncio_compat -from knot_resolver_manager.config_store import ConfigStore -from knot_resolver_manager.constants import DEFAULT_MANAGER_CONFIG_FILE, PID_FILE_NAME, init_user_constants -from knot_resolver_manager.datamodel.cache_schema import CacheClearRPCSchema -from knot_resolver_manager.datamodel.config_schema import KresConfig, get_rundir_without_validation -from knot_resolver_manager.datamodel.globals import Context, set_global_validation_context -from knot_resolver_manager.datamodel.management_schema import ManagementSchema -from knot_resolver_manager.exceptions import CancelStartupExecInsteadException, KresManagerException -from knot_resolver_manager.kresd_controller import get_best_controller_implementation -from knot_resolver_manager.kresd_controller.registered_workers import command_single_registered_worker +from knot_resolver_manager.manager.config_store import ConfigStore +from knot_resolver_manager.manager.constants import DEFAULT_MANAGER_CONFIG_FILE, PID_FILE_NAME, init_user_constants +from knot_resolver_manager.manager.datamodel.cache_schema import CacheClearRPCSchema +from knot_resolver_manager.manager.datamodel.config_schema import KresConfig, get_rundir_without_validation +from knot_resolver_manager.manager.datamodel.globals import Context, set_global_validation_context +from knot_resolver_manager.manager.datamodel.management_schema import ManagementSchema +from knot_resolver_manager.manager.exceptions import CancelStartupExecInsteadException, KresManagerException +from knot_resolver_manager.controller import get_best_controller_implementation +from knot_resolver_manager.controller.registered_workers import command_single_registered_worker from knot_resolver_manager.utils import ignore_exceptions_optional from knot_resolver_manager.utils.async_utils import readfile from knot_resolver_manager.utils.etag import structural_etag diff --git a/python/knot_resolver_manager/statistics.py b/python/knot_resolver_manager/manager/statistics.py similarity index 98% rename from python/knot_resolver_manager/statistics.py rename to python/knot_resolver_manager/manager/statistics.py index ae9d98119..5aa09b300 100644 --- a/python/knot_resolver_manager/statistics.py +++ b/python/knot_resolver_manager/manager/statistics.py @@ -5,9 +5,9 @@ import logging from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Tuple from knot_resolver_manager import compat -from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes_update -from knot_resolver_manager.datamodel.config_schema import KresConfig -from knot_resolver_manager.kresd_controller.registered_workers import ( +from knot_resolver_manager.manager.config_store import ConfigStore, only_on_real_changes_update +from knot_resolver_manager.manager.datamodel.config_schema import KresConfig +from knot_resolver_manager.controller.registered_workers import ( command_registered_workers, get_registered_workers_kresids, ) @@ -15,7 +15,7 @@ from knot_resolver_manager.utils.functional import Result from knot_resolver_manager.utils.modeling.parsing import DataFormat if TYPE_CHECKING: - from knot_resolver_manager.kresd_controller.interface import KresID + from knot_resolver_manager.controller.interface import KresID logger = logging.getLogger(__name__) diff --git a/python/knot_resolver_manager/utils/modeling/exceptions.py b/python/knot_resolver_manager/utils/modeling/exceptions.py index c2a28817e..b3cc415d0 100644 --- a/python/knot_resolver_manager/utils/modeling/exceptions.py +++ b/python/knot_resolver_manager/utils/modeling/exceptions.py @@ -1,6 +1,6 @@ from typing import Iterable, List -from knot_resolver_manager.exceptions import KresManagerException +from knot_resolver_manager.manager.exceptions import KresManagerException class DataModelingBaseException(KresManagerException): diff --git a/scripts/meson/make-doc.sh b/scripts/meson/make-doc.sh index a472d4cba..0e14da4b2 100755 --- a/scripts/meson/make-doc.sh +++ b/scripts/meson/make-doc.sh @@ -7,7 +7,7 @@ cd "$(dirname "${0}")/../.." pushd python ## the following python command should hopefully run without any dependencies except for standard python mkdir -p ../doc/_static/ -python3 -m knot_resolver_manager.cli schema > ../doc/_static/config.schema.json +python3 -m knot_resolver_manager.client schema > ../doc/_static/config.schema.json generate-schema-doc --config expand_buttons=true ../doc/_static/config.schema.json ../doc/_static/schema_doc.html popd diff --git a/scripts/poe-tasks/format b/scripts/poe-tasks/format index e9e192871..4b7f39a2b 100755 --- a/scripts/poe-tasks/format +++ b/scripts/poe-tasks/format @@ -4,7 +4,7 @@ src_dir="$(dirname "$(realpath "$0")")" source $src_dir/utils/_env.sh -dirs="python/knot_resolver_manager/ tests/manager scripts/poe-tasks/utils/create_setup.py build_c_extensions.py" +dirs="python/knot_resolver/ tests/manager scripts/poe-tasks/utils/create_setup.py build_c_extensions.py" # run black code formater black $dirs diff --git a/scripts/poe-tasks/kresctl b/scripts/poe-tasks/kresctl index 38a8b4ea9..922d0624c 100755 --- a/scripts/poe-tasks/kresctl +++ b/scripts/poe-tasks/kresctl @@ -5,4 +5,4 @@ src_dir="$(dirname "$(realpath "$0")")" source $src_dir/utils/_env.sh # run knot-resolver client -python3 -m knot_resolver_manager.cli $@ +python3 -m knot_resolver_manager.client $@ diff --git a/scripts/poe-tasks/run b/scripts/poe-tasks/run index a3f08177b..77b2d1314 100755 --- a/scripts/poe-tasks/run +++ b/scripts/poe-tasks/run @@ -26,4 +26,4 @@ echo The Knot Resolver management API is accessible on http://localhost:5000 echo ----------------------------------------------------------------------- # run the knot-resolver manager -python3 -m knot_resolver_manager $@ +python3 -m knot_resolver_manager.manager $@ diff --git a/setup.py b/setup.py index 04eb40ee4..3f17e9425 100644 --- a/setup.py +++ b/setup.py @@ -6,20 +6,21 @@ package_dir = \ packages = \ ['knot_resolver_manager', - 'knot_resolver_manager.cli', - 'knot_resolver_manager.cli.cmd', + 'knot_resolver_manager.client', + 'knot_resolver_manager.client.commands', 'knot_resolver_manager.compat', - 'knot_resolver_manager.datamodel', - 'knot_resolver_manager.datamodel.templates', - 'knot_resolver_manager.datamodel.types', - 'knot_resolver_manager.kresd_controller', - 'knot_resolver_manager.kresd_controller.supervisord', - 'knot_resolver_manager.kresd_controller.supervisord.plugin', + 'knot_resolver_manager.controller', + 'knot_resolver_manager.controller.supervisord', + 'knot_resolver_manager.controller.supervisord.plugin', + 'knot_resolver_manager.manager', + 'knot_resolver_manager.manager.datamodel', + 'knot_resolver_manager.manager.datamodel.templates', + 'knot_resolver_manager.manager.datamodel.types', 'knot_resolver_manager.utils', 'knot_resolver_manager.utils.modeling'] package_data = \ -{'': ['*'], 'knot_resolver_manager.datamodel.templates': ['macros/*']} +{'': ['*'], 'knot_resolver_manager.manager.datamodel.templates': ['macros/*']} install_requires = \ ['aiohttp', 'jinja2', 'pyyaml', 'supervisor', 'typing-extensions'] @@ -28,8 +29,9 @@ extras_require = \ {'prometheus': ['prometheus-client']} entry_points = \ -{'console_scripts': ['knot-resolver = knot_resolver_manager.__main__:run', - 'kresctl = knot_resolver_manager.cli.main:main']} +{'console_scripts': ['knot-resolver = ' + 'knot_resolver_manager.manager.__main__:run', + 'kresctl = knot_resolver_manager.client.main:main']} setup_kwargs = { 'name': 'knot-resolver-manager', diff --git a/tests/manager/__init__.py b/tests/manager/__init__.py index d3c6280d4..2b1eb0f6d 100644 --- a/tests/manager/__init__.py +++ b/tests/manager/__init__.py @@ -1,5 +1,5 @@ from pathlib import Path -from knot_resolver_manager.datamodel.globals import Context, set_global_validation_context +from knot_resolver_manager.manager.datamodel.globals import Context, set_global_validation_context set_global_validation_context(Context(Path("."), False)) diff --git a/tests/manager/datamodel/templates/test_cache_macros.py b/tests/manager/datamodel/templates/test_cache_macros.py index 155905c66..48a3882d2 100644 --- a/tests/manager/datamodel/templates/test_cache_macros.py +++ b/tests/manager/datamodel/templates/test_cache_macros.py @@ -2,8 +2,8 @@ from typing import Any import pytest -from knot_resolver_manager.datamodel.cache_schema import CacheClearRPCSchema -from knot_resolver_manager.datamodel.templates import template_from_str +from knot_resolver_manager.manager.datamodel.cache_schema import CacheClearRPCSchema +from knot_resolver_manager.manager.datamodel.templates import template_from_str @pytest.mark.parametrize( diff --git a/tests/manager/datamodel/templates/test_common_macros.py b/tests/manager/datamodel/templates/test_common_macros.py index e64b278fd..370b6847b 100644 --- a/tests/manager/datamodel/templates/test_common_macros.py +++ b/tests/manager/datamodel/templates/test_common_macros.py @@ -1,5 +1,5 @@ -from knot_resolver_manager.datamodel.forward_schema import ForwardServerSchema -from knot_resolver_manager.datamodel.templates import template_from_str +from knot_resolver_manager.manager.datamodel.forward_schema import ForwardServerSchema +from knot_resolver_manager.manager.datamodel.templates import template_from_str def test_boolean(): diff --git a/tests/manager/datamodel/templates/test_forward_macros.py b/tests/manager/datamodel/templates/test_forward_macros.py index 534c6007a..b4516d1d7 100644 --- a/tests/manager/datamodel/templates/test_forward_macros.py +++ b/tests/manager/datamodel/templates/test_forward_macros.py @@ -1,6 +1,6 @@ -from knot_resolver_manager.datamodel.forward_schema import ForwardSchema -from knot_resolver_manager.datamodel.templates import template_from_str -from knot_resolver_manager.datamodel.types import IPAddressOptionalPort +from knot_resolver_manager.manager.datamodel.forward_schema import ForwardSchema +from knot_resolver_manager.manager.datamodel.templates import template_from_str +from knot_resolver_manager.manager.datamodel.types import IPAddressOptionalPort def test_policy_rule_forward_add(): diff --git a/tests/manager/datamodel/templates/test_network_macros.py b/tests/manager/datamodel/templates/test_network_macros.py index 066463dff..df14eb2d7 100644 --- a/tests/manager/datamodel/templates/test_network_macros.py +++ b/tests/manager/datamodel/templates/test_network_macros.py @@ -1,5 +1,5 @@ -from knot_resolver_manager.datamodel.network_schema import ListenSchema -from knot_resolver_manager.datamodel.templates import template_from_str +from knot_resolver_manager.manager.datamodel.network_schema import ListenSchema +from knot_resolver_manager.manager.datamodel.templates import template_from_str def test_network_listen(): diff --git a/tests/manager/datamodel/templates/test_policy_macros.py b/tests/manager/datamodel/templates/test_policy_macros.py index a9804cd33..28aa7b30f 100644 --- a/tests/manager/datamodel/templates/test_policy_macros.py +++ b/tests/manager/datamodel/templates/test_policy_macros.py @@ -1,9 +1,9 @@ from typing import List -from knot_resolver_manager.datamodel.network_schema import AddressRenumberingSchema -from knot_resolver_manager.datamodel.policy_schema import AnswerSchema -from knot_resolver_manager.datamodel.templates import template_from_str -from knot_resolver_manager.datamodel.types import PolicyFlagEnum +from knot_resolver_manager.manager.datamodel.network_schema import AddressRenumberingSchema +from knot_resolver_manager.manager.datamodel.policy_schema import AnswerSchema +from knot_resolver_manager.manager.datamodel.templates import template_from_str +from knot_resolver_manager.manager.datamodel.types import PolicyFlagEnum def test_policy_add(): diff --git a/tests/manager/datamodel/templates/test_types_render.py b/tests/manager/datamodel/templates/test_types_render.py index f83b41e34..e7fc92546 100644 --- a/tests/manager/datamodel/templates/test_types_render.py +++ b/tests/manager/datamodel/templates/test_types_render.py @@ -3,7 +3,7 @@ from typing import Any import pytest from jinja2 import Template -from knot_resolver_manager.datamodel.types import EscapedStr +from knot_resolver_manager.manager.datamodel.types import EscapedStr from knot_resolver_manager.utils.modeling import ConfigSchema str_template = Template("'{{ string }}'") diff --git a/tests/manager/datamodel/templates/test_view_macros.py b/tests/manager/datamodel/templates/test_view_macros.py index 5f4956f85..c7547eba3 100644 --- a/tests/manager/datamodel/templates/test_view_macros.py +++ b/tests/manager/datamodel/templates/test_view_macros.py @@ -2,8 +2,8 @@ from typing import Any import pytest -from knot_resolver_manager.datamodel.templates import template_from_str -from knot_resolver_manager.datamodel.view_schema import ViewOptionsSchema, ViewSchema +from knot_resolver_manager.manager.datamodel.templates import template_from_str +from knot_resolver_manager.manager.datamodel.view_schema import ViewOptionsSchema, ViewSchema def test_view_flags(): diff --git a/tests/manager/datamodel/test_config_schema.py b/tests/manager/datamodel/test_config_schema.py index 13a20f33f..8cc430c54 100644 --- a/tests/manager/datamodel/test_config_schema.py +++ b/tests/manager/datamodel/test_config_schema.py @@ -2,8 +2,8 @@ import inspect import json from typing import Any, Dict, Type, cast -from knot_resolver_manager.datamodel import KresConfig -from knot_resolver_manager.datamodel.lua_schema import LuaSchema +from knot_resolver_manager.manager.datamodel import KresConfig +from knot_resolver_manager.manager.datamodel.lua_schema import LuaSchema from knot_resolver_manager.utils.modeling import BaseSchema from knot_resolver_manager.utils.modeling.types import ( get_generic_type_argument, diff --git a/tests/manager/datamodel/test_forward_schema.py b/tests/manager/datamodel/test_forward_schema.py index 9ae77fe86..b1f62720e 100644 --- a/tests/manager/datamodel/test_forward_schema.py +++ b/tests/manager/datamodel/test_forward_schema.py @@ -1,7 +1,7 @@ import pytest from pytest import raises -from knot_resolver_manager.datamodel.forward_schema import ForwardSchema +from knot_resolver_manager.manager.datamodel.forward_schema import ForwardSchema from knot_resolver_manager.utils.modeling.exceptions import DataValidationError diff --git a/tests/manager/datamodel/test_local_data.py b/tests/manager/datamodel/test_local_data.py index 9842b0b2d..ed02c8135 100644 --- a/tests/manager/datamodel/test_local_data.py +++ b/tests/manager/datamodel/test_local_data.py @@ -3,7 +3,7 @@ from typing import Any import pytest from pytest import raises -from knot_resolver_manager.datamodel.local_data_schema import RuleSchema +from knot_resolver_manager.manager.datamodel.local_data_schema import RuleSchema from knot_resolver_manager.utils.modeling.exceptions import DataValidationError diff --git a/tests/manager/datamodel/test_lua_schema.py b/tests/manager/datamodel/test_lua_schema.py index 30d69bd99..4e174aff6 100644 --- a/tests/manager/datamodel/test_lua_schema.py +++ b/tests/manager/datamodel/test_lua_schema.py @@ -1,6 +1,6 @@ from pytest import raises -from knot_resolver_manager.datamodel.lua_schema import LuaSchema +from knot_resolver_manager.manager.datamodel.lua_schema import LuaSchema from knot_resolver_manager.utils.modeling.exceptions import DataValidationError diff --git a/tests/manager/datamodel/test_management_schema.py b/tests/manager/datamodel/test_management_schema.py index 870e7208d..beef7b5f1 100644 --- a/tests/manager/datamodel/test_management_schema.py +++ b/tests/manager/datamodel/test_management_schema.py @@ -2,7 +2,7 @@ from typing import Any, Dict, Optional import pytest -from knot_resolver_manager.datamodel.management_schema import ManagementSchema +from knot_resolver_manager.manager.datamodel.management_schema import ManagementSchema from knot_resolver_manager.utils.modeling.exceptions import DataValidationError diff --git a/tests/manager/datamodel/test_network_schema.py b/tests/manager/datamodel/test_network_schema.py index 7b616f347..fb3093847 100644 --- a/tests/manager/datamodel/test_network_schema.py +++ b/tests/manager/datamodel/test_network_schema.py @@ -3,8 +3,8 @@ from typing import Any, Dict, Optional import pytest from pytest import raises -from knot_resolver_manager.datamodel.network_schema import ListenSchema, NetworkSchema -from knot_resolver_manager.datamodel.types import InterfaceOptionalPort, PortNumber +from knot_resolver_manager.manager.datamodel.network_schema import ListenSchema, NetworkSchema +from knot_resolver_manager.manager.datamodel.types import InterfaceOptionalPort, PortNumber from knot_resolver_manager.utils.modeling.exceptions import DataValidationError diff --git a/tests/manager/datamodel/test_policy_schema.py b/tests/manager/datamodel/test_policy_schema.py index aeb98a71e..bbf1ab1b5 100644 --- a/tests/manager/datamodel/test_policy_schema.py +++ b/tests/manager/datamodel/test_policy_schema.py @@ -3,8 +3,8 @@ from typing import Any, Dict import pytest from pytest import raises -from knot_resolver_manager.datamodel.policy_schema import ActionSchema, PolicySchema -from knot_resolver_manager.datamodel.types import PolicyActionEnum +from knot_resolver_manager.manager.datamodel.policy_schema import ActionSchema, PolicySchema +from knot_resolver_manager.manager.datamodel.types import PolicyActionEnum from knot_resolver_manager.utils.modeling.exceptions import DataValidationError from knot_resolver_manager.utils.modeling.types import get_generic_type_arguments diff --git a/tests/manager/datamodel/test_rpz_schema.py b/tests/manager/datamodel/test_rpz_schema.py index 6603deed2..16e23ca50 100644 --- a/tests/manager/datamodel/test_rpz_schema.py +++ b/tests/manager/datamodel/test_rpz_schema.py @@ -1,7 +1,7 @@ import pytest from pytest import raises -from knot_resolver_manager.datamodel.rpz_schema import RPZSchema +from knot_resolver_manager.manager.datamodel.rpz_schema import RPZSchema from knot_resolver_manager.utils.modeling.exceptions import DataValidationError diff --git a/tests/manager/datamodel/types/test_base_types.py b/tests/manager/datamodel/types/test_base_types.py index 00e7bda5e..3479659f1 100644 --- a/tests/manager/datamodel/types/test_base_types.py +++ b/tests/manager/datamodel/types/test_base_types.py @@ -5,8 +5,8 @@ from typing import List, Optional import pytest from pytest import raises -from knot_resolver_manager.datamodel.types.base_types import IntRangeBase, StringLengthBase -from knot_resolver_manager.exceptions import KresManagerException +from knot_resolver_manager.manager.datamodel.types.base_types import IntRangeBase, StringLengthBase +from knot_resolver_manager.manager.exceptions import KresManagerException @pytest.mark.parametrize("min,max", [(0, None), (None, 0), (1, 65535), (-65535, -1)]) diff --git a/tests/manager/datamodel/types/test_custom_types.py b/tests/manager/datamodel/types/test_custom_types.py index c82779c88..f11d6ea54 100644 --- a/tests/manager/datamodel/types/test_custom_types.py +++ b/tests/manager/datamodel/types/test_custom_types.py @@ -6,7 +6,7 @@ from typing import Any import pytest from pytest import raises -from knot_resolver_manager.datamodel.types import ( +from knot_resolver_manager.manager.datamodel.types import ( Dir, DomainName, EscapedStr, diff --git a/tests/manager/datamodel/types/test_generic_types.py b/tests/manager/datamodel/types/test_generic_types.py index 40b401897..39e1d6550 100644 --- a/tests/manager/datamodel/types/test_generic_types.py +++ b/tests/manager/datamodel/types/test_generic_types.py @@ -3,7 +3,7 @@ from typing import Any, List, Optional, Union import pytest from pytest import raises -from knot_resolver_manager.datamodel.types import ListOrItem +from knot_resolver_manager.manager.datamodel.types import ListOrItem from knot_resolver_manager.utils.modeling import BaseSchema from knot_resolver_manager.utils.modeling.exceptions import DataValidationError from knot_resolver_manager.utils.modeling.types import get_generic_type_wrapper_argument diff --git a/tests/manager/test_config_store.py b/tests/manager/test_config_store.py index f4fd8c035..343ce1421 100644 --- a/tests/manager/test_config_store.py +++ b/tests/manager/test_config_store.py @@ -1,7 +1,7 @@ import pytest -from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes_update -from knot_resolver_manager.datamodel.config_schema import KresConfig +from knot_resolver_manager.manager.config_store import ConfigStore, only_on_real_changes_update +from knot_resolver_manager.manager.datamodel.config_schema import KresConfig @pytest.mark.asyncio # type: ignore