doc/dev/config.md

@@ -14,9 +14,7 @@ Pour modifier il suffit de faire :
 RougailConfig[key] = value
 ```
 
-## Configuration de chargement des dictionnaires
+## Les répertoires des dictionnaires
-
-### Les répertoires des dictionnaires
 
 Il existe deux types de répertoires de dictionnaires :
 
@@ -38,7 +36,7 @@ RougailConfig['extra_dictionaries']['example'] = ['/dir1', '/dir2']
 
 Les dictionnaires sont chargés dans le même ordre que les dictionnaires principaux.
 
-### La DTD
+## La DTD
 
 Rougail a besoin du fichier de DTD pour lire les fichiers dictionnaire.
 
@@ -46,75 +44,51 @@ Par défaut le fichier de la DTD est dans le sous répertoire "data" du réperto
 
 Pour pouvez changer le répertoire de destination de la DTD et le nom du fichier avec la clef "dtdfilename".
 
-### Le fichier de fonction
+## Le fichier de fonction
 
 Le fichier qui contient les fonctions personnalisés est géré dans la clef "functions_file" et a comme valeur par défaut "/srv/rougail/functions.py".
 
-### La variable auto_freeze
+## Le répertoire des templates
+
+Le répertoire des templates est géré dans la clef "templates_dir" et a comme valeur par défaut : "/srv/rougail/templates".
+
+## Le moteur de templates par défaut
+
+Le moteur de template est géré dans la clef "default_engine" et a comme valeur par défaut : "creole". Les valeurs possible sont "none", "creole" ou "jinja2".
+
+## Le répertoire des patchs
+
+Le répertoire des patches est géré dans la clef "patches_dir" et a comme valeur par défaut : "/srv/rougail/patches".
+
+## Le répertoire temporaire
+
+Le répertoire temporaire est utile lors de la génération de template. Il contient une copie des templates avec, éventuellement, les patches appliqués sur les templates.
+
+Le répertoire de temporaire est géré dans la clef "tmp_dir" et a comme valeur par défaut : "/srv/rougail/tmp".
+
+## Le répertoire de destination des fichiers générés
+
+Le répertoire de destination des fichiers générés est géré dans la clef "destinations_dir" et a comme valeur par défaut : "/srv/rougail/destinations".
+
+## La variable auto_freeze
 
 La propriété auto_freeze n'est appliqué que une variable spécifique passe à True. Par défaut le nom de la variable est "instancied_module", mais il est possible de changer le nom de cette variable via la clef "auto_freeze_variable".
 
-### Les modes
+## Les modes
 
 Les modes sont personnalisables dans Rougail. Par défaut les modes sont "basic", "normal" et "expert".
 Il est possible de changer cette liste via la clef "modes_level".
 
 Si vous changer ces valeurs, penser à changer les modes par défaut des familles et des variables.
 
-### Le mode par défaut pour une famille
+## Le mode par défaut pour une famille
 
 Le mode par défaut d'une famille est "basic". Il est possible de changer le mode par défaut d'une famille via la clef "default_family_mode".
 
-### Le mode par défaut pour une variable
+## Le mode par défaut pour une variable
 
 Le mode par défaut d'une variable est "normal". Il est possible de changer le mode par défaut d'une variable via la clef "default_variable_mode".
 
-### Le nom des fonctions internes
+## Le nom des fonctions internes
 
 Il est possible d'ajouter des fonctions interne via la clef "internal_functions".
-
-## Configuration de la templatisation
-
-### Le répertoire des templates
-
-Le répertoire des templates est géré dans la clef "templates_dir" et a comme valeur par défaut : "/srv/rougail/templates".
-
-### Le répertoire des patchs
-
-Le répertoire des patches est géré dans la clef "patches_dir" et a comme valeur par défaut : "/srv/rougail/patches".
-
-### Le répertoire temporaire
-
-Le répertoire temporaire est utile lors de la génération de template. Il contient une copie des templates avec, éventuellement, les patches appliqués sur les templates.
-
-Le répertoire de temporaire est géré dans la clef "tmp_dir" et a comme valeur par défaut : "/srv/rougail/tmp".
-
-### Le répertoire de destination des fichiers générés
-
-Le répertoire de destination des fichiers générés est géré dans la clef "destinations_dir" et a comme valeur par défaut : "/srv/rougail/destinations".
-
-## La configuration par défaut des fichiers
-
-### Le moteur de templates par défaut
-
-Le moteur de template est géré dans la clef "default_files_engine" et a comme valeur par défaut : "creole". Les valeurs possible sont "none", "creole" ou "jinja2".
-
-### Les droits par défaut des fichiers
-
-Les droits des fichiers générés est géré dans la clef "default_files_mode" et a comme valeur par défaut : "0644".
-
-### Le propriétaire par défaut des fichiers
-
-Le propriétaire des fichiers générés est géré dans la clef "default_files_owner" et a comme valeur par défaut : "root".
-Le groupe propriétaire des fichiers générés est géré dans la clef "default_files_group" et a comme valeur par défaut : "root".
-
-### La méthode d'inclusion par défaut des fichiers
-
-La méthode d'inclusion des fichiers générés est géré dans la clef "default_files_included" et a comme valeur par défaut : "no". Les valeurs possible sont "no", "name" et "content".
-                 'default_files_included': 'no',
-
-## La configuration par défaut des overrides
-
-### Le moteur de templates par défaut
-
-Le moteur de template est géré dans la clef "default_overrides_engine" et a comme valeur par défaut : "creole". Les valeurs possible sont "none", "creole" ou "jinja2".

doc/service/file.md

@@ -97,14 +97,12 @@ Attention : les deux variables "my_variable1" et "my_variable2" doivent être mu
 
 Par défaut les droits du fichier généré sont "0644" avec comme utilisateur "root" et groupe "root".
 
-Il est possible de définir les droits, l'utilisateur ou le groupe d'un fichier généré :
+Il est possible de définir une autre valeur à un ou plusieurs de ces attributs :
 
 ```
 <file mode="0640" owner="nobody" group="squid">/etc/squid/squid.conf</file>
 ```
 
-Il est possible de personnaliser les droits par défaut dans la [configuration de rougail](../dev/config.md)
-
 ## Désactiver la génération d'un fichier
 
 Il est possible de définir une [condition](../condition/README.md) de type "disabled_if_in" ou "disabled_if_not_in" sur une balise fichier :
@@ -152,8 +150,6 @@ Ou d'utiliser le moteur "jinja2" :
 <file engine="jinja2">/etc/squid/squid.conf</file>
 ```
 
-Il est possible de personnaliser le moteur par défaut dans la [configuration de rougail](../dev/config.md)
-
 ## Inclusion de template
 
 Un attribut "included" permet de définir la nature du fichier. Cet attribut peut avoir trois valeurs :
@@ -170,5 +166,3 @@ Exemples :
 ```
 
 Bien entendu, c'est au développeur de lister ou d'inclure le contenu de ce template dans le fichier de destination. Cet attribut permet juste de garantir que le fichier sera fait avant l'autre et de ne pas l'installer sur le serveur si ce n'est pas nécessaire.
-
-Il est possible de personnaliser les methodes d'inclusion par défaut dans la [configuration de rougail](../dev/config.md)

doc/service/override.md

@@ -41,5 +41,3 @@ Ou d'utiliser le moteur "jinja2" :
 ```
 <override engine="jinja2"/>
 ```
-
-Il est possible de personnaliser le moteur par défaut dans la [configuration de rougail](../dev/config.md)

doc/variable/leadership.md

@@ -74,15 +74,15 @@ Voici un exemple de définition d'une variable meneuse et de deux variables mene
 </variables>
 <constraints>
     <group leader="example.family.leader">
-        <follower>follower1</follower>
+        <follower>example.family.follower1</follower>
-        <follower>follower2</follower>
+        <follower>example.family.follower2</follower>
     </group>
 </constraints>
 ```
 
-Le chemin de la variable meneuse est traditionnel, par contre le chemin des variables suiveuses est le chemin relatif de la variable.
+Le chemin de la variable meneuse est traditionnel, par contre le chemin des variables suiveuses n'est pas le chemin définitif de la variable.
 
-Le chemin d'une variable suiveuse est normalement "example.family.leader.follower1" mais la variable n'est pas encore une variable suiveuse à ce moment là du traitement. C'est pour cela qu'il ne faut, uniquement dans les groupes, mettre le nom de la variable suiveuse.
+Le chemin d'une variable suiveuse est normalement "example.family.leader.follower1" mais la variable n'est pas encore une variable suiveuse à ce moment là du traitement. C'est pour cela qu'il ne faut, uniquement dans les groupes, mettre le nom de la variable meneuse dans le chemin.
 
 ## Ajout d'une nouvelle variable suiveuse
 

src/rougail/annotator/__init__.py

@@ -24,44 +24,34 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from .variable import CONVERT_OPTION
+from .group import GroupAnnotator
-import importlib.resources
+from .service import ServiceAnnotator
-from ..utils import load_modules
+from .variable import VariableAnnotator, CONVERT_OPTION
-
+from .check import CheckAnnotator
-
+from .value import ValueAnnotator
-ANNOTATORS = None
+from .condition import ConditionAnnotator
-
+from .fill import FillAnnotator
-
+from .family import FamilyAnnotator
-def get_level(module):
+from .property import PropertyAnnotator
-    return module.level
-
-
-def get_annotators(annotators, module_name):
-    annotators[module_name] = []
-    for pathobj in importlib.resources.files(module_name).iterdir():
-        path = str(pathobj)
-        if not path.endswith('__') and not path.endswith('__.py'):
-            module = load_modules(path)
-            if 'Annotator' in dir(module):
-                annotators[module_name].append(module.Annotator)
-
 
 class SpaceAnnotator:  # pylint: disable=R0903
     """Transformations applied on a object instance
     """
     def __init__(self, objectspace, eosfunc_file):
-        global ANNOTATORS
+        self.objectspace = objectspace
-        if ANNOTATORS is None:
+        GroupAnnotator(objectspace)
-            ANNOTATORS = {}
+        ServiceAnnotator(objectspace)
-            get_annotators(ANNOTATORS, 'rougail.annotator')
+        VariableAnnotator(objectspace)
-            for extra_annotator in objectspace.rougailconfig['extra_annotators']:
+        CheckAnnotator(objectspace,
-                get_annotators(ANNOTATORS, extra_annotator)
+                       eosfunc_file,
-        annotators = ANNOTATORS['rougail.annotator'].copy()
+                       )
-        for extra_annotator in objectspace.rougailconfig['extra_annotators']:
+        ConditionAnnotator(objectspace)
-            annotators.extend(ANNOTATORS[extra_annotator])
+        FillAnnotator(objectspace,
-        annotators = sorted(annotators, key=get_level)
+                      eosfunc_file,
-        for annotator in annotators:
+                      )
-            annotator(objectspace, eosfunc_file)
+        ValueAnnotator(objectspace)
+        FamilyAnnotator(objectspace)
+        PropertyAnnotator(objectspace)
 
 
 __all__ = ('SpaceAnnotator', 'CONVERT_OPTION')

src/rougail/annotator/check.py

@@ -26,23 +26,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 from typing import List, Any
 
-from rougail.annotator.target import TargetAnnotator
+from .target import TargetAnnotator
-from rougail.annotator.param import ParamAnnotator
+from .param import ParamAnnotator
 
-from rougail.utils import load_modules
+from ..utils import load_modules
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError, display_xmlfiles
+from ..error import DictConsistencyError, display_xmlfiles
 
 INTERNAL_FUNCTIONS = ['valid_enum', 'valid_in_network', 'valid_differ', 'valid_entier']
 
-class Annotator(TargetAnnotator, ParamAnnotator):
+class CheckAnnotator(TargetAnnotator, ParamAnnotator):
     """Annotate check
     """
-    level = 40
     def __init__(self,
                  objectspace,
                  eosfunc_file,
-                 *args,
                  ):
         if not hasattr(objectspace.space, 'constraints') or \
                 not hasattr(objectspace.space.constraints, 'check'):

src/rougail/annotator/condition.py

@@ -27,21 +27,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from typing import List
 
 
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
 
-from rougail.annotator.target import TargetAnnotator
+from .target import TargetAnnotator
-from rougail.annotator.param import ParamAnnotator
+from .param import ParamAnnotator
-from rougail.annotator.variable import Walk
+from .variable import Walk
 
 
-class Annotator(TargetAnnotator, ParamAnnotator, Walk):
+class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
     """Annotate condition
     """
-    level = 50
     def __init__(self,
                  objectspace,
-                 *args,
                  ):
         self.objectspace = objectspace
         self.force_service_value = {}

src/rougail/annotator/family.py

@@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.annotator.variable import Walk
+from .variable import Walk
 
 
 class Mode:  # pylint: disable=R0903
@@ -43,13 +43,11 @@ class Mode:  # pylint: disable=R0903
         return other.level < self.level
 
 
-class Annotator(Walk):
+class FamilyAnnotator(Walk):
     """Annotate family
     """
-    level = 80
     def __init__(self,
                  objectspace,
-                 *args,
                  ):
         self.objectspace = objectspace
         if not hasattr(self.objectspace.space, 'variables'):
@@ -76,7 +74,6 @@ class Annotator(Walk):
     def remove_empty_families(self) -> None:
         """Remove all families without any variable
         """
-        #FIXME pas sous family
         for families in self.objectspace.space.variables.values():
             removed_families = []
             for family_name, family in families.variable.items():

src/rougail/annotator/fill.py

@@ -24,30 +24,28 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.utils import load_modules
+from ..utils import load_modules
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
 
-from rougail.annotator.target import TargetAnnotator
+from .target import TargetAnnotator
-from rougail.annotator.param import ParamAnnotator
+from .param import ParamAnnotator
 
 
 CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename')
 
 
-class Annotator(TargetAnnotator, ParamAnnotator):
+class FillAnnotator(TargetAnnotator, ParamAnnotator):
     """Fill annotator
     """
-    level = 60
     def __init__(self,
                  objectspace,
                  eosfunc_file,
-                 *args,
                  ):
-        if not hasattr(objectspace.space, 'constraints') or \
-                not hasattr(objectspace.space.constraints, 'fill'):
-            return
         self.objectspace = objectspace
+        if not hasattr(objectspace.space, 'constraints') or \
+                not hasattr(self.objectspace.space.constraints, 'fill'):
+            return
         self.functions = dir(load_modules(eosfunc_file))
         self.functions.extend(self.objectspace.rougailconfig['internal_functions'])
         self.target_is_uniq = True
@@ -70,11 +68,12 @@ class Annotator(TargetAnnotator, ParamAnnotator):
         """valid and manage <fill>
         """
         for fill in self.objectspace.space.constraints.fill:
+            for target in fill.target:
                 # test if the function exists
                 if fill.name not in self.functions:
                     msg = _(f'cannot find fill function "{fill.name}"')
                     raise DictConsistencyError(msg, 25, fill.xmlfiles)
-            for target in fill.target:
+
                 # create an object value
                 value = self.objectspace.value(fill.xmlfiles)
                 value.type = 'calculation'
@@ -88,6 +87,7 @@ class Annotator(TargetAnnotator, ParamAnnotator):
                     target.name.default = value
                 else:
                     target.name.value = [value]
+
                 # manage params
                 if hasattr(fill, 'param') and fill.param:
                     value.param = fill.param

src/rougail/annotator/group.py

@@ -24,18 +24,16 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.utils import normalize_family
+from ..utils import normalize_family
 
 
-class Annotator:
+class GroupAnnotator:
     """Annotate group
     """
-    level = 10
     def __init__(self,
                  objectspace,
-                 *args,
                  ):
         self.objectspace = objectspace
         if not hasattr(self.objectspace.space, 'constraints') or \

src/rougail/annotator/param.py

@@ -29,10 +29,10 @@ try:
 except ModuleNotFoundError:
     import tiramisu
 
-from rougail.annotator.variable import CONVERT_OPTION
+from .variable import CONVERT_OPTION
 
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
 
 
 class ParamAnnotator:

src/rougail/annotator/property.py

@@ -24,23 +24,19 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.annotator.variable import Walk
+from .variable import Walk
 
 
 PROPERTIES = ('hidden', 'frozen', 'force_default_on_freeze',
               'force_store_value', 'disabled', 'mandatory')
 
 
-class Annotator(Walk):
+class PropertyAnnotator(Walk):
     """Annotate properties
     """
-    level = 90
+    def __init__(self, objectspace):
-    def __init__(self,
-                 objectspace,
-                 *args
-                 ) -> None:
         self.objectspace = objectspace
         if hasattr(self.objectspace.space, 'services'):
             self.convert_services()

src/rougail/annotator/service.py

@@ -27,9 +27,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from os.path import basename
 from typing import Tuple
 
-from rougail.i18n import _
+from ..i18n import _
-from rougail.utils import normalize_family
+from ..utils import normalize_family
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
+from ..config import RougailConfig
 # a object's attribute has some annotations
 # that shall not be present in the exported (flatened) XML
 ERASED_ATTRIBUTES = ('redefine', 'exists', 'optional', 'remove_check', 'namespace',
@@ -39,7 +40,7 @@ ERASED_ATTRIBUTES = ('redefine', 'exists', 'optional', 'remove_check', 'namespac
 ALLOW_ATTRIBUT_NOT_MANAGE = ['file']
 
 
-class Annotator:
+class ServiceAnnotator:
     """Manage service's object
     for example::
         <services>
@@ -49,11 +50,7 @@ class Annotator:
             </service>
         </services>
     """
-    level = 20
+    def __init__(self, objectspace):
-    def __init__(self,
-                 objectspace,
-                 *args,
-                 ) -> None:
         self.objectspace = objectspace
         self.uniq_overrides = []
         if 'network_type' not in self.objectspace.types:
@@ -100,7 +97,6 @@ class Annotator:
                 family = self._gen_family(eltname,
                                           path,
                                           service.xmlfiles,
-                                          with_informations=False,
                                           )
                 if isinstance(values, dict):
                     values = list(values.values())
@@ -169,8 +165,7 @@ class Annotator:
                     dtd_key_type = elttype + '_type'
                 else:
                     dtd_key_type = key + '_type'
-                elt_type = getattr(elt, dtd_key_type, None)
+                elt_type = getattr(elt, dtd_key_type, 'string')
-                if elt_type:
                 if elt_type == 'variable':
                     elt_type = 'symlink'
                 family.variable.append(self._generate_element(elt_type,
@@ -181,9 +176,6 @@ class Annotator:
                                                               elt,
                                                               f'{subpath}.{key}'
                                                               ))
-                else:
-                    setattr(family.information, key, value)
-
             family.variable.append(activate_obj)
             families.append(family)
         return families
@@ -213,8 +205,7 @@ class Annotator:
     def _gen_family(self,
                     name,
                     path,
-                    xmlfiles,
+                    xmlfiles
-                    with_informations=True,
                     ):
         family = self.objectspace.family(xmlfiles)
         family.name = normalize_family(name)
@@ -225,8 +216,6 @@ class Annotator:
                                           family,
                                           None,
                                           )
-        if with_informations:
-            family.information = self.objectspace.information(xmlfiles)
         return family
 
     def _generate_element(self,
@@ -274,6 +263,8 @@ class Annotator:
             raise DictConsistencyError(msg, 69, override.xmlfiles)
         self.uniq_overrides.append(service_name)
         override.name = service_name
+        if not hasattr(override, 'engine'):
+            override.engine = RougailConfig['default_engine']
         if not hasattr(override, 'source'):
             override.source = f'{service_name}.service'
 
@@ -288,6 +279,8 @@ class Annotator:
             msg = _(f'attribute "source" is mandatory for the file "{file_.name}" '
                     f'"({service_name})"')
             raise DictConsistencyError(msg, 34, file_.xmlfiles)
+        if not hasattr(file_, 'engine'):
+            file_.engine = RougailConfig['default_engine']
 
     def _update_ip(self,
                    ip,

src/rougail/annotator/target.py

@@ -24,8 +24,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
 
 
 class TargetAnnotator:

src/rougail/annotator/value.py

@@ -24,18 +24,16 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-from rougail.annotator.variable import Walk
+from .variable import Walk
 
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
 
-class Annotator(Walk):  # pylint: disable=R0903
+class ValueAnnotator(Walk):  # pylint: disable=R0903
     """Annotate value
     """
-    level = 70
     def __init__(self,
                  objectspace,
-                 *args,
                  ) -> None:
         if not hasattr(objectspace.space, 'variables'):
             return

src/rougail/annotator/variable.py

@@ -25,9 +25,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-from rougail.i18n import _
+from ..i18n import _
-from rougail.error import DictConsistencyError
+from ..error import DictConsistencyError
-from rougail.objspace import convert_boolean
+from ..objspace import convert_boolean
 
 
 CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
@@ -111,13 +111,11 @@ class Walk:
                     yield from self._get_families(fam)
 
 
-class Annotator(Walk):  # pylint: disable=R0903
+class VariableAnnotator(Walk):  # pylint: disable=R0903
     """Annotate variable
     """
-    level = 30
     def __init__(self,
                  objectspace,
-                 *args,
                  ):
         if not hasattr(objectspace.space, 'variables'):
             return
@@ -231,9 +229,12 @@ class Annotator(Walk):  # pylint: disable=R0903
         """Convert variable help
         """
         for variable in self.get_variables():
-            if not hasattr(variable, 'help'):
-                continue
             if not hasattr(variable, 'information'):
                 variable.information = self.objectspace.information(variable.xmlfiles)
+            self._convert_help(variable)
+
+    @staticmethod
+    def _convert_help(variable) -> None:
+        if hasattr(variable, 'help'):
             variable.information.help = variable.help
             del variable.help

src/rougail/config.py

@@ -42,15 +42,9 @@ RougailConfig = {'dictionaries_dir': [join(ROUGAILROOT, 'dictionaries')],
                  'functions_file': join(ROUGAILROOT, 'functions.py'),
                  'variable_namespace': 'rougail',
                  'auto_freeze_variable': 'server_deployed',
+                 'default_engine': 'creole',
                  'internal_functions': [],
-                 'extra_annotators': [],
                  'modes_level': ['basic', 'normal', 'expert'],
                  'default_family_mode': 'basic',
                  'default_variable_mode': 'normal',
-                 'default_files_engine': 'creole',
-                 'default_files_mode': '0644',
-                 'default_files_owner': 'root',
-                 'default_files_group': 'root',
-                 'default_files_included': 'no',
-                 'default_overrides_engine': 'creole',
                  }

src/rougail/data/rougail.dtd

@@ -62,13 +62,13 @@
 <!ATTLIST file variable CDATA #IMPLIED>
 <!ATTLIST file variable_type (variable) "variable">
 <!ATTLIST file source CDATA #IMPLIED>
-<!ATTLIST file mode CDATA #IMPLIED>
+<!ATTLIST file mode CDATA "0644">
-<!ATTLIST file owner CDATA #IMPLIED>
+<!ATTLIST file owner CDATA "root">
-<!ATTLIST file group CDATA #IMPLIED>
+<!ATTLIST file group CDATA "root">
 <!ATTLIST file filelist CDATA #IMPLIED>
 <!ATTLIST file redefine (True|False) "False">
 <!ATTLIST file engine (none|creole|jinja2|creole_legacy) #IMPLIED>
-<!ATTLIST file included (no|name|content) #IMPLIED>
+<!ATTLIST file included (no|name|content) "no">
 
 <!ELEMENT override EMPTY>
 <!ATTLIST override source CDATA #IMPLIED>
@@ -83,7 +83,6 @@
 <!ATTLIST family mode CDATA #IMPLIED>
 <!ATTLIST family hidden (True|False) "False">
 <!ATTLIST family dynamic CDATA #IMPLIED>
-<!ATTLIST family provider CDATA #IMPLIED>
 
 <!ELEMENT variable (value*)>
 <!ATTLIST variable name CDATA #REQUIRED>
@@ -102,7 +101,6 @@
 <!ATTLIST variable remove_check (True|False) "False">
 <!ATTLIST variable remove_condition (True|False) "False">
 <!ATTLIST variable remove_fill (True|False) "False">
-<!ATTLIST variable provider CDATA #IMPLIED>
 <!ATTLIST variable test CDATA #IMPLIED>
 
 <!ELEMENT value (#PCDATA)>

src/rougail/template/base.py

@@ -34,10 +34,10 @@ from os.path import dirname, join, isfile, isdir, abspath
 
 
 try:
-    from tiramisu3 import Config, undefined
+    from tiramisu3 import Config
     from tiramisu3.error import PropertiesOptionError  # pragma: no cover
 except ModuleNotFoundError:  # pragma: no cover
-    from tiramisu import Config, undefined
+    from tiramisu import Config
     from tiramisu.error import PropertiesOptionError
 
 from ..config import RougailConfig
@@ -55,11 +55,6 @@ log = logging.getLogger(__name__)
 log.addHandler(logging.NullHandler())
 
 
-INFORMATIONS = {'files': ['source', 'mode', 'owner', 'group', 'engine', 'included'],
-                'overrides': ['name', 'source', 'engine'],
-                }
-
-
 class RougailLeaderIndex:
     """This object is create when access to a specified Index of the variable
     """
@@ -74,21 +69,12 @@ class RougailLeaderIndex:
 
     def __getattr__(self, name):
         if name not in self._follower:
-            raise AttributeError(f'unable to find follower "{name}"')
+            raise AttributeError()
         value = self._follower[name]
         if isinstance(value, PropertiesOptionError):
-            raise AttributeError(f'unable to access to follower "{name}": {value}')
+            raise AttributeError()
         return value
 
-    def __getitem__(self, name):
-        return self.__getattr__(name)
-
-    def __contains__(self, name):
-        if self._follower.__contains__(name):
-            value = self._follower[name]
-            return not isinstance(value, PropertiesOptionError)
-        return False
-
     def __str__(self):
         return str(self._value)
 
@@ -122,11 +108,10 @@ class RougailLeader:
     For examples: %%leader, %%leader[0].follower1
     """
     def __init__(self,
-                 leader_name,
                  value,
                  ) -> None:
         self._value = value
-        self._follower = {leader_name: value}
+        self._follower = {}
 
     def __getitem__(self, index):
         """Get a leader.follower at requested index.
@@ -151,7 +136,7 @@ class RougailLeader:
     def __contains__(self, value):
         return self._value.__contains__(value)
 
-    async def _add_follower(self,
+    async def add_follower(self,
                            config,
                            name: str,
                            path: str,
@@ -172,26 +157,22 @@ class RougailExtra:
     For example %%extra1.family.variable
     """
     def __init__(self,
-                 suboption: Dict,
+                 suboption: Dict) -> None:
-                 ) -> None:
+        self.suboption = suboption
-        self._suboption = suboption
 
     def __getattr__(self,
                     key: str,
                     ) -> Any:
         try:
-            return self._suboption[key]
+            return self.suboption[key]
         except KeyError:
             raise AttributeError(f'unable to find extra "{key}"')
 
     def __iter__(self):
-        return iter(self._suboption.values())
+        return iter(self.suboption.values())
 
     def items(self):
-        return self._suboption.items()
+        return self.suboption.items()
-
-    def __str__(self):
-        return f'<extra object with: {self._suboption}>'
 
 
 class RougailBaseTemplate:
@@ -305,14 +286,9 @@ class RougailBaseTemplate:
         chdir(self.templates_dir)
         for option in await self.config.option.list(type='all'):
             namespace = await option.option.name()
-            is_variable_namespace = namespace == self.rougailconfig['variable_namespace']
+            is_var_namespace = namespace == self.rougailconfig['variable_namespace']
-            if namespace == 'services':
-                is_service_namespace = 'root'
-            else:
-                is_service_namespace = False
             self.rougail_variables_dict[namespace] = await self.load_variables(option,
-                                                                               is_variable_namespace,
+                                                                               is_var_namespace,
-                                                                               is_service_namespace,
                                                                                )
         for template in listdir('.'):
             self.prepare_template(template)
@@ -327,7 +303,6 @@ class RougailBaseTemplate:
                     type_ = await fills.option.name()
                     for fill_obj in await fills.list('all'):
                         fill = await fill_obj.value.dict()
-                        await self.get_informations(type_, fill, fill_obj)
                         if 'included' in fill:
                             if (fill['included'] == 'no' and included is True) or \
                                     (fill['included'] != 'no' and included is False):
@@ -342,19 +317,6 @@ class RougailBaseTemplate:
         self.post_instance()
         chdir(ori_dir)
 
-    async def get_informations(self,
-                               type_: str,
-                               dico: dict,
-                               obj: 'Option',
-                               ) -> None:
-        for key in INFORMATIONS.get(type_, []):
-            default_key = f'default_{type_}_{key}'
-            if default_key in RougailConfig:
-                default_value = RougailConfig[default_key]
-            else:
-                default_value = undefined
-            dico[key] = await obj.information.get(key, default_value)
-
     def desactive_service(self,
                           service_name: str,
                           ):
@@ -383,8 +345,7 @@ class RougailBaseTemplate:
 
     async def load_variables(self,
                              optiondescription,
-                             is_variable_namespace: str,
+                             is_variable_namespace,
-                             is_service_namespace: str,
                              ) -> RougailExtra:
         """Load all variables and set it in RougailExtra objects
         """
@@ -394,30 +355,19 @@ class RougailBaseTemplate:
                 if await option.option.isleadership():
                     for idx, suboption in enumerate(await option.list('all')):
                         if idx == 0:
+                            leader = RougailLeader(await suboption.value.get())
                             leader_name = await suboption.option.name()
-                            leader = RougailLeader(leader_name, await suboption.value.get())
-                            leadership_name = await option.option.name()
                             if is_variable_namespace:
                                 self.rougail_variables_dict[await suboption.option.name()] = leader
                         else:
-                            await leader._add_follower(self.config,
+                            await leader.add_follower(self.config,
                                                       await suboption.option.name(),
                                                       await suboption.option.path(),
                                                       )
-                    variables[leadership_name] = leader
+                    variables[leader_name] = leader
                 else:
-                    if is_service_namespace == 'root':
-                        new_is_service_namespace = 'service_name'
-                    elif is_service_namespace == 'service_name':
-                        new_is_service_namespace = await option.option.name()
-                    elif is_service_namespace in INFORMATIONS:
-                        # remove 's'
-                        new_is_service_namespace = is_service_namespace[:-1]
-                    else:
-                        new_is_service_namespace = is_service_namespace
                     subfamilies = await self.load_variables(option,
                                                             is_variable_namespace,
-                                                            new_is_service_namespace,
                                                             )
                     variables[await option.option.name()] = subfamilies
             else:
@@ -432,9 +382,4 @@ class RougailBaseTemplate:
                 else:
                     value = await option.value.get()
                 variables[await option.option.name()] = value
-        if isinstance(is_service_namespace, str) and is_service_namespace + 's' in INFORMATIONS:
-            await self.get_informations(is_service_namespace + 's',
-                                        variables,
-                                        optiondescription,
-                                        )
         return RougailExtra(variables)

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

@@ -3,18 +3,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true

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

@@ -1,8 +1,20 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.engine": "creole",
+    "services.test.files.file.group": "root",
+    "services.test.files.file.included": "no",
+    "services.test.files.file.mode": "0644",
     "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.owner": "root",
+    "services.test.files.file.source": "file",
     "services.test.files.file.activate": true,
+    "services.test.files.file2.engine": "jinja2",
+    "services.test.files.file2.group": "root",
+    "services.test.files.file2.included": "no",
+    "services.test.files.file2.mode": "0644",
     "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.owner": "root",
+    "services.test.files.file2.source": "file2",
     "services.test.files.file2.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -3,18 +3,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true

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

@@ -14,18 +14,27 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_8 = StrOption(name="engine", doc="engine", default="creole")
-option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_9 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_10 = StrOption(name="included", doc="included", default="no")
-option_7.impl_set_information('source', "file")
+option_11 = StrOption(name="mode", doc="mode", default="0644")
-option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = StrOption(name="owner", doc="owner", default="root")
-option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_14 = StrOption(name="source", doc="source", default="file")
-option_10.impl_set_information('engine', "jinja2")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
-option_10.impl_set_information('source', "file2")
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
-option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_17 = StrOption(name="engine", doc="engine", default="jinja2")
-option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = StrOption(name="group", doc="group", default="root")
-option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = StrOption(name="included", doc="included", default="no")
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_20 = StrOption(name="mode", doc="mode", default="0644")
+option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_22 = StrOption(name="owner", doc="owner", default="root")
+option_23 = StrOption(name="source", doc="source", default="file2")
+option_24 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = OptionDescription(name="file2", doc="file2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_16])
+option_25 = BoolOption(name="activate", doc="activate", default=True)
+option_26 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_25, option_26])
 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,18 +3,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true

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

@@ -1,8 +1,20 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.engine": "creole",
+    "services.test.files.file.group": "root",
+    "services.test.files.file.included": "no",
+    "services.test.files.file.mode": "0644",
     "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.owner": "root",
+    "services.test.files.file.source": "file",
     "services.test.files.file.activate": true,
+    "services.test.files.file2.engine": "jinja2",
+    "services.test.files.file2.group": "root",
+    "services.test.files.file2.included": "no",
+    "services.test.files.file2.mode": "0644",
     "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.owner": "root",
+    "services.test.files.file2.source": "file2",
     "services.test.files.file2.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -3,18 +3,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true

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

@@ -14,18 +14,27 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_8 = StrOption(name="engine", doc="engine", default="creole")
-option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_9 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_10 = StrOption(name="included", doc="included", default="no")
-option_7.impl_set_information('source', "file")
+option_11 = StrOption(name="mode", doc="mode", default="0644")
-option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = StrOption(name="owner", doc="owner", default="root")
-option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_14 = StrOption(name="source", doc="source", default="file")
-option_10.impl_set_information('engine', "jinja2")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
-option_10.impl_set_information('source', "file2")
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
-option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_17 = StrOption(name="engine", doc="engine", default="jinja2")
-option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = StrOption(name="group", doc="group", default="root")
-option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = StrOption(name="included", doc="included", default="no")
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_20 = StrOption(name="mode", doc="mode", default="0644")
+option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_22 = StrOption(name="owner", doc="owner", default="root")
+option_23 = StrOption(name="source", doc="source", default="file2")
+option_24 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = OptionDescription(name="file2", doc="file2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_16])
+option_25 = BoolOption(name="activate", doc="activate", default=True)
+option_26 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_25, option_26])
 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,26 +3,98 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.incfile.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.incfile.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.incfile.included": {
+        "owner": "default",
+        "value": "content"
+    },
+    "services.test.files.incfile.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.incfile.name": {
         "owner": "default",
         "value": "/etc/dir/incfile"
     },
+    "services.test.files.incfile.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.incfile.source": {
+        "owner": "default",
+        "value": "incfile"
+    },
     "services.test.files.incfile.activate": {
         "owner": "default",
         "value": true

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

@@ -1,10 +1,28 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.engine": "creole",
+    "services.test.files.file.group": "root",
+    "services.test.files.file.included": "no",
+    "services.test.files.file.mode": "0644",
     "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.owner": "root",
+    "services.test.files.file.source": "file",
     "services.test.files.file.activate": true,
+    "services.test.files.file2.engine": "jinja2",
+    "services.test.files.file2.group": "root",
+    "services.test.files.file2.included": "no",
+    "services.test.files.file2.mode": "0644",
     "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.owner": "root",
+    "services.test.files.file2.source": "file2",
     "services.test.files.file2.activate": true,
+    "services.test.files.incfile.engine": "creole",
+    "services.test.files.incfile.group": "root",
+    "services.test.files.incfile.included": "content",
+    "services.test.files.incfile.mode": "0644",
     "services.test.files.incfile.name": "/etc/dir/incfile",
+    "services.test.files.incfile.owner": "root",
+    "services.test.files.incfile.source": "incfile",
     "services.test.files.incfile.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -3,26 +3,98 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.incfile.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.incfile.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.incfile.included": {
+        "owner": "default",
+        "value": "content"
+    },
+    "services.test.files.incfile.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.incfile.name": {
         "owner": "default",
         "value": "/etc/dir/incfile"
     },
+    "services.test.files.incfile.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.incfile.source": {
+        "owner": "default",
+        "value": "incfile"
+    },
     "services.test.files.incfile.activate": {
         "owner": "default",
         "value": true

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

@@ -14,23 +14,36 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_8 = StrOption(name="engine", doc="engine", default="creole")
-option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_9 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_10 = StrOption(name="included", doc="included", default="no")
-option_7.impl_set_information('source', "file")
+option_11 = StrOption(name="mode", doc="mode", default="0644")
-option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = StrOption(name="owner", doc="owner", default="root")
-option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_14 = StrOption(name="source", doc="source", default="file")
-option_10.impl_set_information('engine', "jinja2")
-option_10.impl_set_information('source', "file2")
-option_14 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_15 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = OptionDescription(name="incfile", doc="incfile", children=[option_14, option_15])
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
-option_13.impl_set_information('included', "content")
+option_17 = StrOption(name="engine", doc="engine", default="jinja2")
-option_13.impl_set_information('source', "incfile")
+option_18 = StrOption(name="group", doc="group", default="root")
-option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
+option_19 = StrOption(name="included", doc="included", default="no")
-option_16 = BoolOption(name="activate", doc="activate", default=True)
+option_20 = StrOption(name="mode", doc="mode", default="0644")
-option_17 = BoolOption(name="manage", doc="manage", default=True)
+option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17])
+option_22 = StrOption(name="owner", doc="owner", default="root")
+option_23 = StrOption(name="source", doc="source", default="file2")
+option_24 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = OptionDescription(name="file2", doc="file2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
+option_26 = StrOption(name="engine", doc="engine", default="creole")
+option_27 = StrOption(name="group", doc="group", default="root")
+option_28 = StrOption(name="included", doc="included", default="content")
+option_29 = StrOption(name="mode", doc="mode", default="0644")
+option_30 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
+option_31 = StrOption(name="owner", doc="owner", default="root")
+option_32 = StrOption(name="source", doc="source", default="incfile")
+option_33 = BoolOption(name="activate", doc="activate", default=True)
+option_25 = OptionDescription(name="incfile", doc="incfile", children=[option_26, option_27, option_28, option_29, option_30, option_31, option_32, option_33])
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_16, option_25])
+option_34 = BoolOption(name="activate", doc="activate", default=True)
+option_35 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_34, option_35])
 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,26 +3,98 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.incfile.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.incfile.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.incfile.included": {
+        "owner": "default",
+        "value": "name"
+    },
+    "services.test.files.incfile.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.incfile.name": {
         "owner": "default",
         "value": "/etc/dir/incfile"
     },
+    "services.test.files.incfile.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.incfile.source": {
+        "owner": "default",
+        "value": "incfile"
+    },
     "services.test.files.incfile.activate": {
         "owner": "default",
         "value": true

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

@@ -1,10 +1,28 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.engine": "creole",
+    "services.test.files.file.group": "root",
+    "services.test.files.file.included": "no",
+    "services.test.files.file.mode": "0644",
     "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.owner": "root",
+    "services.test.files.file.source": "file",
     "services.test.files.file.activate": true,
+    "services.test.files.file2.engine": "jinja2",
+    "services.test.files.file2.group": "root",
+    "services.test.files.file2.included": "no",
+    "services.test.files.file2.mode": "0644",
     "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.owner": "root",
+    "services.test.files.file2.source": "file2",
     "services.test.files.file2.activate": true,
+    "services.test.files.incfile.engine": "creole",
+    "services.test.files.incfile.group": "root",
+    "services.test.files.incfile.included": "name",
+    "services.test.files.incfile.mode": "0644",
     "services.test.files.incfile.name": "/etc/dir/incfile",
+    "services.test.files.incfile.owner": "root",
+    "services.test.files.incfile.source": "incfile",
     "services.test.files.incfile.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -3,26 +3,98 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.incfile.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.incfile.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.incfile.included": {
+        "owner": "default",
+        "value": "name"
+    },
+    "services.test.files.incfile.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.incfile.name": {
         "owner": "default",
         "value": "/etc/dir/incfile"
     },
+    "services.test.files.incfile.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.incfile.source": {
+        "owner": "default",
+        "value": "incfile"
+    },
     "services.test.files.incfile.activate": {
         "owner": "default",
         "value": true

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

@@ -14,23 +14,36 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_8 = StrOption(name="engine", doc="engine", default="creole")
-option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_9 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_10 = StrOption(name="included", doc="included", default="no")
-option_7.impl_set_information('source', "file")
+option_11 = StrOption(name="mode", doc="mode", default="0644")
-option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = StrOption(name="owner", doc="owner", default="root")
-option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_14 = StrOption(name="source", doc="source", default="file")
-option_10.impl_set_information('engine', "jinja2")
-option_10.impl_set_information('source', "file2")
-option_14 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_15 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = OptionDescription(name="incfile", doc="incfile", children=[option_14, option_15])
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
-option_13.impl_set_information('included', "name")
+option_17 = StrOption(name="engine", doc="engine", default="jinja2")
-option_13.impl_set_information('source', "incfile")
+option_18 = StrOption(name="group", doc="group", default="root")
-option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
+option_19 = StrOption(name="included", doc="included", default="no")
-option_16 = BoolOption(name="activate", doc="activate", default=True)
+option_20 = StrOption(name="mode", doc="mode", default="0644")
-option_17 = BoolOption(name="manage", doc="manage", default=True)
+option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17])
+option_22 = StrOption(name="owner", doc="owner", default="root")
+option_23 = StrOption(name="source", doc="source", default="file2")
+option_24 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = OptionDescription(name="file2", doc="file2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
+option_26 = StrOption(name="engine", doc="engine", default="creole")
+option_27 = StrOption(name="group", doc="group", default="root")
+option_28 = StrOption(name="included", doc="included", default="name")
+option_29 = StrOption(name="mode", doc="mode", default="0644")
+option_30 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
+option_31 = StrOption(name="owner", doc="owner", default="root")
+option_32 = StrOption(name="source", doc="source", default="incfile")
+option_33 = BoolOption(name="activate", doc="activate", default=True)
+option_25 = OptionDescription(name="incfile", doc="incfile", children=[option_26, option_27, option_28, option_29, option_30, option_31, option_32, option_33])
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_16, option_25])
+option_34 = BoolOption(name="activate", doc="activate", default=True)
+option_35 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_34, option_35])
 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_patch/makedict/after.json

@@ -3,18 +3,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true

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

@@ -1,8 +1,20 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.file.engine": "creole",
+    "services.test.files.file.group": "root",
+    "services.test.files.file.included": "no",
+    "services.test.files.file.mode": "0644",
     "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.owner": "root",
+    "services.test.files.file.source": "file",
     "services.test.files.file.activate": true,
+    "services.test.files.file2.engine": "jinja2",
+    "services.test.files.file2.group": "root",
+    "services.test.files.file2.included": "no",
+    "services.test.files.file2.mode": "0644",
     "services.test.files.file2.name": "/etc/file2",
+    "services.test.files.file2.owner": "root",
+    "services.test.files.file2.source": "file2",
     "services.test.files.file2.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -3,18 +3,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/etc/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true

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

@@ -14,18 +14,27 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_8 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_8 = StrOption(name="engine", doc="engine", default="creole")
-option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_9 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9])
+option_10 = StrOption(name="included", doc="included", default="no")
-option_7.impl_set_information('source', "file")
+option_11 = StrOption(name="mode", doc="mode", default="0644")
-option_11 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = StrOption(name="owner", doc="owner", default="root")
-option_10 = OptionDescription(name="file2", doc="file2", children=[option_11, option_12])
+option_14 = StrOption(name="source", doc="source", default="file")
-option_10.impl_set_information('engine', "jinja2")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
-option_10.impl_set_information('source', "file2")
+option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
-option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_17 = StrOption(name="engine", doc="engine", default="jinja2")
-option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = StrOption(name="group", doc="group", default="root")
-option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = StrOption(name="included", doc="included", default="no")
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_20 = StrOption(name="mode", doc="mode", default="0644")
+option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
+option_22 = StrOption(name="owner", doc="owner", default="root")
+option_23 = StrOption(name="source", doc="source", default="file2")
+option_24 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = OptionDescription(name="file2", doc="file2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_16])
+option_25 = BoolOption(name="activate", doc="activate", default=True)
+option_26 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_25, option_26])
 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,18 +3,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.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.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.source": {
+        "owner": "default",
+        "value": "systemd-makefs@dev-disk-by\\x2dpartlabel"
+    },
     "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.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.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.source": {
+        "owner": "default",
+        "value": "systemd-makefs@dev-disk-by\\x2dpartlabel2"
+    },
     "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
         "owner": "default",
         "value": true

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

@@ -1,8 +1,20 @@
 {
     "rougail.general.mode_conteneur_actif": "non",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.engine": "creole",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.group": "root",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.included": "no",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.mode": "0644",
     "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.owner": "root",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.source": "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.engine": "jinja2",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.group": "root",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.included": "no",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.mode": "0644",
     "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.owner": "root",
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.source": "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

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

@@ -3,18 +3,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.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.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.source": {
+        "owner": "default",
+        "value": "systemd-makefs@dev-disk-by\\x2dpartlabel"
+    },
     "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.engine": {
+        "owner": "default",
+        "value": "jinja2"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.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.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.source": {
+        "owner": "default",
+        "value": "systemd-makefs@dev-disk-by\\x2dpartlabel2"
+    },
     "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
         "owner": "default",
         "value": true

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

@@ -14,18 +14,27 @@ except:
 option_3 = StrOption(name="mode_conteneur_actif", doc="Description", default="non", properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_8 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel")
+option_8 = StrOption(name="engine", doc="engine", default="creole")
-option_9 = BoolOption(name="activate", doc="activate", default=True)
+option_9 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel", doc="systemd-makefs@dev-disk-by\\x2dpartlabel", children=[option_8, option_9])
+option_10 = StrOption(name="included", doc="included", default="no")
-option_7.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel")
+option_11 = StrOption(name="mode", doc="mode", default="0644")
-option_11 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
+option_12 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel")
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = StrOption(name="owner", doc="owner", default="root")
-option_10 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_11, option_12])
+option_14 = StrOption(name="source", doc="source", default="systemd-makefs@dev-disk-by\\x2dpartlabel")
-option_10.impl_set_information('engine', "jinja2")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
-option_10.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel2")
+option_7 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel", doc="systemd-makefs@dev-disk-by\\x2dpartlabel", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
-option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
+option_17 = StrOption(name="engine", doc="engine", default="jinja2")
-option_13 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = StrOption(name="group", doc="group", default="root")
-option_14 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = StrOption(name="included", doc="included", default="no")
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14])
+option_20 = StrOption(name="mode", doc="mode", default="0644")
+option_21 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
+option_22 = StrOption(name="owner", doc="owner", default="root")
+option_23 = StrOption(name="source", doc="source", default="systemd-makefs@dev-disk-by\\x2dpartlabel2")
+option_24 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
+option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_16])
+option_25 = BoolOption(name="activate", doc="activate", default=True)
+option_26 = BoolOption(name="manage", doc="manage", default=True)
+option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_25, option_26])
 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,10 +11,34 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -2,7 +2,13 @@
     "rougail.general.condition": "non",
     "rougail.general.mode_conteneur_actif": "non",
     "rougail.general.mode_conteneur_actif2": "non",
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -11,10 +11,34 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non"
 option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file1")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file1")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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,10 +11,34 @@
         "owner": "default",
         "value": "no"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -2,7 +2,13 @@
     "rougail.general.condition": "no",
     "rougail.general.condition2": "no",
     "rougail.general.test_variable": "no",
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -11,10 +11,34 @@
         "owner": "default",
         "value": "no"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="condition2", doc="No change", default="no", propertie
 option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file1")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file1")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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,10 +7,34 @@
         "owner": "default",
         "value": "no"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -1,7 +1,13 @@
 {
     "rougail.general.condition": "no",
     "rougail.general.condition2": "no",
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": false,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -7,10 +7,34 @@
         "owner": "default",
         "value": "no"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="condition2", doc="No change", default="no", propertie
 option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file1")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file1")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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,10 +7,34 @@
         "owner": "default",
         "value": "no"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -1,7 +1,13 @@
 {
     "rougail.general.condition": "yes",
     "rougail.general.condition2": "no",
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -7,10 +7,34 @@
         "owner": "default",
         "value": "no"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="condition2", doc="No change", default="no", propertie
 option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file1")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file1")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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,10 +7,34 @@
         "owner": "default",
         "value": "yes"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -1,7 +1,13 @@
 {
     "rougail.general.condition": "yes",
     "rougail.general.condition2": "yes",
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": false,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -7,10 +7,34 @@
         "owner": "default",
         "value": "yes"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="condition2", doc="No change", default="yes", properti
 option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file1")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file1")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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,10 +7,34 @@
         "owner": "default",
         "value": "yes"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -1,7 +1,13 @@
 {
     "rougail.general.condition": "no",
     "rougail.general.condition2": "yes",
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": false,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -7,10 +7,34 @@
         "owner": "default",
         "value": "yes"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="condition2", doc="No change", default="yes", properti
 option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe"), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("yes")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file1")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file1")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["yes", "maybe"]), 'reverse_condition_0': ParamValue(True), 'condition_operator': ParamValue("OR"), 'condition_1': ParamOption(option_4, notraisepropertyerror=True), 'expected_1': ParamValue(["yes", "maybe"])})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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,10 +3,34 @@
         "owner": "default",
         "value": "oui"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -1,6 +1,12 @@
 {
     "rougail.general.condition": "oui",
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": false,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -3,10 +3,34 @@
         "owner": "default",
         "value": "oui"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non"
 option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("maybe")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file1")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file1")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(["oui", "maybe"]), 'condition_operator': ParamValue("OR")})))
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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,10 +7,34 @@
         "owner": "default",
         "value": "no"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -1,7 +1,13 @@
 {
     "rougail.general.condition": "no",
     "rougail.general.disable_variable": "no",
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -7,10 +7,34 @@
         "owner": "default",
         "value": "no"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -15,13 +15,18 @@ option_3 = StrOption(name="condition", doc="No change", default="no", properties
 option_4 = StrOption(name="disable_variable", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_9 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_9 = StrOption(name="engine", doc="engine", default="creole")
-option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_10 = StrOption(name="group", doc="group", default="root")
-option_8 = OptionDescription(name="file1", doc="file1", children=[option_9, option_10])
+option_11 = StrOption(name="included", doc="included", default="no")
-option_8.impl_set_information('source', "file1")
+option_12 = StrOption(name="mode", doc="mode", default="0644")
+option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_14 = StrOption(name="owner", doc="owner", default="root")
+option_15 = StrOption(name="source", doc="source", default="file1")
+option_16 = BoolOption(name="activate", doc="activate", default=True)
+option_8 = OptionDescription(name="file1", doc="file1", children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15, option_16])
 option_7 = OptionDescription(name="files", doc="files", children=[option_8])
-option_11 = BoolOption(name="activate", doc="activate", default=True)
+option_17 = BoolOption(name="activate", doc="activate", default=True)
-option_12 = BoolOption(name="manage", doc="manage", default=True)
+option_18 = 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", doc="test", children=[option_7, option_17, option_18])
 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,10 +11,34 @@
         "owner": "default",
         "value": true
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true

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

@@ -2,7 +2,13 @@
     "rougail.general.condition": "non",
     "rougail.general.mode_conteneur_actif": "non",
     "rougail.general.mode_conteneur_actif2": true,
+    "services.test.files.file.engine": "creole",
+    "services.test.files.file.group": "root",
+    "services.test.files.file.included": "no",
+    "services.test.files.file.mode": "0644",
     "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.owner": "root",
+    "services.test.files.file.source": "file",
     "services.test.files.file.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -11,10 +11,34 @@
         "owner": "default",
         "value": true
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": true

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non"
 option_5 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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,10 +3,34 @@
         "owner": "default",
         "value": true
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -1,6 +1,12 @@
 {
     "rougail.general.condition": true,
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": false,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -3,10 +3,34 @@
         "owner": "default",
         "value": true
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": false

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

@@ -14,13 +14,18 @@ except:
 option_3 = BoolOption(name="condition", doc="condition", default=True, properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_8 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_8 = StrOption(name="engine", doc="engine", default="creole")
-option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(True)})))
+option_9 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="file1", doc="file1", children=[option_8, option_9])
+option_10 = StrOption(name="included", doc="included", default="no")
-option_7.impl_set_information('source', "file1")
+option_11 = StrOption(name="mode", doc="mode", default="0644")
+option_12 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_13 = StrOption(name="owner", doc="owner", default="root")
+option_14 = StrOption(name="source", doc="source", default="file1")
+option_15 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(True)})))
+option_7 = OptionDescription(name="file1", doc="file1", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_6 = OptionDescription(name="files", doc="files", children=[option_7])
-option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = BoolOption(name="activate", doc="activate", default=True)
-option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_17 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11])
+option_5 = OptionDescription(name="test", doc="test", 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/11disabled_if_in_filelist_boolean2/makedict/after.json

@@ -3,10 +3,34 @@
         "owner": "default",
         "value": false
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -1,6 +1,12 @@
 {
     "rougail.general.condition": false,
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -3,10 +3,34 @@
         "owner": "default",
         "value": false
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true

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

@@ -14,13 +14,18 @@ except:
 option_3 = BoolOption(name="condition", doc="condition", default=False, properties=frozenset({"mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_8 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_8 = StrOption(name="engine", doc="engine", default="creole")
-option_9 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(True)})))
+option_9 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="file1", doc="file1", children=[option_8, option_9])
+option_10 = StrOption(name="included", doc="included", default="no")
-option_7.impl_set_information('source', "file1")
+option_11 = StrOption(name="mode", doc="mode", default="0644")
+option_12 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_13 = StrOption(name="owner", doc="owner", default="root")
+option_14 = StrOption(name="source", doc="source", default="file1")
+option_15 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue(True)})))
+option_7 = OptionDescription(name="file1", doc="file1", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_6 = OptionDescription(name="files", doc="files", children=[option_7])
-option_10 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = BoolOption(name="activate", doc="activate", default=True)
-option_11 = BoolOption(name="manage", doc="manage", default=True)
+option_17 = BoolOption(name="manage", doc="manage", default=True)
-option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11])
+option_5 = OptionDescription(name="test", doc="test", 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/11disabled_if_in_filelist_disabled/makedict/after.json

@@ -3,10 +3,34 @@
         "owner": "default",
         "value": "oui"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": false

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

@@ -1,6 +1,12 @@
 {
     "rougail.general.condition": "oui",
+    "services.test.files.file.engine": "creole",
+    "services.test.files.file.group": "root",
+    "services.test.files.file.included": "no",
+    "services.test.files.file.mode": "0644",
     "services.test.files.file.name": "/etc/file",
+    "services.test.files.file.owner": "root",
+    "services.test.files.file.source": "file",
     "services.test.files.file.activate": false,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -3,10 +3,34 @@
         "owner": "default",
         "value": "oui"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/etc/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": false

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non"
 option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/etc/file")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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_multi/makedict/after.json

@@ -11,18 +11,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/tmp/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true

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

@@ -2,9 +2,21 @@
     "rougail.general.condition": "non",
     "rougail.general.mode_conteneur_actif": "non",
     "rougail.general.mode_conteneur_actif2": "non",
+    "services.test.files.file1.engine": "creole",
+    "services.test.files.file1.group": "root",
+    "services.test.files.file1.included": "no",
+    "services.test.files.file1.mode": "0644",
     "services.test.files.file1.name": "/tmp/file1",
+    "services.test.files.file1.owner": "root",
+    "services.test.files.file1.source": "file1",
     "services.test.files.file1.activate": true,
+    "services.test.files.file2.engine": "creole",
+    "services.test.files.file2.group": "root",
+    "services.test.files.file2.included": "no",
+    "services.test.files.file2.mode": "0644",
     "services.test.files.file2.name": "/tmp/file2",
+    "services.test.files.file2.owner": "root",
+    "services.test.files.file2.source": "file2",
     "services.test.files.file2.activate": true,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -11,18 +11,66 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file1.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file1.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file1.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file1.name": {
         "owner": "default",
         "value": "/tmp/file1"
     },
+    "services.test.files.file1.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file1.source": {
+        "owner": "default",
+        "value": "file1"
+    },
     "services.test.files.file1.activate": {
         "owner": "default",
         "value": true
     },
+    "services.test.files.file2.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file2.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file2.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file2.name": {
         "owner": "default",
         "value": "/tmp/file2"
     },
+    "services.test.files.file2.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file2.source": {
+        "owner": "default",
+        "value": "file2"
+    },
     "services.test.files.file2.activate": {
         "owner": "default",
         "value": true

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

@@ -16,17 +16,27 @@ option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non"
 option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True, notraisepropertyerror=True), 'expected': ParamValue("oui")}))}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/tmp/file1")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file1")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
-option_13 = FilenameOption(name="name", doc="name", default="/tmp/file2")
+option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
-option_14 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_15 = StrOption(name="owner", doc="owner", default="root")
-option_12 = OptionDescription(name="file2", doc="file2", children=[option_13, option_14])
+option_16 = StrOption(name="source", doc="source", default="file1")
-option_12.impl_set_information('source', "file2")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
-option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_12])
+option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
-option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_19 = StrOption(name="engine", doc="engine", default="creole")
-option_16 = BoolOption(name="manage", doc="manage", default=True)
+option_20 = StrOption(name="group", doc="group", default="root")
-option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_15, option_16])
+option_21 = StrOption(name="included", doc="included", default="no")
+option_22 = StrOption(name="mode", doc="mode", default="0644")
+option_23 = FilenameOption(name="name", doc="name", default="/tmp/file2")
+option_24 = StrOption(name="owner", doc="owner", default="root")
+option_25 = StrOption(name="source", doc="source", default="file2")
+option_26 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("oui")})))
+option_18 = OptionDescription(name="file2", doc="file2", children=[option_19, option_20, option_21, option_22, option_23, option_24, option_25, option_26])
+option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_18])
+option_27 = BoolOption(name="activate", doc="activate", default=True)
+option_28 = BoolOption(name="manage", doc="manage", default=True)
+option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_27, option_28])
 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/11disabledifin_filelist_notexist/makedict/after.json

@@ -11,10 +11,34 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/tmp/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": false

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

@@ -2,7 +2,13 @@
     "rougail.general.condition": "non",
     "rougail.general.mode_conteneur_actif": "non",
     "rougail.general.mode_conteneur_actif2": "non",
+    "services.test.files.file.engine": "creole",
+    "services.test.files.file.group": "root",
+    "services.test.files.file.included": "no",
+    "services.test.files.file.mode": "0644",
     "services.test.files.file.name": "/tmp/file",
+    "services.test.files.file.owner": "root",
+    "services.test.files.file.source": "file",
     "services.test.files.file.activate": false,
     "services.test.activate": true,
     "services.test.manage": true

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

@@ -11,10 +11,34 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/tmp/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": false

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

@@ -16,13 +16,18 @@ option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non"
 option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_10 = FilenameOption(name="name", doc="name", default="/tmp/file")
+option_10 = StrOption(name="engine", doc="engine", default="creole")
-option_11 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)})))
+option_11 = StrOption(name="group", doc="group", default="root")
-option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11])
+option_12 = StrOption(name="included", doc="included", default="no")
-option_9.impl_set_information('source', "file")
+option_13 = StrOption(name="mode", doc="mode", default="0644")
+option_14 = FilenameOption(name="name", doc="name", default="/tmp/file")
+option_15 = StrOption(name="owner", doc="owner", default="root")
+option_16 = StrOption(name="source", doc="source", default="file")
+option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, notraisepropertyerror=True), 'expected_0': ParamValue("unpossible"), 'reverse_condition_0': ParamValue(True)})))
+option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_8 = OptionDescription(name="files", doc="files", children=[option_9])
-option_12 = BoolOption(name="activate", doc="activate", default=True)
+option_18 = BoolOption(name="activate", doc="activate", default=True)
-option_13 = BoolOption(name="manage", doc="manage", default=True)
+option_19 = 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", doc="test", children=[option_8, option_18, option_19])
 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/11disabledifnotin_filelist_notexist/makedict/after.json

@@ -11,10 +11,34 @@
         "owner": "default",
         "value": "non"
     },
+    "services.test.files.file.engine": {
+        "owner": "default",
+        "value": "creole"
+    },
+    "services.test.files.file.group": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.included": {
+        "owner": "default",
+        "value": "no"
+    },
+    "services.test.files.file.mode": {
+        "owner": "default",
+        "value": "0644"
+    },
     "services.test.files.file.name": {
         "owner": "default",
         "value": "/tmp/file"
     },
+    "services.test.files.file.owner": {
+        "owner": "default",
+        "value": "root"
+    },
+    "services.test.files.file.source": {
+        "owner": "default",
+        "value": "file"
+    },
     "services.test.files.file.activate": {
         "owner": "default",
         "value": false