include => included fixes #2

doc/service/file.md

@@ -152,17 +152,17 @@ Ou d'utiliser le moteur "jinja2" :
 
 ## Inclusion de template
 
-Un attribut "include" permet de définir la nature du fichier. Cet attribut peut avoir trois valeurs :
+Un attribut "included" permet de définir la nature du fichier. Cet attribut peut avoir trois valeurs :
 
 - "no" : c'est un fichier normal
 - "name" : le répertoire de destination est listé dans un autre template, il faut que le fichier soit généré avant cet autre template
-- "include" : le contenu du fichier est copié dans un autre template, il faut que le fichier soit généré avant cet autre template et ce fichier n'a pas besoin d'être installé sur le serveur cible.
+- "content" : le contenu du fichier est copié dans un autre template, il faut que le fichier soit généré avant cet autre template et ce fichier n'a pas besoin d'être installé sur le serveur cible.
 
 Exemples :
 
 ```
-<file include="name">/etc/squid/squid.conf</file>
+<file included="name">/etc/squid/squid.conf</file>
-<file include="content">/etc/squid/squid.conf</file>
+<file included="content">/etc/squid/squid.conf</file>
 ```
 
 Bien entendu, c'est au développeur de lister ou d'inclure le contenu de ce template dans le fichier de destination. Cet attribut permet juste de garantir que le fichier sera fait avant l'autre et de ne pas l'installer sur le serveur si ce n'est pas nécessaire.

src/rougail/data/rougail.dtd

@@ -67,7 +67,7 @@
 <!ATTLIST file filelist CDATA #IMPLIED>
 <!ATTLIST file redefine (True|False) "False">
 <!ATTLIST file engine (none|creole|jinja2) #IMPLIED>
-<!ATTLIST file include (no|name|content) "no">
+<!ATTLIST file included (no|name|content) "no">
 
 <!ELEMENT override EMPTY>
 <!ATTLIST override source CDATA #IMPLIED>

src/rougail/template/base.py

@@ -286,18 +286,18 @@ class RougailBaseTemplate:
                                                                                )
         for template in listdir('.'):
             self.prepare_template(template)
-        for include in (True, False):
+        for included in (True, False):
             for service_obj in await self.config.option('services').list('all'):
                 service_name = await service_obj.option.name()
                 for fills in await service_obj.list('all'):
                     type_ = await fills.option.name()
                     for fill_obj in await fills.list('all'):
                         fill = await fill_obj.value.dict()
-                        if 'include' in fill:
+                        if 'included' in fill:
-                            if (fill['include'] == 'no' and include is True) or \
+                            if (fill['included'] == 'no' and included is True) or \
-                                    (fill['include'] != 'no' and include is False):
+                                    (fill['included'] != 'no' and included is False):
                                 continue
-                        elif include is True:
+                        elif included is True:
                             continue
                         if fill['activate']:
                             self.instance_file(fill, type_, service_name)

src/rougail/template/systemd.py

@@ -47,7 +47,7 @@ z %%filename - - - - -
 %for %%service in %%services
   %if %%hasattr(%%service, 'files')
     %for %%file in %%service.files
-      %if %%file.activate == True and %%file.include != 'content'
+      %if %%file.activate == True and %%file.included != 'content'
         %if %%isinstance(%%file.name, list)
           %for %%filename in %%file.name
 %%display(%%file, %%filename)%slurp

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

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.include": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.included": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true}

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

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="jinja2")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_22 = StrOption(name="owner", doc="owner", default="root")

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

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.include": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.included": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true}

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

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="jinja2")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_22 = StrOption(name="owner", doc="owner", default="root")

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

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

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

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.include": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true, "services.test.files.incfile.engine": "creole", "services.test.files.incfile.group": "root", "services.test.files.incfile.include": "content", "services.test.files.incfile.mode": "0644", "services.test.files.incfile.name": "/etc/dir/incfile", "services.test.files.incfile.owner": "root", "services.test.files.incfile.source": "incfile", "services.test.files.incfile.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.included": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true, "services.test.files.incfile.engine": "creole", "services.test.files.incfile.group": "root", "services.test.files.incfile.included": "content", "services.test.files.incfile.mode": "0644", "services.test.files.incfile.name": "/etc/dir/incfile", "services.test.files.incfile.owner": "root", "services.test.files.incfile.source": "incfile", "services.test.files.incfile.activate": true}

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

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="jinja2")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_22 = StrOption(name="owner", doc="owner", default="root")
@@ -34,7 +34,7 @@ option_24 = BoolOption(name="activate", doc="activate", default=True)
 option_16 = OptionDescription(name="file2", doc="file2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
 option_26 = StrOption(name="engine", doc="engine", default="creole")
 option_27 = StrOption(name="group", doc="group", default="root")
-option_28 = StrOption(name="include", doc="include", default="content")
+option_28 = StrOption(name="included", doc="included", default="content")
 option_29 = StrOption(name="mode", doc="mode", default="0644")
 option_30 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_31 = StrOption(name="owner", doc="owner", default="root")

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

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

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

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.include": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true, "services.test.files.incfile.engine": "creole", "services.test.files.incfile.group": "root", "services.test.files.incfile.include": "name", "services.test.files.incfile.mode": "0644", "services.test.files.incfile.name": "/etc/dir/incfile", "services.test.files.incfile.owner": "root", "services.test.files.incfile.source": "incfile", "services.test.files.incfile.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.included": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true, "services.test.files.incfile.engine": "creole", "services.test.files.incfile.group": "root", "services.test.files.incfile.included": "name", "services.test.files.incfile.mode": "0644", "services.test.files.incfile.name": "/etc/dir/incfile", "services.test.files.incfile.owner": "root", "services.test.files.incfile.source": "incfile", "services.test.files.incfile.activate": true}

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

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="jinja2")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_22 = StrOption(name="owner", doc="owner", default="root")
@@ -34,7 +34,7 @@ option_24 = BoolOption(name="activate", doc="activate", default=True)
 option_16 = OptionDescription(name="file2", doc="file2", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
 option_26 = StrOption(name="engine", doc="engine", default="creole")
 option_27 = StrOption(name="group", doc="group", default="root")
-option_28 = StrOption(name="include", doc="include", default="name")
+option_28 = StrOption(name="included", doc="included", default="name")
 option_29 = StrOption(name="mode", doc="mode", default="0644")
 option_30 = FilenameOption(name="name", doc="name", default="/etc/dir/incfile")
 option_31 = StrOption(name="owner", doc="owner", default="root")

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

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.include": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true, "services.test.files.file2.engine": "jinja2", "services.test.files.file2.group": "root", "services.test.files.file2.included": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/etc/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true}

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

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="file", doc="file", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="jinja2")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/file2")
 option_22 = StrOption(name="owner", doc="owner", default="root")

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

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.engine": "creole", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.group": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.include": "no", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.mode": "0644", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.owner": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.source": "systemd-makefs@dev-disk-by\\x2dpartlabel", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": true, "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.engine": "jinja2", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.group": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.include": "no", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.mode": "0644", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.owner": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.source": "systemd-makefs@dev-disk-by\\x2dpartlabel2", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.engine": "creole", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.group": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.included": "no", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.mode": "0644", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.owner": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.source": "systemd-makefs@dev-disk-by\\x2dpartlabel", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": true, "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.engine": "jinja2", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.group": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.included": "no", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.mode": "0644", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.owner": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.source": "systemd-makefs@dev-disk-by\\x2dpartlabel2", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": true}

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

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel")
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="systemd_makefs@dev_disk_by\\x2dpartlabel", doc="systemd-makefs@dev-disk-by\\x2dpartlabel", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="jinja2")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2")
 option_22 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/10load_disabled_if_in_multi_param/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}
+{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}

tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "no", "rougail.general.condition2": "no", "rougail.general.test_variable": "no", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}
+{"rougail.general.condition": "no", "rougail.general.condition2": "no", "rougail.general.test_variable": "no", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}

tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "no", "rougail.general.condition2": "no", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}
+{"rougail.general.condition": "no", "rougail.general.condition2": "no", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}

tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "yes", "rougail.general.condition2": "no", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}
+{"rougail.general.condition": "yes", "rougail.general.condition2": "no", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}

tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "yes", "rougail.general.condition2": "yes", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}
+{"rougail.general.condition": "yes", "rougail.general.condition2": "yes", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}

tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "no", "rougail.general.condition2": "yes", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}
+{"rougail.general.condition": "no", "rougail.general.condition2": "yes", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}

tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "oui", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}
+{"rougail.general.condition": "oui", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}

tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "no", "rougail.general.disable_variable": "no", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}
+{"rougail.general.condition": "no", "rougail.general.disable_variable": "no", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}

tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py

@@ -17,7 +17,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_9 = StrOption(name="engine", doc="engine", default="creole")
 option_10 = StrOption(name="group", doc="group", default="root")
-option_11 = StrOption(name="include", doc="include", default="no")
+option_11 = StrOption(name="included", doc="included", default="no")
 option_12 = StrOption(name="mode", doc="mode", default="0644")
 option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_14 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11disabled_if_in_filelist/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": true, "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true}
+{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": true, "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true}

tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": true, "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}
+{"rougail.general.condition": true, "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}

tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_13 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": false, "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}
+{"rougail.general.condition": false, "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true}

tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_13 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "oui", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}
+{"rougail.general.condition": "oui", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}

tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11disabled_if_in_filelist_multi/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true, "services.test.files.file2.engine": "creole", "services.test.files.file2.group": "root", "services.test.files.file2.include": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/tmp/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true}
+{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": true, "services.test.files.file2.engine": "creole", "services.test.files.file2.group": "root", "services.test.files.file2.included": "no", "services.test.files.file2.mode": "0644", "services.test.files.file2.name": "/tmp/file2", "services.test.files.file2.owner": "root", "services.test.files.file2.source": "file2", "services.test.files.file2.activate": true}

tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_15 = StrOption(name="owner", doc="owner", default="root")
@@ -27,7 +27,7 @@ option_17 = BoolOption(name="activate", doc="activate", default=Calculation(func
 option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_19 = StrOption(name="engine", doc="engine", default="creole")
 option_20 = StrOption(name="group", doc="group", default="root")
-option_21 = StrOption(name="include", doc="include", default="no")
+option_21 = StrOption(name="included", doc="included", default="no")
 option_22 = StrOption(name="mode", doc="mode", default="0644")
 option_23 = FilenameOption(name="name", doc="name", default="/tmp/file2")
 option_24 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11disabledifin_filelist_notexist/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/tmp/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}
+{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/tmp/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}

tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11disabledifnotin_filelist_notexist/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/tmp/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}
+{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/tmp/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}

tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11disabledifnotin_filelist_notexist_multi/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/tmp/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}
+{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/tmp/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}

tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/tmp/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}
+{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/tmp/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": false}

tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py

@@ -18,7 +18,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_10 = StrOption(name="engine", doc="engine", default="creole")
 option_11 = StrOption(name="group", doc="group", default="root")
-option_12 = StrOption(name="include", doc="include", default="no")
+option_12 = StrOption(name="included", doc="included", default="no")
 option_13 = StrOption(name="mode", doc="mode", default="0644")
 option_14 = FilenameOption(name="name", doc="name", default="/tmp/file")
 option_15 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/11multi_disabled_if_in_filelist/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.include": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}
+{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", "services.test.files.file1.engine": "creole", "services.test.files.file1.group": "root", "services.test.files.file1.included": "no", "services.test.files.file1.mode": "0644", "services.test.files.file1.name": "/tmp/file1", "services.test.files.file1.owner": "root", "services.test.files.file1.source": "file1", "services.test.files.file1.activate": false}

tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py

@@ -17,7 +17,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_9 = StrOption(name="engine", doc="engine", default="creole")
 option_10 = StrOption(name="group", doc="group", default="root")
-option_11 = StrOption(name="include", doc="include", default="no")
+option_11 = StrOption(name="included", doc="included", default="no")
 option_12 = StrOption(name="mode", doc="mode", default="0644")
 option_13 = FilenameOption(name="name", doc="name", default="/tmp/file1")
 option_14 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/20notemplating/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "none", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.engine": "none", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true}

tests/dictionaries/20notemplating/tiramisu/base.py

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3],
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="none")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_13 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/40ifin_leadershipauto/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "oui", "rougail.general.leader.leader": [{"rougail.general.leader.leader": "a", "rougail.general.leader.follower2": null}], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "oui", "rougail.general.leader.leader": [{"rougail.general.leader.leader": "a", "rougail.general.leader.follower2": null}], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true}

tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py

@@ -21,7 +21,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_13 = StrOption(name="engine", doc="engine", default="creole")
 option_14 = StrOption(name="group", doc="group", default="root")
-option_15 = StrOption(name="include", doc="include", default="no")
+option_15 = StrOption(name="included", doc="included", default="no")
 option_16 = StrOption(name="mode", doc="mode", default="0644")
 option_17 = FilenameOption(name="name", doc="name", default="/etc/mailname")
 option_18 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/40ifin_leadershipauto_follower/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "oui", "rougail.general.leader.leader": [{"rougail.general.leader.leader": "a", "rougail.general.leader.follower2": null}, {"rougail.general.leader.leader": "b", "rougail.general.leader.follower1": null, "rougail.general.leader.follower2": null}], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "jinja2", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.include": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": "/etc/mailname2", "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "oui", "rougail.general.leader.leader": [{"rougail.general.leader.leader": "a", "rougail.general.leader.follower2": null}, {"rougail.general.leader.leader": "b", "rougail.general.leader.follower1": null, "rougail.general.leader.follower2": null}], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "jinja2", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.included": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": "/etc/mailname2", "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.activate": true}

tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py

@@ -21,7 +21,7 @@ option_2 = OptionDescription(name="general", doc="general", children=[option_3,
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_13 = StrOption(name="engine", doc="engine", default="creole")
 option_14 = StrOption(name="group", doc="group", default="root")
-option_15 = StrOption(name="include", doc="include", default="no")
+option_15 = StrOption(name="included", doc="included", default="no")
 option_16 = StrOption(name="mode", doc="mode", default="0644")
 option_17 = FilenameOption(name="name", doc="name", default="/etc/mailname")
 option_18 = StrOption(name="owner", doc="owner", default="root")
@@ -30,7 +30,7 @@ option_20 = BoolOption(name="activate", doc="activate", default=True)
 option_12 = OptionDescription(name="mailname", doc="mailname", children=[option_13, option_14, option_15, option_16, option_17, option_18, option_19, option_20])
 option_22 = StrOption(name="engine", doc="engine", default="jinja2")
 option_23 = StrOption(name="group", doc="group", default="root")
-option_24 = StrOption(name="include", doc="include", default="no")
+option_24 = StrOption(name="included", doc="included", default="no")
 option_25 = StrOption(name="mode", doc="mode", default="0644")
 option_26 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
 option_27 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/45extra_without_family/makedict/base.json

@@ -1 +1 @@
-{"rougail.my_var": "rougail", "extra.my_var": null, "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.include": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true}
+{"rougail.my_var": "rougail", "extra.my_var": null, "services.test.files.file.engine": "creole", "services.test.files.file.group": "root", "services.test.files.file.included": "no", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.activate": true}

tests/dictionaries/45extra_without_family/tiramisu/base.py

@@ -17,7 +17,7 @@ option_4 = StrOption(name="my_var", doc="my_var", default=Calculation(func.calc_
 option_3 = OptionDescription(name="extra", doc="extra", children=[option_4])
 option_9 = StrOption(name="engine", doc="engine", default="creole")
 option_10 = StrOption(name="group", doc="group", default="root")
-option_11 = StrOption(name="include", doc="include", default="no")
+option_11 = StrOption(name="included", doc="included", default="no")
 option_12 = StrOption(name="mode", doc="mode", default="0644")
 option_13 = FilenameOption(name="name", doc="name", default="/etc/file")
 option_14 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/60extra_group/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "extra.ejabberd.description.description": [{"extra.ejabberd.description.description": "test", "extra.ejabberd.description.mode": "pre"}], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "jinja2", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.include": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": "/etc/mailname2", "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "extra.ejabberd.description.description": [{"extra.ejabberd.description.description": "test", "extra.ejabberd.description.mode": "pre"}], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "jinja2", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.included": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": "/etc/mailname2", "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.activate": true}

tests/dictionaries/60extra_group/tiramisu/base.py

@@ -22,7 +22,7 @@ option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7
 option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
 option_14 = StrOption(name="engine", doc="engine", default="creole")
 option_15 = StrOption(name="group", doc="group", default="root")
-option_16 = StrOption(name="include", doc="include", default="no")
+option_16 = StrOption(name="included", doc="included", default="no")
 option_17 = StrOption(name="mode", doc="mode", default="0644")
 option_18 = FilenameOption(name="name", doc="name", default="/etc/mailname")
 option_19 = StrOption(name="owner", doc="owner", default="root")
@@ -31,7 +31,7 @@ option_21 = BoolOption(name="activate", doc="activate", default=True)
 option_13 = OptionDescription(name="mailname", doc="mailname", children=[option_14, option_15, option_16, option_17, option_18, option_19, option_20, option_21])
 option_23 = StrOption(name="engine", doc="engine", default="jinja2")
 option_24 = StrOption(name="group", doc="group", default="root")
-option_25 = StrOption(name="include", doc="include", default="no")
+option_25 = StrOption(name="included", doc="included", default="no")
 option_26 = StrOption(name="mode", doc="mode", default="0644")
 option_27 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
 option_28 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/60extra_help/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true}
+{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true}

tests/dictionaries/60extra_help/tiramisu/base.py

@@ -23,7 +23,7 @@ option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7
 option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
 option_14 = StrOption(name="engine", doc="engine", default="creole")
 option_15 = StrOption(name="group", doc="group", default="root")
-option_16 = StrOption(name="include", doc="include", default="no")
+option_16 = StrOption(name="included", doc="included", default="no")
 option_17 = StrOption(name="mode", doc="mode", default="0644")
 option_18 = FilenameOption(name="name", doc="name", default="/etc/mailname")
 option_19 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/70container_files/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.rougail_conf.engine": "creole", "services.test.files.rougail_conf.group": "root", "services.test.files.rougail_conf.include": "no", "services.test.files.rougail_conf.mode": "0644", "services.test.files.rougail_conf.name": "/rougail.conf", "services.test.files.rougail_conf.owner": "root", "services.test.files.rougail_conf.source": "rougail.conf", "services.test.files.rougail_conf.activate": true}
+{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.rougail_conf.engine": "creole", "services.test.files.rougail_conf.group": "root", "services.test.files.rougail_conf.included": "no", "services.test.files.rougail_conf.mode": "0644", "services.test.files.rougail_conf.name": "/rougail.conf", "services.test.files.rougail_conf.owner": "root", "services.test.files.rougail_conf.source": "rougail.conf", "services.test.files.rougail_conf.activate": true}

tests/dictionaries/70container_files/tiramisu/base.py

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname")
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="mailname", doc="mailname", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="creole")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/rougail.conf")
 option_22 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/70container_files_symlink_multi/makedict/base.json

@@ -1 +1 @@
-{"rougail.file_name": ["/etc/mailname", "/etc/mailname2"], "rougail.file_name2": ["/etc/mailname3", "/etc/mailname4"], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": ["/etc/mailname", "/etc/mailname2"], "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "jinja2", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.include": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": ["/etc/mailname3", "/etc/mailname4"], "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.activate": true}
+{"rougail.file_name": ["/etc/mailname", "/etc/mailname2"], "rougail.file_name2": ["/etc/mailname3", "/etc/mailname4"], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": ["/etc/mailname", "/etc/mailname2"], "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "jinja2", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.included": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": ["/etc/mailname3", "/etc/mailname4"], "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.activate": true}

tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = FilenameOption(name="file_name2", doc="file_name2", multi=True, defau
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = SymLinkOption(name="name", opt=option_2)
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="mailname", doc="mailname", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="jinja2")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = SymLinkOption(name="name", opt=option_3)
 option_22 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/70container_files_symlink_multi_variable/makedict/base.json

@@ -1 +1 @@
-{"rougail.file_name": ["/etc/mailname", "/etc/mailname2"], "rougail.file_name2": ["/etc/mailname3", "/etc/mailname4"], "rougail.var": ["mailname", "mailname2"], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": ["/etc/mailname", "/etc/mailname2"], "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.variable": ["mailname", "mailname2"], "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "jinja2", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.include": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": ["/etc/mailname3", "/etc/mailname4"], "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.variable": ["mailname", "mailname2"], "services.test.files.mailname2.activate": true}
+{"rougail.file_name": ["/etc/mailname", "/etc/mailname2"], "rougail.file_name2": ["/etc/mailname3", "/etc/mailname4"], "rougail.var": ["mailname", "mailname2"], "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": ["/etc/mailname", "/etc/mailname2"], "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.variable": ["mailname", "mailname2"], "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "jinja2", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.included": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": ["/etc/mailname3", "/etc/mailname4"], "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.variable": ["mailname", "mailname2"], "services.test.files.mailname2.activate": true}

tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py

@@ -17,7 +17,7 @@ option_4 = StrOption(name="var", doc="var", multi=True, default=['mailname', 'ma
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3, option_4])
 option_9 = StrOption(name="engine", doc="engine", default="creole")
 option_10 = StrOption(name="group", doc="group", default="root")
-option_11 = StrOption(name="include", doc="include", default="no")
+option_11 = StrOption(name="included", doc="included", default="no")
 option_12 = StrOption(name="mode", doc="mode", default="0644")
 option_13 = SymLinkOption(name="name", opt=option_2)
 option_14 = StrOption(name="owner", doc="owner", default="root")
@@ -27,7 +27,7 @@ option_17 = BoolOption(name="activate", doc="activate", default=True)
 option_8 = OptionDescription(name="mailname", doc="mailname", children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17])
 option_19 = StrOption(name="engine", doc="engine", default="jinja2")
 option_20 = StrOption(name="group", doc="group", default="root")
-option_21 = StrOption(name="include", doc="include", default="no")
+option_21 = StrOption(name="included", doc="included", default="no")
 option_22 = StrOption(name="mode", doc="mode", default="0644")
 option_23 = SymLinkOption(name="name", opt=option_3)
 option_24 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/70container_files_symlink_variable/makedict/base.json

@@ -1 +1 @@
-{"rougail.file_name": "/etc/mailname", "rougail.var": "mailname", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.variable": "mailname", "services.test.files.mailname.activate": true}
+{"rougail.file_name": "/etc/mailname", "rougail.var": "mailname", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.variable": "mailname", "services.test.files.mailname.activate": true}

tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py

@@ -16,7 +16,7 @@ option_3 = StrOption(name="var", doc="var", default="mailname", properties=froze
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_3])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = SymLinkOption(name="name", opt=option_2)
 option_13 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/70container_files_twice/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname_1.engine": "creole", "services.test.files.mailname_1.group": "root", "services.test.files.mailname_1.include": "no", "services.test.files.mailname_1.mode": "0644", "services.test.files.mailname_1.name": "/etc/eole/mailname", "services.test.files.mailname_1.owner": "root", "services.test.files.mailname_1.source": "mailname", "services.test.files.mailname_1.activate": true, "services.test.files.rougail_conf.engine": "creole", "services.test.files.rougail_conf.group": "root", "services.test.files.rougail_conf.include": "no", "services.test.files.rougail_conf.mode": "0644", "services.test.files.rougail_conf.name": "/rougail.conf", "services.test.files.rougail_conf.owner": "root", "services.test.files.rougail_conf.source": "rougail.conf", "services.test.files.rougail_conf.activate": true}
+{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname_1.engine": "creole", "services.test.files.mailname_1.group": "root", "services.test.files.mailname_1.included": "no", "services.test.files.mailname_1.mode": "0644", "services.test.files.mailname_1.name": "/etc/eole/mailname", "services.test.files.mailname_1.owner": "root", "services.test.files.mailname_1.source": "mailname", "services.test.files.mailname_1.activate": true, "services.test.files.rougail_conf.engine": "creole", "services.test.files.rougail_conf.group": "root", "services.test.files.rougail_conf.included": "no", "services.test.files.rougail_conf.mode": "0644", "services.test.files.rougail_conf.name": "/rougail.conf", "services.test.files.rougail_conf.owner": "root", "services.test.files.rougail_conf.source": "rougail.conf", "services.test.files.rougail_conf.activate": true}

tests/dictionaries/70container_files_twice/tiramisu/base.py

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname")
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="mailname", doc="mailname", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="creole")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/eole/mailname")
 option_22 = StrOption(name="owner", doc="owner", default="root")
@@ -34,7 +34,7 @@ option_24 = BoolOption(name="activate", doc="activate", default=True)
 option_16 = OptionDescription(name="mailname_1", doc="mailname_1", children=[option_17, option_18, option_19, option_20, option_21, option_22, option_23, option_24])
 option_26 = StrOption(name="engine", doc="engine", default="creole")
 option_27 = StrOption(name="group", doc="group", default="root")
-option_28 = StrOption(name="include", doc="include", default="no")
+option_28 = StrOption(name="included", doc="included", default="no")
 option_29 = StrOption(name="mode", doc="mode", default="0644")
 option_30 = FilenameOption(name="name", doc="name", default="/rougail.conf")
 option_31 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/70container_filesmulti/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.include": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "creole", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.include": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": "/etc/mailname2", "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.activate": true}
+{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname.engine": "creole", "services.test.files.mailname.group": "root", "services.test.files.mailname.included": "no", "services.test.files.mailname.mode": "0644", "services.test.files.mailname.name": "/etc/mailname", "services.test.files.mailname.owner": "root", "services.test.files.mailname.source": "mailname", "services.test.files.mailname.activate": true, "services.test.files.mailname2.engine": "creole", "services.test.files.mailname2.group": "root", "services.test.files.mailname2.included": "no", "services.test.files.mailname2.mode": "0644", "services.test.files.mailname2.name": "/etc/mailname2", "services.test.files.mailname2.owner": "root", "services.test.files.mailname2.source": "mailname2", "services.test.files.mailname2.activate": true}

tests/dictionaries/70container_filesmulti/tiramisu/base.py

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname")
 option_13 = StrOption(name="owner", doc="owner", default="root")
@@ -25,7 +25,7 @@ option_15 = BoolOption(name="activate", doc="activate", default=True)
 option_7 = OptionDescription(name="mailname", doc="mailname", children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14, option_15])
 option_17 = StrOption(name="engine", doc="engine", default="creole")
 option_18 = StrOption(name="group", doc="group", default="root")
-option_19 = StrOption(name="include", doc="include", default="no")
+option_19 = StrOption(name="included", doc="included", default="no")
 option_20 = StrOption(name="mode", doc="mode", default="0644")
 option_21 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
 option_22 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/70container_filesredefine/makedict/base.json

@@ -1 +1 @@
-{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname_new.engine": "creole", "services.test.files.mailname_new.group": "root", "services.test.files.mailname_new.include": "no", "services.test.files.mailname_new.mode": "0644", "services.test.files.mailname_new.name": "/etc/mailname", "services.test.files.mailname_new.owner": "root", "services.test.files.mailname_new.source": "mailname.new", "services.test.files.mailname_new.activate": true}
+{"rougail.general.mode_conteneur_actif": "oui", "services.test.files.mailname_new.engine": "creole", "services.test.files.mailname_new.group": "root", "services.test.files.mailname_new.included": "no", "services.test.files.mailname_new.mode": "0644", "services.test.files.mailname_new.name": "/etc/mailname", "services.test.files.mailname_new.owner": "root", "services.test.files.mailname_new.source": "mailname.new", "services.test.files.mailname_new.activate": true}

tests/dictionaries/70container_filesredefine/tiramisu/base.py

@@ -16,7 +16,7 @@ option_2 = OptionDescription(name="general", doc="général", children=[option_3
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_8 = StrOption(name="engine", doc="engine", default="creole")
 option_9 = StrOption(name="group", doc="group", default="root")
-option_10 = StrOption(name="include", doc="include", default="no")
+option_10 = StrOption(name="included", doc="included", default="no")
 option_11 = StrOption(name="mode", doc="mode", default="0644")
 option_12 = FilenameOption(name="name", doc="name", default="/etc/mailname")
 option_13 = StrOption(name="owner", doc="owner", default="root")

tests/dictionaries/70service_not_managed/makedict/base.json

@@ -1 +1 @@
-{"rougail.var": "mailname", "services.test.files.test.engine": "creole", "services.test.files.test.group": "root", "services.test.files.test.include": "no", "services.test.files.test.mode": "0644", "services.test.files.test.name": "/tmp/test", "services.test.files.test.owner": "root", "services.test.files.test.source": "test", "services.test.files.test.activate": true}
+{"rougail.var": "mailname", "services.test.files.test.engine": "creole", "services.test.files.test.group": "root", "services.test.files.test.included": "no", "services.test.files.test.mode": "0644", "services.test.files.test.name": "/tmp/test", "services.test.files.test.owner": "root", "services.test.files.test.source": "test", "services.test.files.test.activate": true}

tests/dictionaries/70service_not_managed/tiramisu/base.py

@@ -15,7 +15,7 @@ option_2 = StrOption(name="var", doc="var", default="mailname", properties=froze
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
 option_7 = StrOption(name="engine", doc="engine", default="creole")
 option_8 = StrOption(name="group", doc="group", default="root")
-option_9 = StrOption(name="include", doc="include", default="no")
+option_9 = StrOption(name="included", doc="included", default="no")
 option_10 = StrOption(name="mode", doc="mode", default="0644")
 option_11 = FilenameOption(name="name", doc="name", default="/tmp/test")
 option_12 = StrOption(name="owner", doc="owner", default="root")