From 3881cb7e98f0296b23f750f3378116eef0410ff4 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sun, 22 Dec 2019 08:58:37 +0100
Subject: [PATCH] eole => variable

---
 data/creole.dtd                               | 21 ++++++++---------
 src/rougail/annotator.py                      | 23 ++++++++++++-------
 src/rougail/loader.py                         |  2 +-
 .../01auto_base/result/00-base.xml            |  2 +-
 .../01fill_autofreeze/result/00-base.xml      |  2 +-
 .../01fill_autosave/result/00-base.xml        |  2 +-
 .../01fill_base/result/00-base.xml            |  2 +-
 .../01fill_baseaccent/result/00-base.xml      |  2 +-
 .../01fill_mandatory/result/00-base.xml       |  2 +-
 .../01fill_optional/result/00-base.xml        |  2 +-
 .../10check_option/result/00-base.xml         |  2 +-
 .../10check_optional/result/00-base.xml       |  2 +-
 .../10check_valid_differ/result/00-base.xml   |  2 +-
 .../result/00-base.xml                        |  8 +++----
 .../result/00-base.xml                        |  4 ++--
 .../result/00-base.xml                        |  2 +-
 .../10load_masterslaves/result/00-base.xml    |  2 +-
 .../result/00-base.xml                        |  2 +-
 .../result/00-base.xml                        |  2 +-
 .../result/00-base.xml                        |  2 +-
 .../result/00-base.xml                        |  2 +-
 .../10masterslave_multi/result/00-base.xml    |  2 +-
 .../10masterslaves_append/result/00-base.xml  |  2 +-
 .../10masterslaves_auto/result/00-base.xml    |  4 ++--
 .../result/00-base.xml                        |  2 +-
 .../result/00-base.xml                        |  2 +-
 .../60extra_help/result/00-base.xml           |  2 +-
 .../60extra_load/result/00-base.xml           |  2 +-
 .../60extra_mandatory/result/00-base.xml      |  2 +-
 .../60extra_redefine/result/00-base.xml       |  2 +-
 30 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/data/creole.dtd b/data/creole.dtd
index e512273e..1f403384 100644
--- a/data/creole.dtd
+++ b/data/creole.dtd
@@ -2,20 +2,20 @@
 
 <!-- ===================================================================== -->
 
-<!-- Definition de la DTD du fichier creole -->
+<!-- Rougail's DTD -->
 
 <!-- ===================================================================== -->
 
 <!--
-#    Conception :
-#    Eole (http://eole.orion.education.fr)
-
+#    Created by:
+#    EOLE (http://eole.orion.education.fr)
 #    Copyright (C) 2005-2018
 
-#    distribue sous la licence GPL-2
+#    Forked by:
+#    Cadoles (http://www.cadoles.com)
+#    Copyright (C) 2019
 
-#    En attendant une traduction officielle de la GPL, la notice de
-#    copyright demeure en anglais.
+#    distribued with GPL-2 or later license
 
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -30,10 +30,9 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-#    Se reporter a la documentation envoyee avec le programme pour la notice.
-
 -->
+
+
 <!--================ -->
 <!-- root element    -->
 <!-- =============== -->
@@ -218,7 +217,7 @@
 <!ATTLIST group description CDATA #IMPLIED>
 
 <!ELEMENT param (#PCDATA)>
-<!ATTLIST param type (string|eole|number|container|context|python) "string">
+<!ATTLIST param type (string|eole|variable|number|container|context|python) "string">
 <!ATTLIST param name CDATA #IMPLIED>
 <!ATTLIST param hidden (True|False) "True">
 <!ATTLIST param optional (True|False) "False">
diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py
index cae9122a..8b6fb2af 100644
--- a/src/rougail/annotator.py
+++ b/src/rougail/annotator.py
@@ -73,9 +73,9 @@ KEY_TYPE = {'variable': 'symlink',
             'URLOption': 'web_address',
             'FilenameOption': 'filename'}
 
-TYPE_PARAM_CHECK = ('string', 'python', 'eole')
-TYPE_PARAM_CONDITION = ('string', 'python', 'number', 'eole')
-TYPE_PARAM_FILL = ('string', 'eole', 'number', 'context')
+TYPE_PARAM_CHECK = ('string', 'python', 'eole', 'variable')
+TYPE_PARAM_CONDITION = ('string', 'python', 'number', 'eole', 'variable')
+TYPE_PARAM_FILL = ('string', 'eole', 'number', 'context', 'variable')
 
 DISKNOD_KEY_TYPE = {'major': 'number',
                     'minor': 'number'}
@@ -963,6 +963,8 @@ class SpaceAnnotator(object):
                     if param.type not in TYPE_PARAM_CHECK:
                         raise CreoleDictConsistencyError(_('cannot use {} type as a param in check for {}').format(param.type, check.target))
                     if param.type == 'eole':
+                        param.type = 'variable'
+                    if param.type == 'variable':
                         if HIGH_COMPATIBILITY and param.text.startswith('container_ip'):
                             if param.optional is True:
                                 param_option_indexes.append(idx)
@@ -1043,7 +1045,9 @@ class SpaceAnnotator(object):
                                                        '').format(check.target))
                 param = check.param[0]
                 if proposed_value_type:
-                    if param.type != 'eole':
+                    if param.type == 'eole':
+                        raise Exception('hu?')
+                    if param.type == 'variable':
                         try:
                             values = self.load_params_in_validenum(param)
                         except NameError as err:
@@ -1142,12 +1146,13 @@ class SpaceAnnotator(object):
                     if param.type not in TYPE_PARAM_FILL:
                         raise CreoleDictConsistencyError(_('cannot use {} type as a param '
                                                            'in a fill/auto').format(param.type))
+                    if param.type == 'eole':
+                        param.type = 'variable'
                 param_option_indexes = []
                 for fill_idx, param in enumerate(fill.param):
                     if not hasattr(param, 'text') and \
-                            (param.type == 'eole' or param.type == 'number' or \
-                            #param.type == 'container' or param.type == 'python'):
-                            param.type == 'python'):
+                            (param.type == 'variable' or param.type == 'number' or \
+                                param.type == 'python'):
                         raise CreoleDictConsistencyError(_("All '{}' variables shall be set in "
                                                            "order to calculate {}").format(
                                                                param.type,
@@ -1155,7 +1160,7 @@ class SpaceAnnotator(object):
                     # if param.type == 'container':
                     #     param.type = 'eole'
                     #     param.text = 'container_ip_{}'.format(param.text)
-                    if param.type == 'eole':
+                    if param.type == 'variable':
                         #if is_probe:
                         #    raise CreoleDictConsistencyError(_('Function {0} used to calculate {1} '
                         #                                       'is executed on remote server, '
@@ -1347,6 +1352,8 @@ class SpaceAnnotator(object):
                 if param.type not in TYPE_PARAM_CONDITION:
                     raise CreoleDictConsistencyError(_('cannot use {} type as a param '
                                                        'in a condition').format(param.type))
+                if param.type == 'eole':
+                    param.type = 'variable'
 
     def check_choice_option_condition(self, force_remove_targets):
         # remove condition for ChoiceOption that don't have param
diff --git a/src/rougail/loader.py b/src/rougail/loader.py
index 39541fc7..3e1201d6 100644
--- a/src/rougail/loader.py
+++ b/src/rougail/loader.py
@@ -404,7 +404,7 @@ class Variable(Common):
         name = param.attrib.get('name', '')
         if param.attrib['type'] == 'string':
             value = param.text
-        elif param.attrib['type'] == 'eole':
+        elif param.attrib['type'] == 'variable':
             transitive = param.attrib.get('transitive', 'False')
             if transitive == 'True':
                 transitive = True
diff --git a/tests/flattener_dicos/01auto_base/result/00-base.xml b/tests/flattener_dicos/01auto_base/result/00-base.xml
index 432fdac4..e76c5ccd 100644
--- a/tests/flattener_dicos/01auto_base/result/00-base.xml
+++ b/tests/flattener_dicos/01auto_base/result/00-base.xml
@@ -12,7 +12,7 @@
         <property>mandatory</property>
         <property>normal</property>
         <value name="calc_val" type="calculation">
-          <param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
+          <param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param>
         </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
diff --git a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
index 88651580..7b53c763 100644
--- a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
@@ -12,7 +12,7 @@
         <property>basic</property>
         <property expected="oui" inverse="True" source="creole.general.module_instancie" type="calculation">auto_frozen</property>
         <value name="calc_val" type="calculation">
-          <param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
+          <param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param>
         </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
diff --git a/tests/flattener_dicos/01fill_autosave/result/00-base.xml b/tests/flattener_dicos/01fill_autosave/result/00-base.xml
index 7febc100..a55ea99b 100644
--- a/tests/flattener_dicos/01fill_autosave/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_autosave/result/00-base.xml
@@ -10,7 +10,7 @@
         <property>mandatory</property>
         <property>basic</property>
         <value name="calc_val" type="calculation">
-          <param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
+          <param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param>
         </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
diff --git a/tests/flattener_dicos/01fill_base/result/00-base.xml b/tests/flattener_dicos/01fill_base/result/00-base.xml
index 432fdac4..e76c5ccd 100644
--- a/tests/flattener_dicos/01fill_base/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_base/result/00-base.xml
@@ -12,7 +12,7 @@
         <property>mandatory</property>
         <property>normal</property>
         <value name="calc_val" type="calculation">
-          <param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
+          <param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param>
         </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
diff --git a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
index b8db1c50..b9bb3da1 100644
--- a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
@@ -12,7 +12,7 @@
         <property>mandatory</property>
         <property>normal</property>
         <value name="calc_val" type="calculation">
-          <param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
+          <param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param>
         </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
diff --git a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml
index da02f1a6..5d713d37 100644
--- a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml
@@ -7,7 +7,7 @@
         <property>mandatory</property>
         <property>expert</property>
         <value name="calc_val" type="calculation">
-          <param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
+          <param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param>
         </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
diff --git a/tests/flattener_dicos/01fill_optional/result/00-base.xml b/tests/flattener_dicos/01fill_optional/result/00-base.xml
index 432fdac4..e76c5ccd 100644
--- a/tests/flattener_dicos/01fill_optional/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_optional/result/00-base.xml
@@ -12,7 +12,7 @@
         <property>mandatory</property>
         <property>normal</property>
         <value name="calc_val" type="calculation">
-          <param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
+          <param transitive="False" type="variable">creole.general.mode_conteneur_actif1</param>
         </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
diff --git a/tests/flattener_dicos/10check_option/result/00-base.xml b/tests/flattener_dicos/10check_option/result/00-base.xml
index f65ebd92..ab96be9f 100644
--- a/tests/flattener_dicos/10check_option/result/00-base.xml
+++ b/tests/flattener_dicos/10check_option/result/00-base.xml
@@ -16,7 +16,7 @@
       <variable doc="No change" multi="False" name="int" type="number">
         <check name="valid_entier" warnings_only="False">
           <param name="mini" type="string">0</param>
-          <param name="maxi" type="eole">creole.general.int2</param>
+          <param name="maxi" type="variable">creole.general.int2</param>
         </check>
         <property>normal</property>
       </variable>
diff --git a/tests/flattener_dicos/10check_optional/result/00-base.xml b/tests/flattener_dicos/10check_optional/result/00-base.xml
index e664e46e..88b10e62 100644
--- a/tests/flattener_dicos/10check_optional/result/00-base.xml
+++ b/tests/flattener_dicos/10check_optional/result/00-base.xml
@@ -10,7 +10,7 @@
       </variable>
       <variable doc="No change" multi="False" name="int" type="number">
         <check name="valid_not_equal" warnings_only="False">
-          <param type="eole">creole.general.int2</param>
+          <param type="variable">creole.general.int2</param>
         </check>
         <check name="valid_not_equal" warnings_only="False"/>
         <property>normal</property>
diff --git a/tests/flattener_dicos/10check_valid_differ/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ/result/00-base.xml
index 0e3d62bf..0d40273b 100644
--- a/tests/flattener_dicos/10check_valid_differ/result/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ/result/00-base.xml
@@ -5,7 +5,7 @@
       <property>normal</property>
       <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
         <check name="valid_not_equal" warnings_only="False">
-          <param type="eole">creole.general.mode_conteneur_actif1</param>
+          <param type="variable">creole.general.mode_conteneur_actif1</param>
         </check>
         <choice type="string">oui</choice>
         <choice type="string">non</choice>
diff --git a/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml
index 5ef78af3..fc596149 100644
--- a/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml
@@ -26,16 +26,16 @@
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif3" type="string">
         <check name="valid_not_equal" warnings_only="False">
-          <param type="eole">creole.general.mode_conteneur_actif1</param>
+          <param type="variable">creole.general.mode_conteneur_actif1</param>
         </check>
         <check name="valid_not_equal" warnings_only="False">
-          <param type="eole">creole.general.mode_conteneur_actif2</param>
+          <param type="variable">creole.general.mode_conteneur_actif2</param>
         </check>
         <check name="valid_not_equal" warnings_only="False">
-          <param type="eole">creole.general.mode_conteneur_actif1</param>
+          <param type="variable">creole.general.mode_conteneur_actif1</param>
         </check>
         <check name="valid_not_equal" warnings_only="False">
-          <param type="eole">creole.general.mode_conteneur_actif2</param>
+          <param type="variable">creole.general.mode_conteneur_actif2</param>
         </check>
         <property>mandatory</property>
         <property>normal</property>
diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml
index 4c012269..d3646abd 100644
--- a/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml
@@ -26,10 +26,10 @@
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif3" type="string">
         <check name="valid_not_equal" warnings_only="False">
-          <param type="eole">creole.general.mode_conteneur_actif1</param>
+          <param type="variable">creole.general.mode_conteneur_actif1</param>
         </check>
         <check name="valid_not_equal" warnings_only="False">
-          <param type="eole">creole.general.mode_conteneur_actif2</param>
+          <param type="variable">creole.general.mode_conteneur_actif2</param>
         </check>
         <property>mandatory</property>
         <property>normal</property>
diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml b/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml
index 3479a38f..73b07ef5 100644
--- a/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml
@@ -16,7 +16,7 @@
       </variable>
       <variable doc="Masque de sous réseau de la carte" multi="False" name="adresse_netmask_eth0" type="netmask">
         <check name="valid_ip_netmask" warnings_only="True">
-          <param type="eole">creole.general.adresse_ip_eth0</param>
+          <param type="variable">creole.general.adresse_ip_eth0</param>
         </check>
         <property>mandatory</property>
         <property>basic</property>
diff --git a/tests/flattener_dicos/10load_masterslaves/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves/result/00-base.xml
index 49f9a7d6..ae3075fe 100644
--- a/tests/flattener_dicos/10load_masterslaves/result/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves/result/00-base.xml
@@ -25,7 +25,7 @@
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general1.master.slave1</param>
+            <param transitive="False" type="variable">creole.general1.master.slave1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
index 2197054a..b17a5b5a 100644
--- a/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
@@ -25,7 +25,7 @@
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general1.master.slave1</param>
+            <param transitive="False" type="variable">creole.general1.master.slave1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml b/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
index de99fb93..ffbe7a70 100644
--- a/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
@@ -22,7 +22,7 @@
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>expert</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.master.slave1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml b/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
index 869457e8..629553e6 100644
--- a/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
@@ -23,7 +23,7 @@
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.master.slave1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml b/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
index 30386779..7f4c6051 100644
--- a/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
@@ -24,7 +24,7 @@
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.master.slave1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslave_multi/result/00-base.xml b/tests/flattener_dicos/10masterslave_multi/result/00-base.xml
index 13890768..3ecf24f1 100644
--- a/tests/flattener_dicos/10masterslave_multi/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_multi/result/00-base.xml
@@ -25,7 +25,7 @@
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general1.master.slave1</param>
+            <param transitive="False" type="variable">creole.general1.master.slave1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslaves_append/result/00-base.xml b/tests/flattener_dicos/10masterslaves_append/result/00-base.xml
index 0600edfb..d30e3b74 100644
--- a/tests/flattener_dicos/10masterslaves_append/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_append/result/00-base.xml
@@ -25,7 +25,7 @@
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general1.master.slave1</param>
+            <param transitive="False" type="variable">creole.general1.master.slave1</param>
           </value>
         </variable>
         <variable doc="slave3" multi="True" name="slave3" type="string">
diff --git a/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml b/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
index 8b5f0721..93c36e41 100644
--- a/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
@@ -28,7 +28,7 @@
           <property>hidden</property>
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.master.slave1</param>
           </value>
         </variable>
         <variable doc="slave3" multi="True" name="slave3" type="string">
@@ -37,7 +37,7 @@
           <property>hidden</property>
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general.master.master</param>
+            <param transitive="False" type="variable">creole.general.master.master</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
index 3040e55f..a7fa7d42 100644
--- a/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
@@ -28,7 +28,7 @@
           <property>hidden</property>
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general.master.master</param>
+            <param transitive="False" type="variable">creole.general.master.master</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml b/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
index f462f371..190353f9 100644
--- a/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
@@ -22,7 +22,7 @@
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
           <value name="calc_val" type="calculation">
-            <param transitive="False" type="eole">creole.general.master.slave1</param>
+            <param transitive="False" type="variable">creole.general.master.slave1</param>
           </value>
         </variable>
       </leader>
diff --git a/tests/flattener_dicos/60extra_help/result/00-base.xml b/tests/flattener_dicos/60extra_help/result/00-base.xml
index 0f9edc13..18f33cc1 100644
--- a/tests/flattener_dicos/60extra_help/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_help/result/00-base.xml
@@ -43,7 +43,7 @@
         <property>normal</property>
         <value name="calc_multi_condition" type="calculation">
           <param transitive="False" type="string">non</param>
-          <param name="condition_1" type="eole">creole.general.activer_ejabberd</param>
+          <param name="condition_1" type="variable">creole.general.activer_ejabberd</param>
           <param name="match" transitive="False" type="string">none</param>
           <param name="mismatch" transitive="False" type="string">daily</param>
         </value>
diff --git a/tests/flattener_dicos/60extra_load/result/00-base.xml b/tests/flattener_dicos/60extra_load/result/00-base.xml
index 36df5d3a..4345e6b2 100644
--- a/tests/flattener_dicos/60extra_load/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_load/result/00-base.xml
@@ -43,7 +43,7 @@
         <property>normal</property>
         <value name="calc_multi_condition" type="calculation">
           <param transitive="False" type="string">non</param>
-          <param name="condition_1" type="eole">creole.general.activer_ejabberd</param>
+          <param name="condition_1" type="variable">creole.general.activer_ejabberd</param>
           <param name="match" transitive="False" type="string">none</param>
           <param name="mismatch" transitive="False" type="string">daily</param>
         </value>
diff --git a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml
index fef7a21d..3deb5be8 100644
--- a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml
@@ -43,7 +43,7 @@
         <property>normal</property>
         <value name="calc_multi_condition" type="calculation">
           <param transitive="False" type="string">non</param>
-          <param name="condition_1" type="eole">creole.general.activer_ejabberd</param>
+          <param name="condition_1" type="variable">creole.general.activer_ejabberd</param>
           <param name="match" transitive="False" type="string">none</param>
           <param name="mismatch" transitive="False" type="string">daily</param>
         </value>
diff --git a/tests/flattener_dicos/60extra_redefine/result/00-base.xml b/tests/flattener_dicos/60extra_redefine/result/00-base.xml
index 05bb6f41..735e8138 100644
--- a/tests/flattener_dicos/60extra_redefine/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_redefine/result/00-base.xml
@@ -46,7 +46,7 @@
         <property>normal</property>
         <value name="calc_multi_condition" type="calculation">
           <param transitive="False" type="string">non</param>
-          <param name="condition_1" type="eole">creole.general.activer_ejabberd</param>
+          <param name="condition_1" type="variable">creole.general.activer_ejabberd</param>
           <param name="match" transitive="False" type="string">none</param>
           <param name="mismatch" transitive="False" type="string">daily</param>
         </value>