datamodel: /local-data: refactor policy_get_tagset macro

diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
index 215b175bb72d679a79722c82b86f8b9a0e1ccdb5..c4f2768a65c8104c2c11c264d00d84dd70dcfbd4 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
@@ -44,9 +44,7 @@ assert(hints.add_hosts('{{ file }}').result == true)
 {% macro local_data_records(input_str, is_rpz, ttl, nodata, tags=none, id='rrs') -%}
 {{ id }} = ffi.new('struct kr_rule_zonefile_config')
 {{ id }}.ttl = {{ local_data_ttl(ttl) }}
-{% if tags %}
 {{ id }}.tags = {{ policy_get_tagset(tags) }}
-{% endif %}
 {{ id }}.nodata = {{ boolean(nodata) }}
 {{ id }}.is_rpz = {{ boolean(is_rpz) }}
 {% if is_rpz -%}
@@ -60,11 +58,6 @@ assert(C.kr_rule_zonefile({{ id }})==0)
 {%- endmacro %}
 
 {% macro local_data_subtree_root(root, type, ttl, tags) -%}
-{%- if tags -%}
-{%- set get_tags = policy_get_tagset(tags) -%}
-{%- else -%}
-{%- set get_tags = '0' -%}
-{%- endif -%}
 assert(C.kr_rule_local_subtree(todname('{{ root }}'),
-       C.KR_RULE_SUB_{{ type.upper() }}, {{ local_data_ttl(ttl) }}, {{ get_tags }}) == 0)
+       C.KR_RULE_SUB_{{ type.upper() }}, {{ local_data_ttl(ttl) }}, {{ policy_get_tagset(tags) }}) == 0)
 {%- endmacro %}

diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
index 36ce102f0bbbd25585a894e009f77ed2c47f801d..347532e6ba7272d44e8e6001e174cfcf6f14254b 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
@@ -49,7 +49,11 @@ policy.TAGS_ASSIGN({{ string_table(tags) }})
 {%- endmacro %}
 
 {% macro policy_get_tagset(tags) -%}
+{%- if tags -%}
 policy.get_tagset({{ string_table(tags) }})
+{%- else -%}
+0
+{%- endif -%}
 {%- endmacro %}