naming: datamodel: added '_schema' suffix to modules names

diff --git a/manager/knot_resolver_manager/datamodel/__init__.py b/manager/knot_resolver_manager/datamodel/__init__.py
index 7d73b5194dceaedf234fe8e593cd95ac741e47c3..a0174acc5758832bc5505ea46693cb6af04ca7f3 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/__init__.py
+++ b/manager/knot_resolver_manager/datamodel/__init__.py
@@ -1,3 +1,3 @@
-from .config import KresConfig
+from .config_schema import KresConfig
 
 __all__ = ["KresConfig"]

diff --git a/manager/knot_resolver_manager/datamodel/config.py b/manager/knot_resolver_manager/datamodel/config_schema.py
similarity index 80%
rename from manager/knot_resolver_manager/datamodel/config.py
rename to manager/knot_resolver_manager/datamodel/config_schema.py
index a7febfaeb516aeb604dd7abed0bc96b3d776d4d3..a7249206c0b4bc1a78206bcab3572e6dd092b116 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/config.py
+++ b/manager/knot_resolver_manager/datamodel/config_schema.py
@@ -4,12 +4,12 @@ from typing import Text, Union
 from jinja2 import Environment, Template
 from typing_extensions import Literal
 
-from knot_resolver_manager.datamodel.dns64_config import Dns64Schema
-from knot_resolver_manager.datamodel.dnssec_config import DnssecSchema
-from knot_resolver_manager.datamodel.lua_config import LuaSchema
-from knot_resolver_manager.datamodel.network_config import NetworkSchema
-from knot_resolver_manager.datamodel.options_config import OptionsSchema
-from knot_resolver_manager.datamodel.server_config import ServerSchema
+from knot_resolver_manager.datamodel.dns64_schema import Dns64Schema
+from knot_resolver_manager.datamodel.dnssec_schema import DnssecSchema
+from knot_resolver_manager.datamodel.lua_schema import LuaSchema
+from knot_resolver_manager.datamodel.network_schema import NetworkSchema
+from knot_resolver_manager.datamodel.options_schema import OptionsSchema
+from knot_resolver_manager.datamodel.server_schema import ServerSchema
 from knot_resolver_manager.utils import SchemaNode
 
 

diff --git a/manager/knot_resolver_manager/datamodel/dns64_config.py b/manager/knot_resolver_manager/datamodel/dns64_schema.py
similarity index 100%
rename from manager/knot_resolver_manager/datamodel/dns64_config.py
rename to manager/knot_resolver_manager/datamodel/dns64_schema.py

diff --git a/manager/knot_resolver_manager/datamodel/dnssec_config.py b/manager/knot_resolver_manager/datamodel/dnssec_schema.py
similarity index 100%
rename from manager/knot_resolver_manager/datamodel/dnssec_config.py
rename to manager/knot_resolver_manager/datamodel/dnssec_schema.py

diff --git a/manager/knot_resolver_manager/datamodel/lua_config.py b/manager/knot_resolver_manager/datamodel/lua_schema.py
similarity index 100%
rename from manager/knot_resolver_manager/datamodel/lua_config.py
rename to manager/knot_resolver_manager/datamodel/lua_schema.py

diff --git a/manager/knot_resolver_manager/datamodel/network_config.py b/manager/knot_resolver_manager/datamodel/network_schema.py
similarity index 100%
rename from manager/knot_resolver_manager/datamodel/network_config.py
rename to manager/knot_resolver_manager/datamodel/network_schema.py

diff --git a/manager/knot_resolver_manager/datamodel/options_config.py b/manager/knot_resolver_manager/datamodel/options_schema.py
similarity index 100%
rename from manager/knot_resolver_manager/datamodel/options_config.py
rename to manager/knot_resolver_manager/datamodel/options_schema.py

diff --git a/manager/knot_resolver_manager/datamodel/server_config.py b/manager/knot_resolver_manager/datamodel/server_schema.py
similarity index 100%
rename from manager/knot_resolver_manager/datamodel/server_config.py
rename to manager/knot_resolver_manager/datamodel/server_schema.py

diff --git a/manager/tests/datamodel/test_dnssec_config.py b/manager/tests/datamodel/test_dnssec_config.py
index dfe9b980d86f5dd946d8fc43c05d7e9d8806ae69..f4904b625031ee161a8eb383032e0ad86d4a0411 100644 (file)
--- a/manager/tests/datamodel/test_dnssec_config.py
+++ b/manager/tests/datamodel/test_dnssec_config.py
@@ -1,4 +1,4 @@
-from knot_resolver_manager.datamodel.dnssec_config import DnssecSchema
+from knot_resolver_manager.datamodel.dnssec_schema import DnssecSchema
 from knot_resolver_manager.datamodel.types import TimeUnit
 
 tree = {

diff --git a/manager/tests/datamodel/test_lua_config.py b/manager/tests/datamodel/test_lua_config.py
index 5da0ca49667b9e62f9ebde63079fc3d2f88c3299..de69a84dcfa4b7b2a320bcbc75e19c5e9d173b50 100644 (file)
--- a/manager/tests/datamodel/test_lua_config.py
+++ b/manager/tests/datamodel/test_lua_config.py
@@ -1,6 +1,6 @@
 from pytest import raises
 
-from knot_resolver_manager.datamodel.lua_config import LuaSchema
+from knot_resolver_manager.datamodel.lua_schema import LuaSchema
 from knot_resolver_manager.exceptions import KresdManagerException
 
 tree = {"script-only": True, "script": "-- lua script"}

diff --git a/manager/tests/datamodel/test_network_config.py b/manager/tests/datamodel/test_network_config.py
index 63fc1f93c0ded098b61ba6f4615c83f8b9551839..6c5e468132de0de3dbdb6ad97cce8a8f8880df5a 100644 (file)
--- a/manager/tests/datamodel/test_network_config.py
+++ b/manager/tests/datamodel/test_network_config.py
@@ -1,6 +1,6 @@
 import ipaddress
 
-from knot_resolver_manager.datamodel.network_config import NetworkSchema
+from knot_resolver_manager.datamodel.network_schema import NetworkSchema
 
 
 def test_interfaces_default():

diff --git a/manager/tests/datamodel/test_options_config.py b/manager/tests/datamodel/test_options_config.py
index ad81af81bc1e14b9764e72f336dbb8819597c969..74aa0e421934f2c1446b3c3ce453bcde15b08275 100644 (file)
--- a/manager/tests/datamodel/test_options_config.py
+++ b/manager/tests/datamodel/test_options_config.py
@@ -1,4 +1,4 @@
-from knot_resolver_manager.datamodel.options_config import OptionsSchema
+from knot_resolver_manager.datamodel.options_schema import OptionsSchema
 from knot_resolver_manager.datamodel.types import TimeUnit
 
 tree = {