From 02f9e5091ee77d4a5d245649eb3e3019bc743f3d Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sun, 4 Oct 2020 15:11:44 +0200
Subject: [PATCH] dynamic variable and calculation

---
 doc/auto.rst                                  |  23 ++
 doc/fill.rst                                  | 277 ++++++++++++++++++
 doc/variable.rst                              |  13 +
 src/rougail/annotator.py                      |  22 +-
 src/rougail/data/rougail.dtd                  |   2 +-
 src/rougail/path.py                           |   4 +
 src/rougail/tiramisureflector.py              |   4 +-
 tests/flattener_dicos/01fill_base/00-base.xml |   4 +-
 .../01fill_base/tiramisu/base.py              |   2 +-
 .../01fill_base_hidden/00-base.xml            |  28 ++
 .../__init__.py                               |   0
 .../01fill_base_hidden/makedict/base.json     |   1 +
 .../tiramisu/__init__.py                      |   0
 .../01fill_base_hidden/tiramisu/base.py       |   9 +
 .../01fill_information/tiramisu/base.py       |   2 +-
 .../01fill_information_unknown/00-base.xml    |  23 ++
 .../__init__.py                               |   0
 .../makedict/base.json                        |   1 +
 .../tiramisu/__init__.py                      |   0
 .../tiramisu/base.py                          |   8 +
 .../01fill_number/tiramisu/base.py            |   2 +-
 .../10autosave_hidden/tiramisu/base.py        |   2 +-
 .../tiramisu/base.py                          |   2 +-
 .../10leadership_append/tiramisu/base.py      |   2 +-
 .../10leadership_auto/tiramisu/base.py        |   2 +-
 .../10leadership_autoleader/tiramisu/base.py  |   2 +-
 .../tiramisu/base.py                          |   2 +-
 .../tiramisu/base.py                          |   2 +-
 .../tiramisu/base.py                          |   2 +-
 .../tiramisu/base.py                          |   2 +-
 .../tiramisu/base.py                          |   2 +-
 .../10leadership_multi/tiramisu/base.py       |   2 +-
 .../10load_leadership/tiramisu/base.py        |   2 +-
 .../tiramisu/base.py                          |   2 +-
 .../tiramisu/base.py                          |   2 +-
 .../10valid_enum_variable/tiramisu/base.py    |   2 +-
 .../00-base.xml                               |   0
 .../__init__.py                               |   0
 .../makedict/base.json                        |   0
 .../tiramisu/__init__.py                      |   0
 .../tiramisu/base.py                          |   0
 .../20family_dynamic_fill_dynamic/00-base.xml |  25 ++
 .../20family_dynamic_fill_dynamic/__init__.py |   0
 .../makedict/base.json                        |   1 +
 .../tiramisu/__init__.py                      |   0
 .../tiramisu/base.py                          |  12 +
 .../00-base.xml                               |  25 ++
 .../__init__.py                               |   0
 .../makedict/base.json                        |   1 +
 .../tiramisu/__init__.py                      |   0
 .../tiramisu/base.py                          |  12 +
 .../00-base.xml                               |   0
 .../30mandatory_withoutvalue_fill/__init__.py |   0
 .../makedict/base.json                        |   0
 .../tiramisu/__init__.py                      |   0
 .../tiramisu/base.py                          |   2 +-
 .../00-base.xml                               |   0
 .../30mandatory_withvalue_fill/__init__.py    |   0
 .../makedict/base.json                        |   0
 .../tiramisu/__init__.py                      |   0
 .../tiramisu/base.py                          |   2 +-
 .../40ifin_leadershipauto/tiramisu/base.py    |   2 +-
 .../60action_external/tiramisu/base.py        |   2 +-
 .../00-base.xml                               |  25 ++
 .../__init__.py                               |   0
 .../80family_dynamic_with_suffix/00-base.xml  |  25 ++
 .../80family_dynamic_with_suffix/__init__.py  |   0
 67 files changed, 553 insertions(+), 36 deletions(-)
 create mode 100644 doc/auto.rst
 create mode 100644 doc/fill.rst
 create mode 100644 doc/variable.rst
 create mode 100644 tests/flattener_dicos/01fill_base_hidden/00-base.xml
 rename tests/flattener_dicos/{20family_dynamic_calc => 01fill_base_hidden}/__init__.py (100%)
 create mode 100644 tests/flattener_dicos/01fill_base_hidden/makedict/base.json
 rename tests/flattener_dicos/{20family_dynamic_calc => 01fill_base_hidden}/tiramisu/__init__.py (100%)
 create mode 100644 tests/flattener_dicos/01fill_base_hidden/tiramisu/base.py
 create mode 100644 tests/flattener_dicos/01fill_information_unknown/00-base.xml
 rename tests/flattener_dicos/{30mandatory_withoutvaluecalc => 01fill_information_unknown}/__init__.py (100%)
 create mode 100644 tests/flattener_dicos/01fill_information_unknown/makedict/base.json
 rename tests/flattener_dicos/{30mandatory_withoutvaluecalc => 01fill_information_unknown}/tiramisu/__init__.py (100%)
 create mode 100644 tests/flattener_dicos/01fill_information_unknown/tiramisu/base.py
 rename tests/flattener_dicos/{20family_dynamic_calc => 20family_dynamic_fill}/00-base.xml (100%)
 rename tests/flattener_dicos/{30mandatory_withvaluecalc => 20family_dynamic_fill}/__init__.py (100%)
 rename tests/flattener_dicos/{20family_dynamic_calc => 20family_dynamic_fill}/makedict/base.json (100%)
 rename tests/flattener_dicos/{30mandatory_withvaluecalc => 20family_dynamic_fill}/tiramisu/__init__.py (100%)
 rename tests/flattener_dicos/{20family_dynamic_calc => 20family_dynamic_fill}/tiramisu/base.py (100%)
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic/00-base.xml
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic/__init__.py
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic/makedict/base.json
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic/tiramisu/__init__.py
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic/tiramisu/base.py
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/00-base.xml
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/__init__.py
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/makedict/base.json
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/tiramisu/__init__.py
 create mode 100644 tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/tiramisu/base.py
 rename tests/flattener_dicos/{30mandatory_withoutvaluecalc => 30mandatory_withoutvalue_fill}/00-base.xml (100%)
 create mode 100644 tests/flattener_dicos/30mandatory_withoutvalue_fill/__init__.py
 rename tests/flattener_dicos/{30mandatory_withoutvaluecalc => 30mandatory_withoutvalue_fill}/makedict/base.json (100%)
 create mode 100644 tests/flattener_dicos/30mandatory_withoutvalue_fill/tiramisu/__init__.py
 rename tests/flattener_dicos/{30mandatory_withoutvaluecalc => 30mandatory_withoutvalue_fill}/tiramisu/base.py (73%)
 rename tests/flattener_dicos/{30mandatory_withvaluecalc => 30mandatory_withvalue_fill}/00-base.xml (100%)
 create mode 100644 tests/flattener_dicos/30mandatory_withvalue_fill/__init__.py
 rename tests/flattener_dicos/{30mandatory_withvaluecalc => 30mandatory_withvalue_fill}/makedict/base.json (100%)
 create mode 100644 tests/flattener_dicos/30mandatory_withvalue_fill/tiramisu/__init__.py
 rename tests/flattener_dicos/{30mandatory_withvaluecalc => 30mandatory_withvalue_fill}/tiramisu/base.py (68%)
 create mode 100644 tests/flattener_dicos/80family_dynamic_fill_dynamic_suffix_value/00-base.xml
 create mode 100644 tests/flattener_dicos/80family_dynamic_fill_dynamic_suffix_value/__init__.py
 create mode 100644 tests/flattener_dicos/80family_dynamic_with_suffix/00-base.xml
 create mode 100644 tests/flattener_dicos/80family_dynamic_with_suffix/__init__.py

diff --git a/doc/auto.rst b/doc/auto.rst
new file mode 100644
index 00000000..322719f9
--- /dev/null
+++ b/doc/auto.rst
@@ -0,0 +1,23 @@
+Valeur automatiquement modifiée
+===============================
+
+Une variable avec valeur automatiquement modifiée est une variable dont la valeur sera considéré comme modifié quand le serveur sera déployé.
+
+Voici un variable a valeur automatiquement modifiée :
+
+    <variable name="my_variable" type="oui/non" description="My variable" auto_save="True">
+
+Dans ce cas la valeur est fixée à la valeur actuelle.
+Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
+
+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 le serveur sera déployé.
+
+Voici un variable à valeur en lecture seule automatique :
+
+    <variable name="my_variable" type="oui/non" description="My variable" auto_freeze="True">
+
+Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.
+Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
diff --git a/doc/fill.rst b/doc/fill.rst
new file mode 100644
index 00000000..cdbf96f9
--- /dev/null
+++ b/doc/fill.rst
@@ -0,0 +1,277 @@
+Les variables calculées
+=======================
+
+Une variable calculée est une variable donc sa valeur est le résultat d'une fonction python.
+
+Variable avec une valeur par défaut calculée
+--------------------------------------------
+
+Créons une variable de type "oui/non" donc la valeur est retournée par la fonction "return_no" :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_no" target="my_calculated_variable"/>
+    </constraints>
+
+Puis créons la fonction "return_no" :
+
+    def return_no():
+        return 'non'
+
+Dans ce cas, la valeur par défaut est la valeur retournée par la fonction (ici "non"), elle sera calculée tant que l'utilisateur n'a pas de spécifié une valeur à cette variable.
+
+Si l'utilisateur à définit une valeur par défaut à "my_calculated_variable" :
+
+    <variable name="my_calculated_variable" type="oui/non" description="My calculated variable">
+        <value>oui</value>
+    </variable>
+
+Cette valeur par défaut sera complètement ignorée.
+
+Variable avec une valeur calculée
+---------------------------------
+
+En ajoutant le paramètre "hidden" à "True" dans la variable précédente, l'utilisateur n'aura plus la possibilité de modifié la valeur. La valeur de la variable sera donc systématiquement calculée :
+
+    <variable name="my_calculated_variable" type="oui/non" description="My calculated variable" hidden="True"/>
+
+Si une condition "hidden_if_in" est spécifié à la variable, la valeur sera modifiable par l'utilisateur si elle n'est pas cachée mais elle sera systèmatiquement calculée (même si elle a déjà était modifiée) si la variable est cachée.
+
+Variable avec valeur calculée obligatoire
+-----------------------------------------
+
+Par défaut les variables calculées ne sont pas des varibles obligatoires.
+Dans ce cas un calcul peut retourner None, mais surtout un utilisateur peut spécifier une valeur nulle à cette variable. Dans ce cas le calcul ne sera pas réalisé.
+
+Fonction avec une valeur fixe comme paramètre positionnel
+---------------------------------------------------------
+
+Déclarons un calcul avec paramètre :
+
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param>non</param>
+        </fill>
+    </constraints>
+
+Créons la fonction correspondante :
+
+    def return_value(value):
+        return value
+
+La variable aura donc "non" comme valeur puisque le paramètre aura la valeur fixe "non".
+
+Paramètre nommée
+----------------
+
+Déclarons une contrainte avec un paramètre nommée :
+
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param name="valeur">non</param>
+        </fill>
+    </constraints>
+
+Dans ce cas la fonction return_value sera exécuté avec le paramètre nommé "valeur" dont sa valeur sera "non".
+
+Paramètre avec un nombre
+------------------------
+
+Déclarons un calcul avec paramètre avec un nombre :
+
+    <constraints>
+        <fill name="return_value_with_number" target="my_calculated_variable">
+            <param type="number">1</param>
+        </fill>
+    </constraints>
+
+Créons la fonction correspondante :
+
+    def return_value_with_number(value):
+        if value == 1:
+            return 'non'
+        return 'oui'
+
+La variable aura donc "non" comme valeur puisque le paramètre aura la valeur fixe "1".
+
+Paramètre dont la valeur est issue d'une autre variable
+-------------------------------------------------------
+
+Créons deux variables avec une contrainte de type variable qui contient le nom de la variable dont sa valeur sera utilisé comme paramètre :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
+            <variable name="my_variable" type="number" description="My variable">
+                <value>1</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value_with_number" target="my_calculated_variable">
+            <param type="variable">my_variable</param>
+        </fill>
+    </constraints>
+
+Si l'utilisateur laisse la valeur 1 à "my_variable", la valeur par défault de la variable "my_calculated_variable" sera "non".
+Si la valeur de "my_variable" est différent de 1, la valeur par défaut de la variable "my_calculated_variable" sera "oui".
+
+Paramètre dont la valeur est issue d'une information de la configuration
+------------------------------------------------------------------------
+
+Créons une variable et la contrainte :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="string" description="My calculated variable"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param type="information">server_name</param>
+        </fill>
+    </constraints>
+
+Dans ce cas, l'information de la configuration "server_name" sera utilisé comme valeur de la variable "my_calculated_variable".
+Si l'information n'existe pas, la paramètre aura la valeur "None".
+
+Paramètre avec variable potentiellement non existante
+-----------------------------------------------------
+
+Suivant le contexte une variable peut exister ou ne pas exister.
+
+Un paramètre de type "variable" peut être "optional" :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param type="variable" optional="True">unknow_variable</param>
+        </fill>
+    </constraints>
+
+Dans ce cas la fonction "return_value" est exécuté sans paramètre.
+
+
+Les variables suiveuses
+-----------------------
+
+FIXME : 
+
+- tests/flattener_dicos/10leadership_append/00-base.xml
+- tests/flattener_dicos/10leadership_auto/00-base.xml
+- tests/flattener_dicos/10leadership_autoleader/00-base.xml
+- tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml
+
+Les variables dynamiques
+------------------------
+
+Paramètre avec variable dynamique
+'''''''''''''''''''''''''''''''''
+
+Il est possible de faire un calcul avec comme paramètre une variable dynamique mais pour une suffix particulier :
+
+    <variables>
+        <family name='family'>
+            <variable name='suffixes' type='string' description="Suffixes of dynamic family" multi="True">
+                <value>val1</value>
+                <value>val2</value>
+            </variable>
+            <variable name="my_calculated_variable" type="string" description="My calculated variable"/>
+        </family>
+        <family name='dyn' dynamic="suffixes">
+            <variable name='vardyn' type='string' description="Dynamic variable">
+                <value>val</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param type="variable">vardynval1</param>
+        </fill>
+    </constraints>
+
+Dans ce cas, valeur du paramètre de la fonction "return_value" sera la valeur de la variable "vardyn" avec le suffix "val1".
+
+Calcule d'une variable dynamique
+''''''''''''''''''''''''''''''''
+
+Il est également possible de calculer une variable dynamique à partir d'une variable standard :
+
+    <variables>
+        <family name='family'>
+            <variable name='suffixes' type='string' description="Suffixes of dynamic family" multi="True">
+                <value>val1</value>
+                <value>val2</value>
+            </variable>
+            <variable name="my_variable" type="string" description="My variable">
+                <value>val</value>
+            </variable>
+        </family>
+        <family name='dyn' dynamic="suffixes">
+            <variable name="my_calculated_variable_dyn_" type="string" description="My calculated variable"/>
+                <value>val</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable_dyn_">
+            <param type="variable">my_variable</param>
+        </fill>
+    </constraints>
+
+Dans ce cas, les variables dynamiques "my_calculated_variable_dyn_" seront calculés à partir de la valeur de la variable "my_variable".
+Que cela soit pour la variable "my_calculated_variable_dyn_val1" et "my_calculated_variable_dyn_val2".
+
+Par contre, il n'est pas possible de faire un calcul pour une seule des deux variables issues de la variable dynamique.
+Si c'est ce que vous cherchez à faire, il faudra prévoir un traitement particulier dans votre fonction.
+
+Dans ce cas, il faut explicitement demander la valeur du suffix dans la fonction :
+
+    <constraints>
+        <fill name="return_value_suffix" target="my_calculated_variable_dyn_">
+            <param type="variable">my_variable</param>
+            <param type="suffix"/>
+        </fill>
+    </constraints>
+
+Et ainsi faire un traitement spécifique pour ce suffix :
+
+    def return_value_suffix(value, suffix):
+        if suffix == 'val1':
+            return value
+
+Redéfinition des calcules
+-------------------------
+
+Dans un premier dictionnaire déclarons notre variable et notre calcule :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_no" target="my_calculated_variable"/>
+    </constraints>
+
+Dans un second dictionnaire il est possible de redéfinir le calcul :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" redefine="True"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_yes" target="my_calculated_variable"/>
+    </constraints>
+
+Dans ce cas, à aucun moment la fonction "return_no" ne sera exécuté. Seul la fonction "return_yes" le sera.
+
diff --git a/doc/variable.rst b/doc/variable.rst
new file mode 100644
index 00000000..f88ff313
--- /dev/null
+++ b/doc/variable.rst
@@ -0,0 +1,13 @@
+Variable
+========
+
+Variable obligatoire
+--------------------
+
+Variable dont une valeur est requise :
+
+    <variables>
+        <family name="family">
+            <variable name="my_variable" type="oui/non" description="My variable" mandatory="True"/>
+        </family>
+    </variables>
diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py
index 53085c5d..48b7cd60 100644
--- a/src/rougail/annotator.py
+++ b/src/rougail/annotator.py
@@ -1021,18 +1021,22 @@ class ConstraintAnnotator:
 
             namespace = fill.namespace
             # let's replace the target by the path
-            fill.target = self.objectspace.paths.get_variable_path(fill.target,
-                                                                   namespace,
-                                                                   )
-
+            fill.target, suffix = self.objectspace.paths.get_variable_path(fill.target,
+                                                                           namespace,
+                                                                           with_suffix=True,
+                                                                           )
+            if suffix is not None:
+                raise DictConsistencyError(_(f'Cannot add fill function to "{fill.target}" only with the suffix "{suffix}"'))
             value = self.objectspace.value()
             value.type = 'calculation'
             value.name = fill.name
             if hasattr(fill, 'param'):
                 param_to_delete = []
                 for fill_idx, param in enumerate(fill.param):
-                    if param.type != 'string' and not hasattr(param, 'text'):
-                        raise DictConsistencyError(_(f"All '{param.type}' variables shall have a value in order to calculate {fill.target}"))
+                    if param.type not in ['suffix', 'string'] and not hasattr(param, 'text'):
+                        raise DictConsistencyError(_(f"All '{param.type}' variables must have a value in order to calculate {fill.target}"))
+                    if param.type == 'suffix' and hasattr(param, 'text'):
+                        raise DictConsistencyError(_(f"All '{param.type}' variables must not have a value in order to calculate {fill.target}"))
                     if param.type == 'variable':
                         try:
                             param.text, suffix = self.objectspace.paths.get_variable_path(param.text,
@@ -1135,9 +1139,9 @@ class FamilyAnnotator:
                             if param.type == 'variable':
                                 has_variable = True
                                 break
-                    if not has_variable:
-                        # if one parameter is a variable, let variable choice if it's mandatory
-                        variable.mandatory = True
+                    #if not has_variable:
+                    #    # if one parameter is a variable, let variable choice if it's mandatory
+                    #    variable.mandatory = True
             if has_value:
                 # if has value but without any calculation
                 variable.mandatory = True
diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index aaf950c6..fcf88e51 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -141,7 +141,7 @@
 <!ATTLIST group description CDATA #IMPLIED>
 
 <!ELEMENT param (#PCDATA)>
-<!ATTLIST param type (string|number|variable|information) "string">
+<!ATTLIST param type (string|number|variable|information|suffix) "string">
 <!ATTLIST param name CDATA #IMPLIED>
 <!ATTLIST param notraisepropertyerror (True|False) "False">
 <!ATTLIST param optional (True|False) "False">
diff --git a/src/rougail/path.py b/src/rougail/path.py
index 7f0c62db..7e81b692 100644
--- a/src/rougail/path.py
+++ b/src/rougail/path.py
@@ -191,12 +191,16 @@ class Path:
             if name not in self.variables:
                 for var_name, variable in self.variables.items():
                     if variable['is_dynamic'] and name.startswith(var_name):
+                        if not with_suffix:
+                            raise Exception('This option is dynamic, should use "with_suffix" attribute')
                         return variable, name[len(var_name):]
                 if '.' not in name:
                     for var_name, path in self.full_paths.items():
                         if name.startswith(var_name):
                             variable = self.variables[self.full_paths[var_name]]
                             if variable['is_dynamic']:
+                                if not with_suffix:
+                                    raise Exception('This option is dynamic, should use "with_suffix" attribute')
                                 return variable, name[len(var_name):]
                 raise DictConsistencyError(_('unknown option {}').format(name))
         if with_suffix:
diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py
index d43cb700..18b70596 100644
--- a/src/rougail/tiramisureflector.py
+++ b/src/rougail/tiramisureflector.py
@@ -423,7 +423,9 @@ class Variable(Common):
                 value['suffix'] = param.suffix
             return self.build_param(value)
         elif param.type == 'information':
-            return f'ParamInformation("{param.text}")'
+            return f'ParamInformation("{param.text}", None)'
+        elif param.type == 'suffix':
+            return f'ParamSuffix()'
         raise LoaderError(_('unknown param type {}').format(param.type))
 
     def populate_value(self,
diff --git a/tests/flattener_dicos/01fill_base/00-base.xml b/tests/flattener_dicos/01fill_base/00-base.xml
index edf7fd20..5bc01db8 100644
--- a/tests/flattener_dicos/01fill_base/00-base.xml
+++ b/tests/flattener_dicos/01fill_base/00-base.xml
@@ -5,9 +5,7 @@
 
     <variables>
         <family name="general">
-            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
-                <value>non</value>
-            </variable>
+            <variable name="mode_conteneur_actif" type="oui/non" description="No change"/>
             <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
                 <value>non</value>
             </variable>
diff --git a/tests/flattener_dicos/01fill_base/tiramisu/base.py b/tests/flattener_dicos/01fill_base/tiramisu/base.py
index 4bde6b10..0f45e344 100644
--- a/tests/flattener_dicos/01fill_base/tiramisu/base.py
+++ b/tests/flattener_dicos/01fill_base/tiramisu/base.py
@@ -3,7 +3,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
+option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/01fill_base_hidden/00-base.xml b/tests/flattener_dicos/01fill_base_hidden/00-base.xml
new file mode 100644
index 00000000..edf7fd20
--- /dev/null
+++ b/tests/flattener_dicos/01fill_base_hidden/00-base.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+
+    <services/>
+
+    <variables>
+        <family name="general">
+            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+                <value>non</value>
+            </variable>
+            <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
+                <value>non</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+
+    <constraints>
+        <fill name="calc_val" target="mode_conteneur_actif">
+            <param type="variable">mode_conteneur_actif1</param>
+        </fill>
+    </constraints>
+
+    <help/>
+
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->
diff --git a/tests/flattener_dicos/20family_dynamic_calc/__init__.py b/tests/flattener_dicos/01fill_base_hidden/__init__.py
similarity index 100%
rename from tests/flattener_dicos/20family_dynamic_calc/__init__.py
rename to tests/flattener_dicos/01fill_base_hidden/__init__.py
diff --git a/tests/flattener_dicos/01fill_base_hidden/makedict/base.json b/tests/flattener_dicos/01fill_base_hidden/makedict/base.json
new file mode 100644
index 00000000..b58d6e7c
--- /dev/null
+++ b/tests/flattener_dicos/01fill_base_hidden/makedict/base.json
@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/20family_dynamic_calc/tiramisu/__init__.py b/tests/flattener_dicos/01fill_base_hidden/tiramisu/__init__.py
similarity index 100%
rename from tests/flattener_dicos/20family_dynamic_calc/tiramisu/__init__.py
rename to tests/flattener_dicos/01fill_base_hidden/tiramisu/__init__.py
diff --git a/tests/flattener_dicos/01fill_base_hidden/tiramisu/base.py b/tests/flattener_dicos/01fill_base_hidden/tiramisu/base.py
new file mode 100644
index 00000000..4bde6b10
--- /dev/null
+++ b/tests/flattener_dicos/01fill_base_hidden/tiramisu/base.py
@@ -0,0 +1,9 @@
+from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+import imp
+func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
+option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/01fill_information/tiramisu/base.py b/tests/flattener_dicos/01fill_information/tiramisu/base.py
index 4630e4f2..06e73867 100644
--- a/tests/flattener_dicos/01fill_information/tiramisu/base.py
+++ b/tests/flattener_dicos/01fill_information/tiramisu/base.py
@@ -2,7 +2,7 @@ from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamInformation("info")), kwargs={})))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamInformation("info", None)), kwargs={})))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/01fill_information_unknown/00-base.xml b/tests/flattener_dicos/01fill_information_unknown/00-base.xml
new file mode 100644
index 00000000..c280b9df
--- /dev/null
+++ b/tests/flattener_dicos/01fill_information_unknown/00-base.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+
+    <services/>
+
+    <variables>
+        <family name="general">
+            <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
+        </family>
+        <separators/>
+    </variables>
+
+    <constraints>
+        <fill name="calc_val" target="mode_conteneur_actif">
+            <param type="information">unknown</param>
+        </fill>
+    </constraints>
+
+    <help/>
+
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->
diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/__init__.py b/tests/flattener_dicos/01fill_information_unknown/__init__.py
similarity index 100%
rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/__init__.py
rename to tests/flattener_dicos/01fill_information_unknown/__init__.py
diff --git a/tests/flattener_dicos/01fill_information_unknown/makedict/base.json b/tests/flattener_dicos/01fill_information_unknown/makedict/base.json
new file mode 100644
index 00000000..dc0cf526
--- /dev/null
+++ b/tests/flattener_dicos/01fill_information_unknown/makedict/base.json
@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": null}
diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/__init__.py b/tests/flattener_dicos/01fill_information_unknown/tiramisu/__init__.py
similarity index 100%
rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/__init__.py
rename to tests/flattener_dicos/01fill_information_unknown/tiramisu/__init__.py
diff --git a/tests/flattener_dicos/01fill_information_unknown/tiramisu/base.py b/tests/flattener_dicos/01fill_information_unknown/tiramisu/base.py
new file mode 100644
index 00000000..3d199ee9
--- /dev/null
+++ b/tests/flattener_dicos/01fill_information_unknown/tiramisu/base.py
@@ -0,0 +1,8 @@
+from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+import imp
+func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamInformation("unknown", None)), kwargs={})))
+option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/01fill_number/tiramisu/base.py b/tests/flattener_dicos/01fill_number/tiramisu/base.py
index 5f841652..2dd4fda6 100644
--- a/tests/flattener_dicos/01fill_number/tiramisu/base.py
+++ b/tests/flattener_dicos/01fill_number/tiramisu/base.py
@@ -2,7 +2,7 @@ from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = IntOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={})))
+option_3 = IntOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={})))
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
diff --git a/tests/flattener_dicos/10autosave_hidden/tiramisu/base.py b/tests/flattener_dicos/10autosave_hidden/tiramisu/base.py
index cd5be2c6..ec7ca24d 100644
--- a/tests/flattener_dicos/10autosave_hidden/tiramisu/base.py
+++ b/tests/flattener_dicos/10autosave_hidden/tiramisu/base.py
@@ -3,7 +3,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden', 'mandatory'}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})))
+option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})))
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/base.py b/tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/base.py
index 12d974df..0542f952 100644
--- a/tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/base.py
+++ b/tests/flattener_dicos/10autosave_hidden_frozenifin/tiramisu/base.py
@@ -3,7 +3,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
-option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})))
+option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})))
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/10leadership_append/tiramisu/base.py b/tests/flattener_dicos/10leadership_append/tiramisu/base.py
index 031afd31..2f484190 100644
--- a/tests/flattener_dicos/10leadership_append/tiramisu/base.py
+++ b/tests/flattener_dicos/10leadership_append/tiramisu/base.py
@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_9 = StrOption(properties=frozenset({'normal'}), name='follower3', doc='follower3', multi=True)
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8, option_9])
diff --git a/tests/flattener_dicos/10leadership_auto/tiramisu/base.py b/tests/flattener_dicos/10leadership_auto/tiramisu/base.py
index 5f95d40d..6f657b36 100644
--- a/tests/flattener_dicos/10leadership_auto/tiramisu/base.py
+++ b/tests/flattener_dicos/10leadership_auto/tiramisu/base.py
@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_8 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower3', doc='follower3', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7, option_8])
diff --git a/tests/flattener_dicos/10leadership_autoleader/tiramisu/base.py b/tests/flattener_dicos/10leadership_autoleader/tiramisu/base.py
index b8c12fbb..52dfe6d9 100644
--- a/tests/flattener_dicos/10leadership_autoleader/tiramisu/base.py
+++ b/tests/flattener_dicos/10leadership_autoleader/tiramisu/base.py
@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7])
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/base.py b/tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/base.py
index 92137f38..0c37f659 100644
--- a/tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/base.py
+++ b/tests/flattener_dicos/10leadership_autoleader_expert/tiramisu/base.py
@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
-option_6 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'expert'}), name='follower1', doc='follower1', multi=True)
 option_8 = StrOption(properties=frozenset({'expert'}), name='follower2', doc='follower2', multi=True)
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'expert'}), children=[option_6, option_7, option_8])
diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/base.py b/tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/base.py
index 902d56e0..8e0bb258 100644
--- a/tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/base.py
+++ b/tests/flattener_dicos/10leadership_autosaveexpert/tiramisu/base.py
@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'expert'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7])
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
diff --git a/tests/flattener_dicos/10leadership_familyaccent/tiramisu/base.py b/tests/flattener_dicos/10leadership_familyaccent/tiramisu/base.py
index e2974971..b8b928a1 100644
--- a/tests/flattener_dicos/10leadership_familyaccent/tiramisu/base.py
+++ b/tests/flattener_dicos/10leadership_familyaccent/tiramisu/base.py
@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7])
 option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4])
diff --git a/tests/flattener_dicos/10leadership_leader_hidden/tiramisu/base.py b/tests/flattener_dicos/10leadership_leader_hidden/tiramisu/base.py
index 2ffcd10a..a5ae8487 100644
--- a/tests/flattener_dicos/10leadership_leader_hidden/tiramisu/base.py
+++ b/tests/flattener_dicos/10leadership_leader_hidden/tiramisu/base.py
@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
-option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower1', doc='follower1', multi=True)
 option_8 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower2', doc='follower2', multi=True)
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'hidden', 'normal'}), children=[option_6, option_7, option_8])
diff --git a/tests/flattener_dicos/10leadership_leadermandatory/tiramisu/base.py b/tests/flattener_dicos/10leadership_leadermandatory/tiramisu/base.py
index 9aecedf3..ba9d564b 100644
--- a/tests/flattener_dicos/10leadership_leadermandatory/tiramisu/base.py
+++ b/tests/flattener_dicos/10leadership_leadermandatory/tiramisu/base.py
@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_5 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True)
-option_6 = StrOption(properties=frozenset({'basic', 'mandatory'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'basic'}), children=[option_5, option_6, option_7])
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4])
diff --git a/tests/flattener_dicos/10leadership_multi/tiramisu/base.py b/tests/flattener_dicos/10leadership_multi/tiramisu/base.py
index 7e92cabd..30aeba7c 100644
--- a/tests/flattener_dicos/10leadership_multi/tiramisu/base.py
+++ b/tests/flattener_dicos/10leadership_multi/tiramisu/base.py
@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8])
 option_10 = StrOption(name='leader1', doc='leader', multi=True)
diff --git a/tests/flattener_dicos/10load_leadership/tiramisu/base.py b/tests/flattener_dicos/10load_leadership/tiramisu/base.py
index 3e65f494..24f88840 100644
--- a/tests/flattener_dicos/10load_leadership/tiramisu/base.py
+++ b/tests/flattener_dicos/10load_leadership/tiramisu/base.py
@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8])
 option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5])
diff --git a/tests/flattener_dicos/10load_leadership_description/tiramisu/base.py b/tests/flattener_dicos/10load_leadership_description/tiramisu/base.py
index a7a108bb..4ac3d190 100644
--- a/tests/flattener_dicos/10load_leadership_description/tiramisu/base.py
+++ b/tests/flattener_dicos/10load_leadership_description/tiramisu/base.py
@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
 option_5 = Leadership(name='leader', doc='other description', properties=frozenset({'normal'}), children=[option_6, option_7, option_8])
 option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5])
diff --git a/tests/flattener_dicos/10load_leadership_submulti/tiramisu/base.py b/tests/flattener_dicos/10load_leadership_submulti/tiramisu/base.py
index 198cf443..45d1f92d 100644
--- a/tests/flattener_dicos/10load_leadership_submulti/tiramisu/base.py
+++ b/tests/flattener_dicos/10load_leadership_submulti/tiramisu/base.py
@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=submulti, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), default_multi=[])
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8])
 option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5])
diff --git a/tests/flattener_dicos/10valid_enum_variable/tiramisu/base.py b/tests/flattener_dicos/10valid_enum_variable/tiramisu/base.py
index 4ddb7229..cf76643e 100644
--- a/tests/flattener_dicos/10valid_enum_variable/tiramisu/base.py
+++ b/tests/flattener_dicos/10valid_enum_variable/tiramisu/base.py
@@ -4,7 +4,7 @@ import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3])
-option_5 = StrOption(properties=frozenset({'expert', 'force_default_on_freeze', 'frozen', 'hidden', 'mandatory'}), name='varmulti', doc='multi', multi=True, default=Calculation(func.calc_list, Params((ParamValue("test")), kwargs={})))
+option_5 = StrOption(properties=frozenset({'expert', 'force_default_on_freeze', 'frozen', 'hidden'}), name='varmulti', doc='multi', multi=True, default=Calculation(func.calc_list, Params((ParamValue("test")), kwargs={})))
 option_6 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='test', values=Calculation(func.calc_value, Params((ParamOption(option_5)))))
 option_6.impl_set_information("help", "bla bla bla")
 option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5, option_6])
diff --git a/tests/flattener_dicos/20family_dynamic_calc/00-base.xml b/tests/flattener_dicos/20family_dynamic_fill/00-base.xml
similarity index 100%
rename from tests/flattener_dicos/20family_dynamic_calc/00-base.xml
rename to tests/flattener_dicos/20family_dynamic_fill/00-base.xml
diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/__init__.py b/tests/flattener_dicos/20family_dynamic_fill/__init__.py
similarity index 100%
rename from tests/flattener_dicos/30mandatory_withvaluecalc/__init__.py
rename to tests/flattener_dicos/20family_dynamic_fill/__init__.py
diff --git a/tests/flattener_dicos/20family_dynamic_calc/makedict/base.json b/tests/flattener_dicos/20family_dynamic_fill/makedict/base.json
similarity index 100%
rename from tests/flattener_dicos/20family_dynamic_calc/makedict/base.json
rename to tests/flattener_dicos/20family_dynamic_fill/makedict/base.json
diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/__init__.py b/tests/flattener_dicos/20family_dynamic_fill/tiramisu/__init__.py
similarity index 100%
rename from tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/__init__.py
rename to tests/flattener_dicos/20family_dynamic_fill/tiramisu/__init__.py
diff --git a/tests/flattener_dicos/20family_dynamic_calc/tiramisu/base.py b/tests/flattener_dicos/20family_dynamic_fill/tiramisu/base.py
similarity index 100%
rename from tests/flattener_dicos/20family_dynamic_calc/tiramisu/base.py
rename to tests/flattener_dicos/20family_dynamic_fill/tiramisu/base.py
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic/00-base.xml b/tests/flattener_dicos/20family_dynamic_fill_dynamic/00-base.xml
new file mode 100644
index 00000000..181d5b69
--- /dev/null
+++ b/tests/flattener_dicos/20family_dynamic_fill_dynamic/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rougail>
+    <variables>
+        <family name='general'>
+            <variable name='varname' type='string' description="No change" multi="True">
+                <value>val1</value>
+                <value>val2</value>
+            </variable>
+        </family>
+        <family name='dyn' dynamic="varname">
+            <variable name='vardyn' type='string' description="No change"/>
+        </family>
+        <family name='new'>
+            <variable name='newvar' type='string' description="No change">
+                <value>val</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="calc_val" target="vardyn">
+            <param type="variable">newvar</param>
+        </fill>
+    </constraints>
+</rougail>
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic/__init__.py b/tests/flattener_dicos/20family_dynamic_fill_dynamic/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic/makedict/base.json b/tests/flattener_dicos/20family_dynamic_fill_dynamic/makedict/base.json
new file mode 100644
index 00000000..c26e3740
--- /dev/null
+++ b/tests/flattener_dicos/20family_dynamic_fill_dynamic/makedict/base.json
@@ -0,0 +1 @@
+{"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": "val", "rougail.dynval2.vardynval2": "val", "rougail.new.newvar": "val"}
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic/tiramisu/__init__.py b/tests/flattener_dicos/20family_dynamic_fill_dynamic/tiramisu/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic/tiramisu/base.py b/tests/flattener_dicos/20family_dynamic_fill_dynamic/tiramisu/base.py
new file mode 100644
index 00000000..cab6bdba
--- /dev/null
+++ b/tests/flattener_dicos/20family_dynamic_fill_dynamic/tiramisu/base.py
@@ -0,0 +1,12 @@
+from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+import imp
+func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2')
+option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
+option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='newvar', doc='No change', multi=False, default='val')
+option_5 = StrOption(properties=frozenset({'normal'}), name='vardyn', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})))
+option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), properties=frozenset({'normal'}), children=[option_5])
+option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/00-base.xml b/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/00-base.xml
new file mode 100644
index 00000000..d9e50c33
--- /dev/null
+++ b/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rougail>
+    <variables>
+        <family name='general'>
+            <variable name='varname' type='string' description="No change" multi="True">
+                <value>val1</value>
+                <value>val2</value>
+            </variable>
+        </family>
+        <family name='dyn' dynamic="varname">
+            <variable name='vardyn' type='string' description="No change"/>
+        </family>
+        <family name='new'>
+            <variable name='newvar' type='string' description="No change">
+                <value>val</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="calc_val" target="vardyn">
+            <param type="suffix"/>
+        </fill>
+    </constraints>
+</rougail>
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/__init__.py b/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/makedict/base.json b/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/makedict/base.json
new file mode 100644
index 00000000..463d8c1d
--- /dev/null
+++ b/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/makedict/base.json
@@ -0,0 +1 @@
+{"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": "val1", "rougail.dynval2.vardynval2": "val2", "rougail.new.newvar": "val"}
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/tiramisu/__init__.py b/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/tiramisu/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/tiramisu/base.py b/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/tiramisu/base.py
new file mode 100644
index 00000000..446e7973
--- /dev/null
+++ b/tests/flattener_dicos/20family_dynamic_fill_dynamic_suffix/tiramisu/base.py
@@ -0,0 +1,12 @@
+from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+import imp
+func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
+option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2')
+option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
+option_5 = StrOption(properties=frozenset({'normal'}), name='vardyn', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamSuffix()), kwargs={})))
+option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), properties=frozenset({'normal'}), children=[option_5])
+option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='newvar', doc='No change', multi=False, default='val')
+option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/00-base.xml b/tests/flattener_dicos/30mandatory_withoutvalue_fill/00-base.xml
similarity index 100%
rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/00-base.xml
rename to tests/flattener_dicos/30mandatory_withoutvalue_fill/00-base.xml
diff --git a/tests/flattener_dicos/30mandatory_withoutvalue_fill/__init__.py b/tests/flattener_dicos/30mandatory_withoutvalue_fill/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/makedict/base.json b/tests/flattener_dicos/30mandatory_withoutvalue_fill/makedict/base.json
similarity index 100%
rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/makedict/base.json
rename to tests/flattener_dicos/30mandatory_withoutvalue_fill/makedict/base.json
diff --git a/tests/flattener_dicos/30mandatory_withoutvalue_fill/tiramisu/__init__.py b/tests/flattener_dicos/30mandatory_withoutvalue_fill/tiramisu/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/flattener_dicos/30mandatory_withoutvalue_fill/tiramisu/base.py
similarity index 73%
rename from tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/base.py
rename to tests/flattener_dicos/30mandatory_withoutvalue_fill/tiramisu/base.py
index d0607494..54237a03 100644
--- a/tests/flattener_dicos/30mandatory_withoutvaluecalc/tiramisu/base.py
+++ b/tests/flattener_dicos/30mandatory_withoutvalue_fill/tiramisu/base.py
@@ -2,7 +2,7 @@ from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})))
+option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/00-base.xml b/tests/flattener_dicos/30mandatory_withvalue_fill/00-base.xml
similarity index 100%
rename from tests/flattener_dicos/30mandatory_withvaluecalc/00-base.xml
rename to tests/flattener_dicos/30mandatory_withvalue_fill/00-base.xml
diff --git a/tests/flattener_dicos/30mandatory_withvalue_fill/__init__.py b/tests/flattener_dicos/30mandatory_withvalue_fill/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/makedict/base.json b/tests/flattener_dicos/30mandatory_withvalue_fill/makedict/base.json
similarity index 100%
rename from tests/flattener_dicos/30mandatory_withvaluecalc/makedict/base.json
rename to tests/flattener_dicos/30mandatory_withvalue_fill/makedict/base.json
diff --git a/tests/flattener_dicos/30mandatory_withvalue_fill/tiramisu/__init__.py b/tests/flattener_dicos/30mandatory_withvalue_fill/tiramisu/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/base.py b/tests/flattener_dicos/30mandatory_withvalue_fill/tiramisu/base.py
similarity index 68%
rename from tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/base.py
rename to tests/flattener_dicos/30mandatory_withvalue_fill/tiramisu/base.py
index c5a386fc..e37dd74c 100644
--- a/tests/flattener_dicos/30mandatory_withvaluecalc/tiramisu/base.py
+++ b/tests/flattener_dicos/30mandatory_withvalue_fill/tiramisu/base.py
@@ -2,7 +2,7 @@ from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
 import imp
 func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
-option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})))
+option_3 = StrOption(properties=frozenset({'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})))
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])
diff --git a/tests/flattener_dicos/40ifin_leadershipauto/tiramisu/base.py b/tests/flattener_dicos/40ifin_leadershipauto/tiramisu/base.py
index 64e522c4..4494b1b4 100644
--- a/tests/flattener_dicos/40ifin_leadershipauto/tiramisu/base.py
+++ b/tests/flattener_dicos/40ifin_leadershipauto/tiramisu/base.py
@@ -5,7 +5,7 @@ func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
 option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
 option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='condition', multi=False, default='oui', values=('oui', 'non'))
 option_6 = StrOption(name='leader', doc='leader', multi=True)
-option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
+option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})))
 option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True)
 option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8])
 option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5])
diff --git a/tests/flattener_dicos/60action_external/tiramisu/base.py b/tests/flattener_dicos/60action_external/tiramisu/base.py
index bd799ffc..52cdc36a 100644
--- a/tests/flattener_dicos/60action_external/tiramisu/base.py
+++ b/tests/flattener_dicos/60action_external/tiramisu/base.py
@@ -6,7 +6,7 @@ option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen
 option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3])
 option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
 option_6 = IntOption(properties=frozenset({'mandatory', 'normal'}), name='delay', doc='délai en minutes avant lancement', multi=False, default=0)
-option_7 = URLOption(allow_ip=True, allow_without_dot=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='calc_url', doc='domain', multi=False, default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")), kwargs={})))
+option_7 = URLOption(allow_ip=True, allow_without_dot=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='calc_url', doc='domain', multi=False, default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")), kwargs={})))
 option_5 = OptionDescription(name='test', doc='test', properties=frozenset({'normal'}), children=[option_6, option_7])
 option_4 = OptionDescription(name='extra', doc='extra', children=[option_5])
 option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])
diff --git a/tests/flattener_dicos/80family_dynamic_fill_dynamic_suffix_value/00-base.xml b/tests/flattener_dicos/80family_dynamic_fill_dynamic_suffix_value/00-base.xml
new file mode 100644
index 00000000..0a8fe73d
--- /dev/null
+++ b/tests/flattener_dicos/80family_dynamic_fill_dynamic_suffix_value/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rougail>
+    <variables>
+        <family name='general'>
+            <variable name='varname' type='string' description="No change" multi="True">
+                <value>val1</value>
+                <value>val2</value>
+            </variable>
+        </family>
+        <family name='dyn' dynamic="varname">
+            <variable name='vardyn' type='string' description="No change"/>
+        </family>
+        <family name='new'>
+            <variable name='newvar' type='string' description="No change">
+                <value>val</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="calc_val" target="vardyn">
+            <param type="suffix">value</param>
+        </fill>
+    </constraints>
+</rougail>
diff --git a/tests/flattener_dicos/80family_dynamic_fill_dynamic_suffix_value/__init__.py b/tests/flattener_dicos/80family_dynamic_fill_dynamic_suffix_value/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/flattener_dicos/80family_dynamic_with_suffix/00-base.xml b/tests/flattener_dicos/80family_dynamic_with_suffix/00-base.xml
new file mode 100644
index 00000000..25c66aa3
--- /dev/null
+++ b/tests/flattener_dicos/80family_dynamic_with_suffix/00-base.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rougail>
+    <variables>
+        <family name='general'>
+            <variable name='varname' type='string' description="No change" multi="True">
+                <value>val1</value>
+                <value>val2</value>
+            </variable>
+        </family>
+        <family name='dyn' dynamic="varname">
+            <variable name='vardyn' type='string' description="No change">
+                <value>val</value>
+            </variable>
+        </family>
+        <family name='new'>
+            <variable name='newvar' type='string' description="No change"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="calc_val" target="vardynval1">
+            <param type="variable">newvar</param>
+        </fill>
+    </constraints>
+</rougail>
diff --git a/tests/flattener_dicos/80family_dynamic_with_suffix/__init__.py b/tests/flattener_dicos/80family_dynamic_with_suffix/__init__.py
new file mode 100644
index 00000000..e69de29b