datamodel: policy: use Dict instead of List

diff --git a/manager/knot_resolver_manager/datamodel/config_schema.py b/manager/knot_resolver_manager/datamodel/config_schema.py
index bc39471ed1b1177dddd256723da9626d0dd4942f..69ae9eef8142283b0f8ed4028fe5ba0be484ac37 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/config_schema.py
+++ b/manager/knot_resolver_manager/datamodel/config_schema.py
@@ -1,5 +1,5 @@
 import pkgutil
-from typing import List, Text, Union, Optional
+from typing import Dict, List, Optional, Text, Union
 
 from jinja2 import Environment, Template
 from typing_extensions import Literal
@@ -7,6 +7,7 @@ from typing_extensions import Literal
 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_zone import ForwardZoneSchema
 from knot_resolver_manager.datamodel.logging_config import LoggingSchema
 from knot_resolver_manager.datamodel.lua_schema import LuaSchema
 from knot_resolver_manager.datamodel.network_schema import NetworkSchema
@@ -15,7 +16,6 @@ from knot_resolver_manager.datamodel.policy_schema import PolicySchema
 from knot_resolver_manager.datamodel.server_schema import ServerSchema
 from knot_resolver_manager.datamodel.static_hints_schema import StaticHintsSchema
 from knot_resolver_manager.datamodel.stub_zone_schema import StubZoneSchema
-from knot_resolver_manager.datamodel.forward_zone import ForwardZoneSchema
 from knot_resolver_manager.datamodel.view_schema import ViewSchema
 from knot_resolver_manager.utils import SchemaNode
 
@@ -38,7 +38,7 @@ class KresConfig(SchemaNode):
         network: NetworkSchema = NetworkSchema()
         static_hints: StaticHintsSchema = StaticHintsSchema()
         views: Optional[List[ViewSchema]] = None
-        policy: Optional[List[PolicySchema]] = None
+        policy: Optional[Dict[str, PolicySchema]] = None
         stub_zones: Optional[List[StubZoneSchema]] = None
         forward_zones: Optional[List[ForwardZoneSchema]] = None
         cache: CacheSchema = CacheSchema()
@@ -54,7 +54,7 @@ class KresConfig(SchemaNode):
     network: NetworkSchema
     static_hints: StaticHintsSchema
     views: Optional[List[ViewSchema]]
-    policy: Optional[List[PolicySchema]]
+    policy: Optional[Dict[str, PolicySchema]]
     stub_zones: Optional[List[StubZoneSchema]]
     forward_zones: Optional[List[ForwardZoneSchema]]
     cache: CacheSchema

diff --git a/manager/knot_resolver_manager/datamodel/policy_schema.py b/manager/knot_resolver_manager/datamodel/policy_schema.py
index 5c53c857f291d971d5840ea2eddd2d4e139c6c04..b23c5c3c4c69907126dcc4145f69b110201ba818 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/policy_schema.py
+++ b/manager/knot_resolver_manager/datamodel/policy_schema.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
-from knot_resolver_manager.datamodel.types import IPAddressPort
 
+from knot_resolver_manager.datamodel.types import IPAddressPort
 from knot_resolver_manager.datamodel.view_schema import FlagsEnum
 from knot_resolver_manager.utils import SchemaNode
 from knot_resolver_manager.utils.types import LiteralEnum
@@ -20,7 +20,6 @@ class AnswerSchema(SchemaNode):
 
 
 class PolicySchema(SchemaNode):
-    id: str
     action: ActionEnum
     mirror: Optional[List[IPAddressPort]] = None
     filters: Optional[List[FilterSchema]] = None