use only boolean with yaml

doc/check/redefine.md

@@ -47,7 +47,7 @@ En YAML :
 variables:
 - variable:
     name: my_variable
-    redefine: 'True'
+    redefine: true
 constraints:
 - check:
   - name: isspace
@@ -103,6 +103,6 @@ En YAML :
 variables:
 - variable:
     name: my_variable
-    redefine: 'True'
+    redefine: true
-    remove_check: 'True'
+    remove_check: true
 ```

doc/condition/condition.md

@@ -36,7 +36,7 @@ constraints:
   - name: hidden_if_in
     source: condition
     param:
-    - text: 'True'
+    - text: true
     target:
     - text: my_variable
 ```
@@ -119,8 +119,8 @@ En YAML :
 - condition:
   - name: hidden_if_in
     source: condition
-    optional: 'True'
+    optional: true
-    apply_on_fallback: 'False'
+    apply_on_fallback: false
     param:
     - text: 'yes'
     - text: 'maybe'

doc/condition/redefine.md

@@ -34,7 +34,7 @@ constraints:
   - name: hidden_if_in
     source: condition
     param:
-    - text: 'True'
+    - text: true
     target:
     - text: my_variable
 ```
@@ -53,6 +53,6 @@ En YAML :
 variables:
 - variable:
     name: condition
-    redefine: 'True'
+    redefine: true
-    remove_condition: 'True'
+    remove_condition: true
 ```

doc/family/auto.md

@@ -21,7 +21,7 @@ En YAML :
 variables:
 - variable:
     name: variable
-    multi: 'True'
+    multi: true
     value:
     - text: 'val1'
     - text: 'val2'

doc/family/leadership.md

@@ -49,16 +49,16 @@ En YAML :
 variables:
 - family:
     name: family
-    leadership: 'True'
+    leadership: true
     variables:
     - variable:
         name: leader
-        multi: 'True'
+        multi: true
     - variable:
         name: follower1
     - variable:
         name: follower2
-        multi: 'True'
+        multi: true
 ```
 
 ## Ajout d'une nouvelle variable suiveuse

doc/family/simple.md

@@ -124,5 +124,5 @@ En YAML :
 ```
 - family:
     name: my_family
-    hidden: 'True'
+    hidden: true
 ```

doc/fill/examples.md

@@ -22,7 +22,7 @@ variables:
 - variable:
     name: zones_list
     type: string
-    multi: 'True'
+    multi: true
     value:
     - text: 'zone1'
     - text: 'zone2'
@@ -30,8 +30,8 @@ variables:
 - variable:
     name: netwokd_configurations
     type: filename
-    multi: 'True'
+    multi: true
-    hidden: 'True'
+    hidden: true
 ```
 
 Calculons la valeur de la seconde variable à partir de la première :
@@ -63,7 +63,7 @@ constraints:
     - name: join
     - name: multi
       type: boolean
-      text: 'True'
+      text: true
     target:
     - text: netwokd_configurations
 ```

doc/fill/redefine.md

@@ -47,7 +47,7 @@ En YAML :
 variables:
 - variable:
     name: my_calculated_variable
-    redefine: 'True'
+    redefine: true
 constraints:
 - fill:
   - name: return_yes
@@ -103,6 +103,6 @@ En YAML :
 variables:
 - variable:
     name: my_calculated_variable
-    redefine: 'True'
+    redefine: true
-    remove_fill: 'True'
+    remove_fill: true
 ```

doc/fill/value.md

@@ -75,7 +75,7 @@ En YAML :
 variables:
 - variable:
     name: my_calculated_variable
-    hidden: 'True'
+    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.
@@ -121,7 +121,7 @@ variables:
     name: suffixes
     type: string
     description: Suffixes of dynamic family
-    multi: 'True'
+    multi: true
     value:
     - text: val1
     - text: val2

doc/param/simple.md

@@ -56,7 +56,7 @@ En YAML :
 ```
 param:
 - type: boolean
-  text: 'True'
+  text: true
 ```
 
 # Paramètre de type "nil"

doc/param/variable.md

@@ -31,7 +31,7 @@ En YAML :
 ```
 param:
 - type: variable
-  optional: 'True'
+  optional: true
   text: unknow_variable
 ```
 
@@ -54,7 +54,7 @@ En YAML :
 ```
 param:
 - type: variable
-  propertyerror: 'False'
+  propertyerror: false
   text: variable1
 ```
 

doc/service/README.md

@@ -101,7 +101,7 @@ En YAML :
 ```
 - service:
   - name: ldap_client
-    manage: 'False'
+    manage: false
 ```
 
 Un service factice est généralement une service qui n'existe pas réellement (par exemple si on configure un client). Il n'est là que pour contenir des fichiers.
@@ -119,7 +119,7 @@ En YAML :
 ```
 - service:
   - name: test
-    disabled: 'True'
+    disabled: true
 ```
 
 Dans ce cas, le service et les éléments qu'il compose ([fichier](file.md), [IP](ip.md) et [réécriture](override.md) seront désactivés.
@@ -158,7 +158,7 @@ constraints:
     name: disabled_if_in
     source: condition
     param:
-    - text: 'False'
+    - text: false
     target:
     - type: servicelist
       text: test
@@ -181,6 +181,6 @@ En YAML :
 ```
 - service:
   - name: test
-    disabled: 'True'
+    disabled: true
-    undisable: 'True'
+    undisable: true
 ```

doc/service/file.md

@@ -109,7 +109,7 @@ services:
 variables:
 - variable:
     name: my_variable
-    multi: 'True'
+    multi: true
     value:
     - text: /etc/squid1/squid.conf
     - text: /etc/squid2/squid.conf
@@ -157,13 +157,13 @@ services:
 variables:
 - variable:
     name: my_variable1
-    multi: 'True'
+    multi: true
     value:
     - text: /etc/squid1/squid.conf
     - text: /etc/squid2/squid.conf
 - variable:
     name: my_variable2
-    multi: 'True'
+    multi: true
     value:
     - text: squid1
     - text: squid2
@@ -207,7 +207,7 @@ En YAML :
 
 ```
 file:
-- disabled: 'True'
+- disabled: true
   text: /etc/squid/squid.conf
 ```
 
@@ -248,7 +248,7 @@ constraints:
   - name: disabled_if_in
     source: condition
     param:
-    - text: 'False'
+    - text: false
     target:
     - type: filelist
       text: squid

doc/service/ip.md

@@ -81,7 +81,7 @@ constraints:
   - name: disabled_if_in
     source: condition
     param:
-    - text: 'False'
+    - text: false
     target:
     - type: iplist
       text: test_ip

doc/target/family.md

@@ -25,6 +25,6 @@ En YAML :
 ```
 target:
 - type: family
-  optional: 'True'
+  optional: true
   text: my_family
 ```

doc/target/list.md

@@ -63,6 +63,6 @@ En YAML :
 ```
 target:
 - type: filelist
-  optional: 'True'
+  optional: true
   text: unknown
 ```

doc/target/variable.md

@@ -23,6 +23,6 @@ En YAML :
 
 ```
 target:
-- optional: 'True'
+- optional: true
   text: my_variable
 ```

doc/variable/README.md

@@ -120,7 +120,7 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    multi: 'True'
+    multi: true
 ```
 
 ## Variable invisible
@@ -141,7 +141,7 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    hidden: 'True'
+    hidden: true
 ```
 
 ## Variable désactive
@@ -161,7 +161,7 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    disabled: 'True'
+    disabled: true
 ```
 
 ## Variable obligatoire
@@ -177,7 +177,7 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    mandatory: 'True'
+    mandatory: true
 ```
 
 Les variables booléans sont par défaut obligatoire. Pour qu'une variable booléan ne soit pas obligatoire il faut le préciser explicitement :
@@ -192,7 +192,7 @@ En YAML :
 - variable:
     name: my_variable
     type: boolean
-    mandatory: 'False'
+    mandatory: false
 ```
 
 Les variables avec une valeur par défaut (non calculée) sont également automatiquement obligatoire.
@@ -230,7 +230,7 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    multi: 'True'
+    multi: true
     value:
     - text: value 1
     - text: value 2
@@ -274,7 +274,7 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    redefine: 'True'
+    redefine: true
     description: New description
 ```
 
@@ -291,7 +291,7 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    exists: 'False'
+    exists: false
 ```
 
 Si cette variable existe dans un autre dictionnaire, elle ne sera pas modifié ni recréé
@@ -309,8 +309,8 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    exists: 'True'
+    exists: true
-    hidden: 'True'
+    hidden: true
 ```
 
 ## Variable à valeur automatiquement modifiée
@@ -330,7 +330,7 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    auto_save: 'True'
+    auto_save: true
     value:
     - text: my_value
 ```
@@ -365,7 +365,7 @@ En YAML :
     - text: 'False
 - variable:
     name: my_variable
-    auto_freeze: 'True'
+    auto_freeze: true
 ```
 
 Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.

doc/variable/choice.md

@@ -79,7 +79,7 @@ En YAML :
     - type: number
       text: '3'
     - type: boolean
-      text: 'True'
+      text: true
     - type: 'nil'
 ```
 
@@ -100,7 +100,7 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    redefine: 'True'
+    redefine: true
     choice:
     - text: val4
 ```
@@ -121,8 +121,8 @@ En YAML :
 ```
 - variable:
     name: my_variable
-    redefine: 'True'
+    redefine: true
-    remove_choice: 'True'
+    remove_choice: true
     choice:
     - text: val1
     - text: val2

src/rougail/annotator/property.py

@@ -84,7 +84,7 @@ class Annotator(Walk):
                     variable.properties.append(prop)
                 setattr(variable, prop, None)
         if hasattr(variable, 'unique') and variable.unique != 'nil':
-            if variable.unique == 'False':
+            if variable.unique == 'False' or variable.unique is False:
                 variable.properties.append('notunique')
             else:
                 variable.properties.append('unique')

src/rougail/annotator/variable.py

@@ -168,7 +168,11 @@ class Annotator(Walk):  # pylint: disable=R0903
                 else:
                     if not hasattr(value, 'type'):
                         value.type = variable.type
-                    value.name = CONVERT_OPTION.get(value.type, {}).get('func', str)(value.name)
+                    try:
+                        value.name = CONVERT_OPTION.get(value.type, {}).get('func', str)(value.name)
+                    except Exception as err:
+                        msg = _(f'the variable "{variable.name}" has an incorrect value "{value.name}" with "{variable.type}" type')
+                        raise DictConsistencyError(msg, 88, variable.xmlfiles)
             value_to_del.sort(reverse=True)
             for idx in value_to_del:
                 del variable.value[idx]

src/rougail/objspace.py

@@ -62,7 +62,7 @@ class RootRougailObject:  # pylint: disable=R0903
         if not isinstance(xmlfiles, list):
             xmlfiles = [xmlfiles]
         self.xmlfiles = xmlfiles
-        if name:
+        if name is not None:
             self.name = name
 
 
@@ -94,7 +94,9 @@ def convert_boolean(value: str) -> bool:
         return value
     if value == 'True':
         return True
-    return False
+    elif value == 'False':
+        return False
+    raise Exception(f'unknown boolean value {value}')
 
 
 class RougailObjSpace:
@@ -319,8 +321,11 @@ class RougailObjSpace:
             return child.attrib['name'] + '.' + child.attrib.get('type', 'service')
         if 'name' in child.attrib:
             return child.attrib['name']
-        if child.text and child.tag in self.forced_text_elts_as_name:
+        if child.text is not None and child.tag in self.forced_text_elts_as_name:
-            return child.text.strip()
+            text = child.text
+            if isinstance(text, str):
+                text = text.strip()
+            return text
         return None
 
     def create_or_update_redefinable_object(self,
@@ -411,8 +416,10 @@ class RougailObjSpace:
         """
         if child.text is None or child.tag in self.forced_text_elts_as_name:
             return
-        text = child.text.strip()
+        text = child.text
-        if text:
+        if isinstance(text, str):
+            text = text.strip()
+        if text != '':
             variableobj.text = text
 
     def set_attributes(self,

src/rougail/reflector.py

@@ -1,4 +1,4 @@
-"""load XML file from directory
+"""load XML and YAML file from directory
 
 Created by:
 EOLE (http://eole.orion.education.fr)
@@ -32,6 +32,7 @@ from os.path import join, isfile
 from os import listdir
 
 from lxml.etree import DTD, parse, XMLSyntaxError  # pylint: disable=E0611
+from pykwalify.compat import yml
 from pykwalify.core import Core
 from pykwalify.errors import SchemaError
 
@@ -41,6 +42,7 @@ from .error import DictConsistencyError
 
 
 FORCE_SUBYAML = ['override']
+SCHEMA_DATA = {}
 
 
 class Reflector:
@@ -65,6 +67,7 @@ class Reflector:
         if not isfile(yamlschema_filename):
             raise IOError(_(f"no such YAML Schema file: {yamlschema_filename}"))
         self.yamlschema_filename = yamlschema_filename
+        self.schema_data = None
 
     def load_dictionaries_from_folders(self,
                                        folders: List[str],
@@ -114,8 +117,14 @@ class Reflector:
     def load_yml_file(self,
                       filename: str,
                       ):
+        global SCHEMA_DATA
+        if self.yamlschema_filename not in SCHEMA_DATA:
+            with open(self.yamlschema_filename, 'r') as fh:
+                SCHEMA_DATA[self.yamlschema_filename] = yml.load(fh)
         try:
-            document = Core(source_file=filename, schema_files=[self.yamlschema_filename])
+            document = Core(source_file=filename,
+                            schema_data=SCHEMA_DATA[self.yamlschema_filename],
+                            )
         except XMLSyntaxError as err:
             raise DictConsistencyError(_(f'not a XML file: {err}'), 52, [filename]) from err
         try:

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

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

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

@@ -2,7 +2,7 @@ version: '0.10'
 variables:
 - variable:
     name: my_var
-    auto_freeze: 'True'
+    auto_freeze: true
     mode: expert
     value:
     - text: 'no'
@@ -10,4 +10,4 @@ variables:
     name: server_deployed
     type: boolean
     value:
-    - text: 'False'
+    - text: false

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

@@ -11,6 +11,6 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        auto_save: 'True'
+        auto_save: true
         value:
         - text: non

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

@@ -11,7 +11,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        auto_save: 'True'
+        auto_save: true
         mode: expert
         value:
         - text: non

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

@@ -8,6 +8,6 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non

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

@@ -8,7 +8,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
     - variable:

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

@@ -8,6 +8,6 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non

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

@@ -8,6 +8,6 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non

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

@@ -8,6 +8,6 @@ variables:
         name: mode_conteneur_actif1
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non

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

@@ -2,7 +2,7 @@
 <rougail version="0.10">
   <variables>
     <variable name="server_deployed" type="boolean">
-      <value>no</value>
+      <value>False</value>
     </variable>
     <variable name="my_variable" auto_freeze="True" hidden="True">
       <value>no</value>

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

@@ -4,11 +4,11 @@ variables:
     name: server_deployed
     type: boolean
     value:
-    - text: 'no'
+    - text: false
 - variable:
     name: my_variable
-    auto_freeze: 'True'
+    auto_freeze: true
-    hidden: 'True'
+    hidden: true
     value:
     - text: 'no'
 constraints:

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

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
     - variable:

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

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
     - variable:

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

@@ -6,7 +6,7 @@ services:
     - text: /etc/file
     - engine: jinja2
       text: /etc/file2
-    - disabled: 'True'
+    - disabled: true
       text: /etc/file3
 variables:
 - family:

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

@@ -13,6 +13,6 @@ variables:
         name: float_multi
         type: float
         description: Description
-        multi: 'True'
+        multi: true
         value:
         - text: '0.527'

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

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
-        multi: 'True'
+        multi: true
         value:
         - text: non

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

@@ -7,8 +7,8 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
-        multi: 'True'
+        multi: true
-        unique: 'False'
+        unique: false
         value:
         - text: non

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

@@ -7,8 +7,8 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
-        multi: 'True'
+        multi: true
-        unique: 'True'
+        unique: true
         value:
         - text: non

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

@@ -14,6 +14,6 @@ variables:
         name: float_multi
         type: float
         description: Description
-        multi: 'True'
+        multi: true
         value:
         - text: '0.527'

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

@@ -8,13 +8,13 @@ variables:
         type: float
         description: Description
         provider: float
-        hidden: 'True'
+        hidden: true
         value:
         - text: '0.527'
     - variable:
         name: float_multi
         type: float
         description: Description
-        multi: 'True'
+        multi: true
         value:
         - text: '0.527'

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

@@ -7,6 +7,6 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
         value:
         - text: quote"

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

@@ -7,6 +7,6 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
         value:
         - text: quote'"

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

@@ -7,6 +7,6 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
         value:
         - text: quote\"\'

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

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
-        multi: 'True'
+        multi: true
         value:
         - text: quote"

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

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
-        multi: 'True'
+        multi: true
         value:
         - text: quote'"

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

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
-        multi: 'True'
+        multi: true
         value:
         - text: quote'

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

@@ -7,6 +7,6 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: Redefine description
-        hidden: 'True'
+        hidden: true
         value:
         - text: quote'

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

@@ -3,4 +3,4 @@ variables:
 - variable:
     name: my_variable
     type: boolean
-    mandatory: 'False'
+    mandatory: false

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

@@ -2,7 +2,7 @@ version: '0.10'
 variables:
 - variable:
     name: my_var1
-    auto_freeze: 'True'
+    auto_freeze: true
     value:
     - text: 'no'
 - variable:
@@ -13,7 +13,7 @@ variables:
     name: server_deployed
     type: boolean
     value:
-    - text: 'False'
+    - text: false
 constraints:
 - fill:
   - name: calc_val

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

@@ -10,7 +10,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        auto_save: 'True'
+        auto_save: true
         value:
         - text: non
     - variable:

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

@@ -8,7 +8,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        mandatory: 'True'
+        mandatory: true
         mode: expert
     - variable:
         name: mode_conteneur_actif1

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

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: number
         description: No change
-        hidden: 'True'
+        hidden: true
     - variable:
         name: mode_conteneur_actif1
         type: string

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

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
     - variable:
@@ -21,7 +21,7 @@ constraints:
   - name: calc_val
     param:
     - type: variable
-      optional: 'True'
+      optional: true
       text: mode_conteneur_actif4
     target:
     - text: mode_conteneur_actif

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

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
     - variable:
@@ -21,12 +21,12 @@ constraints:
   - name: calc_val
     param:
     - type: variable
-      optional: 'True'
+      optional: true
       text: mode_conteneur_actif4
     - type: variable
       text: mode_conteneur_actif1
     - type: variable
-      optional: 'True'
+      optional: true
       text: mode_conteneur_actif3
     target:
     - text: mode_conteneur_actif

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

@@ -16,5 +16,5 @@ constraints:
     - type: variable
       text: mode_conteneur_actif1
     target:
-    - optional: 'True'
+    - optional: true
       text: mode_conteneur_actif

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

@@ -4,11 +4,11 @@ variables:
     name: server_deployed
     type: boolean
     value:
-    - text: 'False'
+    - text: false
 - variable:
     name: my_var
     type: string
-    auto_freeze: 'True'
+    auto_freeze: true
     value:
     - text: 'no'
 constraints:
@@ -22,7 +22,7 @@ constraints:
   - name: hidden_if_in
     source: server_deployed
     param:
-    - text: 'True'
+    - text: true
     target:
     - type: variable
       text: my_var

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

@@ -5,5 +5,5 @@ variables:
     variables:
     - variable:
         name: mode_conteneur_actif
-        redefine: 'True'
+        redefine: true
         test: test1

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

@@ -2,5 +2,5 @@ version: '0.10'
 variables:
 - variable:
     name: my_variable
-    redefine: 'True'
+    redefine: true
     test: test1

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

@@ -5,5 +5,5 @@ variables:
     variables:
     - variable:
         name: mode_conteneur_actif
-        redefine: 'True'
+        redefine: true
         test: ''

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

@@ -11,14 +11,14 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
     - variable:
         name: autosavevar
         type: string
         description: autosave variable
-        auto_save: 'True'
+        auto_save: true
 constraints:
 - fill:
   - name: calc_val

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

@@ -6,7 +6,7 @@ variables:
     - text: 'no'
 - variable:
     name: var2
-    multi: 'True'
+    multi: true
 constraints:
 - fill:
   - name: calc_value
@@ -15,6 +15,6 @@ constraints:
       text: var1
     - type: boolean
       name: multi
-      text: 'True'
+      text: true
     target:
     - text: var2

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

@@ -2,14 +2,14 @@ version: '0.10'
 variables:
 - variable:
     name: var1
-    multi: 'True'
+    multi: true
     value:
     - text: 'no'
     - text: 'yes'
     - text: maybe
 - variable:
     name: var2
-    multi: 'True'
+    multi: true
 constraints:
 - fill:
   - name: calc_value

tests/dictionaries/10autosave_hidden/yml/00-base.yml

@@ -11,15 +11,15 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
     - variable:
         name: autosavevar
         type: string
         description: autosave variable
-        hidden: 'True'
+        hidden: true
-        auto_save: 'True'
+        auto_save: true
 constraints:
 - fill:
   - name: calc_val

tests/dictionaries/10check_base_target_optional/yml/00-base.yml

@@ -13,5 +13,5 @@ constraints:
       type: number
       text: '100'
     target:
-    - optional: 'True'
+    - optional: true
       text: int

tests/dictionaries/10check_optional/yml/00-base.yml

@@ -22,14 +22,14 @@ constraints:
   - name: valid_differ
     param:
     - type: variable
-      optional: 'True'
+      optional: true
       text: int2
     target:
     - text: int
   - name: valid_differ
     param:
     - type: variable
-      optional: 'True'
+      optional: true
       text: int3
     target:
     - text: int

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

@@ -5,7 +5,7 @@ variables:
     variables:
     - variable:
         name: mode_conteneur_actif3
-        redefine: 'True'
+        redefine: true
 constraints:
 - check:
   - name: valid_differ

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

@@ -5,8 +5,8 @@ variables:
     variables:
     - variable:
         name: mode_conteneur_actif3
-        redefine: 'True'
+        redefine: true
-        remove_check: 'True'
+        remove_check: true
         value:
         - text: oui
 constraints:

tests/dictionaries/10check_valid_in_network/yml/00-base.yml

@@ -13,19 +13,19 @@ variables:
         name: adresse_ip_eth0
         type: local_ip
         description: Adresse IP de la carte
-        mandatory: 'True'
+        mandatory: true
         mode: basic
     - variable:
         name: adresse_netmask_eth0
         type: netmask
         description: "Masque de sous r\xE9seau de la carte"
-        mandatory: 'True'
+        mandatory: true
         mode: basic
     - variable:
         name: adresse_ip
         type: local_ip
         description: IP
-        mandatory: 'True'
+        mandatory: true
         mode: basic
 constraints:
 - check:

tests/dictionaries/10check_valid_in_network_cidr/yml/00-base.yml

@@ -13,13 +13,13 @@ variables:
         name: adresse_ip_eth0
         type: cidr
         description: Adresse IP de la carte
-        mandatory: 'True'
+        mandatory: true
         mode: basic
     - variable:
         name: adresse_ip
         type: local_ip
         description: IP
-        mandatory: 'True'
+        mandatory: true
         mode: basic
 constraints:
 - check:

tests/dictionaries/10check_valid_ipnetmask/yml/00-base.yml

@@ -13,13 +13,13 @@ variables:
         name: adresse_ip_eth0
         type: local_ip
         description: Adresse IP de la carte
-        mandatory: 'True'
+        mandatory: true
         mode: basic
     - variable:
         name: adresse_netmask_eth0
         type: netmask
         description: "Masque de sous r\xE9seau de la carte"
-        mandatory: 'True'
+        mandatory: true
         mode: basic
 constraints:
 - check:

tests/dictionaries/10fill_information_multi/yml/00-base.yml

@@ -7,7 +7,7 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        multi: 'True'
+        multi: true
 constraints:
 - fill:
   - name: calc_val

tests/dictionaries/10leadership_append/yml/00-base.yml

@@ -15,13 +15,13 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower1
             type: string

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

@@ -5,7 +5,7 @@ variables:
     variables:
     - family:
         name: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: follower3

tests/dictionaries/10leadership_append_hidden/yml/00-base.yml

@@ -15,14 +15,14 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
-            hidden: 'True'
+            hidden: true
         - variable:
             name: follower1
             type: string

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

@@ -5,7 +5,7 @@ variables:
     variables:
     - family:
         name: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: follower3

tests/dictionaries/10leadership_append_name/yml/00-base.yml

@@ -15,13 +15,13 @@ variables:
     - family:
         name: leadership
         description: leadership
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower1
             type: string

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

@@ -5,7 +5,7 @@ variables:
     variables:
     - family:
         name: leadership
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: follower3

tests/dictionaries/10leadership_auto/yml/00-base.yml

@@ -12,28 +12,28 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower1
             type: string
             description: follower1
-            hidden: 'True'
+            hidden: true
         - variable:
             name: follower2
             type: string
             description: follower2
-            hidden: 'True'
+            hidden: true
         - variable:
             name: follower3
             type: string
             description: follower3
-            hidden: 'True'
+            hidden: true
 constraints:
 - fill:
   - name: calc_val

tests/dictionaries/10leadership_auto_index/yml/00-base.yml

@@ -3,11 +3,11 @@ variables:
 - family:
     name: leader
     description: leader
-    leadership: 'True'
+    leadership: true
     variables:
     - variable:
         name: leader
-        multi: 'True'
+        multi: true
         value:
         - text: a
         - text: b

tests/dictionaries/10leadership_autoleader/yml/00-base.yml

@@ -12,23 +12,23 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower1
             type: string
             description: follower1
-            hidden: 'True'
+            hidden: true
         - variable:
             name: follower2
             type: string
             description: follower2
-            hidden: 'True'
+            hidden: true
 constraints:
 - fill:
   - name: calc_val

tests/dictionaries/10leadership_autoleader_expert/yml/00-base.yml

@@ -16,13 +16,13 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
             mode: expert
         - variable:
             name: follower1

tests/dictionaries/10leadership_autosaveexpert/yml/00-base.yml

@@ -12,13 +12,13 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower1
             type: string

tests/dictionaries/10leadership_empty/yml/00_base.yml

@@ -5,4 +5,4 @@ services:
 variables:
 - family:
     name: empty_leader
-    leadership: 'True'
+    leadership: true

tests/dictionaries/10leadership_leader_hidden/yml/00-base.yml

@@ -16,14 +16,14 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
-            hidden: 'True'
+            hidden: true
         - variable:
             name: follower1
             type: string

tests/dictionaries/10leadership_leader_hidden_if_in/yml/00-base.yml

@@ -16,13 +16,13 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower1
             type: string

tests/dictionaries/10leadership_leader_hidden_if_in_name/yml/00-base.yml

@@ -16,13 +16,13 @@ variables:
     - family:
         name: other
         description: other
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower1
             type: string

tests/dictionaries/10leadership_leadermandatory/yml/00-base.yml

@@ -12,14 +12,14 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
-            mandatory: 'True'
+            mandatory: true
         - variable:
             name: follower1
             type: string

tests/dictionaries/10leadership_mandatory/yml/00-base.yml

@@ -12,18 +12,18 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower1
             type: string
             description: follower1
-            mandatory: 'True'
+            mandatory: true
         - variable:
             name: follower2
             type: string

tests/dictionaries/10leadership_mandatoryfollower/yml/00-base.yml

@@ -8,21 +8,21 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: oui
     - family:
         name: nut_monitor_netmask
         description: "Masque de l'IP du r\xE9seau de l'esclave"
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: nut_monitor_netmask
             type: netmask
             description: "Masque de l'IP du r\xE9seau de l'esclave"
-            multi: 'True'
+            multi: true
         - variable:
             name: nut_monitor_host
             type: network
             description: "Adresse IP du r\xE9seau de l'esclave"
-            mandatory: 'True'
+            mandatory: true

tests/dictionaries/10leadership_mandatoryfollower_value/yml/00-base.yml

@@ -8,23 +8,23 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: oui
     - family:
         name: nut_monitor_netmask
         description: "Masque de l'IP du r\xE9seau de l'esclave"
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: nut_monitor_netmask
             type: netmask
             description: "Masque de l'IP du r\xE9seau de l'esclave"
-            multi: 'True'
+            multi: true
         - variable:
             name: nut_monitor_host
             type: network
             description: "Adresse IP du r\xE9seau de l'esclave"
-            mandatory: 'True'
+            mandatory: true
             value:
             - text: 192.168.0.0

tests/dictionaries/10leadership_multi/yml/00-base.yml

@@ -15,13 +15,13 @@ variables:
     - family:
         name: leader
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower1
             type: string
@@ -33,13 +33,13 @@ variables:
     - family:
         name: leader1
         description: leader
-        leadership: 'True'
+        leadership: true
         variables:
         - variable:
             name: leader1
             type: string
             description: leader
-            multi: 'True'
+            multi: true
         - variable:
             name: follower11
             type: string

tests/dictionaries/10load_disabled_if_in/yml/00-base.yml

@@ -13,14 +13,14 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
     - variable:
         name: mode_conteneur_actif2
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
 constraints:

tests/dictionaries/10load_disabled_if_in_fill/yml/00-base.yml

@@ -27,7 +27,7 @@ constraints:
   - name: calc_val
     param:
     - type: variable
-      propertyerror: 'False'
+      propertyerror: false
       text: variable1
     target:
     - text: variable2

tests/dictionaries/10load_disabled_if_in_list_optional/yml/00-base.yml

@@ -8,8 +8,8 @@ constraints:
   - name: disabled_if_in
     source: condition
     param:
-    - text: 'True'
+    - text: true
     target:
     - type: filelist
-      optional: 'True'
+      optional: true
       text: unknown

tests/dictionaries/10load_disabled_if_in_multi_param/yml/00-base.yml

@@ -19,14 +19,14 @@ variables:
         name: mode_conteneur_actif
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
     - variable:
         name: mode_conteneur_actif2
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: non
 constraints:

tests/dictionaries/10load_disabled_if_in_multi_param2/yml/00-base.yml

@@ -25,7 +25,7 @@ variables:
         name: test_variable
         type: string
         description: No change
-        hidden: 'True'
+        hidden: true
         value:
         - text: 'no'
 constraints: