check owner, deployed_service and various improvment

doc/variable/simple.md

@@ -198,12 +198,12 @@ Une [variable meneuse ou suiveuse](leadership.md) ne peut pas avoir la propriét
 
 ## Variable à valeur en lecture seule automatique
 
-Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand la [variable "instanciated_module" passe à "True"](../dev/config.md).
+Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand la [variable "server_deployed" passe à "True"](../dev/config.md).
 
 Voici un variable à valeur en lecture seule automatique :
 
 ```
-<variable name="instanciated_module" type="boolean">
+<variable name="server_deployed" type="boolean">
     <value>False</value>
 </variable>
 <variable name="my_variable" auto_freeze="True"/>

src/rougail/annotator/check.py

@@ -165,11 +165,10 @@ class CheckAnnotator(TargetAnnotator, ParamAnnotator):
             variable.values.append(choice)
         if has_variable:
             return None
-        for target in check.target:
+        self.objectspace.valid_enums[variable.path] = {'type': variable.ori_type,
-            self.objectspace.valid_enums[target.name.path] = {'type': variable.ori_type,
+                                                       'values': values,
-                                                              'values': values,
+                                                       'xmlfiles': check.xmlfiles,
-                                                              'xmlfiles': check.xmlfiles,
+                                                       }
-                                                              }
         return values
 
     @staticmethod

src/rougail/annotator/condition.py

@@ -77,11 +77,11 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
             if variable.namespace != self.objectspace.rougailconfig['variable_namespace']:
                 msg = _(f'auto_freeze is not allowed in extra "{variable.namespace}"')
                 raise DictConsistencyError(msg, 49, variable.xmlfiles)
+            variable.force_store_value = True
+            if variable.auto_save:
+                continue
             new_condition = self.objectspace.condition(variable.xmlfiles)
-            if variable.auto_freeze:
+            new_condition.name = 'auto_frozen_if_not_in'
-                new_condition.name = 'auto_frozen_if_not_in'
-            else:
-                new_condition.name = 'auto_saved_if_not_in'
             new_condition.namespace = variable.namespace
             new_condition.source = self.objectspace.rougailconfig['auto_freeze_variable']
             new_param = self.objectspace.param(variable.xmlfiles)
@@ -150,9 +150,7 @@ class ConditionAnnotator(TargetAnnotator, ParamAnnotator, Walk):
         if condition_name.startswith('hidden_if_'):
             return ['hidden', 'frozen', 'force_default_on_freeze']
         if condition_name == 'auto_frozen_if_not_in':
-            return ['force_store_value', 'frozen']
+            return ['frozen']
-        if condition_name == 'auto_saved_if_not_in':
-            return ['force_store_value']
         return [condition_name.split('_', 1)[0]]
 
     def _get_family_variables_from_target(self,

src/rougail/annotator/group.py

@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 from ..i18n import _
 from ..error import DictConsistencyError
+from ..utils import normalize_family
 
 
 class GroupAnnotator:
@@ -83,7 +84,7 @@ class GroupAnnotator:
                                          leader_space,
                                          )
                     # this variable is not more in ori_leader_family
-                    ori_leader_family.variable.pop(variable.name)
+                    ori_leader_family.variable.pop(normalize_family(variable.name))
                     if follower_names == []:
                         # no more follower
                         break
@@ -104,9 +105,10 @@ class GroupAnnotator:
             msg = _(f'the variable "{variable.name}" in a group must be multi')
             raise DictConsistencyError(msg, 32, variable.xmlfiles)
         if hasattr(group, 'name'):
-            leadership_name = group.name
+            ori_leadership_name = group.name
         else:
-            leadership_name = variable.name
+            ori_leadership_name = variable.name
+        leadership_name = normalize_family(ori_leadership_name)
         leader_space = self.objectspace.leadership(variable.xmlfiles)
         leader_space.variable = []
         leader_space.name = leadership_name
@@ -120,18 +122,18 @@ class GroupAnnotator:
         elif variable.name == leadership_name and hasattr(variable, 'description'):
             leader_space.doc = variable.description
         else:
-            leader_space.doc = leadership_name
+            leader_space.doc = ori_leadership_name
         leadership_path = ori_leader_family.path + '.' + leadership_name
         self.objectspace.paths.add_leadership(variable.namespace,
                                               leadership_path,
                                               leader_space,
                                               )
-        ori_leader_family.variable[variable.name] = leader_space
+        ori_leader_family.variable[normalize_family(variable.name)] = leader_space
         leader_space.variable.append(variable)
         self.objectspace.paths.set_leader(variable.namespace,
                                           ori_leader_family.path,
                                           leadership_name,
-                                          variable.name,
+                                          normalize_family(variable.name),
                                           )
         return leader_space
 
@@ -150,7 +152,7 @@ class GroupAnnotator:
         self.objectspace.paths.set_leader(variable.namespace,
                                           leader_family_name,
                                           leader_space.name,
-                                          variable.name,
+                                          normalize_family(variable.name),
                                           )
         if leader_space.hidden:
             variable.frozen = True

src/rougail/annotator/param.py

@@ -64,6 +64,7 @@ class ParamAnnotator:
                         try:
                             path, suffix = self.objectspace.paths.get_variable_path(param.text,
                                                                                     obj.namespace,
+                                                                                    param.xmlfiles,
                                                                                     )
                             param.text = self.objectspace.paths.get_variable(path)
                             if variable_type and param.text.type != variable_type:

src/rougail/annotator/property.py

@@ -71,7 +71,7 @@ class PropertyAnnotator(Walk):
         if 'force_store_value' in variable.properties and \
                 'force_default_on_freeze' in variable.properties:  # pragma: no cover
             # should not appened
-            msg = _('cannot have auto_freeze or auto_store with the hidden '
+            msg = _('cannot have auto_freeze or auto_save with the hidden '
                     f'variable "{variable.name}"')
             raise DictConsistencyError(msg, 50, variable.xmlfiles)
         if not variable.properties:

src/rougail/annotator/service.py

@@ -292,9 +292,9 @@ class ServiceAnnotator:
                     'please use a variable multiple if you want have more than one IP')
             raise DictConsistencyError(msg, 67, ip.xmlfiles)
         self.uniq_ip.append(service_name)
-        variable = self.objectspace.paths.get_variable(ip.name)
+        variable = self.objectspace.paths.get_variable(ip.name, ip.xmlfiles)
         if variable.type not in ['ip', 'network', 'network_cidr']:
-            msg = _('ip cannot be linked to "{variable.type}" variable')
+            msg = _(f'ip cannot be linked to "{variable.type}" variable "{ip.name}"')
             raise DictConsistencyError(msg, 70, ip.xmlfiles)
         if variable.type in ['ip', 'network_cidr'] and hasattr(ip, 'netmask'):
             msg = _(f'ip with ip_type "{variable.type}" must not have netmask')

src/rougail/annotator/variable.py

@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from ..i18n import _
 from ..error import DictConsistencyError
 from ..objspace import convert_boolean
+from ..utils import normalize_family
 
 
 CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
@@ -170,6 +171,7 @@ class VariableAnnotator(Walk):  # pylint: disable=R0903
             if not variable.value:
                 del variable.value
         variable.doc = variable.description
+        variable.name = normalize_family(variable.name)
         del variable.description
         if variable_type == 'follower':
             if variable.multi is True:

src/rougail/config.py

@@ -41,7 +41,7 @@ RougailConfig = {'dictionaries_dir': [join(ROUGAILROOT, 'dictionaries')],
                  'dtdfilename': join(DTDDIR, 'rougail.dtd'),
                  'functions_file': join(ROUGAILROOT, 'functions.py'),
                  'variable_namespace': 'rougail',
-                 'auto_freeze_variable': 'instanciated_module',
+                 'auto_freeze_variable': 'server_deployed',
                  'default_engine': 'creole',
                  'internal_functions': [],
                  'modes_level': ['basic', 'normal', 'expert'],

src/rougail/data/rougail.dtd

@@ -37,7 +37,7 @@
 <!-- root element    -->
 <!-- =============== -->
 
-<!ELEMENT rougail (services|variables|constraints|help)*>
+<!ELEMENT rougail (services|variables|constraints)*>
 <!ATTLIST rougail version (0.9) #REQUIRED>
 
 <!-- ============== -->

src/rougail/objspace.py

@@ -328,7 +328,7 @@ class RougailObjSpace:
         if redefine is True:
             # cannot redefine an inexistant object
             msg = _(f'Redefined object: "{name}" does not exist yet')
-            raise DictConsistencyError(msg, 46, xmlfile)
+            raise DictConsistencyError(msg, 46, [xmlfile])
         tag = FORCE_TAG.get(child.tag, child.tag)
         if tag not in vars(space):
             setattr(space, tag, {})
@@ -352,7 +352,7 @@ class RougailObjSpace:
                 return None
             old_family_name = self.paths.get_variable_family_path(name)
             if space.path != old_family_name:
-                msg = _(f'Variable was previously create in family "{old_family_name}", '
+                msg = _(f'Variable "{name}" was previously create in family "{old_family_name}", '
                         f'now it is in "{space.path}"')
                 raise DictConsistencyError(msg, 47, space.xmlfiles)
             return self.paths.get_variable(name)

src/rougail/path.py

@@ -24,6 +24,7 @@ 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 typing import List
 from .i18n import _
 from .error import DictConsistencyError
 from .utils import normalize_family
@@ -175,10 +176,11 @@ class Path:
 
     def get_variable(self,
                      name: str,
+                     xmlfiles: List[str]=[],
                      ) -> 'Variable':  # pylint: disable=C0111
         """Get variable object from a path
         """
-        variable, suffix = self._get_variable(name, with_suffix=True)
+        variable, suffix = self._get_variable(name, with_suffix=True, xmlfiles=xmlfiles)
         if suffix:
             raise DictConsistencyError(_(f"{name} is a dynamic variable"), 36, [])
         return variable['variableobj']
@@ -193,18 +195,20 @@ class Path:
     def get_variable_path(self,
                           name: str,
                           current_namespace: str,
+                          xmlfiles: List[str]=[],
                           ) -> str:  # pylint: disable=C0111
         """get full path of a variable
         """
         dico, suffix = self._get_variable(name,
                                           with_suffix=True,
+                                          xmlfiles=xmlfiles,
                                           )
         namespace = dico['variableobj'].namespace
         if namespace not in [self.variable_namespace, 'services'] and \
                 current_namespace != namespace:
             msg = _(f'A variable located in the "{namespace}" namespace shall not be used '
                     f'in the "{current_namespace}" namespace')
-            raise DictConsistencyError(msg, 41, [])
+            raise DictConsistencyError(msg, 41, xmlfiles)
         return dico['variableobj'].path, suffix
 
     def path_is_defined(self,
@@ -226,6 +230,7 @@ class Path:
     def _get_variable(self,
                       name: str,
                       with_suffix: bool=False,
+                      xmlfiles: List[str]=[],
                       ) -> str:
         name = '.'.join([normalize_family(subname) for subname in name.split('.')])
         if name not in self.variables:
@@ -238,7 +243,7 @@ class Path:
                         if variable['is_dynamic']:
                             return variable, name[len(var_name):]
         if name not in self.variables:
-            raise DictConsistencyError(_(f'unknown option {name}'), 42, [])
+            raise DictConsistencyError(_(f'unknown option "{name}"'), 42, xmlfiles)
         if with_suffix:
             return self.variables[name], None
         return self.variables[name]

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

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

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

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

tests/dictionaries/00load_autofreeze/00-base.xml

@@ -4,7 +4,7 @@
         <variable name="myvar" auto_freeze="True">
             <value>no</value>
         </variable>
-        <variable name="instanciated_module" type="boolean">
+        <variable name="server_deployed" type="boolean">
             <value>False</value>
         </variable>
     </variables>

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

@@ -0,0 +1,10 @@
+{
+    "rougail.myvar": {
+        "owner": "forced",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}

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

@@ -1,4 +1,4 @@
 {
     "rougail.myvar": "no",
-    "rougail.instanciated_module": false
+    "rougail.server_deployed": false
 }

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

@@ -0,0 +1,10 @@
+{
+    "rougail.myvar": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}

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

@@ -11,7 +11,7 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_3 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"mandatory", "normal"}))
+option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
-option_2 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "mandatory", Calculation(func.calc_value, Params(ParamValue('force_store_value'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_2 = StrOption(name="myvar", doc="myvar", default="no", properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/00load_autofreezeexpert/00-base.xml

@@ -4,7 +4,7 @@
         <variable name="my_var" auto_freeze="True" mode="expert">
             <value>no</value>
         </variable>
-        <variable name="instanciated_module" type="boolean">
+        <variable name="server_deployed" type="boolean">
             <value>False</value>
         </variable>
     </variables>

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

@@ -0,0 +1,10 @@
+{
+    "rougail.my_var": {
+        "owner": "forced",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}

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

@@ -1,4 +1,4 @@
 {
     "rougail.my_var": "no",
-    "rougail.instanciated_module": false
+    "rougail.server_deployed": false
 }

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

@@ -0,0 +1,10 @@
+{
+    "rougail.my_var": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}

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

@@ -11,7 +11,7 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_3 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"mandatory", "normal"}))
+option_3 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
-option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "mandatory", Calculation(func.calc_value, Params(ParamValue('force_store_value'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_2 = StrOption(name="my_var", doc="my_var", default="no", properties=frozenset({"expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/00load_autosave/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <variable name="instanciated_module" type="boolean"/>
+        <variable name="server_deployed" type="boolean"/>
         <family name="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
                 <value>non</value>

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

@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "forced",
+        "value": "non"
+    }
+}

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

@@ -1,4 +1,4 @@
 {
-    "rougail.instanciated_module": true,
+    "rougail.server_deployed": true,
     "rougail.general.mode_conteneur_actif": "non"
 }

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

@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}

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

@@ -11,8 +11,8 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_2 = BoolOption(name="instanciated_module", doc="instanciated_module", default=True, properties=frozenset({"mandatory", "normal"}))
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))
-option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "mandatory", Calculation(func.calc_value, Params(ParamValue('force_store_value'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"basic", "force_store_value", "mandatory"}))
 option_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"basic"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/00load_autosaveexpert/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <variable name="instanciated_module" type="boolean"/>
+        <variable name="server_deployed" type="boolean"/>
         <family name="général">
             <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True" mode="expert">
                 <value>non</value>

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

@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "forced",
+        "value": "non"
+    }
+}

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

@@ -1,4 +1,4 @@
 {
-    "rougail.instanciated_module": true,
+    "rougail.server_deployed": true,
     "rougail.general.mode_conteneur_actif": "non"
 }

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

@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    }
+}

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

@@ -11,8 +11,8 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_2 = BoolOption(name="instanciated_module", doc="instanciated_module", default=True, properties=frozenset({"mandatory", "normal"}))
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=True, properties=frozenset({"mandatory", "normal"}))
-option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory", Calculation(func.calc_value, Params(ParamValue('force_store_value'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "force_store_value", "mandatory"}))
 option_3 = OptionDescription(name="general", doc="général", children=[option_4], properties=frozenset({"expert"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

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

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

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

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

@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.without_type": {
+        "owner": "default",
+        "value": "non"
+    }
+}

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

@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.without_type": {
+        "owner": "default",
+        "value": "non"
+    }
+}

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

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

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

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

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

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

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

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

tests/dictionaries/01auto_autofreeze/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <variable name="instanciated_module" type="boolean">
+        <variable name="server_deployed" type="boolean">
             <value>no</value>
         </variable>
         <variable name="my_variable" auto_freeze="True" hidden="True">

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

@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    },
+    "rougail.my_variable": {
+        "owner": "forced",
+        "value": "yes"
+    }
+}

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

@@ -1,4 +1,4 @@
 {
-    "rougail.instanciated_module": false,
+    "rougail.server_deployed": false,
     "rougail.my_variable": "yes"
 }

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

@@ -0,0 +1,10 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    },
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": "yes"
+    }
+}

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

@@ -11,7 +11,7 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_2 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"mandatory", "normal"}))
+option_2 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
-option_3 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "hidden", Calculation(func.calc_value, Params(ParamValue('force_store_value'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_3 = StrOption(name="my_variable", doc="my_variable", default=Calculation(func.calc_val, Params((ParamValue("yes")))), properties=frozenset({"basic", "force_store_value", "hidden", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_2, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.domain": {
+        "owner": "default",
+        "value": "my.domain.name"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.domain": {
+        "owner": "default",
+        "value": "my.domain.name"
+    }
+}

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

@@ -0,0 +1,78 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,78 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,78 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,78 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,110 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,110 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,110 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,110 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,78 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,78 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,78 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,78 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "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
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,12 @@
+{
+    "rougail.general.float": {
+        "owner": "default",
+        "value": 0.527
+    },
+    "rougail.general.float_multi": {
+        "owner": "default",
+        "value": [
+            0.527
+        ]
+    }
+}

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

@@ -0,0 +1,12 @@
+{
+    "rougail.general.float": {
+        "owner": "default",
+        "value": 0.527
+    },
+    "rougail.general.float_multi": {
+        "owner": "default",
+        "value": [
+            0.527
+        ]
+    }
+}

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

@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": null
+    }
+}

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

@@ -0,0 +1,10 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": null
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": null
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "non"
+        ]
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote\""
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote\""
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'\""
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'\""
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote\\\"\\'"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote\\\"\\'"
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote\""
+        ]
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote\""
+        ]
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote'\""
+        ]
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote'\""
+        ]
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote'"
+        ]
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": [
+            "quote'"
+        ]
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "quote'"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.general": {
+        "owner": "default",
+        "value": "non"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.general.general": {
+        "owner": "default",
+        "value": "non"
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": true
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+    "rougail.my_variable": {
+        "owner": "default",
+        "value": true
+    }
+}

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

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

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

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

tests/dictionaries/01fill_autofreeze/00-base.xml

@@ -7,7 +7,7 @@
         <variable name="my_var2">
             <value>no</value>
         </variable>
-        <variable name="instanciated_module" type="boolean">
+        <variable name="server_deployed" type="boolean">
             <value>False</value>
         </variable>
     </variables>

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

@@ -0,0 +1,14 @@
+{
+    "rougail.my_var1": {
+        "owner": "forced",
+        "value": "no"
+    },
+    "rougail.my_var2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}

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

@@ -1,5 +1,5 @@
 {
     "rougail.my_var1": "no",
     "rougail.my_var2": "no",
-    "rougail.instanciated_module": false
+    "rougail.server_deployed": false
 }

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

@@ -0,0 +1,14 @@
+{
+    "rougail.my_var1": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.my_var2": {
+        "owner": "default",
+        "value": "no"
+    },
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": false
+    }
+}

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

@@ -12,7 +12,7 @@ try:
 except:
     from tiramisu import *
 option_3 = StrOption(name="my_var2", doc="my_var2", default="no", properties=frozenset({"mandatory", "normal"}))
-option_4 = BoolOption(name="instanciated_module", doc="instanciated_module", default=False, properties=frozenset({"mandatory", "normal"}))
+option_4 = BoolOption(name="server_deployed", doc="server_deployed", default=False, properties=frozenset({"mandatory", "normal"}))
-option_2 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"basic", Calculation(func.calc_value, Params(ParamValue('force_store_value'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
+option_2 = StrOption(name="my_var1", doc="my_var1", default=Calculation(func.calc_val, Params((ParamOption(option_3)))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue(True), 'reverse_condition': ParamValue(True)}))}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/01fill_autosave/00-base.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail version="0.9">
     <variables>
-        <variable name="instanciated_module" type="boolean"/>
+        <variable name="server_deployed" type="boolean"/>
         <family name="general">
             <variable name="mode_conteneur_actif" type="string" description="No change" auto_save="True">
                 <value>non</value>

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

@@ -0,0 +1,14 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "forced",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}

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

@@ -1,5 +1,5 @@
 {
-    "rougail.instanciated_module": true,
+    "rougail.server_deployed": true,
     "rougail.general.mode_conteneur_actif": "non",
     "rougail.general.mode_conteneur_actif1": "non"
 }

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

@@ -0,0 +1,14 @@
+{
+    "rougail.server_deployed": {
+        "owner": "default",
+        "value": true
+    },
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.mode_conteneur_actif1": {
+        "owner": "default",
+        "value": "non"
+    }
+}