Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

src/rougail/annotator/fill.py

@@ -32,7 +32,7 @@ from rougail.annotator.target import TargetAnnotator
 from rougail.annotator.param import ParamAnnotator
 
 
-CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename', 'zone_information')
+CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename', 'zone_information', 'get_certificates')
 
 
 class Annotator(TargetAnnotator, ParamAnnotator):

src/rougail/data/rougail.dtd

@@ -53,7 +53,7 @@
 <!ATTLIST service disabled (True|False) "False">
 <!ATTLIST service engine (none|creole|jinja2) #IMPLIED>
 <!ATTLIST service target CDATA #IMPLIED>
-<!ATTLIST service type (service|mount) "service">
+<!ATTLIST service type (service|mount|swap) "service">
 
 <!ELEMENT ip (#PCDATA)>
 <!ATTLIST ip iplist CDATA #IMPLIED>

src/rougail/path.py

@@ -174,6 +174,7 @@ class Path:
                                           )
         namespace = dico['variableobj'].namespace
         if namespace not in [self.variable_namespace, 'services'] and \
+                current_namespace != 'services' and \
                 current_namespace != namespace:
             msg = _(f'A variable located in the "{namespace}" namespace shall not be used '
                     f'in the "{current_namespace}" namespace')

src/rougail/template/systemd.py

@@ -186,7 +186,7 @@ class RougailSystemdTemplate(RougailBaseTemplate):
         self.ip_per_service = None
 
     def post_instance(self):
-        destfile = '/tmpfiles.d/rougail.conf'
+        destfile = '/tmpfiles.d/0rougail.conf'
         destfilename = join(self.destinations_dir, destfile[1:])
         makedirs(dirname(destfilename), exist_ok=True)
         self.log.info(_(f"creole processing: '{destfilename}'"))

tests/dictionaries/70service_servicelist_extra/00-base.xml

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test" servicelist="test"/>
+  </services>
+</rougail>

tests/dictionaries/70service_servicelist_extra/extra_dirs/extra/00-base.xml

@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <variable name="condition">
+      <value>no</value>
+    </variable>
+  </variables>
+  <constraints>
+    <condition name="disabled_if_in" source="extra.condition">
+      <param>yes</param>
+      <target type="servicelist">test</target>
+    </condition>
+  </constraints>
+</rougail>

tests/dictionaries/70service_servicelist_extra/makedict/after.json

@@ -0,0 +1,14 @@
+{
+    "extra.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

tests/dictionaries/70service_servicelist_extra/makedict/base.json

@@ -0,0 +1,5 @@
+{
+    "extra.condition": "no",
+    "services.test.activate": true,
+    "services.test.manage": true
+}

tests/dictionaries/70service_servicelist_extra/makedict/before.json

@@ -0,0 +1,14 @@
+{
+    "extra.condition": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

tests/dictionaries/70service_servicelist_extra/tiramisu/base.py

@@ -0,0 +1,20 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_2 = StrOption(name="condition", doc="condition", default="no", properties=frozenset({"mandatory", "normal"}))
+option_1 = OptionDescription(name="extra", doc="extra", children=[option_2])
+option_5 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_2, notraisepropertyerror=True), 'expected_0': ParamValue("yes")})))
+option_6 = BoolOption(name="manage", doc="manage", default=True)
+option_4 = OptionDescription(name="test", doc="test", children=[option_5, option_6])
+option_3 = OptionDescription(name="services", doc="services", children=[option_4], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_3])