From d78855e70a7ff19f4b50bfc2e13b651ffd6ca17c Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sat, 30 Jan 2021 15:24:47 +0100
Subject: [PATCH] correction in example

---
 .../00-base.xml                               | 26 ++++++++-----------
 .../makedict/base.json                        |  2 +-
 .../tiramisu/base.py                          | 21 +++++++++++----
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
index 8dcca4bb..86bba15b 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/00-base.xml
@@ -1,30 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <rougail>
+    <services>
+        <service name="test">
+            <file name="/tmp/file1" filelist="afilllist"/>
+        </service>
+    </services>
     <variables>
         <family name="general">
             <variable name="condition" type="string" description="No change">
-                <value>non</value>
+                <value>no</value>
             </variable>
-            <variable name="mode_conteneur_actif" type="string" description="No change">
-                <value>non</value>
-            </variable>
-            <variable name="mode_conteneur_actif2" type="string" description="No change">
-                <value>non</value>
+            <variable name="disable_variable" type="string" description="No change">
+                <value>no</value>
             </variable>
         </family>
     </variables>
-
     <constraints>
-        <condition name="disabled_if_not_in" source="condition">
-            <param>oui</param>
-            <target type="variable">mode_conteneur_actif</target>
-            <target type="variable">mode_conteneur_actif2</target>
+        <condition name="disabled_if_not_in" source="unknown" fallback="True">
+            <param>no</param>
+            <target type="variable">disable_variable</target>
             <target type="filelist">afilllist</target>
         </condition>
-        <condition name="disabled_if_not_in" source="activer_client_ldap" fallback="True">
-            <param>non</param>
-            <target type="variable">mode_conteneur_actif</target>
-        </condition>
     </constraints>
 </rougail>
 <!-- vim: ts=4 sw=4 expandtab
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json b/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json
index 5f9738da..69d0407c 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json
@@ -1 +1 @@
-{"rougail.general.condition": "non"}
+{"rougail.general.condition": "no", "rougail.general.disable_variable": "no", "services.test.files.file1.group": "root", "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.templating": true, "services.test.files.file1.activate": true}
diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py
index 3b9eb2fc..547a9583 100644
--- a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py
+++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py
@@ -12,9 +12,20 @@ try:
 except:
     from tiramisu import *
 from rougail.tiramisu import ConvertDynOptionDescription
-option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"}))
-option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}))
-option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}))
-option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"}))
+option_3 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_4 = StrOption(name="disable_variable", doc="No change", default="no", properties=frozenset({"mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"normal"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])
+option_9 = StrOption(name="group", doc="group", default="root")
+option_10 = StrOption(name="mode", doc="mode", default="0644")
+option_11 = StrOption(name="name", doc="name", default="/tmp/file1")
+option_12 = StrOption(name="owner", doc="owner", default="root")
+option_13 = StrOption(name="source", doc="source", default="file1")
+option_14 = BoolOption(name="templating", doc="templating", default=True)
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_8 = OptionDescription(name="file1", doc="file1", children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15])
+option_7 = OptionDescription(name="files", doc="files", children=[option_8])
+option_6 = OptionDescription(name="test", doc="test", children=[option_7])
+option_6.impl_set_information('manage', True)
+option_5 = OptionDescription(name="services", doc="services", children=[option_6], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])