manager: reorganizing python modules

20 files changed, 34 insertions, 34 deletions

diff --git a/tests/manager/__init__.py b/tests/manager/__init__.py
index d3c6280d..2b1eb0f6 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 155905c6..48a3882d 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 e64b278f..370b6847 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 534c6007..b4516d1d 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 066463df..df14eb2d 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 a9804cd3..28aa7b30 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 f83b41e3..e7fc9254 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 5f4956f8..c7547eba 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 13a20f33..8cc430c5 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 9ae77fe8..b1f62720 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 9842b0b2..ed02c813 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 30d69bd9..4e174aff 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 870e7208..beef7b5f 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 7b616f34..fb309384 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 aeb98a71..bbf1ab1b 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 6603deed..16e23ca5 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 00e7bda5..3479659f 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 c82779c8..f11d6ea5 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 40b40189..39e1d655 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 f4fd8c03..343ce142 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