variable and family are list in yaml file + jinja2 => jinja

src/rougail/data/rougail.dtd

@@ -54,7 +54,7 @@
 <!ATTLIST service manage (True|False) "True">
 <!ATTLIST service servicelist CDATA #IMPLIED>
 <!ATTLIST service disabled (True|False) "False">
-<!ATTLIST service engine (none|creole|jinja2) #IMPLIED>
+<!ATTLIST service engine (none|creole|jinja) #IMPLIED>
 <!ATTLIST service target CDATA #IMPLIED>
 <!ATTLIST service type (service|mount|swap|timer|target) "service">
 <!ATTLIST service undisable (True|False) "False">
@@ -77,13 +77,13 @@
 <!ATTLIST file group_type (unix_user|variable) "unix_user">
 <!ATTLIST file filelist CDATA #IMPLIED>
 <!ATTLIST file redefine (True|False) "False">
-<!ATTLIST file engine (none|creole|jinja2|creole_legacy) #IMPLIED>
+<!ATTLIST file engine (none|creole|jinja|creole_legacy) #IMPLIED>
 <!ATTLIST file included (no|name|content) #IMPLIED>
 <!ATTLIST file disabled (True|False) "False">
 
 <!ELEMENT override EMPTY>
 <!ATTLIST override source CDATA #IMPLIED>
-<!ATTLIST override engine (none|creole|jinja2) #IMPLIED>
+<!ATTLIST override engine (none|creole|jinja) #IMPLIED>
 
 <!ELEMENT variables ((variable*|family*)*)>
 

src/rougail/reflector.py

@@ -157,16 +157,18 @@ class SubYAML:
             lists = []
             for dico in self.dico:
                 for key, value in dico.items():
-                    lists.append((key, [value]))
+                    if not isinstance(value, list):
+                        value = [value]
+                    lists.append((key, value))
         else:
             lists = []
             for key, values in self.dico.items():
                 if key == 'variables':
                     for v in values:
                         if 'variable' in v:
-                            lists.append(('variable', [v['variable']]))
+                            lists.append(('variable', v['variable']))
                         if 'family' in v:
-                            lists.append(('family', [v['family']]))
+                            lists.append(('family', v['family']))
                 else:
                     lists.append((key, values))
         for key, values in lists:

src/rougail/template/base.py

@@ -32,7 +32,7 @@ from shutil import copy
 import logging
 from typing import Dict, Any
 from subprocess import call
-from os import listdir, makedirs, getcwd, chdir, unlink, rmdir
+from os import listdir, makedirs, getcwd, chdir, unlink, rmdir, chmod
 from os.path import dirname, join, isfile, isdir, abspath
 
 

src/rougail/template/engine/__init__.py

@@ -1,4 +1,4 @@
-from . import none, creole, jinja2, creole_legacy
+from . import none, creole, jinja, creole_legacy
 
 
-__all__ = ('none', 'creole', 'jinja2', 'creole_legacy')
+__all__ = ('none', 'creole', 'jinja', 'creole_legacy')

src/rougail/template/engine/jinja.py

@@ -1,4 +1,4 @@
-"""Jinja2 engine
+"""Jinja engine
 
 Created by:
 EOLE (http://eole.orion.education.fr)
@@ -51,7 +51,7 @@ def process(filename: str,
     # full path of the destination file
     dir_name, template_name = filename.rsplit('/', 1)
     if source is not None:  # pragma: no cover
-        raise TemplateError(_('source is not supported for jinja2'))
+        raise TemplateError(_('source is not supported for jinja'))
     var = {}
     if variable is not None:
         var['rougail_variable'] = variable

src/rougail/template/systemd.py

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
 from typing import Dict, Any
-from os import makedirs, symlink, chmod
+from os import makedirs, symlink
 from os.path import dirname, isfile, join
 from ipaddress import ip_network
 

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

@@ -1,12 +1,11 @@
 version: '0.10'
 variables:
 - variable:
-    name: myvar
+  - name: myvar
     auto_freeze: true
     value:
     - text: 'no'
-- variable:
+  - name: server_deployed
-    name: server_deployed
     type: boolean
     value:
     - text: false

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

@@ -1,13 +1,12 @@
 version: '0.10'
 variables:
 - variable:
-    name: my_var
+  - name: my_var
     auto_freeze: true
     mode: expert
     value:
     - text: 'no'
-- variable:
+  - name: server_deployed
-    name: server_deployed
     type: boolean
     value:
     - text: false

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

@@ -1,14 +1,14 @@
 version: '0.10'
 variables:
 - variable:
-    name: server_deployed
+  - name: server_deployed
     type: boolean
 - family:
-    name: general
+  - name: general
     description: "g\xE9n\xE9ral"
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         auto_save: true

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

@@ -1,14 +1,14 @@
 version: '0.10'
 variables:
 - variable:
-    name: server_deployed
+  - name: server_deployed
     type: boolean
 - family:
-    name: general
+  - name: general
     description: "g\xE9n\xE9ral"
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         auto_save: true

tests/dictionaries/00load_comment/yml/00-base.yml

@@ -1,11 +1,11 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     description: "g\xE9n\xE9ral"
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         hidden: true

tests/dictionaries/00load_notype/yml/00-base.yml

@@ -1,17 +1,16 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     description: "g\xE9n\xE9ral"
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         hidden: true
         value:
         - text: non
-    - variable:
+      - name: without_type
-        name: without_type
         value:
         - text: non

tests/dictionaries/00load_save/yml/00-base.yml

@@ -1,11 +1,11 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     description: "g\xE9n\xE9ral"
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         hidden: true

tests/dictionaries/00load_subfolder/yml/99-base.yml

@@ -1,11 +1,11 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     description: "g\xE9n\xE9ral"
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         hidden: true

tests/dictionaries/00load_subfolder/yml/subfolder/00-base.yml

@@ -1,11 +1,11 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     description: "g\xE9n\xE9ral"
     variables:
     - variable:
-        name: mode_conteneur_actif1
+      - name: mode_conteneur_actif1
         type: string
         description: No change
         hidden: true

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

@@ -1,12 +1,11 @@
 version: '0.10'
 variables:
 - variable:
-    name: server_deployed
+  - name: server_deployed
     type: boolean
     value:
     - text: false
-- variable:
+  - name: my_variable
-    name: my_variable
     auto_freeze: true
     hidden: true
     value:

tests/dictionaries/01auto_base/yml/00-base.yml

@@ -1,17 +1,16 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         hidden: true
         value:
         - text: non
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: No change
         value:

tests/dictionaries/01auto_withoutparam/yml/00-base.yml

@@ -1,17 +1,16 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         hidden: true
         value:
         - text: non
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: No change
         value:

tests/dictionaries/01base_domainname/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: domain
+      - name: domain
         type: domainname
         description: Description
         value:

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

@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
 option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_9 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
 optiondescription_8.impl_set_information('source', "file2")
 optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
 option_3 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
 optiondescription_10.impl_set_information('source', "file2")
 optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
 option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "file")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_20 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_19 = OptionDescription(name="file2", doc="file2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
 optiondescription_19.impl_set_information('source', "file2")
 optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
 option_14 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file>/etc/file</file>
-      <file engine="jinja2">/etc/file2</file>
+      <file engine="jinja">/etc/file2</file>
     </service>
   </services>
   <variables>

tests/dictionaries/01base_file/yml/00-base.yml

@@ -4,14 +4,14 @@ services:
   - name: test
     file:
     - text: /etc/file
-    - engine: jinja2
+    - engine: jinja
       text: /etc/file2
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:

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

@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
 option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_9 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
 optiondescription_8.impl_set_information('source', "file2")
 option_13 = FilenameOption(name="name", doc="name", default="/etc/file3")
 option_12 = BoolOption(name="activate", doc="activate", default=False)

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

@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
 optiondescription_10.impl_set_information('source', "file2")
 option_15 = FilenameOption(name="name", doc="name", default="/etc/file3")
 option_14 = BoolOption(name="activate", doc="activate", default=False)
@@ -51,7 +51,7 @@ optiondescription_19.impl_set_information('source', "file")
 option_24 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_23 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_22 = OptionDescription(name="file2", doc="file2", children=[option_24, option_23])
-optiondescription_22.impl_set_information('engine', "jinja2")
+optiondescription_22.impl_set_information('engine', "jinja")
 optiondescription_22.impl_set_information('source', "file2")
 option_27 = FilenameOption(name="name", doc="name", default="/etc/file3")
 option_26 = BoolOption(name="activate", doc="activate", default=False)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file>/etc/file</file>
-      <file engine="jinja2">/etc/file2</file>
+      <file engine="jinja">/etc/file2</file>
       <file disabled='True'>/etc/file3</file>
     </service>
   </services>

tests/dictionaries/01base_file_disabled/yml/00-base.yml

@@ -4,16 +4,16 @@ services:
   - name: test
     file:
     - text: /etc/file
-    - engine: jinja2
+    - engine: jinja
       text: /etc/file2
     - disabled: true
       text: /etc/file3
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:

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

@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
 option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_9 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
 optiondescription_8.impl_set_information('source', "file2")
 optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
 option_3 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
 optiondescription_10.impl_set_information('source', "file2")
 optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
 option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "file")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_20 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_19 = OptionDescription(name="file2", doc="file2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
 optiondescription_19.impl_set_information('source', "file2")
 optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
 option_14 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file>/etc/file</file>
-      <file engine="jinja2">/etc/file2</file>
+      <file engine="jinja">/etc/file2</file>
     </service>
   </services>
   <variables>

tests/dictionaries/01base_file_include/yml/00-base.yml

@@ -4,14 +4,14 @@ services:
   - name: test
     file:
     - text: /etc/file
-    - engine: jinja2
+    - engine: jinja
       text: /etc/file2
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:

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

@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
 option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_9 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
 optiondescription_8.impl_set_information('source', "file2")
 option_13 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_12 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
 optiondescription_10.impl_set_information('source', "file2")
 option_15 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_14 = BoolOption(name="activate", doc="activate", default=True)
@@ -52,7 +52,7 @@ optiondescription_19.impl_set_information('source', "file")
 option_24 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_23 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_22 = OptionDescription(name="file2", doc="file2", children=[option_24, option_23])
-optiondescription_22.impl_set_information('engine', "jinja2")
+optiondescription_22.impl_set_information('engine', "jinja")
 optiondescription_22.impl_set_information('source', "file2")
 option_27 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_26 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file>/etc/file</file>
-      <file engine="jinja2">/etc/file2</file>
+      <file engine="jinja">/etc/file2</file>
       <file included="content">/etc/dir/incfile</file>
     </service>
   </services>

tests/dictionaries/01base_file_include_content/yml/00-base.yml

@@ -4,16 +4,16 @@ services:
   - name: test
     file:
     - text: /etc/file
-    - engine: jinja2
+    - engine: jinja
       text: /etc/file2
     - included: content
       text: /etc/dir/incfile
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:

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

@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
 option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_9 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
 optiondescription_8.impl_set_information('source', "file2")
 option_13 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_12 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
 optiondescription_10.impl_set_information('source', "file2")
 option_15 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_14 = BoolOption(name="activate", doc="activate", default=True)
@@ -52,7 +52,7 @@ optiondescription_19.impl_set_information('source', "file")
 option_24 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_23 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_22 = OptionDescription(name="file2", doc="file2", children=[option_24, option_23])
-optiondescription_22.impl_set_information('engine', "jinja2")
+optiondescription_22.impl_set_information('engine', "jinja")
 optiondescription_22.impl_set_information('source', "file2")
 option_27 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_26 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file>/etc/file</file>
-      <file engine="jinja2">/etc/file2</file>
+      <file engine="jinja">/etc/file2</file>
       <file included="name">/etc/dir/incfile</file>
     </service>
   </services>

tests/dictionaries/01base_file_include_name/yml/00-base.yml

@@ -4,16 +4,16 @@ services:
   - name: test
     file:
     - text: /etc/file
-    - engine: jinja2
+    - engine: jinja
       text: /etc/file2
     - included: name
       text: /etc/dir/incfile
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:

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

@@ -32,7 +32,7 @@ option_13 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_14 = UsernameOption(name="owner", doc="owner", default="nobody")
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_13, option_14, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
 optiondescription_10.impl_set_information('source', "file2")
 optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_10])
 option_3 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -32,7 +32,7 @@ option_15 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_16 = UsernameOption(name="owner", doc="owner", default="nobody")
 option_13 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_12 = OptionDescription(name="file2", doc="file2", children=[option_14, option_15, option_16, option_13])
-optiondescription_12.impl_set_information('engine', "jinja2")
+optiondescription_12.impl_set_information('engine', "jinja")
 optiondescription_12.impl_set_information('source', "file2")
 optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_12])
 option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -55,7 +55,7 @@ option_28 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_29 = UsernameOption(name="owner", doc="owner", default="nobody")
 option_26 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_25 = OptionDescription(name="file2", doc="file2", children=[option_27, option_28, option_29, option_26])
-optiondescription_25.impl_set_information('engine', "jinja2")
+optiondescription_25.impl_set_information('engine', "jinja")
 optiondescription_25.impl_set_information('source', "file2")
 optiondescription_19 = OptionDescription(name="files", doc="files", children=[optiondescription_20, optiondescription_25])
 option_18 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file owner="nobody" group="nobody">/etc/file</file>
-      <file owner="nobody" group="nobody" engine="jinja2">/etc/file2</file>
+      <file owner="nobody" group="nobody" engine="jinja">/etc/file2</file>
     </service>
   </services>
   <variables>

tests/dictionaries/01base_file_owner/yml/00-base.yml

@@ -8,14 +8,14 @@ services:
       text: /etc/file
     - owner: nobody
       group: nobody
-      engine: jinja2
+      engine: jinja
       text: /etc/file2
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:

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

@@ -34,7 +34,7 @@ option_15 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_16 = SymLinkOption(name="owner", opt=option_3)
 option_13 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_12 = OptionDescription(name="file2", doc="file2", children=[option_14, option_15, option_16, option_13])
-optiondescription_12.impl_set_information('engine', "jinja2")
+optiondescription_12.impl_set_information('engine', "jinja")
 optiondescription_12.impl_set_information('source', "file2")
 optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_12])
 option_5 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -34,7 +34,7 @@ option_19 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_20 = SymLinkOption(name="owner", opt=option_3)
 option_17 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_16 = OptionDescription(name="file2", doc="file2", children=[option_18, option_19, option_20, option_17])
-optiondescription_16.impl_set_information('engine', "jinja2")
+optiondescription_16.impl_set_information('engine', "jinja")
 optiondescription_16.impl_set_information('source', "file2")
 optiondescription_10 = OptionDescription(name="files", doc="files", children=[optiondescription_11, optiondescription_16])
 option_9 = BoolOption(name="activate", doc="activate", default=True)
@@ -59,7 +59,7 @@ option_32 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_33 = SymLinkOption(name="owner", opt=option_7)
 option_30 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_29 = OptionDescription(name="file2", doc="file2", children=[option_31, option_32, option_33, option_30])
-optiondescription_29.impl_set_information('engine', "jinja2")
+optiondescription_29.impl_set_information('engine', "jinja")
 optiondescription_29.impl_set_information('source', "file2")
 optiondescription_23 = OptionDescription(name="files", doc="files", children=[optiondescription_24, optiondescription_29])
 option_22 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file owner_type='variable' owner="owner" group_type='variable' group="group">/etc/file</file>
-      <file owner_type='variable' owner="owner" group_type='variable' group="group" engine="jinja2">/etc/file2</file>
+      <file owner_type='variable' owner="owner" group_type='variable' group="group" engine="jinja">/etc/file2</file>
     </service>
   </services>
   <variables>

tests/dictionaries/01base_file_owner_variable/yml/00-base.yml

@@ -12,25 +12,23 @@ services:
       owner: owner
       group_type: variable
       group: group
-      engine: jinja2
+      engine: jinja
       text: /etc/file2
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:
         - text: non
-    - variable:
+      - name: owner
-        name: owner
         type: unix_user
         value:
         - text: nobody
-    - variable:
+      - name: group
-        name: group
         type: unix_user
         value:
         - text: nobody

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

@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
 option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_9 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
 optiondescription_8.impl_set_information('source', "file2")
 optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
 option_3 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
 optiondescription_10.impl_set_information('source', "file2")
 optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
 option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "file")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_20 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_19 = OptionDescription(name="file2", doc="file2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
 optiondescription_19.impl_set_information('source', "file2")
 optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
 option_14 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file>/etc/file</file>
-      <file engine="jinja2">/etc/file2</file>
+      <file engine="jinja">/etc/file2</file>
     </service>
   </services>
   <variables>

tests/dictionaries/01base_file_patch/yml/00-base.yml

@@ -4,14 +4,14 @@ services:
   - name: test
     file:
     - text: /etc/file
-    - engine: jinja2
+    - engine: jinja
       text: /etc/file2
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:

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

@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "file")
 option_10 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_9 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_8 = OptionDescription(name="file2", doc="file2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
 optiondescription_8.impl_set_information('source', "file2")
 optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
 option_3 = BoolOption(name="activate", doc="activate", default=True)

tests/dictionaries/01base_file_tmpfile_dest_dir/tiramisu/multi.py

@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "file")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_10 = OptionDescription(name="file2", doc="file2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
 optiondescription_10.impl_set_information('source', "file2")
 optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
 option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "file")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_20 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_19 = OptionDescription(name="file2", doc="file2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
 optiondescription_19.impl_set_information('source', "file2")
 optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
 option_14 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file>/etc/file</file>
-      <file engine="jinja2">/etc/file2</file>
+      <file engine="jinja">/etc/file2</file>
     </service>
   </services>
   <variables>

tests/dictionaries/01base_file_tmpfile_dest_dir/yml/00-base.yml

@@ -4,14 +4,14 @@ services:
   - name: test
     file:
     - text: /etc/file
-    - engine: jinja2
+    - engine: jinja
       text: /etc/file2
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:

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

@@ -28,7 +28,7 @@ optiondescription_5.impl_set_information('source', "systemd-makefs@dev-disk-by\\
 option_10 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
 option_9 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_8 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_10, option_9])
-optiondescription_8.impl_set_information('engine', "jinja2")
+optiondescription_8.impl_set_information('engine', "jinja")
 optiondescription_8.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel2")
 optiondescription_4 = OptionDescription(name="files", doc="files", children=[optiondescription_5, optiondescription_8])
 option_3 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -28,7 +28,7 @@ optiondescription_7.impl_set_information('source', "systemd-makefs@dev-disk-by\\
 option_12 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
 option_11 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_10 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_12, option_11])
-optiondescription_10.impl_set_information('engine', "jinja2")
+optiondescription_10.impl_set_information('engine', "jinja")
 optiondescription_10.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel2")
 optiondescription_6 = OptionDescription(name="files", doc="files", children=[optiondescription_7, optiondescription_10])
 option_5 = BoolOption(name="activate", doc="activate", default=True)
@@ -47,7 +47,7 @@ optiondescription_16.impl_set_information('source', "systemd-makefs@dev-disk-by\
 option_21 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
 option_20 = BoolOption(name="activate", doc="activate", default=True)
 optiondescription_19 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel2", doc="systemd-makefs@dev-disk-by\\x2dpartlabel2", children=[option_21, option_20])
-optiondescription_19.impl_set_information('engine', "jinja2")
+optiondescription_19.impl_set_information('engine', "jinja")
 optiondescription_19.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlabel2")
 optiondescription_15 = OptionDescription(name="files", doc="files", children=[optiondescription_16, optiondescription_19])
 option_14 = BoolOption(name="activate", doc="activate", default=True)

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

@@ -3,7 +3,7 @@
   <services>
     <service name="test">
       <file>/etc/systemd-makefs@dev-disk-by\x2dpartlabel</file>
-      <file engine="jinja2">/etc/systemd-makefs@dev-disk-by\x2dpartlabel2</file>
+      <file engine="jinja">/etc/systemd-makefs@dev-disk-by\x2dpartlabel2</file>
     </service>
   </services>
   <variables>

tests/dictionaries/01base_file_utfchar/yml/00-base.yml

@@ -4,14 +4,14 @@ services:
   - name: test
     file:
     - text: /etc/systemd-makefs@dev-disk-by\x2dpartlabel
-    - engine: jinja2
+    - engine: jinja
       text: /etc/systemd-makefs@dev-disk-by\x2dpartlabel2
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Description
         value:

tests/dictionaries/01base_float/yml/00-base.yml

@@ -1,16 +1,15 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: float
+      - name: float
         type: float
         description: Description
         value:
         - text: 0.527
-    - variable:
+      - name: float_multi
-        name: float_multi
         type: float
         description: Description
         multi: true

tests/dictionaries/01base_help_quote/yml/00-base.yml

@@ -1,15 +1,14 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         help: message with '
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: Redefine description
         help: message with "

tests/dictionaries/01base_multi/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_multi_notuniq/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_multi_uniq/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_provider/yml/00-base.yml

@@ -1,17 +1,16 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: float
+      - name: float
         type: float
         description: Description
         provider: float
         value:
         - text: 0.527
-    - variable:
+      - name: float_multi
-        name: float_multi
         type: float
         description: Description
         multi: true

tests/dictionaries/01base_provider_extra/yml/00-base.yml

@@ -1,6 +1,6 @@
 version: '0.10'
 variables:
 - variable:
-    name: float
+  - name: float
     type: float
     description: Description

tests/dictionaries/01base_provider_extra/yml/extra_dirs/extra/00-base.yml

@@ -1,9 +1,9 @@
 version: '0.10'
 variables:
 - family:
-    name: example
+  - name: example
     variables:
     - variable:
-        name: description
+      - name: description
         type: string
         provider: example

tests/dictionaries/01base_provider_hidden/yml/00-base.yml

@@ -1,18 +1,17 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: float
+      - name: float
         type: float
         description: Description
         provider: float
         hidden: true
         value:
         - text: 0.527
-    - variable:
+      - name: float_multi
-        name: float_multi
         type: float
         description: Description
         multi: true

tests/dictionaries/01base_value_doublequote/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_value_doublequote2/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_value_doublequote3/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_value_multi_doublequote/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_value_multi_doublequote2/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_value_multi_quote/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_value_quote/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: Redefine description
         hidden: true

tests/dictionaries/01base_var_name_same_family/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: general
+      - name: general
         type: string
         description: description
         value:

tests/dictionaries/01boolean_no_mandatory/yml/00-base.yml

@@ -1,6 +1,6 @@
 version: '0.10'
 variables:
 - variable:
-    name: my_variable
+  - name: my_variable
     type: boolean
     mandatory: false

tests/dictionaries/01family_description/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     description: Other description
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         value:
         - text: non

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

@@ -1,16 +1,14 @@
 version: '0.10'
 variables:
 - variable:
-    name: my_var1
+  - name: my_var1
     auto_freeze: true
     value:
     - text: 'no'
-- variable:
+  - name: my_var2
-    name: my_var2
     value:
     - text: 'no'
-- variable:
+  - name: server_deployed
-    name: server_deployed
     type: boolean
     value:
     - text: false

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

@@ -1,20 +1,19 @@
 version: '0.10'
 variables:
 - variable:
-    name: server_deployed
+  - name: server_deployed
     type: boolean
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         auto_save: true
         value:
         - text: non
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: No change
         value:

tests/dictionaries/01fill_base/yml/00-base.yml

@@ -1,14 +1,13 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: No change
         value:

tests/dictionaries/01fill_mandatory/yml/00-base.yml

@@ -1,17 +1,16 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     mode: basic
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         mandatory: true
         mode: expert
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: No change
         value:

tests/dictionaries/01fill_number/yml/00-base.yml

@@ -1,15 +1,14 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: number
         description: No change
         hidden: true
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: No change
         value:

tests/dictionaries/01fill_only_optional/yml/00-base.yml

@@ -1,17 +1,16 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         hidden: true
         value:
         - text: non
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: No change
         value:

tests/dictionaries/01fill_optional/yml/00-base.yml

@@ -1,17 +1,16 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         hidden: true
         value:
         - text: non
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: No change
         value:

tests/dictionaries/01fill_quote/yml/00-base.yml

@@ -1,22 +1,19 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
-    - variable:
+      - name: mode_conteneur_actif1
-        name: mode_conteneur_actif1
         type: string
         description: No change
-    - variable:
+      - name: mode_conteneur_actif2
-        name: mode_conteneur_actif2
         type: string
         description: No change
-    - variable:
+      - name: mode_conteneur_actif3
-        name: mode_conteneur_actif3
         type: string
         description: No change
 constraints:

tests/dictionaries/01fill_target_optional/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif1
+      - name: mode_conteneur_actif1
         type: string
         description: No change
         value:

tests/dictionaries/01hidden_if_in_autofreeze/yml/00-base.yml

@@ -1,12 +1,11 @@
 version: '0.10'
 variables:
 - variable:
-    name: server_deployed
+  - name: server_deployed
     type: boolean
     value:
     - text: false
-- variable:
+  - name: my_var
-    name: my_var
     type: string
     auto_freeze: true
     value:

tests/dictionaries/01test/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         test: test
         value:
         - text: non

tests/dictionaries/01test_multi/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         test: test1|test2
         value:
         - text: non

tests/dictionaries/01test_multi_none/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         test: '|test1|test2'
         value:
         - text: non

tests/dictionaries/01test_redefine/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         test: test
         value:
         - text: non

tests/dictionaries/01test_redefine/yml/10-base.yml

@@ -1,9 +1,9 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         redefine: true
         test: test1

tests/dictionaries/01test_redefine_base/yml/00-base.yml

@@ -1,4 +1,4 @@
 version: '0.10'
 variables:
 - variable:
-    name: my_variable
+  - name: my_variable

tests/dictionaries/01test_redefine_base/yml/10-base.yml

@@ -1,6 +1,6 @@
 version: '0.10'
 variables:
 - variable:
-    name: my_variable
+  - name: my_variable
     redefine: true
     test: test1

tests/dictionaries/01test_redefine_remove/yml/00-base.yml

@@ -1,10 +1,10 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         test: test
         value:
         - text: non

tests/dictionaries/01test_redefine_remove/yml/10-base.yml

@@ -1,9 +1,9 @@
 version: '0.10'
 variables:
 - family:
-    name: general
+  - name: general
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         redefine: true
         test: ''

tests/dictionaries/02autosave_hidden_frozenifin/yml/00-base.yml

@@ -1,21 +1,20 @@
 version: '0.10'
 variables:
 - variable:
-    name: server_deployed
+  - name: server_deployed
     type: boolean
 - family:
-    name: general
+  - name: general
     description: "g\xE9n\xE9ral"
     variables:
     - variable:
-        name: mode_conteneur_actif
+      - name: mode_conteneur_actif
         type: string
         description: No change
         hidden: true
         value:
         - text: non
-    - variable:
+      - name: autosavevar
-        name: autosavevar
         type: string
         description: autosave variable
         auto_save: true

tests/dictionaries/02fill_multi_calc_val/yml/00-base.yml

@@ -1,11 +1,10 @@
 version: '0.10'
 variables:
 - variable:
-    name: var1
+  - name: var1
     value:
     - text: 'no'
-- variable:
+  - name: var2
-    name: var2
     multi: true
 constraints:
 - fill: