force 'configuration' namespace if update

doc/param/simple.md

@@ -42,3 +42,11 @@ Le paramètre peut être une valeur null (None en python) :
 ```
 <param type="nil"/>
 ```
+
+# Paramètre de type "space"
+
+Les paramètres sont chargés en supprimer les espaces en début ou fin de chaîne. Ce qui rend impossible d'avoir un paramètre " ". Avec le type "space", le paramètre sera donc un simple espace :
+
+```
+<param type="space"/>
+```

doc/service/README.md

@@ -24,6 +24,7 @@ Les services peuvent être de plusieurs type :
 - service (valeur par défaut) : cela signifie que c'est un service systemd qui est activer au démarrage de la machine
 - mount : fichier utilisé par systemd-mount
 - swap : fichier utilisé par systemd-swap
+- timer : tâche planifié pour systemd
 
 ```
 <service name="dev-disk-by\x2dpartlabel-swap" type="swap"/>

doc/service/file.md

@@ -2,7 +2,7 @@
 
 ## La balise file
 
-La gestion des fichiers se fait dans un conteneur de [service](service.md).
+La gestion des fichiers se fait dans un conteneur de [service](README.md).
 
 La déclaration du fichier permet de générer un fichier à partir d'un template pour le déposer à l'endroit prévu dans la déclaration de cette élément.
 

doc/service/ip.md

@@ -2,7 +2,7 @@
 
 ## La balise IP
 
-La gestion des IP se fait dans un conteneur de [service](service.md).
+La gestion des IP se fait dans un conteneur de [service](README.md).
 
 La déclaration de l'attribut permet d'associer une IP autorisé à accéder au service.
 

doc/service/override.md

@@ -2,7 +2,7 @@
 
 ## La balise override
 
-La gestion des overrides se fait dans un conteneur de [service](service.md).
+La gestion des overrides se fait dans un conteneur de [service](README.md).
 
 La balise override permet de redéfinir facilement un service systemd.
 

src/rougail/annotator/family.py

@@ -268,7 +268,7 @@ class Annotator(Walk):
         for family in self.get_families():
             if 'dynamic' not in vars(family):
                 continue
-            family.suffixes = self.objectspace.paths.get_variable(family.dynamic)
+            family.suffixes = self.objectspace.paths.get_variable(family.dynamic, family.xmlfiles)
             del family.dynamic
             if not family.suffixes.multi:
                 msg = _(f'dynamic family "{family.name}" must be linked '

src/rougail/annotator/param.py

@@ -59,7 +59,7 @@ class ParamAnnotator:
                     if param.type in ['suffix', 'index']:
                         msg = _(f'"{param.type}" parameter must not have a value')
                         raise DictConsistencyError(msg, 28, obj.xmlfiles)
-                    if param.type == 'nil':
+                    if param.type in ['nil', 'space']:
                         if param.text is not None:
                             msg = _(f'"{param.type}" parameter must not have a value')
                             raise DictConsistencyError(msg, 40, obj.xmlfiles)
@@ -116,6 +116,9 @@ class ParamAnnotator:
                             raise DictConsistencyError(msg, 60, obj.xmlfiles)
                 elif param.type == 'nil':
                     param.text = None
+                elif param.type == 'space':
+                    param.type = 'string'
+                    param.text = ' '
                 elif param.type == 'string':
                     param.text = ''
                     if variable_type:

src/rougail/annotator/service.py

@@ -253,7 +253,7 @@ class Annotator:
         variable.mode = None
         variable.type = type_
         if type_ == 'symlink':
-            variable.opt = self.objectspace.paths.get_variable(value)
+            variable.opt = self.objectspace.paths.get_variable(value, xmlfiles=elt.xmlfiles)
             variable.multi = None
             needed_type = self.objectspace.types[dtd_key_type]
             if needed_type not in ('variable', variable.opt.type):
@@ -285,7 +285,7 @@ class Annotator:
         self.uniq_overrides.append(service_name)
         override.name = service_name
         if not hasattr(override, 'source'):
-            override.source = f'{service_name}.service'
+            override.source = service_name
 
     @staticmethod
     def _update_file(file_,

src/rougail/annotator/variable.py

@@ -163,6 +163,8 @@ class Annotator(Walk):  # pylint: disable=R0903
                     raise DictConsistencyError(msg, 5, choice.xmlfiles)
                 if choice.type == 'nil':
                     choice.name = None
+                elif choice.type == 'space':
+                    choice.name = ' '
                 elif choice.type == 'variable':
                     choice.name = self.objectspace.paths.get_variable(choice.name)
                     if not choice.name.multi:

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|swap) "service">
+<!ATTLIST service type (service|mount|swap|timer) "service">
 <!ATTLIST service undisable (True|False) "False">
 
 <!ELEMENT ip (#PCDATA)>
@@ -115,10 +115,10 @@
 <!ATTLIST variable test CDATA #IMPLIED>
 
 <!ELEMENT value (#PCDATA)>
-<!ATTLIST value type (string|number|nil|boolean) #IMPLIED>
+<!ATTLIST value type (string|number|nil|space|boolean) #IMPLIED>
 
 <!ELEMENT choice (#PCDATA | param)*>
-<!ATTLIST choice type (string|number|nil|boolean|function|variable) "string">
+<!ATTLIST choice type (string|number|nil|space|boolean|function|variable) "string">
 <!ATTLIST choice name CDATA #IMPLIED>
 
 <!ELEMENT constraints ((fill*|check*|condition*)*)>
@@ -137,7 +137,7 @@
 <!ATTLIST condition apply_on_fallback (True|False) #IMPLIED>
 
 <!ELEMENT param (#PCDATA)>
-<!ATTLIST param type (string|number|nil|boolean|variable|function|information|target_information|suffix|index) "string">
+<!ATTLIST param type (string|number|nil|space|boolean|variable|function|information|target_information|suffix|index) "string">
 <!ATTLIST param name CDATA #IMPLIED>
 <!ATTLIST param propertyerror (True|False) "True">
 <!ATTLIST param optional (True|False) "False">

src/rougail/objspace.py

@@ -286,6 +286,8 @@ class RougailObjSpace:
                   ) -> Optional[str]:
         if child.tag == 'variables':
             return namespace
+        if child.tag == 'service':
+            return child.attrib['name'] + '.' + child.attrib.get('type', 'service')
         if 'name' in child.attrib:
             return child.attrib['name']
         if child.text and child.tag in self.forced_text_elts_as_name:

src/rougail/template/base.py

@@ -276,7 +276,6 @@ class RougailBaseTemplate:
                       filevar: Dict,
                       type_: str,
                       service_name: str,
-                      service_type: str,
                       ) -> str:
         """Run templatisation on one file
         """
@@ -302,7 +301,6 @@ class RougailBaseTemplate:
             data = getattr(self, func)(filevar,
                                        filename,
                                        service_name,
-                                       service_type,
                                        variable,
                                        idx,
                                        )
@@ -359,10 +357,9 @@ class RougailBaseTemplate:
         for included in (True, False):
             for service_obj in await self.config.option('services').list('all'):
                 service_name = await service_obj.option.description()
-                service_type = await service_obj.information.get('type', 'service')
                 if await service_obj.option('activate').value.get() is False:
                     if included is False and not await service_obj.information.get('undisable', False):
-                        self.desactive_service(service_name, service_type)
+                        self.desactive_service(service_name)
                     continue
                 if not included:
                     engine = await service_obj.information.get('engine', None)
@@ -370,13 +367,11 @@ class RougailBaseTemplate:
                         self.instance_file({'engine': engine},
                                            'service',
                                            service_name,
-                                           service_type,
                                            )
                     target_name = await service_obj.information.get('target', None)
                     if target_name:
                         self.target_service(service_name,
                                             target_name,
-                                            service_type,
                                             engine is None,
                                             )
                 for fills in await service_obj.list('optiondescription'):
@@ -395,13 +390,12 @@ class RougailBaseTemplate:
                             destfilenames = self.instance_file(fill,
                                                                type_,
                                                                service_name,
-                                                               service_type,
                                                                )
                             if included and fill.get('included', 'no') == 'content':
                                 files_to_delete.extend(destfilenames)
                         else:
                             self.log.debug(_(f"Instantiation of file '{fill['name']}' disabled"))
-                self.post_instance_service(service_name, service_type)
+                self.post_instance_service(service_name)
         for filename in files_to_delete:
             unlink(filename)
             parent = filename

src/rougail/template/engine/creole.py

@@ -38,12 +38,12 @@ from ...error import TemplateError
 def cl_compile(kls, *args, **kwargs):
     """Rewrite compile methode to force some settings
     """
-    kwargs['compilerSettings'] = {'directiveStartToken' : '%',
-                                  'cheetahVarStartToken' : '%%',
-                                  'EOLSlurpToken' : '%',
-                                  'commentStartToken' : '#',
-                                  'multiLineCommentStartToken' : '#*',
-                                  'multiLineCommentEndToken' : '*#',
+    kwargs['compilerSettings'] = {'directiveStartToken': '%',
+                                  'cheetahVarStartToken': '%%',
+                                  'EOLSlurpToken': '%',
+                                  'commentStartToken': '#',
+                                  'multiLineCommentStartToken': '#*',
+                                  'multiLineCommentEndToken': '*#',
                                   }
     return kls.old_compile(*args, **kwargs)  # pylint: disable=E1101
 Template.old_compile = Template.compile

src/rougail/template/engine/creole_legacy.py

@@ -49,7 +49,6 @@ def cl_compile(kls, *args, **kwargs):
                    'multiLineCommentStartToken' : u'µ' * 10,
                    'multiLineCommentEndToken' : u'µ' * 10}
     return kls.old_compile(*args, **kwargs)  # pylint: disable=E1101
-oriCheetahTemplate.compile = cl_compile
 
 
 class IsDefined:
@@ -126,6 +125,8 @@ def process(filename: str,
     """Process a cheetah template
     """
     # full path of the destination file
+    ori_compile = oriCheetahTemplate.compile
+    oriCheetahTemplate.compile = cl_compile
     try:
         extra_context = {'normalize_family': normalize_family,
                          'rougail_filename': true_destfilename,
@@ -148,13 +149,16 @@ def process(filename: str,
             msg = f"Error: unknown variable used in template {filename} to {destfilename}: {varname}"
         else:
             msg = f"Error: unknown variable used in file {destfilename}: {varname}"
+        oriCheetahTemplate.compile = ori_compile
         raise TemplateError(_(msg)) from err
     except Exception as err:  # pragma: no cover
         if filename:
             msg = _(f"Error while instantiating template {filename} to {destfilename}: {err}")
         else:
             msg = _(f"Error while instantiating filename {destfilename}: {err}")
+        oriCheetahTemplate.compile = ori_compile
         raise TemplateError(msg) from err
 
     with open(destfilename, 'w') as file_h:
         file_h.write(data)
+    oriCheetahTemplate.compile = ori_compile

src/rougail/template/systemd.py

@@ -82,7 +82,6 @@ class RougailSystemdTemplate(RougailBaseTemplate):
                        filevar: Dict,
                        destfile: str,
                        service_name: str,
-                       service_type: str,
                        variable,
                        idx: int,
                        ) -> tuple:
@@ -101,7 +100,6 @@ class RougailSystemdTemplate(RougailBaseTemplate):
                            filevar: Dict,
                            destfile,
                            service_name: str,
-                           service_type: str,
                            *args,
                            ) -> tuple:
         source = filevar['source']
@@ -109,14 +107,13 @@ class RougailSystemdTemplate(RougailBaseTemplate):
             raise FileNotFound(_(f'Override source file "{source}" does not exist in {", ".join(self.templates_dir)}'))
         tmp_file = join(self.tmp_dir, source)
         service_name = filevar['name']
-        destfile = f'/systemd/system/{service_name}.{service_type}.d/rougail.conf'
+        destfile = f'/systemd/system/{service_name}.d/rougail.conf'
         return tmp_file, None, destfile, None
 
     def get_data_ip(self,
                     filevar: Dict,
                     ip,
                     service_name: str,
-                    service_type: str,
                     var: Any,
                     idx: int,
                     *args,
@@ -136,45 +133,40 @@ class RougailSystemdTemplate(RougailBaseTemplate):
                          servicevar: Dict,
                          info,
                          service_name: str,
-                         service_type: str,
                          *args,
                          ):
-        filename = f'{service_name}.{service_type}'
-        tmp_file = join(self.tmp_dir, filename)
+        tmp_file = join(self.tmp_dir, service_name)
         var = None
-        destfile = f'/systemd/system/{filename}'
+        destfile = f'/systemd/system/{service_name}'
         return tmp_file, None, destfile, var
 
 
     def desactive_service(self,
                           service_name: str,
-                          service_type: str,
                           ):
-        filename = f'{self.destinations_dir}/systemd/system/{service_name}.{service_type}'
+        filename = f'{self.destinations_dir}/systemd/system/{service_name}'
         makedirs(dirname(filename), exist_ok=True)
         symlink('/dev/null', filename)
 
     def target_service(self,
                        service_name: str,
                        target_name: str,
-                       service_type: str,
                        global_service: str,
                        ):
-        filename = f'{self.destinations_dir}/systemd/system/{target_name}.target.wants/{service_name}.{service_type}'
+        filename = f'{self.destinations_dir}/systemd/system/{target_name}.target.wants/{service_name}'
         makedirs(dirname(filename), exist_ok=True)
         if global_service:
-            source_filename = f'{ROUGAIL_GLOBAL_SYSTEMD_FILE}/{service_name}.{service_type}'
+            source_filename = f'{ROUGAIL_GLOBAL_SYSTEMD_FILE}/{service_name}'
         else:
-            source_filename = f'{ROUGAIL_DEST}/systemd/system/{service_name}.{service_type}'
+            source_filename = f'{ROUGAIL_DEST}/systemd/system/{service_name}'
         symlink(source_filename, filename)
 
     def post_instance_service(self,
                               service_name: str,
-                              service_type: str,
                               ) -> None:  # pragma: no cover
         if self.ip_per_service is None:
             return
-        destfile = f'/systemd/system/{service_name}.{service_type}.d/rougail_ip.conf'
+        destfile = f'/systemd/system/{service_name}.d/rougail_ip.conf'
         destfilename = join(self.destinations_dir, destfile[1:])
         makedirs(dirname(destfilename), exist_ok=True)
         self.log.info(_(f"creole processing: '{destfilename}'"))

src/rougail/tiramisu.py

@@ -36,6 +36,8 @@ class ConvertDynOptionDescription(DynOptionDescription):
     Suffix could also contain invalid character, so we should "normalize" it
     """
     def convert_suffix_to_path(self, suffix):
+        if suffix is None:
+            return suffix
         if not isinstance(suffix, str):
             suffix = str(suffix)
         return normalize_family(suffix)

src/rougail/tiramisureflector.py

@@ -296,7 +296,7 @@ class Common:
                        ):
         """Populate variable parameters
         """
-        if param.type in ['number', 'boolean', 'nil', 'string', 'port', 'choice']:
+        if param.type in ['number', 'boolean', 'nil', 'string', 'port', 'choice', 'space']:
             value = param.text
             if param.type == 'string' and value is not None:
                 value = self.convert_str(value)

src/rougail/update.py

@@ -116,7 +116,7 @@ class RougailUpgrade:
         if variables is None:
             return root
         paths = self._get_path_variables(variables,
-                                         namespace == self.rougailconfig['variable_namespace'],
+                                         namespace == 'configuration',
                                          namespace,
                                          )
         constraints = root.find('constraints')
@@ -334,7 +334,7 @@ class RougailUpgrade:
                             subsubsubelement.attrib['mandatory'] = 'True'
                         if subsubsubelement.attrib['name'] in upgrade_help.get('variables', {}).get('type', {}):
                             subsubsubelement.attrib['type'] = upgrade_help.get('variables', {}).get('type', {})[subsubsubelement.attrib['name']]
-                        if namespace == self.rougailconfig['variable_namespace']:
+                        if namespace == 'configuration':
                             path = subsubsubelement.attrib['name']
                             npath = normalize_family(subsubsubelement.attrib['name'])
                         else:

tests/dictionaries/00empty/makedict/after.json

@@ -1,9 +1,9 @@
 {
-    "services.tata.activate": {
+    "services.tata_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.tata.manage": {
+    "services.tata_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/00empty/makedict/base.json

@@ -1,4 +1,4 @@
 {
-    "services.tata.activate": true,
-    "services.tata.manage": true
+    "services.tata_service.activate": true,
+    "services.tata_service.manage": true
 }

tests/dictionaries/00empty/makedict/before.json

@@ -1,9 +1,9 @@
 {
-    "services.tata.activate": {
+    "services.tata_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.tata.manage": {
+    "services.tata_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/00empty/tiramisu/base.py

@@ -16,6 +16,6 @@ except:
     from tiramisu import *
 option_3 = BoolOption(name="activate", doc="activate", default=True)
 option_4 = BoolOption(name="manage", doc="manage", default=True)
-option_2 = OptionDescription(name="tata", doc="tata", children=[option_3, option_4])
+option_2 = OptionDescription(name="tata_service", doc="tata.service", children=[option_3, option_4])
 option_1 = OptionDescription(name="services", doc="services", children=[option_2], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/00load_subfolder/makedict/after.json

@@ -1,9 +1,9 @@
 {
-    "rougail.general.mode_conteneur_actif": {
+    "rougail.general.mode_conteneur_actif1": {
         "owner": "default",
         "value": "non"
     },
-    "rougail.general.mode_conteneur_actif1": {
+    "rougail.general.mode_conteneur_actif": {
         "owner": "default",
         "value": "non"
     }

tests/dictionaries/00load_subfolder/makedict/base.json

@@ -1,4 +1,4 @@
 {
-    "rougail.general.mode_conteneur_actif": "non",
-    "rougail.general.mode_conteneur_actif1": "non"
+    "rougail.general.mode_conteneur_actif1": "non",
+    "rougail.general.mode_conteneur_actif": "non"
 }

tests/dictionaries/00load_subfolder/makedict/before.json

@@ -1,9 +1,9 @@
 {
-    "rougail.general.mode_conteneur_actif": {
+    "rougail.general.mode_conteneur_actif1": {
         "owner": "default",
         "value": "non"
     },
-    "rougail.general.mode_conteneur_actif1": {
+    "rougail.general.mode_conteneur_actif": {
         "owner": "default",
         "value": "non"
     }

tests/dictionaries/01base_file/makedict/after.json

@@ -3,27 +3,27 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file/makedict/base.json

@@ -1,9 +1,9 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
-    "services.test.files.file.name": "/etc/file",
-    "services.test.files.file.activate": true,
-    "services.test.files.file2.name": "/etc/file2",
-    "services.test.files.file2.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file.name": "/etc/file",
+    "services.test_service.files.file.activate": true,
+    "services.test_service.files.file2.name": "/etc/file2",
+    "services.test_service.files.file2.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/01base_file/makedict/before.json

@@ -3,27 +3,27 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file/tiramisu/base.py

@@ -29,6 +29,6 @@ option_10.impl_set_information('source', "file2")
 option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
 option_13 = BoolOption(name="activate", doc="activate", default=True)
 option_14 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_13, option_14])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/01base_file_disabled/makedict/after.json

@@ -3,35 +3,35 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file3.name": {
+    "services.test_service.files.file3.name": {
         "owner": "default",
         "value": "/etc/file3"
     },
-    "services.test.files.file3.activate": {
+    "services.test_service.files.file3.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_disabled/makedict/base.json

@@ -1,11 +1,11 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
-    "services.test.files.file.name": "/etc/file",
-    "services.test.files.file.activate": true,
-    "services.test.files.file2.name": "/etc/file2",
-    "services.test.files.file2.activate": true,
-    "services.test.files.file3.name": "/etc/file3",
-    "services.test.files.file3.activate": false,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file.name": "/etc/file",
+    "services.test_service.files.file.activate": true,
+    "services.test_service.files.file2.name": "/etc/file2",
+    "services.test_service.files.file2.activate": true,
+    "services.test_service.files.file3.name": "/etc/file3",
+    "services.test_service.files.file3.activate": false,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/01base_file_disabled/makedict/before.json

@@ -3,35 +3,35 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file3.name": {
+    "services.test_service.files.file3.name": {
         "owner": "default",
         "value": "/etc/file3"
     },
-    "services.test.files.file3.activate": {
+    "services.test_service.files.file3.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_disabled/tiramisu/base.py

@@ -33,6 +33,6 @@ option_13.impl_set_information('source', "file3")
 option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
 option_16 = BoolOption(name="activate", doc="activate", default=True)
 option_17 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17])
+option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_16, option_17])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/01base_file_include/makedict/after.json

@@ -3,27 +3,27 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_include/makedict/base.json

@@ -1,9 +1,9 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
-    "services.test.files.file.name": "/etc/file",
-    "services.test.files.file.activate": true,
-    "services.test.files.file2.name": "/etc/file2",
-    "services.test.files.file2.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file.name": "/etc/file",
+    "services.test_service.files.file.activate": true,
+    "services.test_service.files.file2.name": "/etc/file2",
+    "services.test_service.files.file2.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/01base_file_include/makedict/before.json

@@ -3,27 +3,27 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_include/tiramisu/base.py

@@ -29,6 +29,6 @@ option_10.impl_set_information('source', "file2")
 option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
 option_13 = BoolOption(name="activate", doc="activate", default=True)
 option_14 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_13, option_14])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/01base_file_include_content/makedict/after.json

@@ -3,35 +3,35 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.incfile.name": {
+    "services.test_service.files.incfile.name": {
         "owner": "default",
         "value": "/etc/dir/incfile"
     },
-    "services.test.files.incfile.activate": {
+    "services.test_service.files.incfile.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_include_content/makedict/base.json

@@ -1,11 +1,11 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
-    "services.test.files.file.name": "/etc/file",
-    "services.test.files.file.activate": true,
-    "services.test.files.file2.name": "/etc/file2",
-    "services.test.files.file2.activate": true,
-    "services.test.files.incfile.name": "/etc/dir/incfile",
-    "services.test.files.incfile.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file.name": "/etc/file",
+    "services.test_service.files.file.activate": true,
+    "services.test_service.files.file2.name": "/etc/file2",
+    "services.test_service.files.file2.activate": true,
+    "services.test_service.files.incfile.name": "/etc/dir/incfile",
+    "services.test_service.files.incfile.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/01base_file_include_content/makedict/before.json

@@ -3,35 +3,35 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.incfile.name": {
+    "services.test_service.files.incfile.name": {
         "owner": "default",
         "value": "/etc/dir/incfile"
     },
-    "services.test.files.incfile.activate": {
+    "services.test_service.files.incfile.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_include_content/tiramisu/base.py

@@ -34,6 +34,6 @@ option_13.impl_set_information('source', "incfile")
 option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
 option_16 = BoolOption(name="activate", doc="activate", default=True)
 option_17 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17])
+option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_16, option_17])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/01base_file_include_name/makedict/after.json

@@ -3,35 +3,35 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.incfile.name": {
+    "services.test_service.files.incfile.name": {
         "owner": "default",
         "value": "/etc/dir/incfile"
     },
-    "services.test.files.incfile.activate": {
+    "services.test_service.files.incfile.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_include_name/makedict/base.json

@@ -1,11 +1,11 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
-    "services.test.files.file.name": "/etc/file",
-    "services.test.files.file.activate": true,
-    "services.test.files.file2.name": "/etc/file2",
-    "services.test.files.file2.activate": true,
-    "services.test.files.incfile.name": "/etc/dir/incfile",
-    "services.test.files.incfile.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file.name": "/etc/file",
+    "services.test_service.files.file.activate": true,
+    "services.test_service.files.file2.name": "/etc/file2",
+    "services.test_service.files.file2.activate": true,
+    "services.test_service.files.incfile.name": "/etc/dir/incfile",
+    "services.test_service.files.incfile.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/01base_file_include_name/makedict/before.json

@@ -3,35 +3,35 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.incfile.name": {
+    "services.test_service.files.incfile.name": {
         "owner": "default",
         "value": "/etc/dir/incfile"
     },
-    "services.test.files.incfile.activate": {
+    "services.test_service.files.incfile.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_include_name/tiramisu/base.py

@@ -34,6 +34,6 @@ option_13.impl_set_information('source', "incfile")
 option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
 option_16 = BoolOption(name="activate", doc="activate", default=True)
 option_17 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17])
+option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_16, option_17])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/01base_file_owner/makedict/after.json

@@ -3,43 +3,43 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.group": {
+    "services.test_service.files.file.group": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.owner": {
+    "services.test_service.files.file.owner": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.group": {
+    "services.test_service.files.file2.group": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.owner": {
+    "services.test_service.files.file2.owner": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_owner/makedict/base.json

@@ -1,13 +1,13 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
-    "services.test.files.file.group": "nobody",
-    "services.test.files.file.name": "/etc/file",
-    "services.test.files.file.owner": "nobody",
-    "services.test.files.file.activate": true,
-    "services.test.files.file2.group": "nobody",
-    "services.test.files.file2.name": "/etc/file2",
-    "services.test.files.file2.owner": "nobody",
-    "services.test.files.file2.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file.group": "nobody",
+    "services.test_service.files.file.name": "/etc/file",
+    "services.test_service.files.file.owner": "nobody",
+    "services.test_service.files.file.activate": true,
+    "services.test_service.files.file2.group": "nobody",
+    "services.test_service.files.file2.name": "/etc/file2",
+    "services.test_service.files.file2.owner": "nobody",
+    "services.test_service.files.file2.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/01base_file_owner/makedict/before.json

@@ -3,43 +3,43 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.group": {
+    "services.test_service.files.file.group": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.owner": {
+    "services.test_service.files.file.owner": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.group": {
+    "services.test_service.files.file2.group": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.owner": {
+    "services.test_service.files.file2.owner": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_owner/tiramisu/base.py

@@ -33,6 +33,6 @@ option_12.impl_set_information('source', "file2")
 option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_12])
 option_17 = BoolOption(name="activate", doc="activate", default=True)
 option_18 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_17, option_18])
+option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_17, option_18])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/01base_file_owner_variable/makedict/after.json

@@ -11,43 +11,43 @@
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.group": {
+    "services.test_service.files.file.group": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.owner": {
+    "services.test_service.files.file.owner": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.group": {
+    "services.test_service.files.file2.group": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.owner": {
+    "services.test_service.files.file2.owner": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_owner_variable/makedict/base.json

@@ -2,14 +2,14 @@
     "rougail.general.mode_conteneur_actif": "non",
     "rougail.general.owner": "nobody",
     "rougail.general.group": "nobody",
-    "services.test.files.file.group": "nobody",
-    "services.test.files.file.name": "/etc/file",
-    "services.test.files.file.owner": "nobody",
-    "services.test.files.file.activate": true,
-    "services.test.files.file2.group": "nobody",
-    "services.test.files.file2.name": "/etc/file2",
-    "services.test.files.file2.owner": "nobody",
-    "services.test.files.file2.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file.group": "nobody",
+    "services.test_service.files.file.name": "/etc/file",
+    "services.test_service.files.file.owner": "nobody",
+    "services.test_service.files.file.activate": true,
+    "services.test_service.files.file2.group": "nobody",
+    "services.test_service.files.file2.name": "/etc/file2",
+    "services.test_service.files.file2.owner": "nobody",
+    "services.test_service.files.file2.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/01base_file_owner_variable/makedict/before.json

@@ -11,43 +11,43 @@
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.group": {
+    "services.test_service.files.file.group": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.owner": {
+    "services.test_service.files.file.owner": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.group": {
+    "services.test_service.files.file2.group": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.owner": {
+    "services.test_service.files.file2.owner": {
         "owner": "default",
         "value": "nobody"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_owner_variable/tiramisu/base.py

@@ -35,6 +35,6 @@ option_14.impl_set_information('source', "file2")
 option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_14])
 option_19 = BoolOption(name="activate", doc="activate", default=True)
 option_20 = BoolOption(name="manage", doc="manage", default=True)
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_19, option_20])
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_19, option_20])
 option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

tests/dictionaries/01base_file_patch/makedict/after.json

@@ -3,27 +3,27 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_patch/makedict/base.json

@@ -1,9 +1,9 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
-    "services.test.files.file.name": "/etc/file",
-    "services.test.files.file.activate": true,
-    "services.test.files.file2.name": "/etc/file2",
-    "services.test.files.file2.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file.name": "/etc/file",
+    "services.test_service.files.file.activate": true,
+    "services.test_service.files.file2.name": "/etc/file2",
+    "services.test_service.files.file2.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/01base_file_patch/makedict/before.json

@@ -3,27 +3,27 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.file2.name": {
+    "services.test_service.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
-    "services.test.files.file2.activate": {
+    "services.test_service.files.file2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_patch/tiramisu/base.py

@@ -29,6 +29,6 @@ option_10.impl_set_information('source', "file2")
 option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
 option_13 = BoolOption(name="activate", doc="activate", default=True)
 option_14 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_13, option_14])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/01base_file_utfchar/makedict/after.json

@@ -3,27 +3,27 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": {
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": {
         "owner": "default",
         "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel"
     },
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": {
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": {
         "owner": "default",
         "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2"
     },
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_utfchar/makedict/base.json

@@ -1,9 +1,9 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel",
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": true,
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2",
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel",
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": true,
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2",
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/01base_file_utfchar/makedict/before.json

@@ -3,27 +3,27 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": {
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": {
         "owner": "default",
         "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel"
     },
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": {
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": {
         "owner": "default",
         "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2"
     },
-    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
+    "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/01base_file_utfchar/tiramisu/base.py

@@ -29,6 +29,6 @@ option_10.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlab
 option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
 option_13 = BoolOption(name="activate", doc="activate", default=True)
 option_14 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_13, option_14])
 option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

tests/dictionaries/10load_disabled_if_in_multi_param/makedict/after.json

@@ -11,19 +11,19 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param/makedict/base.json

@@ -2,8 +2,8 @@
     "rougail.general.condition": "non",
     "rougail.general.mode_conteneur_actif": "non",
     "rougail.general.mode_conteneur_actif2": "non",
-    "services.test.files.file1.name": "/tmp/file1",
-    "services.test.files.file1.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file1.name": "/tmp/file1",
+    "services.test_service.files.file1.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/10load_disabled_if_in_multi_param/makedict/before.json

@@ -11,19 +11,19 @@
         "owner": "default",
         "value": "non"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py

@@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_12 = BoolOption(name="activate", doc="activate", default=True)
 option_13 = BoolOption(name="manage", doc="manage", default=True)
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
 option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/after.json

@@ -11,19 +11,19 @@
         "owner": "default",
         "value": "no"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/base.json

@@ -2,8 +2,8 @@
     "rougail.general.condition": "no",
     "rougail.general.condition2": "no",
     "rougail.general.test_variable": "no",
-    "services.test.files.file1.name": "/tmp/file1",
-    "services.test.files.file1.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file1.name": "/tmp/file1",
+    "services.test_service.files.file1.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/before.json

@@ -11,19 +11,19 @@
         "owner": "default",
         "value": "no"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py

@@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_12 = BoolOption(name="activate", doc="activate", default=True)
 option_13 = BoolOption(name="manage", doc="manage", default=True)
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
 option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/after.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "no"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/base.json

@@ -1,8 +1,8 @@
 {
     "rougail.general.condition": "no",
     "rougail.general.condition2": "no",
-    "services.test.files.file1.name": "/tmp/file1",
-    "services.test.files.file1.activate": false,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file1.name": "/tmp/file1",
+    "services.test_service.files.file1.activate": false,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/before.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "no"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py

@@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_12 = BoolOption(name="activate", doc="activate", default=True)
 option_13 = BoolOption(name="manage", doc="manage", default=True)
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
 option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/after.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "no"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/base.json

@@ -1,8 +1,8 @@
 {
     "rougail.general.condition": "yes",
     "rougail.general.condition2": "no",
-    "services.test.files.file1.name": "/tmp/file1",
-    "services.test.files.file1.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file1.name": "/tmp/file1",
+    "services.test_service.files.file1.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/before.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "no"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py

@@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_12 = BoolOption(name="activate", doc="activate", default=True)
 option_13 = BoolOption(name="manage", doc="manage", default=True)
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
 option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/after.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "yes"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/base.json

@@ -1,8 +1,8 @@
 {
     "rougail.general.condition": "yes",
     "rougail.general.condition2": "yes",
-    "services.test.files.file1.name": "/tmp/file1",
-    "services.test.files.file1.activate": false,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file1.name": "/tmp/file1",
+    "services.test_service.files.file1.activate": false,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/before.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "yes"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py

@@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_12 = BoolOption(name="activate", doc="activate", default=True)
 option_13 = BoolOption(name="manage", doc="manage", default=True)
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
 option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/after.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "yes"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/base.json

@@ -1,8 +1,8 @@
 {
     "rougail.general.condition": "no",
     "rougail.general.condition2": "yes",
-    "services.test.files.file1.name": "/tmp/file1",
-    "services.test.files.file1.activate": false,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file1.name": "/tmp/file1",
+    "services.test_service.files.file1.activate": false,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/before.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "yes"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py

@@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_12 = BoolOption(name="activate", doc="activate", default=True)
 option_13 = BoolOption(name="manage", doc="manage", default=True)
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
 option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/after.json

@@ -3,19 +3,19 @@
         "owner": "default",
         "value": "oui"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/base.json

@@ -1,7 +1,7 @@
 {
     "rougail.general.condition": "oui",
-    "services.test.files.file1.name": "/tmp/file1",
-    "services.test.files.file1.activate": false,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file1.name": "/tmp/file1",
+    "services.test_service.files.file1.activate": false,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/before.json

@@ -3,19 +3,19 @@
         "owner": "default",
         "value": "oui"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py

@@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_12 = BoolOption(name="activate", doc="activate", default=True)
 option_13 = BoolOption(name="manage", doc="manage", default=True)
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
 option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/after.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "no"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json

@@ -1,8 +1,8 @@
 {
     "rougail.general.condition": "no",
     "rougail.general.disable_variable": "no",
-    "services.test.files.file1.name": "/tmp/file1",
-    "services.test.files.file1.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file1.name": "/tmp/file1",
+    "services.test_service.files.file1.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/before.json

@@ -7,19 +7,19 @@
         "owner": "default",
         "value": "no"
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py

@@ -25,6 +25,6 @@ option_8.impl_set_information('source', "file1")
 option_7 = OptionDescription(name="files", doc="files", children=[option_8])
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 option_12 = BoolOption(name="manage", doc="manage", default=True)
-option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_11, option_12])
+option_6 = OptionDescription(name="test_service", doc="test.service", children=[option_7, option_11, option_12])
 option_5 = OptionDescription(name="services", doc="services", children=[option_6], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])

tests/dictionaries/11disabled_if_in_filelist/makedict/after.json

@@ -11,19 +11,19 @@
         "owner": "default",
         "value": true
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/11disabled_if_in_filelist/makedict/base.json

@@ -2,8 +2,8 @@
     "rougail.general.condition": "non",
     "rougail.general.mode_conteneur_actif": "non",
     "rougail.general.mode_conteneur_actif2": true,
-    "services.test.files.file.name": "/etc/file",
-    "services.test.files.file.activate": true,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file.name": "/etc/file",
+    "services.test_service.files.file.activate": true,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/11disabled_if_in_filelist/makedict/before.json

@@ -11,19 +11,19 @@
         "owner": "default",
         "value": true
     },
-    "services.test.files.file.name": {
+    "services.test_service.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
-    "services.test.files.file.activate": {
+    "services.test_service.files.file.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py

@@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file")
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
 option_12 = BoolOption(name="activate", doc="activate", default=True)
 option_13 = BoolOption(name="manage", doc="manage", default=True)
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13])
+option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
 option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/after.json

@@ -3,19 +3,19 @@
         "owner": "default",
         "value": true
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }

tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/base.json

@@ -1,7 +1,7 @@
 {
     "rougail.general.condition": true,
-    "services.test.files.file1.name": "/tmp/file1",
-    "services.test.files.file1.activate": false,
-    "services.test.activate": true,
-    "services.test.manage": true
+    "services.test_service.files.file1.name": "/tmp/file1",
+    "services.test_service.files.file1.activate": false,
+    "services.test_service.activate": true,
+    "services.test_service.manage": true
 }

tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/before.json

@@ -3,19 +3,19 @@
         "owner": "default",
         "value": true
     },
-    "services.test.files.file1.name": {
+    "services.test_service.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
-    "services.test.files.file1.activate": {
+    "services.test_service.files.file1.activate": {
         "owner": "default",
         "value": false
     },
-    "services.test.activate": {
+    "services.test_service.activate": {
         "owner": "default",
         "value": true
     },
-    "services.test.manage": {
+    "services.test_service.manage": {
         "owner": "default",
         "value": true
     }