From f5c7220930d31714b0101d88dc525af44f2d0b1e Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 23 Jan 2021 21:15:26 +0100 Subject: [PATCH] reorganize tiramisureflector --- FIXME | 1 + src/rougail/annotator/__init__.py | 6 +- src/rougail/annotator/check.py | 12 +- src/rougail/annotator/condition.py | 8 +- src/rougail/annotator/family.py | 30 +++- src/rougail/annotator/property.py | 16 +- src/rougail/annotator/service.py | 5 +- src/rougail/annotator/value.py | 46 +++++ src/rougail/annotator/variable.py | 14 +- src/rougail/tiramisureflector.py | 166 ++++-------------- .../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 | 4 +- .../01base_multi/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 | 8 +- .../tiramisu/base.py | 10 +- .../10leadership_append_name/tiramisu/base.py | 8 +- .../10leadership_auto/tiramisu/base.py | 8 +- .../10leadership_autoleader/tiramisu/base.py | 6 +- .../tiramisu/base.py | 8 +- .../tiramisu/base.py | 6 +- .../tiramisu/base.py | 6 +- .../tiramisu/base.py | 8 +- .../tiramisu/base.py | 8 +- .../tiramisu/base.py | 8 +- .../tiramisu/base.py | 8 +- .../10leadership_mandatory/tiramisu/base.py | 6 +- .../tiramisu/base.py | 4 +- .../10leadership_multi/tiramisu/base.py | 10 +- .../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 | 6 +- .../tiramisu/base.py | 6 +- .../tiramisu/base.py | 8 +- .../tiramisu/base.py | 8 +- .../tiramisu/base.py | 6 +- .../10load_leadership_name/tiramisu/base.py | 6 +- .../tiramisu/base.py | 8 +- .../tiramisu/base.py | 6 +- .../10load_mandatoryifin/tiramisu/base.py | 6 +- .../tiramisu/base.py | 6 +- .../10load_multivalue/tiramisu/base.py | 2 +- .../10valid_enum_accent/tiramisu/base.py | 4 +- .../10valid_enum_base/tiramisu/base.py | 4 +- .../tiramisu/base.py | 6 +- .../10valid_enum_leader/tiramisu/base.py | 6 +- .../10valid_enum_mandatory/tiramisu/base.py | 4 +- .../10valid_enum_multi/tiramisu/base.py | 4 +- .../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 | 4 +- .../20family_append/tiramisu/base.py | 4 +- .../20family_appendaccent/tiramisu/base.py | 8 +- .../20family_dynamic/tiramisu/base.py | 4 +- .../20family_dynamic_calc/tiramisu/base.py | 6 +- .../20family_dynamic_calc2/tiramisu/base.py | 6 +- .../tiramisu/base.py | 6 +- .../tiramisu/base.py | 4 +- .../20family_dynamic_number/tiramisu/base.py | 6 +- .../20family_empty/tiramisu/base.py | 2 +- .../20family_hidden/tiramisu/base.py | 2 +- .../20family_mode/tiramisu/base.py | 2 +- .../20family_modeleadership/tiramisu/base.py | 6 +- .../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 | 6 +- .../40ifin_leadership/tiramisu/base.py | 8 +- .../40ifin_leadershipauto/tiramisu/base.py | 24 +-- .../tiramisu/base.py | 24 +-- .../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 | 22 +-- .../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 | 4 +- .../61extra_dyn_extra/tiramisu/base.py | 6 +- .../70container_files/tiramisu/base.py | 30 ++-- .../tiramisu/base.py | 16 +- .../tiramisu/base.py | 18 +- .../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 | 10 +- .../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 +- tests/test_1_flattener.py | 2 +- 200 files changed, 807 insertions(+), 859 deletions(-) create mode 100644 src/rougail/annotator/value.py diff --git a/FIXME b/FIXME index e69de29b..78cb4e75 100644 --- a/FIXME +++ b/FIXME @@ -0,0 +1 @@ +value avec quote diff --git a/src/rougail/annotator/__init__.py b/src/rougail/annotator/__init__.py index 41a08860..91ede8a3 100644 --- a/src/rougail/annotator/__init__.py +++ b/src/rougail/annotator/__init__.py @@ -4,7 +4,8 @@ from .group import GroupAnnotator from .service import ServiceAnnotator, ERASED_ATTRIBUTES from .variable import VariableAnnotator, CONVERT_OPTION from .check import CheckAnnotator -from .condition import Conditionnnotator +from .value import ValueAnnotator +from .condition import ConditionAnnotator from .fill import FillAnnotator from .family import FamilyAnnotator, modes from .property import PropertyAnnotator @@ -20,12 +21,13 @@ class SpaceAnnotator: # pylint: disable=R0903 CheckAnnotator(objectspace, eosfunc_file, ) - Conditionnnotator(objectspace) + ConditionAnnotator(objectspace) FillAnnotator(objectspace, eosfunc_file, ) FamilyAnnotator(objectspace) PropertyAnnotator(objectspace) + ValueAnnotator(objectspace) __all__ = ('SpaceAnnotator', 'ERASED_ATTRIBUTES', 'CONVERT_OPTION', 'modes') diff --git a/src/rougail/annotator/check.py b/src/rougail/annotator/check.py index e12d9dfd..ee5031ef 100644 --- a/src/rougail/annotator/check.py +++ b/src/rougail/annotator/check.py @@ -129,7 +129,7 @@ class CheckAnnotator: # value for choice's variable is mandatory variable.mandatory = True # build choice - variable.choice = [] + variable.values = [] variable_type = variable.type variable.type = 'choice' @@ -182,7 +182,7 @@ class CheckAnnotator: choice = self.objectspace.choice(variable.xmlfiles) choice.name = value choice.type = param_type - variable.choice.append(choice) + variable.values.append(choice) if has_variable: return None @@ -223,7 +223,7 @@ class CheckAnnotator: msg = _(f'unknown parameter "{param.name}" in check "valid_entier" ' f'for variable "{check.target.name}" in {xmlfiles}') raise DictConsistencyError(msg, 19) - else: - if not hasattr(check.target, 'check'): - check.target.check = [] - check.target.check.append(check) + continue + if not hasattr(check.target, 'validators'): + check.target.validators = [] + check.target.validators.append(check) diff --git a/src/rougail/annotator/condition.py b/src/rougail/annotator/condition.py index 85d328bd..bf244e96 100644 --- a/src/rougail/annotator/condition.py +++ b/src/rougail/annotator/condition.py @@ -10,7 +10,7 @@ from ..config import Config FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie' -class Conditionnnotator: +class ConditionAnnotator: """Annotate condition """ def __init__(self, @@ -290,6 +290,6 @@ class Conditionnnotator: prop.source = condition.source prop.expected = text prop.name = action - if not hasattr(obj, 'property'): - obj.property = [] - obj.property.append(prop) + if not hasattr(obj, 'properties'): + obj.properties = [] + obj.properties.append(prop) diff --git a/src/rougail/annotator/family.py b/src/rougail/annotator/family.py index 52648a26..0bde0cbd 100644 --- a/src/rougail/annotator/family.py +++ b/src/rougail/annotator/family.py @@ -2,6 +2,8 @@ """ from ..i18n import _ from ..error import DictConsistencyError +from ..utils import normalize_family +from .variable import RENAME_ATTIBUTES #mode order is important @@ -34,14 +36,28 @@ class FamilyAnnotator: objectspace, ): self.objectspace = objectspace - if hasattr(self.objectspace.space, 'variables'): - self.remove_empty_families() - self.change_variable_mode() - self.change_family_mode() - self.dynamic_families() - self.convert_help() + if not hasattr(self.objectspace.space, 'variables'): + return + self.family_names() + self.remove_empty_families() + self.change_variable_mode() + self.change_family_mode() + self.dynamic_families() + self.convert_help() - def remove_empty_families(self): + def family_names(self) -> None: + for families in self.objectspace.space.variables.values(): + families.doc = families.name + families.path = families.name + for family in families.family.values(): + if not hasattr(family, 'description'): + family.description = family.name + for key, value in RENAME_ATTIBUTES.items(): + setattr(family, value, getattr(family, key)) + setattr(family, key, None) + family.name = normalize_family(family.name) + + def remove_empty_families(self) -> None: """Remove all families without any variable """ for families in self.objectspace.space.variables.values(): diff --git a/src/rougail/annotator/property.py b/src/rougail/annotator/property.py index da0f3c5d..fd5bd844 100644 --- a/src/rougail/annotator/property.py +++ b/src/rougail/annotator/property.py @@ -26,25 +26,27 @@ class PropertyAnnotator: ) -> None: """convert properties """ - properties = [] + if not hasattr(variable, 'properties'): + variable.properties = [] + for prop in PROPERTIES: if hasattr(variable, prop): if getattr(variable, prop) is True: for subprop in CONVERT_PROPERTIES.get(prop, [prop]): - properties.append(subprop) + variable.properties.append(subprop) setattr(variable, prop, None) if hasattr(variable, 'mode') and variable.mode: - properties.append(variable.mode) + variable.properties.append(variable.mode) variable.mode = None - if 'force_store_value' in properties and \ - 'force_default_on_freeze' in properties: # pragma: no cover + if 'force_store_value' in variable.properties and \ + 'force_default_on_freeze' in variable.properties: # pragma: no cover # should not appened xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles) msg = _('cannot have auto_freeze or auto_store with the hidden ' f'variable "{variable.name}" in {xmlfiles}') raise DictConsistencyError(msg, 50) - if properties: - variable.properties = set(properties) + if not variable.properties: + del variable.properties def convert_services(self) -> None: """convert services diff --git a/src/rougail/annotator/service.py b/src/rougail/annotator/service.py index d7984a06..d64d00d6 100644 --- a/src/rougail/annotator/service.py +++ b/src/rougail/annotator/service.py @@ -183,10 +183,7 @@ class ServiceAnnotator: variable.multi = None else: variable.doc = key - val = self.objectspace.value(xmlfiles) - val.type = type_ - val.name = value - variable.value = [val] + variable.default = value variable.namespace = 'services' self.objectspace.paths.add_variable('services', path, diff --git a/src/rougail/annotator/value.py b/src/rougail/annotator/value.py new file mode 100644 index 00000000..761ec55a --- /dev/null +++ b/src/rougail/annotator/value.py @@ -0,0 +1,46 @@ +class ValueAnnotator: + """Annotate check + """ + def __init__(self, + objectspace, + ) -> None: + if not hasattr(objectspace.space, 'variables'): + return + self.objectspace = objectspace + self.convert_value() + + def convert_value(self) -> None: + for families in self.objectspace.space.variables.values(): + for family in families.family.values(): + for variable in family.variable.values(): + if isinstance(variable, self.objectspace.leadership): + variable_type = 'leader' + for follower in variable.variable: + self._convert_value(follower, + variable_type, + ) + variable_type = 'follower' + else: + self._convert_value(variable) + + def _convert_value(self, + variable, + variable_type: str=None, + ) -> None: + if not hasattr(variable, 'value'): + return + if variable.value[0].type == 'calculation': + variable.default = variable.value[0] + else: + if variable.multi: + if variable_type != 'follower': + variable.default = [value.name for value in variable.value] + if variable_type != 'leader': + if variable.multi == 'submulti': + variable.default_multi = [value.name for value in variable.value] + else: + #FIXME 0 ou -1 ? + variable.default_multi = variable.value[-1].name + else: + variable.default = variable.value[0].name + del variable.value diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py index 593975cd..7335af79 100644 --- a/src/rougail/annotator/variable.py +++ b/src/rougail/annotator/variable.py @@ -1,6 +1,5 @@ """Annotate variable """ -from ..utils import normalize_family CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int), @@ -60,15 +59,7 @@ class VariableAnnotator: # pylint: disable=R0903 """convert variable """ for families in self.objectspace.space.variables.values(): - families.doc = families.name - families.path = families.name for family in families.family.values(): - if not hasattr(family, 'description'): - family.description = family.name - for key, value in RENAME_ATTIBUTES.items(): - setattr(family, value, getattr(family, key)) - setattr(family, key, None) - family.name = normalize_family(family.name) if not hasattr(family, 'variable'): continue for variable in family.variable.values(): @@ -192,9 +183,8 @@ class VariableAnnotator: # pylint: disable=R0903 else: self._convert_help(variable) - def _convert_help(self, - variable, - ) -> None: + @staticmethod + def _convert_help(variable) -> None: if hasattr(variable, 'help'): variable.information.help = variable.help del variable.help diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index 403e0f14..11981b53 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -7,7 +7,7 @@ from .objspace import RootRougailObject FUNC_TO_DICT = [] -ATTRIBUTES_ORDER = ('name', 'doc', 'default', 'multi', 'properties', 'min_number', 'max_number') +ATTRIBUTES_ORDER = ('name', 'doc', 'default', 'values', 'multi', 'default_multi', 'properties', 'validators', 'min_number', 'max_number') class Root(): # pylint: disable=R0903 @@ -127,6 +127,7 @@ class TiramisuReflector: self.set_name(elt) family.add(Variable(elt, self.text, + self.objectspace, is_follower, is_leader, )) @@ -168,18 +169,19 @@ class Common: f"'expected': ParamValue('{child.expected}')") if child.inverse: kwargs += ", 'reverse_condition': ParamValue(True)" - prop = 'Calculation(calc_value, Params(' + action + ', kwargs={' + kwargs + '}))' - if self.attrib['properties']: - self.attrib['properties'] += ', ' - self.attrib['properties'] += prop + return 'Calculation(calc_value, Params(' + action + ', kwargs={' + kwargs + '}))' def properties_to_string(self): """Change properties to string """ - if not self.attrib['properties']: - self.attrib['properties'] = '' - else: - self.attrib['properties'] = "'" + "', '".join(sorted(self.attrib['properties'])) + "'" + properties = [] + calc_properties = [] + for property_ in self.attrib['properties']: + if not isinstance(property_, str): + calc_properties.append(self.populate_properties(property_)) + else: + properties.append(f"'{property_}'") + return 'frozenset({' + ', '.join(sorted(properties) + calc_properties) + '})' def get_attrib(self): """Get attributes @@ -189,13 +191,21 @@ class Common: if value is None: continue if key == 'properties': - if not self.attrib[key]: - continue - value = "frozenset({" + self.attrib[key] + "})" - elif key in ['default', 'multi', 'suffixes', 'validators', 'values']: - value = self.attrib[key] + value = self.properties_to_string() + elif key == 'validators': + value = '[' + ', '.join([self.calculation_value(val, ['ParamSelfOption()']) for val in value]) + ']' + elif key == 'values': + if value[0].type == 'calculation': + value = value[0].name.reflector_object.get() + value = f"Calculation(func.calc_value, Params((ParamOption({value}))))" + else: + value = str(tuple([val.name for val in value])) + elif key in ['multi', 'suffixes']: + pass elif isinstance(value, str) and key != 'opt' and not value.startswith('['): value = "'" + value.replace("'", "\\\'") + "'" + elif isinstance(value, self.objectspace.value): + value = self.calculation_value(value, []) ret_list.append(f'{key}={value}') return ', '.join(ret_list) @@ -211,22 +221,12 @@ class Common: value = '"' + value.replace('"', '\"') + '"' self.text.append(f'{self.option_name}.impl_set_information("{key}", {value})') - @staticmethod - def get_attributes(space): - """Get attributes + def populate_attrib(self): + """Populate attributes """ for attr in ATTRIBUTES_ORDER: - if hasattr(space, attr): - yield attr - - @staticmethod - def get_children(space): - """Get children - """ - for attr in dir(space): - if not attr.startswith('_') and attr not in ERASED_ATTRIBUTES: - if isinstance(getattr(space, attr), list): - yield attr, getattr(space, attr) + if hasattr(self.elt, attr): + self.attrib[attr] = getattr(self.elt, attr) class Variable(Common): @@ -235,18 +235,17 @@ class Variable(Common): def __init__(self, elt, text, + objectspace, is_follower, is_leader, ): super().__init__(elt, text) + self.objectspace = objectspace self.is_leader = is_leader self.is_follower = is_follower convert_option = CONVERT_OPTION[elt.type] self.object_type = convert_option['opttype'] self.attrib.update(convert_option.get('initkwargs', {})) - if self.object_type != 'SymLinkOption': - self.attrib['properties'] = [] - self.attrib['validators'] = [] def get(self): """Get tiramisu's object @@ -255,79 +254,12 @@ class Variable(Common): self.populate_attrib() if self.object_type == 'SymLinkOption': self.attrib['opt'] = self.elt.opt.reflector_object.get() - else: - self.parse_children() attrib = self.get_attrib() self.option_name = self.elt.reflector_name self.text.append(f'{self.option_name} = {self.object_type}({attrib})') self.populate_informations() return self.option_name - def populate_attrib(self): - """Populate attributes - """ - for key in self.get_attributes(self.elt): - self.attrib[key] = getattr(self.elt, key) - - def parse_children(self): - """Parse children - """ - if 'default' not in self.attrib or self.attrib['multi']: - self.attrib['default'] = [] - if self.attrib['multi'] == 'submulti' and self.is_follower: - self.attrib['default_multi'] = [] - choices = [] - self.properties_to_string() - for tag, children in self.get_children(self.elt): - for child in children: - self.parse_child(tag, - child, - choices, - ) - if choices: - self.attrib['values'] = str(tuple(choices)) - if not self.attrib['default']: - del self.attrib['default'] - elif not self.attrib['multi'] and isinstance(self.attrib['default'], list): - self.attrib['default'] = self.attrib['default'][-1] - if not self.attrib['validators']: - del self.attrib['validators'] - else: - self.attrib['validators'] = '[' + ', '.join(self.attrib['validators']) + ']' - - def parse_child(self, - tag, - child, - choices, - ) -> None: - """Parse child - """ - if tag == 'property': - self.populate_properties(child) - elif tag == 'value': - self.populate_value(child) - elif tag == 'check': - validator = self.calculation_value(child, ['ParamSelfOption()']) - self.attrib['validators'].append(validator) - elif tag == 'choice': - self.calculate_choice(child, - choices, - ) - else: # pragma: no cover - raise Exception(f'unknown tag {tag}') - - def calculate_choice(self, - child, - choices: list, - ) -> None: - """Calculating choice - """ - if child.type == 'calculation': - value = child.name.reflector_object.get() - self.attrib['values'] = f"Calculation(func.calc_value, Params((ParamOption({value}))))" - else: - choices.append(child.name) - def calculation_value(self, child, args, @@ -375,28 +307,6 @@ class Variable(Common): return 'ParamSuffix()' return '' # pragma: no cover - def populate_value(self, - child, - ): - """Populate variable's values - """ - if child.type == 'calculation': - self.attrib['default'] = self.calculation_value(child, []) - else: - value = child.name - if self.attrib['multi'] == 'submulti': - self.attrib['default_multi'].append(value) - elif self.is_follower: - self.attrib['default_multi'] = value - elif self.attrib['multi']: - self.attrib['default'].append(value) - if not self.is_leader: - self.attrib['default_multi'] = value - elif isinstance(value, (int, float)) or value is None: - self.attrib['default'].append(value) - else: - self.attrib['default'].append("'" + value + "'") - @staticmethod def build_param(param) -> str: """build variable parameters @@ -431,7 +341,6 @@ class Family(Common): """ if not self.option_name: self.populate_attrib() - self.parse_properties() self.populate_dynamic() self.option_name = self.elt.reflector_name object_name = self.get_object_name() @@ -448,21 +357,6 @@ class Family(Common): dyn = self.elt.dynamic.reflector_object.get() self.attrib['suffixes'] = f"Calculation(func.calc_value, Params((ParamOption({dyn}))))" - def populate_attrib(self): - """parse a populate attributes - """ - for key in self.get_attributes(self.elt): - self.attrib[key] = getattr(self.elt, key) - - def parse_properties(self): - """parse current children - """ - if 'properties' in self.attrib: - self.properties_to_string() - if hasattr(self.elt, 'property'): - for child in self.elt.property: - self.populate_properties(child) - def get_object_name(self): """Get family object's name """ diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/base.py b/tests/dictionaries/00load_autofreeze/tiramisu/base.py index a43499a1..36603116 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(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non') -option_3 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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 be2333b7..5ac2dca2 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(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non') -option_3 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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 31031489..f801edc3 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(properties=frozenset({'basic', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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 700ba106..d5e29950 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(properties=frozenset({'expert', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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 939aa6b0..3a97cca4 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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 36bd6bcc..1013d97c 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='without_type', doc='without_type', multi=False, default='non') +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_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 939aa6b0..3a97cca4 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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 bf5a9445..9d2d244e 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') +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_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 11c18273..0a9729fb 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(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non') -option_4 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={}))) +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_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 6c8d2ef8..553b333b 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) +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_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 2d844fa3..106d3da4 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((), kwargs={}))) -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') +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_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 136429de..43bd5728 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', multi=False, 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', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/file') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='file') -option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 136429de..43bd5728 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', multi=False, 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', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/file') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='file') -option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 ba08472b..0e949bb9 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', multi=False, 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', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/systemd-makefs@dev-disk-by\\x2dpartlabel') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='systemd-makefs@dev-disk-by\\x2dpartlabel') -option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 cd608a09..f9d2c26d 100644 --- a/tests/dictionaries/01base_float/tiramisu/base.py +++ b/tests/dictionaries/01base_float/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = FloatOption(properties=frozenset({'mandatory', 'normal'}), name='float', doc='Description', multi=False, default=0.527) -option_4 = FloatOption(properties=frozenset({'mandatory', 'normal'}), name='float_multi', doc='Description', multi=True, default=[0.527], default_multi=0.527) +option_3 = FloatOption(name='float', doc='Description', default=0.527, multi=False, 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]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01base_multi/tiramisu/base.py b/tests/dictionaries/01base_multi/tiramisu/base.py index e909a4e4..9b3a339f 100644 --- a/tests/dictionaries/01base_multi/tiramisu/base.py +++ b/tests/dictionaries/01base_multi/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine description', multi=True, default=['non'], default_multi='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='Redefine description', default=['non'], multi=True, default_multi='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/01base_var_name_same_family/tiramisu/base.py b/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py index a6e45319..7135ab36 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(properties=frozenset({'mandatory', 'normal'}), name='general', doc='description', multi=False, default='non') +option_3 = StrOption(name='general', doc='description', default='non', multi=False, 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 2c10d346..5178d0e4 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='mode_conteneur_actif', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, 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 edec3c72..e4eb9638 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_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_3 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) +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_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 ac16166f..69174a52 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_3 = StrOption(properties=frozenset({'basic', 'force_store_value'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) +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_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 bfc778c6..a768170e 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_3 = StrOption(properties=frozenset({'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) +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_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 27de1b94..d4f985dd 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) +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_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 3731e2ce..2512dd67 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_3 = StrOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) +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_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 97dce73e..1c430506 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={}))) -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') +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_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 2d844fa3..106d3da4 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((), kwargs={}))) -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') +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_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 6c8d2ef8..553b333b 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) +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_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 4feb658f..781dc823 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(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non') -option_4 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={}))) +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_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 5b5a3f79..ecccdb13 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='mode_conteneur_actif', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, 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 8f138022..a1d054df 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='mode_conteneur_actif', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, 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 86045c7c..878933ff 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='mode_conteneur_actif', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, 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 3552e754..4a091ea1 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='mode_conteneur_actif', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, 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 2169f85c..f924606d 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='mode_conteneur_actif', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', multi=False, 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 ea799f77..87e56db4 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={}))) +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_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 a30c5afe..565d3e92 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'}), name='autosavevar', doc='autosave variable', multi=False, default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={}))) +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_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 8e462996..edc761b0 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b') -option_4 = IntOption(properties=frozenset({'normal'}), name='int', doc='No change', multi=False, min_number=0, max_number=100) +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_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 6354055a..b270da33 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b') -option_4 = IntOption(properties=frozenset({'normal'}), validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={}), warnings_only=False)], name='int', doc='No change', multi=False) +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_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 4403de45..b22a84d7 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b') -option_4 = IntOption(properties=frozenset({'mandatory', 'normal'}), name='int2', doc='No change', multi=False, default=100) -option_5 = IntOption(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)], name='int', doc='No change', multi=False) +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_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 5bf09700..723b11aa 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b') -option_5 = IntOption(properties=frozenset({'normal'}), name='int2', doc='No change', multi=False) -option_4 = IntOption(properties=frozenset({'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], name='int', doc='No change', multi=False) +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_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 03d739bb..0927b9db 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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 85430ac9..fe88c807 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') -option_6 = StrOption(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)], name='mode_conteneur_actif3', doc='No change', multi=False, default='oui') +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_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 31f6e9c4..a9916dbb 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') -option_6 = StrOption(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)], name='mode_conteneur_actif3', doc='No change', multi=False, default='oui') +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_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 13a3285a..030c1e30 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = IPOption(private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}), name='adresse_ip_eth0', doc='Adresse IP de la carte', multi=False) -option_5 = NetmaskOption(properties=frozenset({'basic', 'mandatory'}), name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', multi=False) -option_6 = IPOption(private_only=True, warnings_only=True, 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)], name='adresse_ip', doc='IP', multi=False) +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_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 8eea3de1..82aa929f 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = IPOption(cidr=True, properties=frozenset({'basic', 'mandatory'}), name='adresse_ip_eth0', doc='Adresse IP de la carte', multi=False) -option_5 = IPOption(private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)], name='adresse_ip', doc='IP', multi=False) +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_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 9bbcd8ab..718cadca 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = IPOption(private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'}), name='adresse_ip_eth0', doc='Adresse IP de la carte', multi=False) -option_5 = NetmaskOption(properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)], name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', multi=False) +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_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 a7545176..1578d425 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(properties=frozenset({'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)), kwargs={}))) +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_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 774599ce..0a368887 100644 --- a/tests/dictionaries/10leadership_append/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append/tiramisu/base.py @@ -12,12 +12,12 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={}))) -option_9 = StrOption(properties=frozenset({'normal'}), name='follower3', doc='follower3', multi=True) +option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) +option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8, option_9]) option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py index 68b08590..c89ca277 100644 --- a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py @@ -12,12 +12,12 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen'}), name='leader', doc='leader', multi=True) -option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={}))) -option_9 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower3', doc='follower3', multi=True) +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'})) +option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) +option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'hidden', 'normal'}), children=[option_6, option_7, option_8, option_9]) option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10leadership_append_name/tiramisu/base.py b/tests/dictionaries/10leadership_append_name/tiramisu/base.py index 70756133..9fbe37c8 100644 --- a/tests/dictionaries/10leadership_append_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_name/tiramisu/base.py @@ -12,12 +12,12 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={}))) -option_9 = StrOption(properties=frozenset({'normal'}), name='follower3', doc='follower3', multi=True) +option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) +option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leadership', doc='leadership', properties=frozenset({'normal'}), children=[option_6, option_7, option_8, option_9]) option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10leadership_auto/tiramisu/base.py b/tests/dictionaries/10leadership_auto/tiramisu/base.py index 6cb92c04..a949d194 100644 --- a/tests/dictionaries/10leadership_auto/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={}))) -option_8 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower3', doc='follower3', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}))) +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'})) +option_8 = StrOption(name='follower3', doc='follower3', 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'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7, option_8]) 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/10leadership_autoleader/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py index 7632b7df..6adabfea 100644 --- a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}))) +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'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) 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/10leadership_autoleader_expert/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py index f9adb01c..926a2560 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_7 = StrOption(properties=frozenset({'expert'}), name='follower1', doc='follower1', multi=True) -option_8 = StrOption(properties=frozenset({'expert'}), name='follower2', doc='follower2', multi=True) +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'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'expert'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'expert'}), children=[option_6, option_7, option_8]) option_4 = OptionDescription(name='leadermode', doc='leadermode', properties=frozenset({'expert'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py index 006d5868..ea542274 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_7 = StrOption(properties=frozenset({'expert'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={}))) +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'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) 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/10leadership_familyaccent/tiramisu/base.py b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py index 7ca1452e..79cfcf6a 100644 --- a/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py +++ b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={}))) +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'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) 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]) diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py index 0fd8bb0f..0e6066b5 100644 --- a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen'}), name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower1', doc='follower1', multi=True) -option_8 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'}), name='follower2', doc='follower2', multi=True) +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'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'hidden', 'normal'}), children=[option_6, option_7, option_8]) option_4 = OptionDescription(name='leadermode', doc='leadermode', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) 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 b2d347b6..c7a579e4 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_6 = StrOption(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')}))}), name='leader', doc='leader', multi=True) -option_7 = StrOption(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')}))}), name='follower1', doc='follower1', multi=True) -option_8 = StrOption(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')}))}), name='follower2', doc='follower2', multi=True) +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')}))})) +option_8 = StrOption(name='follower2', doc='follower2', 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')}))})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))}), children=[option_6, option_7, option_8]) option_4 = OptionDescription(name='leadermode', doc='leadermode', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) 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 da742629..0ec07f3f 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,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_6 = StrOption(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')}))}), name='leader', doc='leader', multi=True) -option_7 = StrOption(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')}))}), name='follower1', doc='follower1', multi=True) -option_8 = StrOption(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')}))}), name='follower2', doc='follower2', multi=True) +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')}))})) +option_8 = StrOption(name='follower2', doc='follower2', 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')}))})) option_5 = Leadership(name='other', doc='other', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))}), children=[option_6, option_7, option_8]) option_4 = OptionDescription(name='leadermode', doc='leadermode', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py index 6f1feb37..044f5b5a 100644 --- a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True) -option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={}))) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'basic'}), children=[option_5, option_6, option_7]) 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]) diff --git a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py index 8c21d599..de6d8712 100644 --- a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={}))) +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'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) 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/10leadership_mandatoryfollower/tiramisu/base.py b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py index 3e085551..4df42840 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_5 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=True) -option_6 = NetworkOption(properties=frozenset({'mandatory', 'normal'}), name='nut_monitor_host', doc='Adresse 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]) 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]) diff --git a/tests/dictionaries/10leadership_multi/tiramisu/base.py b/tests/dictionaries/10leadership_multi/tiramisu/base.py index 159834f8..f33d582d 100644 --- a/tests/dictionaries/10leadership_multi/tiramisu/base.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/base.py @@ -12,15 +12,15 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={}))) +option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) option_10 = StrOption(name='leader1', doc='leader', multi=True) -option_11 = StrOption(properties=frozenset({'normal'}), name='follower11', doc='follower1', multi=True) -option_12 = StrOption(properties=frozenset({'normal'}), name='follower21', doc='follower2', multi=True) +option_11 = StrOption(name='follower11', doc='follower1', multi=True, properties=frozenset({'normal'})) +option_12 = StrOption(name='follower21', doc='follower2', multi=True, properties=frozenset({'normal'})) option_9 = Leadership(name='leader1', doc='leader', properties=frozenset({'normal'}), children=[option_10, option_11, option_12]) option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5, option_9]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py index ca0b36b9..6958dcdb 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(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')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(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')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 170a355f..c8663dca 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(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')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(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')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 9efe2e5c..d2c52638 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_7 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif3', doc='No change', multi=False, default='non') +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_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 9688b180..6ba6dc7c 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 9688b180..6ba6dc7c 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 5f497aef..13dadd75 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'disabled', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 fe61de69..fca303f9 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 fe61de69..fca303f9 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 5462a207..4ce40508 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(properties=frozenset({'normal'}), name='mode_conteneur_actif', doc='No change', multi=False) -option_4 = StrOption(properties=frozenset({'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False) +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_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 fbc46ae0..f5ce68d6 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(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')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(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')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 1c6d8117..3ece39ef 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(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')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("non")), kwargs={}))) -option_5 = StrOption(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')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 38e52f55..22a91e36 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='tous', values=('tous', 'authentifié', 'aucun')) -option_4 = StrOption(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é')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(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é')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 1792cb35..1a5d8f5b 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='tous', values=('tous', 'authentifié', 'aucun')) -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 f26ef55b..5f1969b4 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(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)}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 1792cb35..1a5d8f5b 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='tous', values=('tous', 'authentifié', 'aucun')) -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 90950aa3..822ad2a1 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(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')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(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')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_7 = StrOption(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')}))}), name='mode_conteneur_actif3', doc='No change', multi=False, default='non') +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_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 e7550170..712f923c 100644 --- a/tests/dictionaries/10load_leadership/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={}))) +option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py index 84f564ca..829cb444 100644 --- a/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='leader', multi=True, default=['non'], default_multi='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='leader', default=['non'], multi=True, default_multi='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default_multi='value') -option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default_multi='value', properties=frozenset({'mandatory', 'normal'})) +option_7 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) 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/10load_leadership_default_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py index 1d4fb5ba..7b0145b9 100644 --- a/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='leader', multi=True, default=['non'], default_multi='non') -option_5 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True, default=['leader']) -option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=submulti, default_multi=['value']) -option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='follower2', doc='follower2', multi=submulti, default_multi=['value1', 'value2']) +option_3 = StrOption(name='mode_conteneur_actif', doc='leader', default=['non'], multi=True, default_multi='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='leader', doc='leader', default=['leader'], multi=True, properties=frozenset({'mandatory'})) +option_6 = StrOption(name='follower1', doc='follower1', multi=submulti, default_multi=['value'], properties=frozenset({'mandatory', 'normal'})) +option_7 = StrOption(name='follower2', doc='follower2', multi=submulti, default_multi=['value1', 'value2'], properties=frozenset({'mandatory', 'normal'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) 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/10load_leadership_defaultmulti_leader/tiramisu/base.py b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py index d1061620..c505b5ff 100644 --- a/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='leader', multi=True, default=['non'], default_multi='non') -option_5 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True, default=['value']) -option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True) -option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True) +option_3 = StrOption(name='mode_conteneur_actif', doc='leader', default=['non'], multi=True, default_multi='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='leader', doc='leader', default=['value'], multi=True, properties=frozenset({'mandatory'})) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal'})) +option_7 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) 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/10load_leadership_description/tiramisu/base.py b/tests/dictionaries/10load_leadership_description/tiramisu/base.py index d243213f..274a16dc 100644 --- a/tests/dictionaries/10load_leadership_description/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={}))) +option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='other description', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10load_leadership_name/tiramisu/base.py b/tests/dictionaries/10load_leadership_name/tiramisu/base.py index 66d837fb..eeaa2483 100644 --- a/tests/dictionaries/10load_leadership_name/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_name/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={}))) +option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='other_name', doc='other_name', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py index bbd35582..89d8f421 100644 --- a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_6 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True) -option_7 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True) +option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'mandatory'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'basic'}), children=[option_6, option_7, option_8]) option_4 = OptionDescription(name='general_1', doc='general-1', properties=frozenset({'basic'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py index 6c66ab72..8f1b9f17 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=submulti, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), default_multi=[]) +option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=submulti, properties=frozenset({'normal'})) option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py index e3817b58..466bce5b 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 1792cb35..1a5d8f5b 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='tous', values=('tous', 'authentifié', 'aucun')) -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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_multivalue/tiramisu/base.py b/tests/dictionaries/10load_multivalue/tiramisu/base.py index 68c47d77..7f8b91fe 100644 --- a/tests/dictionaries/10load_multivalue/tiramisu/base.py +++ b/tests/dictionaries/10load_multivalue/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=True, default=['non', 'oui'], default_multi='oui') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=['non', 'oui'], multi=True, default_multi='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/10valid_enum_accent/tiramisu/base.py b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py index 359143e9..660868e5 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(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='c', values=('a', 'b', 'c', 'é')) +option_5 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'b', 'c', 'é'), multi=False, 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 79ec2719..f6cccca6 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(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='c', values=('a', 'b', 'c')) +option_5 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'b', 'c'), multi=False, 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 2fd2f926..7353ed33 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(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar2', doc='multi', multi=False, default='c', values=('a', 'b', 'c')) -option_6 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='c', values=('a', 'c')) +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_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 2efbc1ff..63014154 100644 --- a/tests/dictionaries/10valid_enum_leader/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='follower1', doc='follower1', multi=True, default_multi='a', values=('a', 'b', 'c')) -option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', 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'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) 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_mandatory/tiramisu/base.py b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py index c8c5bb0d..a277a114 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(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='a', values=('a', 'b', 'c')) +option_5 = ChoiceOption(name='enumvar', doc='multi', default='a', values=('a', 'b', 'c'), multi=False, 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 fd8ef49e..d4b25be3 100644 --- a/tests/dictionaries/10valid_enum_multi/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='multi', doc='multi', multi=True, default=['a'], default_multi='a', values=('a', 'b', 'c')) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_none/tiramisu/base.py b/tests/dictionaries/10valid_enum_none/tiramisu/base.py index 183c9827..eb859322 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(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, default='b', values=('a', 'b', None)) +option_5 = ChoiceOption(name='enumvar', doc='multi', default='b', values=('a', 'b', None), multi=False, 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 b996b0a9..4917b846 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(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='enumvar', multi=False, default=1, values=(1, 2, 3)) +option_5 = ChoiceOption(name='enumvar', doc='enumvar', default=1, values=(1, 2, 3), multi=False, 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 e333e01e..6e797b0e 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(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='enumvar', multi=False, default=3, values=(1, 2, 3)) +option_5 = ChoiceOption(name='enumvar', doc='enumvar', default=3, values=(1, 2, 3), multi=False, 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 a8186ebb..154e7a9f 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(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, values=(None,)) +option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), multi=False, 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 a8186ebb..154e7a9f 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(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'expert', 'mandatory'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='enumvar', doc='multi', multi=False, values=(None,)) +option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), multi=False, 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 9c3983fe..7fbf17fc 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='b', values=('a', 'b', 'c')) +option_3 = ChoiceOption(name='mode_conteneur_actif', doc='No change', default='b', values=('a', 'b', 'c'), multi=False, 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 207f84fb..efd1e7a0 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = BoolOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default=True) +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_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', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = StrOption(name='name', doc='name', multi=False, default='/etc/file') -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False, default=True) +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_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 e69dc398..ea65ba01 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='oui') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = StrOption(name='name', doc='name', multi=False, default='/etc/file') -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False, default=True) +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_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 a7ef4710..f63f27a3 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file1') -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='file1') -option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False, default=True) +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_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', multi=False, default='root') -option_19 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_20 = StrOption(name='name', doc='name', multi=False, default='/tmp/file2') -option_21 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_22 = StrOption(name='source', doc='source', multi=False, default='file2') -option_23 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_24 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False, default=True) +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_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 7f6073ed..8af9db4e 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file') -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('unpossible'), 'reverse_condition': ParamValue(True)}))}), name='activate', doc='activate', multi=False, default=True) +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_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 7f6073ed..8af9db4e 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file') -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('unpossible'), 'reverse_condition': ParamValue(True)}))}), name='activate', doc='activate', multi=False, default=True) +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_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 874cfb50..d59b61f6 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file') -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_16 = BoolOption(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)}))}), name='activate', doc='activate', multi=False, default=True) +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_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 c302c722..a58395bb 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(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('non', 'statique')) -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file') -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('statique'), 'reverse_condition': ParamValue(True)}))}), name='activate', doc='activate', multi=False, default=True) +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_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 9f650421..fb0bb90e 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') +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_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', multi=False, default='root') -option_10 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_11 = StrOption(name='name', doc='name', multi=False, default='/tmp/file1') -option_12 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_13 = StrOption(name='source', doc='source', multi=False, default='file1') -option_14 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_15 = BoolOption(properties=frozenset({'disabled'}), name='activate', doc='activate', multi=False, default=True) +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_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 5450840e..89a6c860 100644 --- a/tests/dictionaries/11valid_enum_variable/tiramisu/base.py +++ b/tests/dictionaries/11valid_enum_variable/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='var', doc='New variable', multi=True, default=['a', 'b', 'c'], default_multi='c') -option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='a', values=Calculation(func.calc_value, Params((ParamOption(option_4))))) +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_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 df52d7ed..b86584b5 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') +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_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 5c3935a6..1f07c230 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif3', doc='No change', multi=False, default='non') -option_3 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 f5598ddf..0241c7f8 100644 --- a/tests/dictionaries/20family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2') +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(properties=frozenset({'normal'}), name='vardyn', doc='No change', multi=False) +option_5 = StrOption(name='vardyn', doc='No change', multi=False, 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 eab80d32..d86c2d47 100644 --- a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2') +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(properties=frozenset({'mandatory', 'normal'}), name='vardyn', doc='No change', multi=False, default='val') +option_5 = StrOption(name='vardyn', doc='No change', default='val', multi=False, 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(properties=frozenset({'normal'}), name='newvar', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamDynOption(option_5, 'val1', option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) +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_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 a046cc01..d5a5e91f 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2') +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(properties=frozenset({'normal'}), name='newvar', doc='No change', multi=False) -option_5 = StrOption(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')}))}), name='vardyn', doc='No change', multi=False, default='val') +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_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 c7b9c11b..9cd9b8ea 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2') +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(properties=frozenset({'normal'}), name='vardyn', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamSuffix()), kwargs={}))) +option_5 = StrOption(name='vardyn', doc='No change', default=Calculation(func.calc_val, Params((ParamSuffix()), kwargs={})), multi=False, 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(properties=frozenset({'normal'}), name='newvar', doc='No change', multi=False) +option_7 = StrOption(name='newvar', doc='No change', multi=False, 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 7699dca7..485bec37 100644 --- a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2') +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(properties=frozenset({'normal'}), name='vardyn', doc='No change', multi=False) +option_5 = StrOption(name='vardyn', doc='No change', multi=False, 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 137b58ee..d9fd8eac 100644 --- a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = IntOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=[1, 2], default_multi=2) +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(properties=frozenset({'mandatory', 'normal'}), name='vardyn', doc='No change', multi=False, default='val') +option_5 = StrOption(name='vardyn', doc='No change', default='val', multi=False, 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(properties=frozenset({'normal'}), name='newvar', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamDynOption(option_5, '1', option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) +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_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 6a0127cc..fe0cf169 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(properties=frozenset({'basic', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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 1f6e7ebc..82fe4271 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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 6a0127cc..fe0cf169 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(properties=frozenset({'basic', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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 3f1a1d66..fcd91118 100644 --- a/tests/dictionaries/20family_modeleadership/tiramisu/base.py +++ b/tests/dictionaries/20family_modeleadership/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(properties=frozenset({'normal'}), name='follower1', doc='follower1', multi=True) -option_7 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', 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'})) option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) 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/20notemplating/tiramisu/base.py b/tests/dictionaries/20notemplating/tiramisu/base.py index 27d2dfff..bc04c650 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/file') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='file') -option_13 = BoolOption(name='templating', doc='templating', multi=False, default=False) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 2b163004..248d9904 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/systemd/system/test.service.d/rougail.conf') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='test.service') -option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 a3087706..5eac8a47 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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 7186ce3b..ee1c20cf 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(properties=frozenset({'basic', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', multi=False, 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 798bb995..6f7e314f 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={}))) +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_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 f6e00098..9b1801be 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='value') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='value', multi=False, 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 0a2df97e..86f96955 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(properties=frozenset({'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={}))) +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_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 865ccc07..71a8c229 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_6 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 865ccc07..71a8c229 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_6 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 99a5462d..9fee48d7 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'disabled', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'disabled', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_7 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif3', doc='No change', multi=False, default='non') +option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', multi=False, 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 ca3f0aca..afec083d 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') +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_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 e65f7855..689e7cdf 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') +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_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 a7d51c07..0b9087c1 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, properties=frozenset({'expert'}), name='toto1', doc='Port d\'écoute du proxy', multi=False, default=Calculation(func.calc_multi_condition, Params((ParamValue("None")), kwargs={}))) -option_4 = PortOption(allow_private=True, properties=frozenset({'expert', 'mandatory'}), name='toto2', doc='Port d\'écoute du proxy NTLM', multi=False, default='3127') +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_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 edf15f9d..c067bebd 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, properties=frozenset({'expert'}), name='toto1', doc='Port d\'écoute du proxy', multi=False, default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue("None")}))) -option_4 = PortOption(allow_private=True, properties=frozenset({'expert', 'mandatory'}), name='toto2', doc='Port d\'écoute du proxy NTLM', multi=False, default='3127') +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_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 f2ad35aa..75eccd7d 100644 --- a/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py +++ b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory'}), name='mode_conteneur_actif1', doc='No change', multi=True, default=['non']) -option_6 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=True, default_multi='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, 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]) 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/40ifin_leadership/tiramisu/base.py b/tests/dictionaries/40ifin_leadership/tiramisu/base.py index 2953d3f6..c94a43dc 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='condition', multi=False, default='oui') +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_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))}), name='follower1', doc='follower1', multi=True) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', 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'})) 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]) diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index a5b5f7a5..33c1eafc 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='condition', multi=False, default='oui') -option_6 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True, default=['a']) -option_7 = StrOption(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')}))}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True) +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_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', multi=False, default='root') -option_14 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_15 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_16 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_17 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_18 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_19 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 e89316b9..223b99cb 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='condition', multi=False, default='oui') -option_6 = StrOption(properties=frozenset({'mandatory'}), name='leader', doc='leader', multi=True, default=['a', 'b']) -option_7 = StrOption(properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue('a')}))}), name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")}))) -option_8 = StrOption(properties=frozenset({'normal'}), name='follower2', doc='follower2', multi=True) +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_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', multi=False, default='root') -option_14 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_15 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_16 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_17 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_18 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_19 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 9f85b356..dbd0e226 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') -option_6 = StrOption(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')}))}), name='mode_conteneur_actif3', doc='No change', multi=False, default='non') +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_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 5905c6e2..d03410fd 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', multi=False, properties=frozenset({'mandatory', 'normal'})) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(properties=frozenset({'disabled', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') -option_6 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif3', doc='No change', multi=False, default='a', values=('a', 'b', 'c')) +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_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 6b19a89a..3f91cdab 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', multi=False, 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 5ca5fee3..d546f228 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefined', multi=False, default='non') +option_3 = StrOption(name='mode_conteneur_actif', doc='Redefined', default='non', multi=False, 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 43413bfc..55a62d12 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='Description', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='New description', multi=False, default='oui') +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_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 59cc23ec..95aeaa5c 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='oui') +option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='oui', multi=False, 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 af5a56ad..f4408320 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")}))) +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_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 fdf599c4..82396b4f 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(properties=frozenset({'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")}))) +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_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 a2c1670f..31458450 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 af5a56ad..f4408320 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")}))) +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_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 af5a56ad..f4408320 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")}))) +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_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 708ec8ec..caab1692 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='redefine help', multi=False, default='non') +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.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 d037a0e6..0587d9ca 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine hidden', multi=False, default='non') +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_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 4c1e4541..254dcf70 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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 60f43773..e95f1616 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 3c66d816..3145d876 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non') -option_3 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non') -option_5 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') -option_6 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif2', doc='No change', multi=False, default='non') +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_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 5dffd58c..2d1061cf 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine description', multi=False, default='a', values=('a', 'b')) +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_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 94cdd2f0..8892cf13 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Redefine value', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='Redefine value', multi=False, default='oui') +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_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 81eba2b7..8cb18f52 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(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non') +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_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 516134f6..e212a7c3 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='New description', multi=False, default='non') +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_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 20b6fdb2..21505e25 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='delay', doc='délai en minutes avant lancement', multi=False, default=0) -option_7 = URLOption(allow_ip=True, allow_without_dot=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='calc_url', doc='domain', multi=False, default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")), kwargs={}))) +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_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 1fc5f9a8..faa673de 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non') -option_3 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='description', doc='description', multi=False, default='Exportation de la base de ejabberd') -option_9 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='day', doc='day', multi=False, default='none', values=('none', 'daily', 'weekly', 'monthly')) -option_10 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=False, default='pre', values=('pre', 'post')) +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_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(properties=frozenset({'mandatory', 'normal'}), name='description', doc='description', multi=False, default='test') +option_13 = StrOption(name='description', doc='description', default='test', multi=False, 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 009981f3..8151f669 100644 --- a/tests/dictionaries/60extra_group/tiramisu/base.py +++ b/tests/dictionaries/60extra_group/tiramisu/base.py @@ -12,22 +12,22 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory'}), name='description', doc='description', multi=True, default=['test']) -option_9 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=True, default_multi='pre') +option_8 = StrOption(name='description', doc='description', default=['test'], multi=True, properties=frozenset({'mandatory'})) +option_9 = StrOption(name='mode', doc='mode', multi=True, default_multi='pre', properties=frozenset({'mandatory', 'normal'})) 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', multi=False, default='root') -option_15 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_16 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_17 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_18 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_19 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_20 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 38a88c72..b1793055 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='description', doc='description', multi=False, default='Exportation de la base de ejabberd') -option_8 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='day', doc='day', multi=False, 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')) +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_8.impl_set_information("help", "Test help") -option_9 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=False, default='pre', values=('pre', 'post')) +option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), multi=False, 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', multi=False, default='root') -option_15 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_16 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_17 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_18 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_19 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_20 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 9ec2e2ef..56c50b42 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='description', doc='description', multi=False, default='Exportation de la base de ejabberd') -option_8 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='day', doc='day', multi=False, 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')) -option_9 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=False, default='pre', values=('pre', 'post')) +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_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 53b9d1b5..8d3b20e7 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='description', doc='description', multi=False, default='Exportation de la base de ejabberd') -option_8 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='day', doc='day', multi=False, 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')) -option_9 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=False, default='pre', values=('pre', 'post')) -option_10 = StrOption(properties=frozenset({'basic', 'mandatory'}), name='var1', doc='var1', multi=False) +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_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 c4c9923f..54c272a0 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='description', doc='description', multi=False, default='Exportation de la base de ejabberd') -option_8 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='day', doc='day', multi=False, 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')) -option_9 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=False, default='pre', values=('pre', 'post')) +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_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 78316d93..67ab94f7 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non') -option_3 = StrOption(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)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='description', doc='description', multi=False, default='Exportation de la base de ejabberd') -option_9 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='day', doc='day', multi=False, default='none', values=('none', 'daily', 'weekly', 'monthly')) -option_10 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=False, default='pre', values=('pre', 'post')) +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_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 772ea0d9..4d72fe62 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') -option_4 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='activer_ejabberd', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='description', doc='description', multi=False, default='Exportation de la base de ejabberd') -option_8 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='day', doc='day', multi=False, 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')) -option_9 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode', doc='mode', multi=False, default='pre', values=('pre', 'post')) +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_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 bc676c3c..a1ca297f 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='delay', doc='délai en minutes avant lancement', multi=False, default=0) +option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, multi=False, 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 bc676c3c..a1ca297f 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='delay', doc='délai en minutes avant lancement', multi=False, default=0) +option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, multi=False, 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 8cd701bf..d2be89db 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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(properties=frozenset({'mandatory', 'normal'}), name='delay', doc='délai en minutes avant lancement', multi=False, default=0) -option_7 = IntOption(properties=frozenset({'basic', 'mandatory'}), name='day', doc='day avant lancement', multi=False) +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_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 0efbe600..5d0c6d38 100644 --- a/tests/dictionaries/61extra_dyn/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['a'], default_multi='a') +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(properties=frozenset({'normal'}), name='mode', doc='mode', multi=False) +option_6 = StrOption(name='mode', doc='mode', multi=False, 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 c43c70f3..ed6ac0bb 100644 --- a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py @@ -12,12 +12,12 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['a'], default_multi='a') +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(properties=frozenset({'mandatory', 'normal'}), name='varname', doc='No change', multi=True, default=['a'], default_multi='a') +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(properties=frozenset({'normal'}), name='mode', doc='mode', multi=False) +option_8 = StrOption(name='mode', doc='mode', multi=False, 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 0b140030..8c851f9e 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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', multi=False, default='root') -option_17 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_18 = StrOption(name='name', doc='name', multi=False, default='/rougail.conf') -option_19 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_20 = StrOption(name='source', doc='source', multi=False, default='rougail.conf') -option_21 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_22 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 358bd3d3..3c395dc7 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='file_name', doc='file_name', multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi='/etc/mailname2') +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', '/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', multi=False, default='root') -option_10 = StrOption(name='mode', doc='mode', multi=False, default='0644') +option_9 = StrOption(name='group', doc='group', default='root', multi=False) +option_10 = StrOption(name='mode', doc='mode', default='0644', multi=False) option_11 = SymLinkOption(name='name', opt=option_4) -option_12 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_13 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_14 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_15 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 943ae68b..19499302 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='file_name', doc='file_name', multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi='/etc/mailname2') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='var', doc='var', multi=True, default=['mailname', 'mailname2'], default_multi='mailname2') +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', '/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', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') +option_10 = StrOption(name='group', doc='group', default='root', multi=False) +option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) option_12 = SymLinkOption(name='name', opt=option_4) -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) +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_16 = SymLinkOption(name='variable', opt=option_5) -option_17 = BoolOption(name='activate', doc='activate', multi=False, default=True) +option_17 = BoolOption(name='activate', doc='activate', default=True, multi=False) 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 f33ce3ba..91e2cf62 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='file_name', doc='file_name', multi=False, default='/etc/mailname') -option_5 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='var', doc='var', multi=False, default='mailname') +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_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', multi=False, default='root') -option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') +option_10 = StrOption(name='group', doc='group', default='root', multi=False) +option_11 = StrOption(name='mode', doc='mode', default='0644', multi=False) option_12 = SymLinkOption(name='name', opt=option_4) -option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_14 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) +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_16 = SymLinkOption(name='variable', opt=option_5) -option_17 = BoolOption(name='activate', doc='activate', multi=False, default=True) +option_17 = BoolOption(name='activate', doc='activate', default=True, multi=False) 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 1119525b..b2fb9e4f 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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', multi=False, default='root') -option_17 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_18 = StrOption(name='name', doc='name', multi=False, default='/etc/eole/mailname') -option_19 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_20 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_21 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_22 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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', multi=False, default='root') -option_25 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_26 = StrOption(name='name', doc='name', multi=False, default='/rougail.conf') -option_27 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_28 = StrOption(name='source', doc='source', multi=False, default='rougail.conf') -option_29 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_30 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 92618fb4..42ea06e0 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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', multi=False, default='root') -option_17 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_18 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname2') -option_19 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_20 = StrOption(name='source', doc='source', multi=False, default='mailname2') -option_21 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_22 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 d7b3c98a..9b69dbcd 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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', multi=False, default='root') -option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') -option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') -option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') -option_12 = StrOption(name='source', doc='source', multi=False, default='mailname.new') -option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 9c3d4a64..56c5138f 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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 9aa9d076..e3072f2a 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non') +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_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 a677c114..37a5e196 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = IPOption(allow_reserved=True, properties=frozenset({'normal'}), name='adresse_ip_test', doc='No change', multi=False) +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_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 b807ff0e..dc71f895 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_4 = NetmaskOption(properties=frozenset({'basic', 'mandatory'}), name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=False) -option_5 = NetworkOption(properties=frozenset({'basic', 'mandatory'}), name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=False) +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_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', multi=False, default='auto') +option_10 = StrOption(name='interface', doc='interface', default='auto', multi=False) option_11 = SymLinkOption(name='name', opt=option_5) option_12 = SymLinkOption(name='netmask', opt=option_4) -option_13 = BoolOption(name='activate', doc='activate', multi=False, default=True) +option_13 = BoolOption(name='activate', doc='activate', default=True, multi=False) 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 4747351d..e31bf196 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') -option_5 = NetmaskOption(properties=frozenset({'mandatory'}), name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=True) -option_6 = NetworkOption(properties=frozenset({'basic', 'mandatory'}), name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=True) +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_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', multi=False, default='auto') +option_11 = StrOption(name='interface', doc='interface', default='auto', multi=False) option_12 = SymLinkOption(name='name', opt=option_6) option_13 = SymLinkOption(name='netmask', opt=option_5) -option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) +option_14 = BoolOption(name='activate', doc='activate', default=True, multi=False) 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 4ad152b0..159a9cd5 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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 4ba81a03..c3bab051 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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', multi=False, default='123') -option_9 = StrOption(name='protocol', doc='protocol', multi=False, default='udp') -option_10 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 18cb7894..5afcf204 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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', multi=False, default='eth0') -option_9 = NetworkOption(name='name', doc='name', multi=False, default='192.168.1.1') -option_10 = NetmaskOption(name='netmask', doc='netmask', multi=False, default='255.255.255.255') -option_11 = BoolOption(name='activate', doc='activate', multi=False, default=True) +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_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 625d0117..7953f7ea 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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 faf26d3a..87c6be61 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(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui') +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_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/test_1_flattener.py b/tests/test_1_flattener.py index a01307e3..96f6e64f 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -28,7 +28,7 @@ excludes = set([]) #excludes = set(['01base_file_utfchar']) test_ok -= excludes test_raise -= excludes -#test_ok = ['01auto_autofreeze'] +#test_ok = ['00load_autofreeze'] #test_ok = [] #test_raise = ['80auto_autofreeze'] #test_raise = []