From f4f0312e46c189a45d5caacca027a9c165c8bd39 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 24 Jan 2021 10:17:01 +0100 Subject: [PATCH] remove multi=False --- src/rougail/tiramisureflector.py | 3 +- .../00load_autofreeze/tiramisu/base.py | 4 +- .../00load_autofreezeexpert/tiramisu/base.py | 4 +- .../00load_autosave/tiramisu/base.py | 2 +- .../00load_autosaveexpert/tiramisu/base.py | 2 +- .../00load_comment/tiramisu/base.py | 2 +- .../00load_notype/tiramisu/base.py | 4 +- .../dictionaries/00load_save/tiramisu/base.py | 2 +- .../00load_subfolder/tiramisu/base.py | 4 +- .../01auto_autofreeze/tiramisu/base.py | 4 +- .../dictionaries/01auto_base/tiramisu/base.py | 4 +- .../01auto_withoutparam/tiramisu/base.py | 4 +- .../01base_file_include/tiramisu/base.py | 16 +++---- .../01base_file_patch/tiramisu/base.py | 16 +++---- .../01base_file_utfchar/tiramisu/base.py | 16 +++---- .../01base_float/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../01family_description/tiramisu/base.py | 2 +- .../01fill_autofreeze/tiramisu/base.py | 6 +-- .../01fill_autosave/tiramisu/base.py | 4 +- .../dictionaries/01fill_base/tiramisu/base.py | 4 +- .../01fill_baseaccent/tiramisu/base.py | 4 +- .../01fill_mandatory/tiramisu/base.py | 4 +- .../01fill_number/tiramisu/base.py | 4 +- .../01fill_only_optional/tiramisu/base.py | 4 +- .../01fill_optional/tiramisu/base.py | 4 +- .../tiramisu/base.py | 4 +- tests/dictionaries/01test/tiramisu/base.py | 2 +- .../01test_multi/tiramisu/base.py | 2 +- .../01test_multi_none/tiramisu/base.py | 2 +- .../01test_redefine/tiramisu/base.py | 2 +- .../01test_redefine_remove/tiramisu/base.py | 2 +- .../tiramisu/base.py | 4 +- .../10autosave_hidden/tiramisu/base.py | 4 +- .../10check_base/tiramisu/base.py | 4 +- .../10check_no_param/tiramisu/base.py | 4 +- .../10check_option/tiramisu/base.py | 6 +-- .../10check_optional/tiramisu/base.py | 6 +-- .../10check_valid_differ/tiramisu/base.py | 4 +- .../10check_valid_differ_add/tiramisu/base.py | 8 ++-- .../tiramisu/base.py | 8 ++-- .../10check_valid_in_network/tiramisu/base.py | 8 ++-- .../tiramisu/base.py | 6 +-- .../10check_valid_ipnetmask/tiramisu/base.py | 6 +-- .../10fill_information/tiramisu/base.py | 2 +- .../10leadership_append/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10leadership_append_name/tiramisu/base.py | 2 +- .../10leadership_auto/tiramisu/base.py | 2 +- .../10leadership_autoleader/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10leadership_mandatory/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10leadership_multi/tiramisu/base.py | 2 +- .../10load_disabled_if_in/tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../tiramisu/base.py | 8 ++-- .../tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../10load_emptyvalue/tiramisu/base.py | 4 +- .../10load_frozenifin/tiramisu/base.py | 6 +-- .../10load_frozenifin_auto/tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../10load_frozenifnotin/tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../10load_hidden_if_family/tiramisu/base.py | 8 ++-- .../10load_leadership/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10load_leadership_name/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../10load_mandatoryifin/tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../10valid_enum_accent/tiramisu/base.py | 4 +- .../10valid_enum_base/tiramisu/base.py | 4 +- .../tiramisu/base.py | 6 +-- .../10valid_enum_leader/tiramisu/base.py | 2 +- .../10valid_enum_mandatory/tiramisu/base.py | 4 +- .../10valid_enum_multi/tiramisu/base.py | 2 +- .../10valid_enum_none/tiramisu/base.py | 4 +- .../10valid_enum_number/tiramisu/base.py | 4 +- .../tiramisu/base.py | 4 +- .../10valid_enum_param_empty/tiramisu/base.py | 4 +- .../tiramisu/base.py | 4 +- .../10valid_enum_value/tiramisu/base.py | 2 +- .../tiramisu/base.py | 20 ++++----- .../tiramisu/base.py | 20 ++++----- .../tiramisu/base.py | 34 +++++++------- .../tiramisu/base.py | 20 ++++----- .../tiramisu/base.py | 20 ++++----- .../tiramisu/base.py | 20 ++++----- .../tiramisu/base.py | 20 ++++----- .../tiramisu/base.py | 18 ++++---- .../11valid_enum_variable/tiramisu/base.py | 2 +- .../20family_append/tiramisu/base.py | 4 +- .../20family_appendaccent/tiramisu/base.py | 8 ++-- .../20family_dynamic/tiramisu/base.py | 2 +- .../20family_dynamic_calc/tiramisu/base.py | 4 +- .../20family_dynamic_calc2/tiramisu/base.py | 4 +- .../tiramisu/base.py | 4 +- .../tiramisu/base.py | 2 +- .../20family_dynamic_number/tiramisu/base.py | 4 +- .../20family_empty/tiramisu/base.py | 2 +- .../20family_hidden/tiramisu/base.py | 2 +- .../20family_mode/tiramisu/base.py | 2 +- .../20family_modeleadership/tiramisu/base.py | 2 +- .../20notemplating/tiramisu/base.py | 16 +++---- .../dictionaries/20override/tiramisu/base.py | 16 +++---- .../21family_empty/tiramisu/base.py | 2 +- .../30mandatory_withoutvalue/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../30mandatory_withvalue/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../40condition_base/tiramisu/base.py | 8 ++-- .../40condition_base_add/tiramisu/base.py | 8 ++-- .../40condition_fallback/tiramisu/base.py | 8 ++-- .../40condition_optional/tiramisu/base.py | 6 +-- .../tiramisu/base.py | 6 +-- .../40empty_param/tiramisu/base.py | 4 +- .../40empty_param2/tiramisu/base.py | 4 +- .../tiramisu/base.py | 2 +- .../40ifin_leadership/tiramisu/base.py | 4 +- .../40ifin_leadershipauto/tiramisu/base.py | 18 ++++---- .../tiramisu/base.py | 18 ++++---- .../40ifin_multi/tiramisu/base.py | 6 +-- .../40ifin_validenum/tiramisu/base.py | 6 +-- .../50exists_exists/tiramisu/base.py | 2 +- .../50redefine_description/tiramisu/base.py | 2 +- .../51exists_nonexists/tiramisu/base.py | 6 +-- .../51exists_redefine/tiramisu/base.py | 2 +- .../51redefine_auto/tiramisu/base.py | 2 +- .../51redefine_autofill/tiramisu/base.py | 2 +- .../51redefine_family/tiramisu/base.py | 4 +- .../51redefine_fill/tiramisu/base.py | 2 +- .../51redefine_fillauto/tiramisu/base.py | 2 +- .../51redefine_help/tiramisu/base.py | 2 +- .../51redefine_hidden/tiramisu/base.py | 2 +- .../51redefine_remove_check/tiramisu/base.py | 2 +- .../tiramisu/base.py | 8 ++-- .../tiramisu/base.py | 10 ++--- .../51redefine_validenum/tiramisu/base.py | 2 +- .../51redefine_value/tiramisu/base.py | 4 +- .../51remove_fill/tiramisu/base.py | 4 +- .../52exists_redefine/tiramisu/base.py | 2 +- .../60action_external/tiramisu/base.py | 6 +-- .../tiramisu/base.py | 14 +++--- .../60extra_group/tiramisu/base.py | 18 ++++---- .../60extra_help/tiramisu/base.py | 24 +++++----- .../60extra_load/tiramisu/base.py | 10 ++--- .../60extra_mandatory/tiramisu/base.py | 12 ++--- .../60extra_name_family/tiramisu/base.py | 10 ++--- .../60extra_no_condition/tiramisu/base.py | 12 ++--- .../60extra_redefine/tiramisu/base.py | 10 ++--- .../60familyaction/tiramisu/base.py | 4 +- .../60familyaction_accent/tiramisu/base.py | 4 +- .../60familyaction_mandatory/tiramisu/base.py | 6 +-- .../dictionaries/61extra_dyn/tiramisu/base.py | 2 +- .../61extra_dyn_extra/tiramisu/base.py | 2 +- .../70container_files/tiramisu/base.py | 30 ++++++------- .../tiramisu/base.py | 14 +++--- .../tiramisu/base.py | 14 +++--- .../tiramisu/base.py | 18 ++++---- .../70container_files_twice/tiramisu/base.py | 44 +++++++++---------- .../70container_filesmulti/tiramisu/base.py | 30 ++++++------- .../tiramisu/base.py | 16 +++---- .../70container_new/tiramisu/base.py | 2 +- .../70container_newnocont/tiramisu/base.py | 2 +- .../70container_newwithip/tiramisu/base.py | 4 +- .../70container_pathaccess/tiramisu/base.py | 10 ++--- .../tiramisu/base.py | 6 +-- .../70container_save/tiramisu/base.py | 2 +- .../tiramisu/base.py | 8 ++-- .../tiramisu/base.py | 10 ++--- .../70container_services/tiramisu/base.py | 2 +- .../70services_unmanage/tiramisu/base.py | 2 +- 185 files changed, 584 insertions(+), 583 deletions(-) diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index 22b4a11c1..f093475c3 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -205,7 +205,8 @@ class Common: else: value = str(tuple([val.name for val in value])) elif key in ['multi', 'suffixes']: - pass + if not value: + continue elif isinstance(value, str) and key != 'opt' and not value.startswith('['): value = "'" + value.replace("'", "\\\'") + "'" elif isinstance(value, self.objectspace.value): diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/base.py b/tests/dictionaries/00load_autofreeze/tiramisu/base.py index 366031169..5880b71eb 100644 --- a/tests/dictionaries/00load_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreeze/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='module_instancie', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py index 5ac2dca29..992e84bda 100644 --- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='module_instancie', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'auto_freeze', 'expert', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'auto_freeze', 'expert', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_autosave/tiramisu/base.py b/tests/dictionaries/00load_autosave/tiramisu/base.py index f801edc39..41d6156fd 100644 --- a/tests/dictionaries/00load_autosave/tiramisu/base.py +++ b/tests/dictionaries/00load_autosave/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'basic', 'force_store_value', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'basic', 'force_store_value', 'mandatory'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py index d5e29950f..470d5bd48 100644 --- a/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'force_store_value', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'force_store_value', 'mandatory'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'expert'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_comment/tiramisu/base.py b/tests/dictionaries/00load_comment/tiramisu/base.py index 3a97cca41..070826aaa 100644 --- a/tests/dictionaries/00load_comment/tiramisu/base.py +++ b/tests/dictionaries/00load_comment/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_notype/tiramisu/base.py b/tests/dictionaries/00load_notype/tiramisu/base.py index 1013d97c6..e15e21bcf 100644 --- a/tests/dictionaries/00load_notype/tiramisu/base.py +++ b/tests/dictionaries/00load_notype/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='without_type', doc='without_type', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='without_type', doc='without_type', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_save/tiramisu/base.py b/tests/dictionaries/00load_save/tiramisu/base.py index 3a97cca41..070826aaa 100644 --- a/tests/dictionaries/00load_save/tiramisu/base.py +++ b/tests/dictionaries/00load_save/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_subfolder/tiramisu/base.py b/tests/dictionaries/00load_subfolder/tiramisu/base.py index 9d2d244ea..05bcd8c51 100644 --- a/tests/dictionaries/00load_subfolder/tiramisu/base.py +++ b/tests/dictionaries/00load_subfolder/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py index 0a9729fb7..8c3396549 100644 --- a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='module_instancie', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), multi=False, properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'frozen', 'hidden', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'frozen', 'hidden', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01auto_base/tiramisu/base.py b/tests/dictionaries/01auto_base/tiramisu/base.py index 553b333b0..7ec3d4b66 100644 --- a/tests/dictionaries/01auto_base/tiramisu/base.py +++ b/tests/dictionaries/01auto_base/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01auto_withoutparam/tiramisu/base.py b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py index 106d3da45..864b86449 100644 --- a/tests/dictionaries/01auto_withoutparam/tiramisu/base.py +++ b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((), kwargs={})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01base_file_include/tiramisu/base.py b/tests/dictionaries/01base_file_include/tiramisu/base.py index 43bd57288..bcccf75c0 100644 --- a/tests/dictionaries/01base_file_include/tiramisu/base.py +++ b/tests/dictionaries/01base_file_include/tiramisu/base.py @@ -12,16 +12,16 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', default='root', multi=False) -option_9 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_10 = StrOption(name='name', doc='name', default='/etc/file', multi=False) -option_11 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_12 = StrOption(name='source', doc='source', default='file', multi=False) -option_13 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='group', doc='group', default='root') +option_9 = StrOption(name='mode', doc='mode', default='0644') +option_10 = StrOption(name='name', doc='name', default='/etc/file') +option_11 = StrOption(name='owner', doc='owner', default='root') +option_12 = StrOption(name='source', doc='source', default='file') +option_13 = BoolOption(name='templating', doc='templating', default=True) +option_14 = 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_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/dictionaries/01base_file_patch/tiramisu/base.py b/tests/dictionaries/01base_file_patch/tiramisu/base.py index 43bd57288..bcccf75c0 100644 --- a/tests/dictionaries/01base_file_patch/tiramisu/base.py +++ b/tests/dictionaries/01base_file_patch/tiramisu/base.py @@ -12,16 +12,16 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', default='root', multi=False) -option_9 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_10 = StrOption(name='name', doc='name', default='/etc/file', multi=False) -option_11 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_12 = StrOption(name='source', doc='source', default='file', multi=False) -option_13 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='group', doc='group', default='root') +option_9 = StrOption(name='mode', doc='mode', default='0644') +option_10 = StrOption(name='name', doc='name', default='/etc/file') +option_11 = StrOption(name='owner', doc='owner', default='root') +option_12 = StrOption(name='source', doc='source', default='file') +option_13 = BoolOption(name='templating', doc='templating', default=True) +option_14 = 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_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py index 0e949bb98..ee9b3ca1b 100644 --- a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py +++ b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py @@ -12,16 +12,16 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', default='root', multi=False) -option_9 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_10 = StrOption(name='name', doc='name', default='/etc/systemd-makefs@dev-disk-by\\x2dpartlabel', multi=False) -option_11 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_12 = StrOption(name='source', doc='source', default='systemd-makefs@dev-disk-by\\x2dpartlabel', multi=False) -option_13 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='group', doc='group', default='root') +option_9 = StrOption(name='mode', doc='mode', default='0644') +option_10 = StrOption(name='name', doc='name', default='/etc/systemd-makefs@dev-disk-by\\x2dpartlabel') +option_11 = StrOption(name='owner', doc='owner', default='root') +option_12 = StrOption(name='source', doc='source', default='systemd-makefs@dev-disk-by\\x2dpartlabel') +option_13 = BoolOption(name='templating', doc='templating', default=True) +option_14 = 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_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/dictionaries/01base_float/tiramisu/base.py b/tests/dictionaries/01base_float/tiramisu/base.py index f9d2c26da..de0e047e4 100644 --- a/tests/dictionaries/01base_float/tiramisu/base.py +++ b/tests/dictionaries/01base_float/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = FloatOption(name='float', doc='Description', default=0.527, multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = FloatOption(name='float', doc='Description', default=0.527, properties=frozenset({'mandatory', 'normal'})) option_4 = FloatOption(name='float_multi', doc='Description', default=[0.527], multi=True, default_multi=0.527, properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py b/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py index 7135ab36e..aeee9aea0 100644 --- a/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py +++ b/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='general', doc='description', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='general', doc='description', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01family_description/tiramisu/base.py b/tests/dictionaries/01family_description/tiramisu/base.py index 5178d0e4c..f0bde94f8 100644 --- a/tests/dictionaries/01family_description/tiramisu/base.py +++ b/tests/dictionaries/01family_description/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='Other description', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py index e4eb9638d..32631837c 100644 --- a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='module_instancie', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), multi=False, properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_autosave/tiramisu/base.py b/tests/dictionaries/01fill_autosave/tiramisu/base.py index 69174a524..f7e37982d 100644 --- a/tests/dictionaries/01fill_autosave/tiramisu/base.py +++ b/tests/dictionaries/01fill_autosave/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), multi=False, properties=frozenset({'basic', 'force_store_value'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'basic', 'force_store_value'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_base/tiramisu/base.py b/tests/dictionaries/01fill_base/tiramisu/base.py index a768170e9..15f65fe62 100644 --- a/tests/dictionaries/01fill_base/tiramisu/base.py +++ b/tests/dictionaries/01fill_base/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), multi=False, properties=frozenset({'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_baseaccent/tiramisu/base.py b/tests/dictionaries/01fill_baseaccent/tiramisu/base.py index d4f985dd5..fded476ba 100644 --- a/tests/dictionaries/01fill_baseaccent/tiramisu/base.py +++ b/tests/dictionaries/01fill_baseaccent/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_mandatory/tiramisu/base.py b/tests/dictionaries/01fill_mandatory/tiramisu/base.py index 2512dd67a..7f9697487 100644 --- a/tests/dictionaries/01fill_mandatory/tiramisu/base.py +++ b/tests/dictionaries/01fill_mandatory/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_number/tiramisu/base.py b/tests/dictionaries/01fill_number/tiramisu/base.py index 1c430506b..6cbc847ce 100644 --- a/tests/dictionaries/01fill_number/tiramisu/base.py +++ b/tests/dictionaries/01fill_number/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = IntOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = IntOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_only_optional/tiramisu/base.py b/tests/dictionaries/01fill_only_optional/tiramisu/base.py index 106d3da45..864b86449 100644 --- a/tests/dictionaries/01fill_only_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_only_optional/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((), kwargs={})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_optional/tiramisu/base.py b/tests/dictionaries/01fill_optional/tiramisu/base.py index 553b333b0..7ec3d4b66 100644 --- a/tests/dictionaries/01fill_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_optional/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py index 781dc8236..1b4e48eb9 100644 --- a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='module_instancie', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), multi=False, properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01test/tiramisu/base.py b/tests/dictionaries/01test/tiramisu/base.py index ecccdb135..268318df7 100644 --- a/tests/dictionaries/01test/tiramisu/base.py +++ b/tests/dictionaries/01test/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_3.impl_set_information("test", ('test',)) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/dictionaries/01test_multi/tiramisu/base.py b/tests/dictionaries/01test_multi/tiramisu/base.py index a1d054dfc..7a8c30fcc 100644 --- a/tests/dictionaries/01test_multi/tiramisu/base.py +++ b/tests/dictionaries/01test_multi/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_3.impl_set_information("test", ('test1', 'test2')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/dictionaries/01test_multi_none/tiramisu/base.py b/tests/dictionaries/01test_multi_none/tiramisu/base.py index 878933ff4..46dd92c1b 100644 --- a/tests/dictionaries/01test_multi_none/tiramisu/base.py +++ b/tests/dictionaries/01test_multi_none/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_3.impl_set_information("test", (None, 'test1', 'test2')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/dictionaries/01test_redefine/tiramisu/base.py b/tests/dictionaries/01test_redefine/tiramisu/base.py index 4a091ea16..642950836 100644 --- a/tests/dictionaries/01test_redefine/tiramisu/base.py +++ b/tests/dictionaries/01test_redefine/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_3.impl_set_information("test", ('test1',)) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/dictionaries/01test_redefine_remove/tiramisu/base.py b/tests/dictionaries/01test_redefine_remove/tiramisu/base.py index f924606d9..7673b0bee 100644 --- a/tests/dictionaries/01test_redefine_remove/tiramisu/base.py +++ b/tests/dictionaries/01test_redefine_remove/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py index 87e56db46..a12b7c492 100644 --- a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), multi=False, properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10autosave_hidden/tiramisu/base.py b/tests/dictionaries/10autosave_hidden/tiramisu/base.py index 565d3e924..ebedad0ab 100644 --- a/tests/dictionaries/10autosave_hidden/tiramisu/base.py +++ b/tests/dictionaries/10autosave_hidden/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), multi=False, properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_base/tiramisu/base.py b/tests/dictionaries/10check_base/tiramisu/base.py index edc761b07..9e6c9b031 100644 --- a/tests/dictionaries/10check_base/tiramisu/base.py +++ b/tests/dictionaries/10check_base/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = IntOption(name='int', doc='No change', multi=False, properties=frozenset({'normal'}), min_number=0, max_number=100) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'})) +option_4 = IntOption(name='int', doc='No change', properties=frozenset({'normal'}), min_number=0, max_number=100) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_no_param/tiramisu/base.py b/tests/dictionaries/10check_no_param/tiramisu/base.py index b270da335..ed58ecc10 100644 --- a/tests/dictionaries/10check_no_param/tiramisu/base.py +++ b/tests/dictionaries/10check_no_param/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = IntOption(name='int', doc='No change', multi=False, properties=frozenset({'normal'}), validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={}), warnings_only=False)]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'})) +option_4 = IntOption(name='int', doc='No change', properties=frozenset({'normal'}), validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={}), warnings_only=False)]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_option/tiramisu/base.py b/tests/dictionaries/10check_option/tiramisu/base.py index b22a84d75..c3df4770d 100644 --- a/tests/dictionaries/10check_option/tiramisu/base.py +++ b/tests/dictionaries/10check_option/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = IntOption(name='int2', doc='No change', default=100, multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = IntOption(name='int', doc='No change', multi=False, properties=frozenset({'normal'}), validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={'mini': ParamValue("0"), 'maxi': ParamOption(option_4, notraisepropertyerror=False, todict=False)}), warnings_only=False)]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'})) +option_4 = IntOption(name='int2', doc='No change', default=100, properties=frozenset({'mandatory', 'normal'})) +option_5 = IntOption(name='int', doc='No change', properties=frozenset({'normal'}), validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={'mini': ParamValue("0"), 'maxi': ParamOption(option_4, notraisepropertyerror=False, todict=False)}), warnings_only=False)]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_optional/tiramisu/base.py b/tests/dictionaries/10check_optional/tiramisu/base.py index 723b11aa2..4ccca1463 100644 --- a/tests/dictionaries/10check_optional/tiramisu/base.py +++ b/tests/dictionaries/10check_optional/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = IntOption(name='int2', doc='No change', multi=False, properties=frozenset({'normal'})) -option_4 = IntOption(name='int', doc='No change', multi=False, properties=frozenset({'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'})) +option_5 = IntOption(name='int2', doc='No change', properties=frozenset({'normal'})) +option_4 = IntOption(name='int', doc='No change', properties=frozenset({'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_differ/tiramisu/base.py b/tests/dictionaries/10check_valid_differ/tiramisu/base.py index 0927b9db6..8f73b6e7b 100644 --- a/tests/dictionaries/10check_valid_differ/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py index fe88c807b..4c058cda1 100644 --- a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py index a9916dbbf..0e8af0960 100644 --- a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py index 030c1e30a..3729e043a 100644 --- a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = IPOption(private_only=True, warnings_only=True, name='adresse_ip_eth0', doc='Adresse IP de la carte', multi=False, properties=frozenset({'basic', 'mandatory'})) -option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', multi=False, properties=frozenset({'basic', 'mandatory'})) -option_6 = IPOption(private_only=True, warnings_only=True, name='adresse_ip', doc='IP', multi=False, properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) +option_4 = IPOption(private_only=True, warnings_only=True, name='adresse_ip_eth0', doc='Adresse IP de la carte', properties=frozenset({'basic', 'mandatory'})) +option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', properties=frozenset({'basic', 'mandatory'})) +option_6 = IPOption(private_only=True, warnings_only=True, name='adresse_ip', doc='IP', properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5, option_6]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py index 82aa929f6..0f51a2210 100644 --- a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = IPOption(cidr=True, name='adresse_ip_eth0', doc='Adresse IP de la carte', multi=False, properties=frozenset({'basic', 'mandatory'})) -option_5 = IPOption(private_only=True, warnings_only=True, name='adresse_ip', doc='IP', multi=False, properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) +option_4 = IPOption(cidr=True, name='adresse_ip_eth0', doc='Adresse IP de la carte', properties=frozenset({'basic', 'mandatory'})) +option_5 = IPOption(private_only=True, warnings_only=True, name='adresse_ip', doc='IP', properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py index 718cadca7..b5c6c8481 100644 --- a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = IPOption(private_only=True, warnings_only=True, name='adresse_ip_eth0', doc='Adresse IP de la carte', multi=False, properties=frozenset({'basic', 'mandatory'})) -option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', multi=False, properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) +option_4 = IPOption(private_only=True, warnings_only=True, name='adresse_ip_eth0', doc='Adresse IP de la carte', properties=frozenset({'basic', 'mandatory'})) +option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10fill_information/tiramisu/base.py b/tests/dictionaries/10fill_information/tiramisu/base.py index 1578d4251..217b74002 100644 --- a/tests/dictionaries/10fill_information/tiramisu/base.py +++ b/tests/dictionaries/10fill_information/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)), kwargs={})), multi=False, properties=frozenset({'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)), kwargs={})), properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_append/tiramisu/base.py b/tests/dictionaries/10leadership_append/tiramisu/base.py index 0a3688876..dec1fd78f 100644 --- a/tests/dictionaries/10leadership_append/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py index c89ca277b..64f6825f4 100644 --- a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen'})) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) diff --git a/tests/dictionaries/10leadership_append_name/tiramisu/base.py b/tests/dictionaries/10leadership_append_name/tiramisu/base.py index 9fbe37c88..7ec12ebaa 100644 --- a/tests/dictionaries/10leadership_append_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_name/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_auto/tiramisu/base.py b/tests/dictionaries/10leadership_auto/tiramisu/base.py index a949d194a..39855631a 100644 --- a/tests/dictionaries/10leadership_auto/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) diff --git a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py index 6adabfea7..346300013 100644 --- a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) diff --git a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py index 926a25604..cf75899e6 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'expert'})) diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py index ea542274a..f920c2ca5 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'expert'})) diff --git a/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py index 79cfcf6a8..e7a5aa5ea 100644 --- a/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py +++ b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py index 0e6066b58..0c1588fdd 100644 --- a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen'})) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py index c7a579e4c..d4e74a12d 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py index 0ec07f3f2..2a4280932 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py index 044f5b5a0..3c46ff94b 100644 --- a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'mandatory'})) option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py index de6d87125..a15a99ac8 100644 --- a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'mandatory', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py index 4df428400..f543d0982 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=True) option_6 = NetworkOption(name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=True, properties=frozenset({'mandatory', 'normal'})) option_4 = Leadership(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', properties=frozenset({'normal'}), children=[option_5, option_6]) diff --git a/tests/dictionaries/10leadership_multi/tiramisu/base.py b/tests/dictionaries/10leadership_multi/tiramisu/base.py index f33d582da..f8bff23d6 100644 --- a/tests/dictionaries/10leadership_multi/tiramisu/base.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py index 6958dcdbd..031fac446 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py index c8663dca2..098edef11 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) +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({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py index d2c52638f..ad2d7cadc 100644 --- a/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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')}))})) +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')}))})) option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_6 = OptionDescription(name='general2', doc='Général2', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), children=[option_7]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) 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 6ba6dc7c8..fdf850dbf 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,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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', multi=False, 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_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', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py index 6ba6dc7c8..fdf850dbf 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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', multi=False, 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_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', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py index 13dadd756..635adabdd 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'disabled', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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({'disabled', 'mandatory', 'normal'})) +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')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py index fca303f92..19d560c9e 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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')}))})) +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')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py index fca303f92..19d560c9e 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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')}))})) +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')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_emptyvalue/tiramisu/base.py b/tests/dictionaries/10load_emptyvalue/tiramisu/base.py index 4ce405089..b8f6bcfbe 100644 --- a/tests/dictionaries/10load_emptyvalue/tiramisu/base.py +++ b/tests/dictionaries/10load_emptyvalue/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', multi=False, properties=frozenset({'normal'})) -option_4 = StrOption(name='mode_conteneur_actif2', doc='No change', multi=False, properties=frozenset({'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', properties=frozenset({'normal'})) +option_4 = StrOption(name='mode_conteneur_actif2', doc='No change', properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin/tiramisu/base.py b/tests/dictionaries/10load_frozenifin/tiramisu/base.py index f5ce68d6c..35b15e511 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py index 3ece39ef6..094e5d803 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("non")), kwargs={})), multi=False, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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=Calculation(func.calc_val, Params((ParamValue("non")), kwargs={})), properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py index 22a91e36c..24274cfeb 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) +option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py index 1a5d8f5b6..69752e2dc 100644 --- a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py index 5f1969b4e..93ad543ad 100644 --- a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), 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', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), 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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py b/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py index 1a5d8f5b6..69752e2dc 100644 --- a/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py index 822ad2a15..eb7b35a8d 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_6 = OptionDescription(name='general2', doc='Général2', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), children=[option_7]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_leadership/tiramisu/base.py b/tests/dictionaries/10load_leadership/tiramisu/base.py index 712f923c5..9394d0738 100644 --- a/tests/dictionaries/10load_leadership/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10load_leadership_description/tiramisu/base.py b/tests/dictionaries/10load_leadership_description/tiramisu/base.py index 274a16dcc..a21204bc5 100644 --- a/tests/dictionaries/10load_leadership_description/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10load_leadership_name/tiramisu/base.py b/tests/dictionaries/10load_leadership_name/tiramisu/base.py index eeaa24836..b5c7bacd4 100644 --- a/tests/dictionaries/10load_leadership_name/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_name/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py index 89d8f421b..a1582fb0e 100644 --- a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'mandatory'})) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py index 8f1b9f17d..bb3d866ca 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_6 = StrOption(name='leader', doc='leader', multi=True) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py index 466bce5b9..55cbc83bf 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py index 1a5d8f5b6..69752e2dc 100644 --- a/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_accent/tiramisu/base.py b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py index 660868e53..10a7d75fa 100644 --- a/tests/dictionaries/10valid_enum_accent/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'b', 'c', 'é'), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'b', 'c', 'é'), properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10valid_enum_base/tiramisu/base.py b/tests/dictionaries/10valid_enum_base/tiramisu/base.py index f6cccca67..37a7e9605 100644 --- a/tests/dictionaries/10valid_enum_base/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'b', 'c'), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'b', 'c'), properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py index 7353ed332..d38ebf73e 100644 --- a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar2', doc='multi', default='c', values=('a', 'b', 'c'), multi=False, properties=frozenset({'expert', 'mandatory'})) -option_6 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'c'), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_5 = ChoiceOption(name='enumvar2', doc='multi', default='c', values=('a', 'b', 'c'), properties=frozenset({'expert', 'mandatory'})) +option_6 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'c'), properties=frozenset({'expert', 'mandatory'})) option_6.impl_set_information("help", "bla bla bla") option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5, option_6]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10valid_enum_leader/tiramisu/base.py b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py index 630141546..daac638db 100644 --- a/tests/dictionaries/10valid_enum_leader/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = ChoiceOption(name='follower1', doc='follower1', values=('a', 'b', 'c'), multi=True, default_multi='a', properties=frozenset({'mandatory', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py index a277a1146..1761948bf 100644 --- a/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', default='a', values=('a', 'b', 'c'), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', default='a', values=('a', 'b', 'c'), properties=frozenset({'expert', 'mandatory'})) option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_multi/tiramisu/base.py b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py index d4b25be34..23f4081d3 100644 --- a/tests/dictionaries/10valid_enum_multi/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = ChoiceOption(name='multi', doc='multi', default=['a'], values=('a', 'b', 'c'), multi=True, default_multi='a', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) diff --git a/tests/dictionaries/10valid_enum_none/tiramisu/base.py b/tests/dictionaries/10valid_enum_none/tiramisu/base.py index eb8593226..4886b2f1e 100644 --- a/tests/dictionaries/10valid_enum_none/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_none/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', default='b', values=('a', 'b', None), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', default='b', values=('a', 'b', None), properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10valid_enum_number/tiramisu/base.py b/tests/dictionaries/10valid_enum_number/tiramisu/base.py index 4917b8465..a891c333a 100644 --- a/tests/dictionaries/10valid_enum_number/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_number/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='enumvar', default=1, values=(1, 2, 3), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_5 = ChoiceOption(name='enumvar', doc='enumvar', default=1, values=(1, 2, 3), properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py index 6e797b0ee..6e87793f5 100644 --- a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='enumvar', default=3, values=(1, 2, 3), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_5 = ChoiceOption(name='enumvar', doc='enumvar', default=3, values=(1, 2, 3), properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py index 154e7a9f8..c64c9aef0 100644 --- a/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py index 154e7a9f8..c64c9aef0 100644 --- a/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), multi=False, properties=frozenset({'expert', 'mandatory'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10valid_enum_value/tiramisu/base.py b/tests/dictionaries/10valid_enum_value/tiramisu/base.py index 7fbf17fcc..c5ffb47c3 100644 --- a/tests/dictionaries/10valid_enum_value/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_value/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='mode_conteneur_actif', doc='No change', default='b', values=('a', 'b', 'c'), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = ChoiceOption(name='mode_conteneur_actif', doc='No change', default='b', values=('a', 'b', 'c'), properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index efd1e7a05..6ba51b781 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -12,18 +12,18 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = BoolOption(name='mode_conteneur_actif2', doc='No change', default=True, multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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')}))})) +option_5 = BoolOption(name='mode_conteneur_actif2', doc='No change', default=True, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', default='root', multi=False) -option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_12 = StrOption(name='name', doc='name', default='/etc/file', multi=False) -option_13 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_14 = StrOption(name='source', doc='source', default='file', multi=False) -option_15 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_16 = BoolOption(name='activate', doc='activate', default=True, multi=False, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_10 = StrOption(name='group', doc='group', default='root') +option_11 = StrOption(name='mode', doc='mode', default='0644') +option_12 = StrOption(name='name', doc='name', default='/etc/file') +option_13 = StrOption(name='owner', doc='owner', default='root') +option_14 = StrOption(name='source', doc='source', default='file') +option_15 = BoolOption(name='templating', doc='templating', default=True) +option_16 = BoolOption(name='activate', doc='activate', default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py index ea65ba01c..4a1b1e1d4 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -12,18 +12,18 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_3 = StrOption(name='condition', doc='No change', default='oui', 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')}))})) +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')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', default='root', multi=False) -option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_12 = StrOption(name='name', doc='name', default='/etc/file', multi=False) -option_13 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_14 = StrOption(name='source', doc='source', default='file', multi=False) -option_15 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_16 = BoolOption(name='activate', doc='activate', default=True, multi=False, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_10 = StrOption(name='group', doc='group', default='root') +option_11 = StrOption(name='mode', doc='mode', default='0644') +option_12 = StrOption(name='name', doc='name', default='/etc/file') +option_13 = StrOption(name='owner', doc='owner', default='root') +option_14 = StrOption(name='source', doc='source', default='file') +option_15 = BoolOption(name='templating', doc='templating', default=True) +option_16 = BoolOption(name='activate', doc='activate', default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py index f63f27a3c..1f4b8d76e 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -12,26 +12,26 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +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')}))})) +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')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', default='root', multi=False) -option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_12 = StrOption(name='name', doc='name', default='/tmp/file1', multi=False) -option_13 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_14 = StrOption(name='source', doc='source', default='file1', multi=False) -option_15 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_16 = BoolOption(name='activate', doc='activate', default=True, multi=False, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_10 = StrOption(name='group', doc='group', default='root') +option_11 = StrOption(name='mode', doc='mode', default='0644') +option_12 = StrOption(name='name', doc='name', default='/tmp/file1') +option_13 = StrOption(name='owner', doc='owner', default='root') +option_14 = StrOption(name='source', doc='source', default='file1') +option_15 = BoolOption(name='templating', doc='templating', default=True) +option_16 = BoolOption(name='activate', doc='activate', default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_9 = OptionDescription(name='file1', doc='file1', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) -option_18 = StrOption(name='group', doc='group', default='root', multi=False) -option_19 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_20 = StrOption(name='name', doc='name', default='/tmp/file2', multi=False) -option_21 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_22 = StrOption(name='source', doc='source', default='file2', multi=False) -option_23 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_24 = BoolOption(name='activate', doc='activate', default=True, multi=False, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_18 = StrOption(name='group', doc='group', default='root') +option_19 = StrOption(name='mode', doc='mode', default='0644') +option_20 = StrOption(name='name', doc='name', default='/tmp/file2') +option_21 = StrOption(name='owner', doc='owner', default='root') +option_22 = StrOption(name='source', doc='source', default='file2') +option_23 = BoolOption(name='templating', doc='templating', default=True) +option_24 = BoolOption(name='activate', doc='activate', default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_17 = OptionDescription(name='file2', doc='file2', children=[option_18, option_19, option_20, option_21, option_22, option_23, option_24]) option_8 = OptionDescription(name='files', doc='files', children=[option_9, option_17]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py index 8af9db4e9..c7ee25577 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py @@ -12,18 +12,18 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +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({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', default='root', multi=False) -option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_12 = StrOption(name='name', doc='name', default='/tmp/file', multi=False) -option_13 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_14 = StrOption(name='source', doc='source', default='file', multi=False) -option_15 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_16 = BoolOption(name='activate', doc='activate', default=True, multi=False, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('unpossible'), 'reverse_condition': ParamValue(True)}))})) +option_10 = StrOption(name='group', doc='group', default='root') +option_11 = StrOption(name='mode', doc='mode', default='0644') +option_12 = StrOption(name='name', doc='name', default='/tmp/file') +option_13 = StrOption(name='owner', doc='owner', default='root') +option_14 = StrOption(name='source', doc='source', default='file') +option_15 = BoolOption(name='templating', doc='templating', default=True) +option_16 = BoolOption(name='activate', doc='activate', default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('unpossible'), 'reverse_condition': ParamValue(True)}))})) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py index 8af9db4e9..c7ee25577 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -12,18 +12,18 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +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({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', default='root', multi=False) -option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_12 = StrOption(name='name', doc='name', default='/tmp/file', multi=False) -option_13 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_14 = StrOption(name='source', doc='source', default='file', multi=False) -option_15 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_16 = BoolOption(name='activate', doc='activate', default=True, multi=False, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('unpossible'), 'reverse_condition': ParamValue(True)}))})) +option_10 = StrOption(name='group', doc='group', default='root') +option_11 = StrOption(name='mode', doc='mode', default='0644') +option_12 = StrOption(name='name', doc='name', default='/tmp/file') +option_13 = StrOption(name='owner', doc='owner', default='root') +option_14 = StrOption(name='source', doc='source', default='file') +option_15 = BoolOption(name='templating', doc='templating', default=True) +option_16 = BoolOption(name='activate', doc='activate', default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('unpossible'), 'reverse_condition': ParamValue(True)}))})) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index d59b61f6d..f73e9cc5e 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -12,18 +12,18 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +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({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', default='root', multi=False) -option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_12 = StrOption(name='name', doc='name', default='/tmp/file', multi=False) -option_13 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_14 = StrOption(name='source', doc='source', default='file', multi=False) -option_15 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_16 = BoolOption(name='activate', doc='activate', default=True, multi=False, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('unpossible'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_10 = StrOption(name='group', doc='group', default='root') +option_11 = StrOption(name='mode', doc='mode', default='0644') +option_12 = StrOption(name='name', doc='name', default='/tmp/file') +option_13 = StrOption(name='owner', doc='owner', default='root') +option_14 = StrOption(name='source', doc='source', default='file') +option_15 = BoolOption(name='templating', doc='templating', default=True) +option_16 = BoolOption(name='activate', doc='activate', default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('unpossible'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index a58395bbc..3da7ddd69 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -12,18 +12,18 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='non', values=('non', 'statique'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = ChoiceOption(name='condition', doc='No change', default='non', values=('non', 'statique'), properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', default='root', multi=False) -option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_12 = StrOption(name='name', doc='name', default='/tmp/file', multi=False) -option_13 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_14 = StrOption(name='source', doc='source', default='file', multi=False) -option_15 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_16 = BoolOption(name='activate', doc='activate', default=True, multi=False, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('statique'), 'reverse_condition': ParamValue(True)}))})) +option_10 = StrOption(name='group', doc='group', default='root') +option_11 = StrOption(name='mode', doc='mode', default='0644') +option_12 = StrOption(name='name', doc='name', default='/tmp/file') +option_13 = StrOption(name='owner', doc='owner', default='root') +option_14 = StrOption(name='source', doc='source', default='file') +option_15 = BoolOption(name='templating', doc='templating', default=True) +option_16 = BoolOption(name='activate', doc='activate', default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('statique'), 'reverse_condition': ParamValue(True)}))})) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py index fb0bb90e6..5907c3944 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py @@ -12,17 +12,17 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_9 = StrOption(name='group', doc='group', default='root', multi=False) -option_10 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_11 = StrOption(name='name', doc='name', default='/tmp/file1', multi=False) -option_12 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_13 = StrOption(name='source', doc='source', default='file1', multi=False) -option_14 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_15 = BoolOption(name='activate', doc='activate', default=True, multi=False, properties=frozenset({'disabled'})) +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, properties=frozenset({'disabled'})) 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]) diff --git a/tests/dictionaries/11valid_enum_variable/tiramisu/base.py b/tests/dictionaries/11valid_enum_variable/tiramisu/base.py index 89a6c8607..be856cae8 100644 --- a/tests/dictionaries/11valid_enum_variable/tiramisu/base.py +++ b/tests/dictionaries/11valid_enum_variable/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='var', doc='New variable', default=['a', 'b', 'c'], multi=True, default_multi='c', properties=frozenset({'mandatory', 'normal'})) -option_3 = ChoiceOption(name='mode_conteneur_actif', doc='No change', default='a', values=Calculation(func.calc_value, Params((ParamOption(option_4)))), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = ChoiceOption(name='mode_conteneur_actif', doc='No change', default='a', values=Calculation(func.calc_value, Params((ParamOption(option_4)))), properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_append/tiramisu/base.py b/tests/dictionaries/20family_append/tiramisu/base.py index b86584b51..27c45223d 100644 --- a/tests/dictionaries/20family_append/tiramisu/base.py +++ b/tests/dictionaries/20family_append/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_appendaccent/tiramisu/base.py b/tests/dictionaries/20family_appendaccent/tiramisu/base.py index 1f07c2302..b3bd4a267 100644 --- a/tests/dictionaries/20family_appendaccent/tiramisu/base.py +++ b/tests/dictionaries/20family_appendaccent/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_6 = OptionDescription(name='other', doc='Other', properties=frozenset({'normal'}), children=[option_7]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_6]) diff --git a/tests/dictionaries/20family_dynamic/tiramisu/base.py b/tests/dictionaries/20family_dynamic/tiramisu/base.py index 0241c7f86..976124f3a 100644 --- a/tests/dictionaries/20family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(name='vardyn', doc='No change', multi=False, properties=frozenset({'normal'})) +option_5 = StrOption(name='vardyn', doc='No change', properties=frozenset({'normal'})) option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py index d86c2d47b..ec2b06acc 100644 --- a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py @@ -14,9 +14,9 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(name='vardyn', doc='No change', default='val', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='vardyn', doc='No change', default='val', properties=frozenset({'mandatory', 'normal'})) option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) -option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, 'val1', option_4, notraisepropertyerror=False, todict=False)), kwargs={})), multi=False, properties=frozenset({'normal'})) +option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, 'val1', option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py index d5a5e91f8..3749f7bb0 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py @@ -14,8 +14,8 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_7 = StrOption(name='newvar', doc='No change', multi=False, properties=frozenset({'normal'})) -option_5 = StrOption(name='vardyn', doc='No change', default='val', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) +option_7 = StrOption(name='newvar', doc='No change', properties=frozenset({'normal'})) +option_5 = StrOption(name='vardyn', doc='No change', default='val', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6]) diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py index 9cd9b8ea1..56288d815 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py @@ -14,9 +14,9 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(name='vardyn', doc='No change', default=Calculation(func.calc_val, Params((ParamSuffix()), kwargs={})), multi=False, properties=frozenset({'normal'})) +option_5 = StrOption(name='vardyn', doc='No change', default=Calculation(func.calc_val, Params((ParamSuffix()), kwargs={})), properties=frozenset({'normal'})) option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) -option_7 = StrOption(name='newvar', doc='No change', multi=False, properties=frozenset({'normal'})) +option_7 = StrOption(name='newvar', doc='No change', properties=frozenset({'normal'})) option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py index 485bec374..8c7451cde 100644 --- a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(name='vardyn', doc='No change', multi=False, properties=frozenset({'normal'})) +option_5 = StrOption(name='vardyn', doc='No change', properties=frozenset({'normal'})) option_4 = ConvertDynOptionDescription(name='dyn', doc='Dyn ', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py index d9fd8eac5..664e4a6ab 100644 --- a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py @@ -14,9 +14,9 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = IntOption(name='varname', doc='No change', default=[1, 2], multi=True, default_multi=2, properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(name='vardyn', doc='No change', default='val', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='vardyn', doc='No change', default='val', properties=frozenset({'mandatory', 'normal'})) option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) -option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, '1', option_4, notraisepropertyerror=False, todict=False)), kwargs={})), multi=False, properties=frozenset({'normal'})) +option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, '1', option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_empty/tiramisu/base.py b/tests/dictionaries/20family_empty/tiramisu/base.py index fe0cf169b..3a1a81a20 100644 --- a/tests/dictionaries/20family_empty/tiramisu/base.py +++ b/tests/dictionaries/20family_empty/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'basic', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'basic', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_hidden/tiramisu/base.py b/tests/dictionaries/20family_hidden/tiramisu/base.py index 82fe42711..9fad17957 100644 --- a/tests/dictionaries/20family_hidden/tiramisu/base.py +++ b/tests/dictionaries/20family_hidden/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'hidden', 'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_mode/tiramisu/base.py b/tests/dictionaries/20family_mode/tiramisu/base.py index fe0cf169b..3a1a81a20 100644 --- a/tests/dictionaries/20family_mode/tiramisu/base.py +++ b/tests/dictionaries/20family_mode/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'basic', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'basic', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_modeleadership/tiramisu/base.py b/tests/dictionaries/20family_modeleadership/tiramisu/base.py index fcd91118a..437137260 100644 --- a/tests/dictionaries/20family_modeleadership/tiramisu/base.py +++ b/tests/dictionaries/20family_modeleadership/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/20notemplating/tiramisu/base.py b/tests/dictionaries/20notemplating/tiramisu/base.py index bc04c6505..9fab06825 100644 --- a/tests/dictionaries/20notemplating/tiramisu/base.py +++ b/tests/dictionaries/20notemplating/tiramisu/base.py @@ -12,16 +12,16 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', default='root', multi=False) -option_9 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_10 = StrOption(name='name', doc='name', default='/etc/file', multi=False) -option_11 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_12 = StrOption(name='source', doc='source', default='file', multi=False) -option_13 = BoolOption(name='templating', doc='templating', default=False, multi=False) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='group', doc='group', default='root') +option_9 = StrOption(name='mode', doc='mode', default='0644') +option_10 = StrOption(name='name', doc='name', default='/etc/file') +option_11 = StrOption(name='owner', doc='owner', default='root') +option_12 = StrOption(name='source', doc='source', default='file') +option_13 = BoolOption(name='templating', doc='templating', default=False) +option_14 = 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_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/dictionaries/20override/tiramisu/base.py b/tests/dictionaries/20override/tiramisu/base.py index 248d9904d..a7accbf17 100644 --- a/tests/dictionaries/20override/tiramisu/base.py +++ b/tests/dictionaries/20override/tiramisu/base.py @@ -12,16 +12,16 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', default='root', multi=False) -option_9 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_10 = StrOption(name='name', doc='name', default='/systemd/system/test.service.d/rougail.conf', multi=False) -option_11 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_12 = StrOption(name='source', doc='source', default='test.service', multi=False) -option_13 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='group', doc='group', default='root') +option_9 = StrOption(name='mode', doc='mode', default='0644') +option_10 = StrOption(name='name', doc='name', default='/systemd/system/test.service.d/rougail.conf') +option_11 = StrOption(name='owner', doc='owner', default='root') +option_12 = StrOption(name='source', doc='source', default='test.service') +option_13 = BoolOption(name='templating', doc='templating', default=True) +option_14 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='test_service', doc='test.service', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='overrides', doc='overrides', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/dictionaries/21family_empty/tiramisu/base.py b/tests/dictionaries/21family_empty/tiramisu/base.py index 5eac8a476..b318ad1e4 100644 --- a/tests/dictionaries/21family_empty/tiramisu/base.py +++ b/tests/dictionaries/21family_empty/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py index ee1c20cfb..712d52e8c 100644 --- a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', multi=False, properties=frozenset({'basic', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', properties=frozenset({'basic', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py index 6f7e314f5..c81a54eb0 100644 --- a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py index 9b1801be7..3706bdd41 100644 --- a/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='value', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='value', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py index 86f96955e..22c60e340 100644 --- a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})), multi=False, properties=frozenset({'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})), properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_base/tiramisu/base.py b/tests/dictionaries/40condition_base/tiramisu/base.py index 71a8c2291..6c2ceae78 100644 --- a/tests/dictionaries/40condition_base/tiramisu/base.py +++ b/tests/dictionaries/40condition_base/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) -option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_base_add/tiramisu/base.py b/tests/dictionaries/40condition_base_add/tiramisu/base.py index 71a8c2291..6c2ceae78 100644 --- a/tests/dictionaries/40condition_base_add/tiramisu/base.py +++ b/tests/dictionaries/40condition_base_add/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) -option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_fallback/tiramisu/base.py b/tests/dictionaries/40condition_fallback/tiramisu/base.py index 9fee48d76..eccf21576 100644 --- a/tests/dictionaries/40condition_fallback/tiramisu/base.py +++ b/tests/dictionaries/40condition_fallback/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'disabled', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'disabled', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'disabled', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'disabled', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_6 = OptionDescription(name='disabled_family', doc='disabled_family', properties=frozenset({'disabled', 'normal'}), children=[option_7]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_optional/tiramisu/base.py b/tests/dictionaries/40condition_optional/tiramisu/base.py index afec083d4..b01157600 100644 --- a/tests/dictionaries/40condition_optional/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_optional_empty/tiramisu/base.py b/tests/dictionaries/40condition_optional_empty/tiramisu/base.py index 689e7cdfa..784e30cff 100644 --- a/tests/dictionaries/40condition_optional_empty/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional_empty/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40empty_param/tiramisu/base.py b/tests/dictionaries/40empty_param/tiramisu/base.py index 0b9087c11..867edd5c8 100644 --- a/tests/dictionaries/40empty_param/tiramisu/base.py +++ b/tests/dictionaries/40empty_param/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = PortOption(allow_private=True, name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((ParamValue("None")), kwargs={})), multi=False, properties=frozenset({'expert'})) -option_4 = PortOption(allow_private=True, name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = PortOption(allow_private=True, name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((ParamValue("None")), kwargs={})), properties=frozenset({'expert'})) +option_4 = PortOption(allow_private=True, name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='proxy_authentifie', doc='proxy authentifié', properties=frozenset({'expert'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40empty_param2/tiramisu/base.py b/tests/dictionaries/40empty_param2/tiramisu/base.py index c067bebdb..b62c7a9dd 100644 --- a/tests/dictionaries/40empty_param2/tiramisu/base.py +++ b/tests/dictionaries/40empty_param2/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = PortOption(allow_private=True, name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue("None")})), multi=False, properties=frozenset({'expert'})) -option_4 = PortOption(allow_private=True, name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', multi=False, properties=frozenset({'expert', 'mandatory'})) +option_3 = PortOption(allow_private=True, name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue("None")})), properties=frozenset({'expert'})) +option_4 = PortOption(allow_private=True, name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='proxy_authentifie', doc='proxy authentifié', properties=frozenset({'expert'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py index 75eccd7d3..5736efc69 100644 --- a/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py +++ b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default=['non'], multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory'})) option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', multi=True, default_multi='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory', 'normal'})) option_4 = Leadership(name='mode_conteneur_actif1', doc='No change', properties=frozenset({'hidden', 'normal'}), children=[option_5, option_6]) diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/base.py b/tests/dictionaries/40ifin_leadership/tiramisu/base.py index c94a43dc3..b4d929274 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='condition', doc='condition', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='condition', doc='condition', default='oui', properties=frozenset({'mandatory', 'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index 33c1eafca..4b4b95bda 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -12,21 +12,21 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='condition', doc='condition', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='condition', doc='condition', default='oui', properties=frozenset({'mandatory', 'normal'})) option_6 = StrOption(name='leader', doc='leader', default=['a'], multi=True, properties=frozenset({'mandatory'})) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_13 = StrOption(name='group', doc='group', default='root', multi=False) -option_14 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_15 = StrOption(name='name', doc='name', default='/etc/mailname', multi=False) -option_16 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_17 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_18 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_19 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_13 = StrOption(name='group', doc='group', default='root') +option_14 = StrOption(name='mode', doc='mode', default='0644') +option_15 = StrOption(name='name', doc='name', default='/etc/mailname') +option_16 = StrOption(name='owner', doc='owner', default='root') +option_17 = StrOption(name='source', doc='source', default='mailname') +option_18 = BoolOption(name='templating', doc='templating', default=True) +option_19 = 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_11 = OptionDescription(name='files', doc='files', children=[option_12]) option_10 = OptionDescription(name='test', doc='test', children=[option_11]) diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py index 223b99cb5..9499e450b 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py @@ -12,21 +12,21 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='condition', doc='condition', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='condition', doc='condition', default='oui', properties=frozenset({'mandatory', 'normal'})) option_6 = StrOption(name='leader', doc='leader', default=['a', 'b'], multi=True, properties=frozenset({'mandatory'})) option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue('a')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_13 = StrOption(name='group', doc='group', default='root', multi=False) -option_14 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_15 = StrOption(name='name', doc='name', default='/etc/mailname', multi=False) -option_16 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_17 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_18 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_19 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_13 = StrOption(name='group', doc='group', default='root') +option_14 = StrOption(name='mode', doc='mode', default='0644') +option_15 = StrOption(name='name', doc='name', default='/etc/mailname') +option_16 = StrOption(name='owner', doc='owner', default='root') +option_17 = StrOption(name='source', doc='source', default='mailname') +option_18 = BoolOption(name='templating', doc='templating', default=True) +option_19 = 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_11 = OptionDescription(name='files', doc='files', children=[option_12]) option_10 = OptionDescription(name='test', doc='test', children=[option_11]) diff --git a/tests/dictionaries/40ifin_multi/tiramisu/base.py b/tests/dictionaries/40ifin_multi/tiramisu/base.py index dbd0e226b..dc0dbc8f1 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_6 = StrOption(name='mode_conteneur_actif3', 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')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui')}))})) option_4 = OptionDescription(name='general2', doc='general2', properties=frozenset({'hidden', 'normal'}), children=[option_5, option_6]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40ifin_validenum/tiramisu/base.py b/tests/dictionaries/40ifin_validenum/tiramisu/base.py index d03410fd8..c947b42d1 100644 --- a/tests/dictionaries/40ifin_validenum/tiramisu/base.py +++ b/tests/dictionaries/40ifin_validenum/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'disabled', 'mandatory', 'normal'})) -option_6 = ChoiceOption(name='mode_conteneur_actif3', doc='No change', default='a', values=('a', 'b', 'c'), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'disabled', 'mandatory', 'normal'})) +option_6 = ChoiceOption(name='mode_conteneur_actif3', doc='No change', default='a', values=('a', 'b', 'c'), properties=frozenset({'mandatory', 'normal'})) option_4 = OptionDescription(name='general2', doc='general2', properties=frozenset({'hidden', 'normal'}), children=[option_5, option_6]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/50exists_exists/tiramisu/base.py b/tests/dictionaries/50exists_exists/tiramisu/base.py index 3f91cdab8..75c7c394f 100644 --- a/tests/dictionaries/50exists_exists/tiramisu/base.py +++ b/tests/dictionaries/50exists_exists/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/50redefine_description/tiramisu/base.py b/tests/dictionaries/50redefine_description/tiramisu/base.py index d546f228e..1e0dabee2 100644 --- a/tests/dictionaries/50redefine_description/tiramisu/base.py +++ b/tests/dictionaries/50redefine_description/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Redefined', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='Redefined', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51exists_nonexists/tiramisu/base.py b/tests/dictionaries/51exists_nonexists/tiramisu/base.py index 55a62d121..cb18d7fbf 100644 --- a/tests/dictionaries/51exists_nonexists/tiramisu/base.py +++ b/tests/dictionaries/51exists_nonexists/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='Description', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif2', doc='New description', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='Description', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='New description', default='oui', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51exists_redefine/tiramisu/base.py b/tests/dictionaries/51exists_redefine/tiramisu/base.py index 95aeaa5c6..01ecab934 100644 --- a/tests/dictionaries/51exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/51exists_redefine/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_auto/tiramisu/base.py b/tests/dictionaries/51redefine_auto/tiramisu/base.py index f4408320f..d3d026c27 100644 --- a/tests/dictionaries/51redefine_auto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_auto/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_autofill/tiramisu/base.py b/tests/dictionaries/51redefine_autofill/tiramisu/base.py index 82396b4f7..c0ca7b110 100644 --- a/tests/dictionaries/51redefine_autofill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_autofill/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), multi=False, properties=frozenset({'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_family/tiramisu/base.py b/tests/dictionaries/51redefine_family/tiramisu/base.py index 314584509..59ccfc218 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/base.py +++ b/tests/dictionaries/51redefine_family/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = OptionDescription(name='general2', doc='general2', properties=frozenset({'hidden', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_fill/tiramisu/base.py b/tests/dictionaries/51redefine_fill/tiramisu/base.py index f4408320f..d3d026c27 100644 --- a/tests/dictionaries/51redefine_fill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fill/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py index f4408320f..d3d026c27 100644 --- a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_help/tiramisu/base.py b/tests/dictionaries/51redefine_help/tiramisu/base.py index caab16926..8ed65e6ab 100644 --- a/tests/dictionaries/51redefine_help/tiramisu/base.py +++ b/tests/dictionaries/51redefine_help/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='redefine help', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='redefine help', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_3.impl_set_information("help", "redefine help ok") option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_2.impl_set_information("help", "redefine help family ok") diff --git a/tests/dictionaries/51redefine_hidden/tiramisu/base.py b/tests/dictionaries/51redefine_hidden/tiramisu/base.py index 0587d9ca1..555988732 100644 --- a/tests/dictionaries/51redefine_hidden/tiramisu/base.py +++ b/tests/dictionaries/51redefine_hidden/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Redefine hidden', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='Redefine hidden', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_remove_check/tiramisu/base.py b/tests/dictionaries/51redefine_remove_check/tiramisu/base.py index 254dcf70f..14337f505 100644 --- a/tests/dictionaries/51redefine_remove_check/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_check/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py index e95f16169..301109bdf 100644 --- a/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py index 3145d876b..950bce8bf 100644 --- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_7 = StrOption(name='module_instancie', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_4 = StrOption(name='condition', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_7 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5, option_6, option_7]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_validenum/tiramisu/base.py b/tests/dictionaries/51redefine_validenum/tiramisu/base.py index 2d1061cfd..45b0399a0 100644 --- a/tests/dictionaries/51redefine_validenum/tiramisu/base.py +++ b/tests/dictionaries/51redefine_validenum/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='mode_conteneur_actif', doc='Redefine description', default='a', values=('a', 'b'), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = ChoiceOption(name='mode_conteneur_actif', doc='Redefine description', default='a', values=('a', 'b'), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_value/tiramisu/base.py b/tests/dictionaries/51redefine_value/tiramisu/base.py index 8892cf13e..5771c871d 100644 --- a/tests/dictionaries/51redefine_value/tiramisu/base.py +++ b/tests/dictionaries/51redefine_value/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Redefine value', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='Redefine value', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='Redefine value', default='non', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='Redefine value', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51remove_fill/tiramisu/base.py b/tests/dictionaries/51remove_fill/tiramisu/base.py index 8cb18f527..e9010eb3c 100644 --- a/tests/dictionaries/51remove_fill/tiramisu/base.py +++ b/tests/dictionaries/51remove_fill/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) +option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/52exists_redefine/tiramisu/base.py b/tests/dictionaries/52exists_redefine/tiramisu/base.py index e212a7c36..a6e5ea1ae 100644 --- a/tests/dictionaries/52exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/52exists_redefine/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='New description', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='New description', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/60action_external/tiramisu/base.py b/tests/dictionaries/60action_external/tiramisu/base.py index 21505e258..6c518a23f 100644 --- a/tests/dictionaries/60action_external/tiramisu/base.py +++ b/tests/dictionaries/60action_external/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, multi=False, properties=frozenset({'mandatory', 'normal'})) -option_7 = URLOption(allow_ip=True, allow_without_dot=True, name='calc_url', doc='domain', default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")), kwargs={})), multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'})) +option_7 = URLOption(allow_ip=True, allow_without_dot=True, name='calc_url', doc='domain', default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_5 = OptionDescription(name='test', doc='test', properties=frozenset({'normal'}), children=[option_6, option_7]) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py index faa673dea..dd4b10ba5 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py @@ -12,17 +12,17 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_5 = StrOption(name='module_instancie', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='day', doc='day', default='none', values=('none', 'daily', 'weekly', 'monthly'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_10 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_8 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='day', doc='day', default='none', values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) +option_10 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) option_7 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_8, option_9, option_10]) option_6 = OptionDescription(name='extra', doc='extra', children=[option_7]) -option_13 = StrOption(name='description', doc='description', default='test', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_13 = StrOption(name='description', doc='description', default='test', properties=frozenset({'mandatory', 'normal'})) option_12 = OptionDescription(name='external', doc='external', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True), 'expected': ParamValue('non')}))}), children=[option_13]) option_11 = OptionDescription(name='extra1', doc='extra1', children=[option_12]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6, option_11]) diff --git a/tests/dictionaries/60extra_group/tiramisu/base.py b/tests/dictionaries/60extra_group/tiramisu/base.py index 8151f6694..a8db48734 100644 --- a/tests/dictionaries/60extra_group/tiramisu/base.py +++ b/tests/dictionaries/60extra_group/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='description', doc='description', default=['test'], multi=True, properties=frozenset({'mandatory'})) @@ -21,13 +21,13 @@ option_9 = StrOption(name='mode', doc='mode', multi=True, default_multi='pre', p option_7 = Leadership(name='description', doc='description', properties=frozenset({'normal'}), children=[option_8, option_9]) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7]) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) -option_14 = StrOption(name='group', doc='group', default='root', multi=False) -option_15 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_16 = StrOption(name='name', doc='name', default='/etc/mailname', multi=False) -option_17 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_18 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_19 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_20 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_14 = StrOption(name='group', doc='group', default='root') +option_15 = StrOption(name='mode', doc='mode', default='0644') +option_16 = StrOption(name='name', doc='name', default='/etc/mailname') +option_17 = StrOption(name='owner', doc='owner', default='root') +option_18 = StrOption(name='source', doc='source', default='mailname') +option_19 = BoolOption(name='templating', doc='templating', default=True) +option_20 = 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_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) diff --git a/tests/dictionaries/60extra_help/tiramisu/base.py b/tests/dictionaries/60extra_help/tiramisu/base.py index b17930555..c768abb5b 100644 --- a/tests/dictionaries/60extra_help/tiramisu/base.py +++ b/tests/dictionaries/60extra_help/tiramisu/base.py @@ -12,23 +12,23 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) option_8.impl_set_information("help", "Test help") -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7, option_8, option_9]) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) -option_14 = StrOption(name='group', doc='group', default='root', multi=False) -option_15 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_16 = StrOption(name='name', doc='name', default='/etc/mailname', multi=False) -option_17 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_18 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_19 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_20 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_14 = StrOption(name='group', doc='group', default='root') +option_15 = StrOption(name='mode', doc='mode', default='0644') +option_16 = StrOption(name='name', doc='name', default='/etc/mailname') +option_17 = StrOption(name='owner', doc='owner', default='root') +option_18 = StrOption(name='source', doc='source', default='mailname') +option_19 = BoolOption(name='templating', doc='templating', default=True) +option_20 = 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_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) diff --git a/tests/dictionaries/60extra_load/tiramisu/base.py b/tests/dictionaries/60extra_load/tiramisu/base.py index 56c50b42c..da65cd87a 100644 --- a/tests/dictionaries/60extra_load/tiramisu/base.py +++ b/tests/dictionaries/60extra_load/tiramisu/base.py @@ -12,13 +12,13 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7, option_8, option_9]) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/60extra_mandatory/tiramisu/base.py b/tests/dictionaries/60extra_mandatory/tiramisu/base.py index 8d3b20e7f..b1febc7ba 100644 --- a/tests/dictionaries/60extra_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60extra_mandatory/tiramisu/base.py @@ -12,14 +12,14 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_10 = StrOption(name='var1', doc='var1', multi=False, properties=frozenset({'basic', 'mandatory'})) +option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) +option_10 = StrOption(name='var1', doc='var1', properties=frozenset({'basic', 'mandatory'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'basic'}), children=[option_7, option_8, option_9, option_10]) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/60extra_name_family/tiramisu/base.py b/tests/dictionaries/60extra_name_family/tiramisu/base.py index 54c272a09..fde1855d0 100644 --- a/tests/dictionaries/60extra_name_family/tiramisu/base.py +++ b/tests/dictionaries/60extra_name_family/tiramisu/base.py @@ -12,13 +12,13 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='extra', doc='extra', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7, option_8, option_9]) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/60extra_no_condition/tiramisu/base.py b/tests/dictionaries/60extra_no_condition/tiramisu/base.py index 67ab94f7f..b164aefc7 100644 --- a/tests/dictionaries/60extra_no_condition/tiramisu/base.py +++ b/tests/dictionaries/60extra_no_condition/tiramisu/base.py @@ -12,14 +12,14 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_5 = StrOption(name='module_instancie', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_5 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='day', doc='day', default='none', values=('none', 'daily', 'weekly', 'monthly'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_10 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_8 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='day', doc='day', default='none', values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) +option_10 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) option_7 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_8, option_9, option_10]) option_6 = OptionDescription(name='extra', doc='extra', children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/60extra_redefine/tiramisu/base.py b/tests/dictionaries/60extra_redefine/tiramisu/base.py index 4d72fe622..eed03b247 100644 --- a/tests/dictionaries/60extra_redefine/tiramisu/base.py +++ b/tests/dictionaries/60extra_redefine/tiramisu/base.py @@ -12,13 +12,13 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), multi=False, properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), multi=False, properties=frozenset({'mandatory', 'normal'})) +option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7, option_8, option_9]) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/60familyaction/tiramisu/base.py b/tests/dictionaries/60familyaction/tiramisu/base.py index a1ca297fa..7515aff98 100644 --- a/tests/dictionaries/60familyaction/tiramisu/base.py +++ b/tests/dictionaries/60familyaction/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, multi=False, properties=frozenset({'mandatory', 'normal'})) +option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'})) option_5 = OptionDescription(name='test', doc='test', properties=frozenset({'normal'}), children=[option_6]) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/60familyaction_accent/tiramisu/base.py b/tests/dictionaries/60familyaction_accent/tiramisu/base.py index a1ca297fa..7515aff98 100644 --- a/tests/dictionaries/60familyaction_accent/tiramisu/base.py +++ b/tests/dictionaries/60familyaction_accent/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, multi=False, properties=frozenset({'mandatory', 'normal'})) +option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'})) option_5 = OptionDescription(name='test', doc='test', properties=frozenset({'normal'}), children=[option_6]) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py index d2be89db3..a11709f7c 100644 --- a/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, multi=False, properties=frozenset({'mandatory', 'normal'})) -option_7 = IntOption(name='day', doc='day avant lancement', multi=False, properties=frozenset({'basic', 'mandatory'})) +option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'})) +option_7 = IntOption(name='day', doc='day avant lancement', properties=frozenset({'basic', 'mandatory'})) option_5 = OptionDescription(name='test', doc='test', properties=frozenset({'basic'}), children=[option_6, option_7]) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/61extra_dyn/tiramisu/base.py b/tests/dictionaries/61extra_dyn/tiramisu/base.py index 5d0c6d386..e1c78cf4e 100644 --- a/tests/dictionaries/61extra_dyn/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='varname', doc='No change', default=['a'], multi=True, default_multi='a', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_6 = StrOption(name='mode', doc='mode', multi=False, properties=frozenset({'normal'})) +option_6 = StrOption(name='mode', doc='mode', properties=frozenset({'normal'})) option_5 = ConvertDynOptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_6]) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py index ed6ac0bb1..24b02f900 100644 --- a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py @@ -17,7 +17,7 @@ option_2 = OptionDescription(name='general', doc='général', properties=frozens option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = StrOption(name='varname', doc='No change', default=['a'], multi=True, default_multi='a', properties=frozenset({'mandatory', 'normal'})) option_5 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_6]) -option_8 = StrOption(name='mode', doc='mode', multi=False, properties=frozenset({'normal'})) +option_8 = StrOption(name='mode', doc='mode', properties=frozenset({'normal'})) option_7 = ConvertDynOptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_6)))), children=[option_8]) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5, option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_files/tiramisu/base.py b/tests/dictionaries/70container_files/tiramisu/base.py index 8c851f9e8..2a2a25b98 100644 --- a/tests/dictionaries/70container_files/tiramisu/base.py +++ b/tests/dictionaries/70container_files/tiramisu/base.py @@ -12,24 +12,24 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', default='root', multi=False) -option_9 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_10 = StrOption(name='name', doc='name', default='/etc/mailname', multi=False) -option_11 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_12 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_13 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='group', doc='group', default='root') +option_9 = StrOption(name='mode', doc='mode', default='0644') +option_10 = StrOption(name='name', doc='name', default='/etc/mailname') +option_11 = StrOption(name='owner', doc='owner', default='root') +option_12 = StrOption(name='source', doc='source', default='mailname') +option_13 = BoolOption(name='templating', doc='templating', default=True) +option_14 = 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_16 = StrOption(name='group', doc='group', default='root', multi=False) -option_17 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_18 = StrOption(name='name', doc='name', default='/rougail.conf', multi=False) -option_19 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_20 = StrOption(name='source', doc='source', default='rougail.conf', multi=False) -option_21 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_22 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_16 = StrOption(name='group', doc='group', default='root') +option_17 = StrOption(name='mode', doc='mode', default='0644') +option_18 = StrOption(name='name', doc='name', default='/rougail.conf') +option_19 = StrOption(name='owner', doc='owner', default='root') +option_20 = StrOption(name='source', doc='source', default='rougail.conf') +option_21 = BoolOption(name='templating', doc='templating', default=True) +option_22 = BoolOption(name='activate', doc='activate', default=True) option_15 = OptionDescription(name='rougail_conf', doc='rougail.conf', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py index 3c395dc77..53b1f8bab 100644 --- a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py @@ -12,17 +12,17 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='file_name', doc='file_name', default=['/etc/mailname', '/etc/mailname2'], multi=True, default_multi='/etc/mailname2', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_9 = StrOption(name='group', doc='group', default='root', multi=False) -option_10 = StrOption(name='mode', doc='mode', default='0644', multi=False) +option_9 = StrOption(name='group', doc='group', default='root') +option_10 = StrOption(name='mode', doc='mode', default='0644') option_11 = SymLinkOption(name='name', opt=option_4) -option_12 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_13 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_14 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_15 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_12 = StrOption(name='owner', doc='owner', default='root') +option_13 = StrOption(name='source', doc='source', default='mailname') +option_14 = BoolOption(name='templating', doc='templating', default=True) +option_15 = 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_7 = OptionDescription(name='files', doc='files', children=[option_8]) option_6 = OptionDescription(name='test', doc='test', children=[option_7]) diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py index 194993028..e44239fd4 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py @@ -12,19 +12,19 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='file_name', doc='file_name', default=['/etc/mailname', '/etc/mailname2'], multi=True, default_multi='/etc/mailname2', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='var', doc='var', default=['mailname', 'mailname2'], multi=True, default_multi='mailname2', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', default='root', multi=False) -option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) +option_10 = StrOption(name='group', doc='group', default='root') +option_11 = StrOption(name='mode', doc='mode', default='0644') option_12 = SymLinkOption(name='name', opt=option_4) -option_13 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_14 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_15 = BoolOption(name='templating', doc='templating', default=True, multi=False) +option_13 = StrOption(name='owner', doc='owner', default='root') +option_14 = StrOption(name='source', doc='source', default='mailname') +option_15 = BoolOption(name='templating', doc='templating', default=True) option_16 = SymLinkOption(name='variable', opt=option_5) -option_17 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_17 = BoolOption(name='activate', doc='activate', default=True) option_9 = OptionDescription(name='mailname', doc='mailname', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py index 91e2cf627..d3741dcd2 100644 --- a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py @@ -12,19 +12,19 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='file_name', doc='file_name', default='/etc/mailname', multi=False, properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='var', doc='var', default='mailname', multi=False, properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = StrOption(name='file_name', doc='file_name', default='/etc/mailname', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='var', doc='var', default='mailname', properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='group', doc='group', default='root', multi=False) -option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) +option_10 = StrOption(name='group', doc='group', default='root') +option_11 = StrOption(name='mode', doc='mode', default='0644') option_12 = SymLinkOption(name='name', opt=option_4) -option_13 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_14 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_15 = BoolOption(name='templating', doc='templating', default=True, multi=False) +option_13 = StrOption(name='owner', doc='owner', default='root') +option_14 = StrOption(name='source', doc='source', default='mailname') +option_15 = BoolOption(name='templating', doc='templating', default=True) option_16 = SymLinkOption(name='variable', opt=option_5) -option_17 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_17 = BoolOption(name='activate', doc='activate', default=True) option_9 = OptionDescription(name='mailname', doc='mailname', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/dictionaries/70container_files_twice/tiramisu/base.py b/tests/dictionaries/70container_files_twice/tiramisu/base.py index b2fb9e4f2..374afb84d 100644 --- a/tests/dictionaries/70container_files_twice/tiramisu/base.py +++ b/tests/dictionaries/70container_files_twice/tiramisu/base.py @@ -12,32 +12,32 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', default='root', multi=False) -option_9 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_10 = StrOption(name='name', doc='name', default='/etc/mailname', multi=False) -option_11 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_12 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_13 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='group', doc='group', default='root') +option_9 = StrOption(name='mode', doc='mode', default='0644') +option_10 = StrOption(name='name', doc='name', default='/etc/mailname') +option_11 = StrOption(name='owner', doc='owner', default='root') +option_12 = StrOption(name='source', doc='source', default='mailname') +option_13 = BoolOption(name='templating', doc='templating', default=True) +option_14 = 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_16 = StrOption(name='group', doc='group', default='root', multi=False) -option_17 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_18 = StrOption(name='name', doc='name', default='/etc/eole/mailname', multi=False) -option_19 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_20 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_21 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_22 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_16 = StrOption(name='group', doc='group', default='root') +option_17 = StrOption(name='mode', doc='mode', default='0644') +option_18 = StrOption(name='name', doc='name', default='/etc/eole/mailname') +option_19 = StrOption(name='owner', doc='owner', default='root') +option_20 = StrOption(name='source', doc='source', default='mailname') +option_21 = BoolOption(name='templating', doc='templating', default=True) +option_22 = BoolOption(name='activate', doc='activate', default=True) option_15 = OptionDescription(name='mailname_1', doc='mailname_1', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) -option_24 = StrOption(name='group', doc='group', default='root', multi=False) -option_25 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_26 = StrOption(name='name', doc='name', default='/rougail.conf', multi=False) -option_27 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_28 = StrOption(name='source', doc='source', default='rougail.conf', multi=False) -option_29 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_30 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_24 = StrOption(name='group', doc='group', default='root') +option_25 = StrOption(name='mode', doc='mode', default='0644') +option_26 = StrOption(name='name', doc='name', default='/rougail.conf') +option_27 = StrOption(name='owner', doc='owner', default='root') +option_28 = StrOption(name='source', doc='source', default='rougail.conf') +option_29 = BoolOption(name='templating', doc='templating', default=True) +option_30 = BoolOption(name='activate', doc='activate', default=True) option_23 = OptionDescription(name='rougail_conf', doc='rougail.conf', children=[option_24, option_25, option_26, option_27, option_28, option_29, option_30]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15, option_23]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/dictionaries/70container_filesmulti/tiramisu/base.py b/tests/dictionaries/70container_filesmulti/tiramisu/base.py index 42ea06e0f..0f9cfa0dc 100644 --- a/tests/dictionaries/70container_filesmulti/tiramisu/base.py +++ b/tests/dictionaries/70container_filesmulti/tiramisu/base.py @@ -12,24 +12,24 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', default='root', multi=False) -option_9 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_10 = StrOption(name='name', doc='name', default='/etc/mailname', multi=False) -option_11 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_12 = StrOption(name='source', doc='source', default='mailname', multi=False) -option_13 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='group', doc='group', default='root') +option_9 = StrOption(name='mode', doc='mode', default='0644') +option_10 = StrOption(name='name', doc='name', default='/etc/mailname') +option_11 = StrOption(name='owner', doc='owner', default='root') +option_12 = StrOption(name='source', doc='source', default='mailname') +option_13 = BoolOption(name='templating', doc='templating', default=True) +option_14 = 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_16 = StrOption(name='group', doc='group', default='root', multi=False) -option_17 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_18 = StrOption(name='name', doc='name', default='/etc/mailname2', multi=False) -option_19 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_20 = StrOption(name='source', doc='source', default='mailname2', multi=False) -option_21 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_22 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_16 = StrOption(name='group', doc='group', default='root') +option_17 = StrOption(name='mode', doc='mode', default='0644') +option_18 = StrOption(name='name', doc='name', default='/etc/mailname2') +option_19 = StrOption(name='owner', doc='owner', default='root') +option_20 = StrOption(name='source', doc='source', default='mailname2') +option_21 = BoolOption(name='templating', doc='templating', default=True) +option_22 = BoolOption(name='activate', doc='activate', default=True) option_15 = OptionDescription(name='mailname2', doc='mailname2', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/dictionaries/70container_filesredefine/tiramisu/base.py b/tests/dictionaries/70container_filesredefine/tiramisu/base.py index 9b69dbcd9..a09960eaf 100644 --- a/tests/dictionaries/70container_filesredefine/tiramisu/base.py +++ b/tests/dictionaries/70container_filesredefine/tiramisu/base.py @@ -12,16 +12,16 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='group', doc='group', default='root', multi=False) -option_9 = StrOption(name='mode', doc='mode', default='0644', multi=False) -option_10 = StrOption(name='name', doc='name', default='/etc/mailname', multi=False) -option_11 = StrOption(name='owner', doc='owner', default='root', multi=False) -option_12 = StrOption(name='source', doc='source', default='mailname.new', multi=False) -option_13 = BoolOption(name='templating', doc='templating', default=True, multi=False) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='group', doc='group', default='root') +option_9 = StrOption(name='mode', doc='mode', default='0644') +option_10 = StrOption(name='name', doc='name', default='/etc/mailname') +option_11 = StrOption(name='owner', doc='owner', default='root') +option_12 = StrOption(name='source', doc='source', default='mailname.new') +option_13 = BoolOption(name='templating', doc='templating', default=True) +option_14 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='mailname_new', doc='mailname.new', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/dictionaries/70container_new/tiramisu/base.py b/tests/dictionaries/70container_new/tiramisu/base.py index 56c5138ff..3bbada2f4 100644 --- a/tests/dictionaries/70container_new/tiramisu/base.py +++ b/tests/dictionaries/70container_new/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='test', doc='test', children=[]) diff --git a/tests/dictionaries/70container_newnocont/tiramisu/base.py b/tests/dictionaries/70container_newnocont/tiramisu/base.py index e3072f2aa..3c8a7a144 100644 --- a/tests/dictionaries/70container_newnocont/tiramisu/base.py +++ b/tests/dictionaries/70container_newnocont/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='test', doc='test', children=[]) diff --git a/tests/dictionaries/70container_newwithip/tiramisu/base.py b/tests/dictionaries/70container_newwithip/tiramisu/base.py index 37a5e1968..d563f55d6 100644 --- a/tests/dictionaries/70container_newwithip/tiramisu/base.py +++ b/tests/dictionaries/70container_newwithip/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = IPOption(allow_reserved=True, name='adresse_ip_test', doc='No change', multi=False, properties=frozenset({'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = IPOption(allow_reserved=True, name='adresse_ip_test', doc='No change', properties=frozenset({'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = OptionDescription(name='test', doc='test', children=[]) diff --git a/tests/dictionaries/70container_pathaccess/tiramisu/base.py b/tests/dictionaries/70container_pathaccess/tiramisu/base.py index dc71f8958..de3304364 100644 --- a/tests/dictionaries/70container_pathaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess/tiramisu/base.py @@ -12,15 +12,15 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=False, properties=frozenset({'basic', 'mandatory'})) -option_5 = NetworkOption(name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=False, properties=frozenset({'basic', 'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_4 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', properties=frozenset({'basic', 'mandatory'})) +option_5 = NetworkOption(name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', properties=frozenset({'basic', 'mandatory'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_10 = StrOption(name='interface', doc='interface', default='auto', multi=False) +option_10 = StrOption(name='interface', doc='interface', default='auto') option_11 = SymLinkOption(name='name', opt=option_5) option_12 = SymLinkOption(name='netmask', opt=option_4) -option_13 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_13 = BoolOption(name='activate', doc='activate', default=True) option_9 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', children=[option_10, option_11, option_12, option_13]) option_8 = OptionDescription(name='ips', doc='ips', children=[option_9]) option_7 = OptionDescription(name='nut', doc='nut', children=[option_8]) diff --git a/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py index e31bf196b..79fa9279f 100644 --- a/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py @@ -12,16 +12,16 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=True, properties=frozenset({'mandatory'})) option_6 = NetworkOption(name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=True, properties=frozenset({'basic', 'mandatory'})) option_4 = Leadership(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', properties=frozenset({'basic'}), children=[option_5, option_6]) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_11 = StrOption(name='interface', doc='interface', default='auto', multi=False) +option_11 = StrOption(name='interface', doc='interface', default='auto') option_12 = SymLinkOption(name='name', opt=option_6) option_13 = SymLinkOption(name='netmask', opt=option_5) -option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_14 = BoolOption(name='activate', doc='activate', default=True) option_10 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', children=[option_11, option_12, option_13, option_14]) option_9 = OptionDescription(name='ips', doc='ips', children=[option_10]) option_8 = OptionDescription(name='ntp', doc='ntp', children=[option_9]) diff --git a/tests/dictionaries/70container_save/tiramisu/base.py b/tests/dictionaries/70container_save/tiramisu/base.py index 159a9cd5d..321b99862 100644 --- a/tests/dictionaries/70container_save/tiramisu/base.py +++ b/tests/dictionaries/70container_save/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/70container_serviceaccess/tiramisu/base.py b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py index c3bab051b..e1cc3c2d9 100644 --- a/tests/dictionaries/70container_serviceaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py @@ -12,12 +12,12 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = PortOption(allow_private=True, name='name', doc='name', default='123', multi=False) -option_9 = StrOption(name='protocol', doc='protocol', default='udp', multi=False) -option_10 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = PortOption(allow_private=True, name='name', doc='name', default='123') +option_9 = StrOption(name='protocol', doc='protocol', default='udp') +option_10 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='123', doc='123', children=[option_8, option_9, option_10]) option_6 = OptionDescription(name='ports', doc='ports', children=[option_7]) option_5 = OptionDescription(name='ntp', doc='ntp', children=[option_6]) diff --git a/tests/dictionaries/70container_servicerestriction/tiramisu/base.py b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py index 5afcf2041..8b6fe0a40 100644 --- a/tests/dictionaries/70container_servicerestriction/tiramisu/base.py +++ b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py @@ -12,13 +12,13 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='interface', doc='interface', default='eth0', multi=False) -option_9 = NetworkOption(name='name', doc='name', default='192.168.1.1', multi=False) -option_10 = NetmaskOption(name='netmask', doc='netmask', default='255.255.255.255', multi=False) -option_11 = BoolOption(name='activate', doc='activate', default=True, multi=False) +option_8 = StrOption(name='interface', doc='interface', default='eth0') +option_9 = NetworkOption(name='name', doc='name', default='192.168.1.1') +option_10 = NetmaskOption(name='netmask', doc='netmask', default='255.255.255.255') +option_11 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='192_168_1_1', doc='192.168.1.1', children=[option_8, option_9, option_10, option_11]) option_6 = OptionDescription(name='ips', doc='ips', children=[option_7]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[option_6]) diff --git a/tests/dictionaries/70container_services/tiramisu/base.py b/tests/dictionaries/70container_services/tiramisu/base.py index 7953f7eaa..899db519c 100644 --- a/tests/dictionaries/70container_services/tiramisu/base.py +++ b/tests/dictionaries/70container_services/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[]) diff --git a/tests/dictionaries/70services_unmanage/tiramisu/base.py b/tests/dictionaries/70services_unmanage/tiramisu/base.py index 87c6be616..dccbe3e42 100644 --- a/tests/dictionaries/70services_unmanage/tiramisu/base.py +++ b/tests/dictionaries/70services_unmanage/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', multi=False, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[])