Infra/rougail
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

condition and check in makedict

Browse Source
This commit is contained in:
Emmanuel Garette
2019-11-27 15:03:05 +01:00
parent 4c84a8b89b
commit 5e3ff68325
45 changed files with 149 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/flattener_dicos/01auto_base/result/00-base.xml
View File

@ -12,7 +12,7 @@
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
<param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
View File

@ -12,7 +12,7 @@
<property>basic</property>
<property expected="oui" inverse="True" source="creole.general.module_instancie" type="calculation">auto_frozen</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
<param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_autosave/result/00-base.xml
View File

@ -10,7 +10,7 @@
<property>mandatory</property>
<property>basic</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
<param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_base/result/00-base.xml
View File

@ -12,7 +12,7 @@
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
<param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
View File

@ -12,7 +12,7 @@
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
<param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_mandatory/result/00-base.xml
View File

@ -7,7 +7,7 @@
<property>mandatory</property>
<property>expert</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
<param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_number/result/00-base.xml
View File

@ -9,7 +9,7 @@
<property>hidden</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="number">3</param>
<param transitive="False" type="number">3</param>
</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/01fill_optional/result/00-base.xml
View File

@ -12,7 +12,7 @@
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
<param transitive="False" type="eole">creole.general.mode_conteneur_actif1</param>
</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">

2
tests/flattener_dicos/10autosave_hidden/result/00-base.xml
View File

@ -19,7 +19,7 @@
<property>hidden</property>
<property>basic</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="string">oui</param>
<param transitive="False" type="string">oui</param>
</value>
</variable>
</family>

2
tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml
View File

@ -20,7 +20,7 @@
<property expected="oui" inverse="False" source="creole.general.mode_conteneur_actif" type="calculation">hidden</property>
<property expected="oui" inverse="False" source="creole.general.mode_conteneur_actif" type="calculation">force_default_on_freeze</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="string">oui</param>
<param transitive="False" type="string">oui</param>
</value>
</variable>
</family>

2
tests/flattener_dicos/10check_base/result/00-base.xml
View File

@ -9,7 +9,7 @@
<value>b</value>
</variable>
<variable doc="No change" multi="False" name="int" type="number">
<check level="error" name="valid_entier" transitive="True" type="calculation" warnings_only="False">
<check name="valid_entier" warnings_only="False">
<param name="mini" type="string">0</param>
<param name="maxi" type="string">100</param>
</check>

2
tests/flattener_dicos/10check_option/result/00-base.xml
View File

@ -14,7 +14,7 @@
<value>100</value>
</variable>
<variable doc="No change" multi="False" name="int" type="number">
<check level="error" name="valid_entier" transitive="True" type="calculation" warnings_only="False">
<check name="valid_entier" warnings_only="False">
<param name="mini" type="string">0</param>
<param name="maxi" type="eole">creole.general.int2</param>
</check>

4
tests/flattener_dicos/10check_optional/result/00-base.xml
View File

@ -9,10 +9,10 @@
<value>b</value>
</variable>
<variable doc="No change" multi="False" name="int" type="number">
<check level="error" name="valid_not_equal" transitive="True" type="calculation" warnings_only="False">
<check name="valid_not_equal" warnings_only="False">
<param type="eole">creole.general.int2</param>
</check>
<check level="error" name="valid_not_equal" transitive="True" type="calculation" warnings_only="False"/>
<check name="valid_not_equal" warnings_only="False"/>
<property>normal</property>
</variable>
<variable doc="No change" multi="False" name="int2" type="number">

2
tests/flattener_dicos/10check_valid_differ/result/00-base.xml
View File

@ -4,7 +4,7 @@
<family doc="general" name="general">
<property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
<check level="error" name="valid_not_equal" transitive="True" type="calculation" warnings_only="False">
<check name="valid_not_equal" warnings_only="False">
<param type="eole">creole.general.mode_conteneur_actif1</param>
</check>
<choice type="string">oui</choice>

8
tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml
View File

@ -25,16 +25,16 @@
<value type="string">non</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif3" type="string">
<check level="error" name="valid_not_equal" transitive="True" type="calculation" warnings_only="False">
<check name="valid_not_equal" warnings_only="False">
<param type="eole">creole.general.mode_conteneur_actif1</param>
</check>
<check level="error" name="valid_not_equal" transitive="True" type="calculation" warnings_only="False">
<check name="valid_not_equal" warnings_only="False">
<param type="eole">creole.general.mode_conteneur_actif2</param>
</check>
<check level="error" name="valid_not_equal" transitive="True" type="calculation" warnings_only="False">
<check name="valid_not_equal" warnings_only="False">
<param type="eole">creole.general.mode_conteneur_actif1</param>
</check>
<check level="error" name="valid_not_equal" transitive="True" type="calculation" warnings_only="False">
<check name="valid_not_equal" warnings_only="False">
<param type="eole">creole.general.mode_conteneur_actif2</param>
</check>
<property>mandatory</property>

4
tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml
View File

@ -25,10 +25,10 @@
<value type="string">non</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif3" type="string">
<check level="error" name="valid_not_equal" transitive="True" type="calculation" warnings_only="False">
<check name="valid_not_equal" warnings_only="False">
<param type="eole">creole.general.mode_conteneur_actif1</param>
</check>
<check level="error" name="valid_not_equal" transitive="True" type="calculation" warnings_only="False">
<check name="valid_not_equal" warnings_only="False">
<param type="eole">creole.general.mode_conteneur_actif2</param>
</check>
<property>mandatory</property>

2
tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml
View File

@ -15,7 +15,7 @@
<property>basic</property>
</variable>
<variable doc="Masque de sous réseau de la carte" multi="False" name="adresse_netmask_eth0" type="netmask">
<check level="error" name="valid_ip_netmask" transitive="True" type="calculation" warnings_only="True">
<check name="valid_ip_netmask" warnings_only="True">
<param type="eole">creole.general.adresse_ip_eth0</param>
</check>
<property>mandatory</property>

2
tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml
View File

@ -19,7 +19,7 @@
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">hidden</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">force_default_on_freeze</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="string">non</param>
<param transitive="False" type="string">non</param>
</value>
</variable>
<variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice">

4
tests/flattener_dicos/10load_masterslaves/result/00-base.xml
View File

@ -19,13 +19,13 @@
<variable doc="slave1" multi="True" name="slave1" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general1.master.slave1</param>
<param transitive="False" type="eole">creole.general1.master.slave1</param>
</value>
</variable>
</leader>

4
tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
View File

@ -16,13 +16,13 @@
<variable doc="slave1" multi="True" name="slave1" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">
<property>expert</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.master.slave1</param>
<param transitive="False" type="eole">creole.general.master.slave1</param>
</value>
</variable>
</leader>

4
tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
View File

@ -17,13 +17,13 @@
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.master.slave1</param>
<param transitive="False" type="eole">creole.general.master.slave1</param>
</value>
</variable>
</leader>

4
tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
View File

@ -18,13 +18,13 @@
<variable doc="slave1" multi="True" name="slave1" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.master.slave1</param>
<param transitive="False" type="eole">creole.general.master.slave1</param>
</value>
</variable>
</leader>

4
tests/flattener_dicos/10masterslave_multi/result/00-base.xml
View File

@ -19,13 +19,13 @@
<variable doc="slave1" multi="True" name="slave1" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general1.master.slave1</param>
<param transitive="False" type="eole">creole.general1.master.slave1</param>
</value>
</variable>
</leader>

4
tests/flattener_dicos/10masterslaves_append/result/00-base.xml
View File

@ -19,13 +19,13 @@
<variable doc="slave1" multi="True" name="slave1" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general1.master.slave1</param>
<param transitive="False" type="eole">creole.general1.master.slave1</param>
</value>
</variable>
<variable doc="slave3" multi="True" name="slave3" type="string">

6
tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
View File

@ -19,7 +19,7 @@
<property>hidden</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">
@ -28,7 +28,7 @@
<property>hidden</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.master.slave1</param>
<param transitive="False" type="eole">creole.general.master.slave1</param>
</value>
</variable>
<variable doc="slave3" multi="True" name="slave3" type="string">
@ -37,7 +37,7 @@
<property>hidden</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.master.master</param>
<param transitive="False" type="eole">creole.general.master.master</param>
</value>
</variable>
</leader>

4
tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
View File

@ -19,7 +19,7 @@
<property>hidden</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">
@ -28,7 +28,7 @@
<property>hidden</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.master.master</param>
<param transitive="False" type="eole">creole.general.master.master</param>
</value>
</variable>
</leader>

2
tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml
View File

@ -20,7 +20,7 @@
<property>force_default_on_freeze</property>
<property>frozen</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave1" multi="True" name="slave1" type="string">

4
tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
View File

@ -16,13 +16,13 @@
<variable doc="slave1" multi="True" name="slave1" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="eole">creole.general.master.slave1</param>
<param transitive="False" type="eole">creole.general.master.slave1</param>
</value>
</variable>
</leader>

2
tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml
View File

@ -9,7 +9,7 @@
<property>hidden</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="string">value</param>
<param transitive="False" type="string">value</param>
</value>
</variable>
</family>

2
tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml
View File

@ -6,7 +6,7 @@
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="string">
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="string">value</param>
<param transitive="False" type="string">value</param>
</value>
</variable>
</family>

2
tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml
View File

@ -27,7 +27,7 @@
<property>normal</property>
<property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property>
<value name="calc_val" type="calculation">
<param hidden="True" name="valeur" type="string">valfill</param>
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="slave2" multi="True" name="slave2" type="string">

2
tests/flattener_dicos/51redefine_auto/result/00-base.xml
View File

@ -12,7 +12,7 @@
<property>mandatory</property>
<property>normal</property>
<value name="concat" type="calculation">
<param hidden="True" name="valeur" type="string">non</param>
<param name="valeur" transitive="False" type="string">non</param>
</value>
</variable>
</family>

2
tests/flattener_dicos/51redefine_autofill/result/00-base.xml
View File

@ -9,7 +9,7 @@
<property>mandatory</property>
<property>normal</property>
<value name="concat" type="calculation">
<param hidden="True" name="valeur" type="string">non</param>
<param name="valeur" transitive="False" type="string">non</param>
</value>
</variable>
</family>

2
tests/flattener_dicos/51redefine_fill/result/00-base.xml
View File

@ -12,7 +12,7 @@
<property>mandatory</property>
<property>normal</property>
<value name="concat" type="calculation">
<param hidden="True" name="valeur" type="string">non</param>
<param name="valeur" transitive="False" type="string">non</param>
</value>
</variable>
</family>

2
tests/flattener_dicos/51redefine_fillauto/result/00-base.xml
View File

@ -12,7 +12,7 @@
<property>mandatory</property>
<property>normal</property>
<value name="concat" type="calculation">
<param hidden="True" name="valeur" type="string">non</param>
<param name="valeur" transitive="False" type="string">non</param>
</value>
</variable>
</family>

2
tests/flattener_dicos/60action_external/result/00-base.xml
View File

@ -87,7 +87,7 @@
<property>hidden</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param hidden="True" type="string">http://localhost/</param>
<param transitive="False" type="string">http://localhost/</param>
</value>
</variable>
</family>

8
tests/flattener_dicos/60extra_help/result/00-base.xml
View File

@ -42,10 +42,10 @@
<property>mandatory</property>
<property>normal</property>
<value name="calc_multi_condition" type="calculation">
<param hidden="True" type="string">non</param>
<param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
<param hidden="True" name="match" type="string">none</param>
<param hidden="True" name="mismatch" type="string">daily</param>
<param transitive="False" type="string">non</param>
<param name="condition_1" type="eole">creole.general.activer_ejabberd</param>
<param name="match" transitive="False" type="string">none</param>
<param name="mismatch" transitive="False" type="string">daily</param>
</value>
</variable>
<variable doc="mode" multi="False" name="mode" type="choice">

8
tests/flattener_dicos/60extra_load/result/00-base.xml
View File

@ -42,10 +42,10 @@
<property>mandatory</property>
<property>normal</property>
<value name="calc_multi_condition" type="calculation">
<param hidden="True" type="string">non</param>
<param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
<param hidden="True" name="match" type="string">none</param>
<param hidden="True" name="mismatch" type="string">daily</param>
<param transitive="False" type="string">non</param>
<param name="condition_1" type="eole">creole.general.activer_ejabberd</param>
<param name="match" transitive="False" type="string">none</param>
<param name="mismatch" transitive="False" type="string">daily</param>
</value>
</variable>
<variable doc="mode" multi="False" name="mode" type="choice">

8
tests/flattener_dicos/60extra_mandatory/result/00-base.xml
View File

@ -42,10 +42,10 @@
<property>mandatory</property>
<property>normal</property>
<value name="calc_multi_condition" type="calculation">
<param hidden="True" type="string">non</param>
<param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
<param hidden="True" name="match" type="string">none</param>
<param hidden="True" name="mismatch" type="string">daily</param>
<param transitive="False" type="string">non</param>
<param name="condition_1" type="eole">creole.general.activer_ejabberd</param>
<param name="match" transitive="False" type="string">none</param>
<param name="mismatch" transitive="False" type="string">daily</param>
</value>
</variable>
<variable doc="mode" multi="False" name="mode" type="choice">

8
tests/flattener_dicos/60extra_redefine/result/00-base.xml
View File

@ -45,10 +45,10 @@
<property>mandatory</property>
<property>normal</property>
<value name="calc_multi_condition" type="calculation">
<param hidden="True" type="string">non</param>
<param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
<param hidden="True" name="match" type="string">none</param>
<param hidden="True" name="mismatch" type="string">daily</param>
<param transitive="False" type="string">non</param>
<param name="condition_1" type="eole">creole.general.activer_ejabberd</param>
<param name="match" transitive="False" type="string">none</param>
<param name="mismatch" transitive="False" type="string">daily</param>
</value>
</variable>
<variable doc="mode" multi="False" name="mode" type="choice">

10
tests/flattener_dicos/70container_disknod/result/00-base.xml
View File

@ -9,8 +9,8 @@
<property>frozen</property>
<property>hidden</property>
<value name="cdrom_minormajor" type="calculation">
<param hidden="True" type="string">major</param>
<param hidden="True" type="string">/etc/mailname'</param>
<param transitive="False" type="string">major</param>
<param transitive="False" type="string">/etc/mailname'</param>
</value>
</variable>
<variable doc="" multi="False" name="minor" type="number">
@ -18,8 +18,8 @@
<property>frozen</property>
<property>hidden</property>
<value name="cdrom_minormajor" type="calculation">
<param hidden="True" type="string">minor</param>
<param hidden="True" type="string">/etc/mailname'</param>
<param transitive="False" type="string">minor</param>
<param transitive="False" type="string">/etc/mailname'</param>
</value>
</variable>
<variable doc="" multi="False" name="mode" type="string">
@ -36,7 +36,7 @@
<property>frozen</property>
<property>hidden</property>
<value name="device_type" type="calculation">
<param hidden="True" type="string">/etc/mailname'</param>
<param transitive="False" type="string">/etc/mailname'</param>
</value>
</variable>
</family>