From 38c95ea87ace8db6b57223ef36f0272c2bb1b52a Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 6 Jul 2020 20:58:11 +0200 Subject: [PATCH] creole => rougail --- src/rougail/annotator.py | 23 +-- src/rougail/i18n.py | 2 +- src/rougail/loader.py | 17 +-- src/rougail/objspace.py | 132 +++++++++--------- src/rougail/path.py | 25 ++-- src/rougail/template.py | 25 ++-- .../00load_autofreeze/makedict/base.json | 2 +- .../00load_autofreeze/result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../00load_autosave/makedict/base.json | 2 +- .../00load_autosave/result/00-base.xml | 2 +- .../00load_autosaveexpert/makedict/base.json | 2 +- .../00load_autosaveexpert/result/00-base.xml | 2 +- .../00load_comment/makedict/base.json | 2 +- .../00load_comment/result/00-base.xml | 2 +- .../00load_notype/makedict/base.json | 2 +- .../00load_notype/result/00-base.xml | 2 +- .../00load_save/makedict/base.json | 2 +- .../00load_save/result/00-base.xml | 2 +- .../00load_subfolder/makedict/base.json | 2 +- .../00load_subfolder/result/00-base.xml | 2 +- .../01auto_base/makedict/base.json | 2 +- .../01auto_base/result/00-base.xml | 4 +- .../01auto_withoutparam/makedict/base.json | 2 +- .../01auto_withoutparam/result/00-base.xml | 2 +- .../01base_multi/makedict/base.json | 2 +- .../01base_multi/result/00-base.xml | 2 +- .../01base_submulti/makedict/base.json | 2 +- .../01base_submulti/result/00-base.xml | 2 +- .../01fill_autofreeze/makedict/base.json | 2 +- .../01fill_autofreeze/result/00-base.xml | 6 +- .../01fill_autosave/makedict/base.json | 2 +- .../01fill_autosave/result/00-base.xml | 4 +- .../01fill_base/makedict/base.json | 2 +- .../01fill_base/result/00-base.xml | 4 +- .../01fill_baseaccent/makedict/base.json | 2 +- .../01fill_baseaccent/result/00-base.xml | 4 +- .../01fill_mandatory/makedict/base.json | 2 +- .../01fill_mandatory/result/00-base.xml | 4 +- .../01fill_number/makedict/base.json | 2 +- .../01fill_number/result/00-base.xml | 2 +- .../01fill_optional/makedict/base.json | 2 +- .../01fill_optional/result/00-base.xml | 4 +- .../01separator_base/makedict/base.json | 2 +- .../01separator_base/result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../10autosave_hidden/makedict/base.json | 2 +- .../10autosave_hidden/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 8 +- .../10check_base/makedict/base.json | 2 +- .../10check_base/result/00-base.xml | 2 +- .../10check_option/makedict/base.json | 2 +- .../10check_option/result/00-base.xml | 4 +- .../10check_optional/makedict/base.json | 2 +- .../10check_optional/result/00-base.xml | 4 +- .../10check_valid_differ/makedict/base.json | 2 +- .../10check_valid_differ/result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 10 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 6 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../10leadership_append/makedict/base.json | 2 +- .../10leadership_append/result/00-base.xml | 4 +- .../10leadership_auto/makedict/base.json | 2 +- .../10leadership_auto/result/00-base.xml | 6 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../10leadership_mandatory/makedict/base.json | 2 +- .../10leadership_mandatory/result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../10leadership_multi/makedict/base.json | 2 +- .../10leadership_multi/result/00-base.xml | 4 +- .../10load_disabled_if_in/makedict/base.json | 2 +- .../10load_disabled_if_in/result/00-base.xml | 6 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 6 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 8 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 6 +- .../10load_emptyvalue/makedict/base.json | 2 +- .../10load_emptyvalue/result/00-base.xml | 2 +- .../10load_frozenifin/makedict/base.json | 2 +- .../10load_frozenifin/result/00-base.xml | 14 +- .../10load_frozenifin_auto/makedict/base.json | 2 +- .../10load_frozenifin_auto/result/00-base.xml | 14 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 26 ++-- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../10load_leadership/makedict/base.json | 2 +- .../10load_leadership/result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../10load_mandatoryifin/makedict/base.json | 2 +- .../10load_mandatoryifin/result/00-base.xml | 6 +- .../10load_multivalue/makedict/base.json | 2 +- .../10load_multivalue/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../10valid_enum_accent/makedict/base.json | 2 +- .../10valid_enum_accent/result/00-base.xml | 2 +- .../10valid_enum_base/makedict/base.json | 2 +- .../10valid_enum_base/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../10valid_enum_eosfunc/makedict/base.json | 2 +- .../10valid_enum_eosfunc/result/00-base.xml | 2 +- .../10valid_enum_leader/makedict/base.json | 2 +- .../10valid_enum_leader/result/00-base.xml | 2 +- .../10valid_enum_mandatory/makedict/base.json | 2 +- .../10valid_enum_mandatory/result/00-base.xml | 2 +- .../10valid_enum_multi/makedict/base.json | 2 +- .../10valid_enum_multi/result/00-base.xml | 2 +- .../10valid_enum_number/makedict/base.json | 2 +- .../10valid_enum_number/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../10valid_enum_python/makedict/base.json | 2 +- .../10valid_enum_python/result/00-base.xml | 2 +- .../10valid_enum_value/makedict/base.json | 2 +- .../10valid_enum_value/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 8 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 8 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 10 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../20family_append/makedict/base.json | 2 +- .../20family_append/result/00-base.xml | 2 +- .../20family_appendaccent/makedict/base.json | 2 +- .../20family_appendaccent/result/00-base.xml | 4 +- .../20family_dynamic/makedict/base.json | 2 +- .../20family_dynamic/result/00-base.xml | 4 +- .../20family_dynamic_calc/makedict/base.json | 2 +- .../20family_dynamic_calc/result/00-base.xml | 6 +- .../20family_empty/makedict/base.json | 2 +- .../20family_empty/result/00-base.xml | 2 +- .../20family_hidden/makedict/base.json | 2 +- .../20family_hidden/result/00-base.xml | 2 +- .../20family_mode/makedict/base.json | 2 +- .../20family_mode/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../20notemplating/makedict/base.json | 2 +- .../20notemplating/result/00-base.xml | 2 +- .../20override/makedict/base.json | 2 +- .../20override/result/00-base.xml | 2 +- .../21family_change/makedict/base.json | 2 +- .../21family_change/result/00-base.xml | 2 +- .../21family_changeaccent/makedict/base.json | 2 +- .../21family_changeaccent/result/00-base.xml | 2 +- .../21family_empty/makedict/base.json | 2 +- .../21family_empty/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../30mandatory_withvalue/makedict/base.json | 2 +- .../30mandatory_withvalue/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../40condition_base/makedict/base.json | 2 +- .../40condition_base/result/00-base.xml | 6 +- .../40condition_fallback/makedict/base.json | 2 +- .../40condition_fallback/result/00-base.xml | 2 +- .../40condition_optional/makedict/base.json | 2 +- .../40condition_optional/result/00-base.xml | 4 +- .../40ifin_leadership/makedict/base.json | 2 +- .../40ifin_leadership/result/00-base.xml | 4 +- .../40ifin_leadershipauto/makedict/base.json | 2 +- .../40ifin_leadershipauto/result/00-base.xml | 4 +- .../40ifin_multi/makedict/base.json | 2 +- .../40ifin_multi/result/00-base.xml | 6 +- .../40ifin_validenum/makedict/base.json | 2 +- .../40ifin_validenum/result/00-base.xml | 2 +- .../50exists_exists/makedict/base.json | 2 +- .../50exists_exists/result/00-base.xml | 2 +- .../50redefine_description/makedict/base.json | 2 +- .../50redefine_description/result/00-base.xml | 2 +- .../51exists_nonexists/makedict/base.json | 2 +- .../51exists_nonexists/result/00-base.xml | 2 +- .../51redefine_auto/makedict/base.json | 2 +- .../51redefine_auto/result/00-base.xml | 2 +- .../51redefine_autofill/makedict/base.json | 2 +- .../51redefine_autofill/result/00-base.xml | 2 +- .../51redefine_family/makedict/base.json | 2 +- .../51redefine_family/result/00-base.xml | 4 +- .../51redefine_fill/makedict/base.json | 2 +- .../51redefine_fill/result/00-base.xml | 2 +- .../51redefine_fillauto/makedict/base.json | 2 +- .../51redefine_fillauto/result/00-base.xml | 2 +- .../51redefine_help/makedict/base.json | 2 +- .../51redefine_help/result/00-base.xml | 2 +- .../51redefine_hidden/makedict/base.json | 2 +- .../51redefine_hidden/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 6 +- .../51redefine_validenum/makedict/base.json | 2 +- .../51redefine_validenum/result/00-base.xml | 2 +- .../51redefine_value/makedict/base.json | 2 +- .../51redefine_value/result/00-base.xml | 2 +- .../52exists_redefine/makedict/base.json | 2 +- .../52exists_redefine/result/00-base.xml | 2 +- .../60action_external/makedict/base.json | 2 +- .../60action_external/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../60extra_group/makedict/base.json | 2 +- .../60extra_group/result/00-base.xml | 2 +- .../60extra_help/makedict/base.json | 2 +- .../60extra_help/result/00-base.xml | 4 +- .../60extra_load/makedict/base.json | 2 +- .../60extra_load/result/00-base.xml | 4 +- .../60extra_mandatory/makedict/base.json | 2 +- .../60extra_mandatory/result/00-base.xml | 4 +- .../60extra_redefine/makedict/base.json | 2 +- .../60extra_redefine/result/00-base.xml | 4 +- .../60familyaction/makedict/base.json | 2 +- .../60familyaction/result/00-base.xml | 2 +- .../60familyaction_accent/makedict/base.json | 2 +- .../60familyaction_accent/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../70container_files/makedict/base.json | 2 +- .../70container_files/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 4 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 6 +- .../70container_filesmulti/makedict/base.json | 2 +- .../70container_filesmulti/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../70container_new/makedict/base.json | 2 +- .../70container_new/result/00-base.xml | 2 +- .../70container_newnocont/makedict/base.json | 2 +- .../70container_newnocont/result/00-base.xml | 2 +- .../70container_newwithip/makedict/base.json | 2 +- .../70container_newwithip/result/00-base.xml | 2 +- .../70container_pathaccess/makedict/base.json | 2 +- .../70container_pathaccess/result/00-base.xml | 6 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 6 +- .../70container_save/makedict/base.json | 2 +- .../70container_save/result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../makedict/base.json | 2 +- .../result/00-base.xml | 2 +- .../70container_services/makedict/base.json | 2 +- .../70container_services/result/00-base.xml | 2 +- .../01fill_context/00-base.xml | 29 ---- .../01fill_context/makedict/base.json | 1 - .../01fill_context/result/00-base.xml | 29 ---- .../10load_hidden_if_in/00-base.xml | 33 ----- .../10load_hidden_if_in/result/00-base.xml | 36 ----- .../10load_hidden_if_not_in/00-base.xml | 33 ----- .../result/00-base.xml | 36 ----- .../10valid_enum_accent_checkval/00-base.xml | 33 ----- .../makedict/base.json | 1 - .../result/00-base.xml | 29 ---- .../10valid_enum_checkval/00-base.xml | 24 ---- .../10valid_enum_checkval/makedict/base.json | 1 - .../10valid_enum_checkval/result/00-base.xml | 19 --- .../10valid_enum_value_checkval/00-base.xml | 26 ---- .../makedict/base.json | 1 - .../result/00-base.xml | 19 --- .../00-base.xml | 39 ------ .../01-base.xml | 18 --- .../result/00-base.xml | 45 ------ tests/test_flattener.py | 3 +- 316 files changed, 521 insertions(+), 960 deletions(-) delete mode 100644 tests/flattener_dicos_hum/01fill_context/00-base.xml delete mode 100644 tests/flattener_dicos_hum/01fill_context/makedict/base.json delete mode 100644 tests/flattener_dicos_hum/01fill_context/result/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10load_hidden_if_in/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10load_hidden_if_in/result/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10load_hidden_if_not_in/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10load_hidden_if_not_in/result/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10valid_enum_accent_checkval/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10valid_enum_accent_checkval/makedict/base.json delete mode 100644 tests/flattener_dicos_hum/10valid_enum_accent_checkval/result/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10valid_enum_checkval/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10valid_enum_checkval/makedict/base.json delete mode 100644 tests/flattener_dicos_hum/10valid_enum_checkval/result/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10valid_enum_value_checkval/00-base.xml delete mode 100644 tests/flattener_dicos_hum/10valid_enum_value_checkval/makedict/base.json delete mode 100644 tests/flattener_dicos_hum/10valid_enum_value_checkval/result/00-base.xml delete mode 100644 tests/flattener_dicos_hum/51redefine_remove_condition_no_target/00-base.xml delete mode 100644 tests/flattener_dicos_hum/51redefine_remove_condition_no_target/01-base.xml delete mode 100644 tests/flattener_dicos_hum/51redefine_remove_condition_no_target/result/00-base.xml diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py index 907bdefe..97719d60 100644 --- a/src/rougail/annotator.py +++ b/src/rougail/annotator.py @@ -73,15 +73,15 @@ KEY_TYPE = {'variable': 'symlink', 'URLOption': 'web_address', 'FilenameOption': 'filename'} -TYPE_PARAM_CHECK = ('string', 'python', 'eole', 'variable') -TYPE_PARAM_CONDITION = ('string', 'python', 'number', 'eole', 'variable') +TYPE_PARAM_CHECK = ('string', 'python', 'variable') +TYPE_PARAM_CONDITION = ('string', 'python', 'number', 'variable') TYPE_PARAM_FILL = ('string', 'number', 'variable') CONVERSION = {'number': int} -ERASED_FAMILY_ACTION_ATTRIBUTES = ('index', 'action') - FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie' +VARIABLE_NAMESPACE = 'rougail' + class ServiceAnnotator: """Manage service's object @@ -341,7 +341,9 @@ class SpaceAnnotator(object): for fam1 in fam.family: for variable in fam1.variable: if variable.type == 'symlink' and '.' not in variable.name: - variable.opt = self.paths.get_variable_path(variable.opt, 'creole') + variable.opt = self.paths.get_variable_path(variable.opt, + VARIABLE_NAMESPACE, + ) def convert_helps(self): # FIXME l'aide doit etre dans la variable! @@ -529,7 +531,7 @@ class SpaceAnnotator(object): (not has_value or is_follower) and variable.type != 'choice'): variable.mode = modes_level[0] if has_value: - if not HIGH_COMPATIBILITY or (not path.startswith('creole.services.') \ + if not HIGH_COMPATIBILITY or (not path.startswith(f'{VARIABLE_NAMESPACE}.services.') \ and path not in self.force_no_value and path not in self.force_not_mandatory): variable.mandatory = True if variable.hidden is True: @@ -582,7 +584,8 @@ class SpaceAnnotator(object): new_condition.param = [new_param] new_target = self.objectspace.target() new_target.type = 'variable' - if variables.name == 'creole': + print(variables.name, VARIABLE_NAMESPACE) + if variables.name == VARIABLE_NAMESPACE: path = variable.name else: path = variable.namespace + '.' + family.name + '.' + variable.name @@ -1145,7 +1148,7 @@ class SpaceAnnotator(object): del condition.param[idx] if condition.param == []: for target in condition.target: - if target.name.startswith('creole.'): + if target.name.startswith(f'{VARIABLE_NAMESPACE}.'): name = target.name.split('.')[-1] else: name = target.name @@ -1178,7 +1181,7 @@ class SpaceAnnotator(object): for target_idx, target in enumerate(condition.target): if target.name in force_remove_targets.get(condition.name, []): remove_targets.append(target_idx) - if target.name.startswith('creole.'): + if target.name.startswith(f'{VARIABLE_NAMESPACE}.'): name = target.name.split('.')[-1] else: name = target.name @@ -1258,7 +1261,7 @@ class SpaceAnnotator(object): else: param = None for target in condition.target: - if target.name.startswith('creole.'): + if target.name.startswith(f'{VARIABLE_NAMESPACE}.'): name = target.name.split('.')[-1] else: name = target.name diff --git a/src/rougail/i18n.py b/src/rougail/i18n.py index 76758cd3..d0ae9ca4 100644 --- a/src/rougail/i18n.py +++ b/src/rougail/i18n.py @@ -24,7 +24,7 @@ import sys import locale # Application Name -APP_NAME = 'creole' +APP_NAME = 'rougail' # Traduction dir APP_DIR = os.path.join(sys.prefix, 'share') diff --git a/src/rougail/loader.py b/src/rougail/loader.py index d45a0cde..d9f91ca7 100644 --- a/src/rougail/loader.py +++ b/src/rougail/loader.py @@ -1,4 +1,4 @@ -"""creole loader +"""loader flattened XML specific """ from os.path import join, isfile, isdir @@ -22,6 +22,7 @@ from .xmlreflector import HIGH_COMPATIBILITY #from . import eosfunc from .objspace import CreoleObjSpace from .utils import normalize_family +from .annotator import VARIABLE_NAMESPACE import imp @@ -127,12 +128,12 @@ class PopulateTiramisuObjects(object): if set(attr.itervalues()) == set(['True', 'False']): self.booleans.append(attr.name) - def make_tiramisu_objects(self, xmlroot, creolefunc_file): + def make_tiramisu_objects(self, xmlroot, eosfunc): elt = Elt({'name': 'baseoption'}) - if creolefunc_file is None: + if eosfunc is None: self.eosfunc = None else: - self.eosfunc = imp.load_source('eosfunc', creolefunc_file) + self.eosfunc = imp.load_source('eosfunc', eosfunc) family = Family(elt, self.booleans, self.storage, self.eosfunc) self.storage.add('.', family) @@ -148,12 +149,12 @@ class PopulateTiramisuObjects(object): if elt == 'family': xmlelts = [] actions = None - # `creole` family has to be loaded before any other family - # because `extra` family could use `creole` variables. + # VARIABLE_NAMESPACE family has to be loaded before any other family + # because `extra` family could use `VARIABLE_NAMESPACE` variables. # `actions` family has to be loaded at the very end - # because it may use `creole` or `extra` variables + # because it may use `VARIABLE_NAMESPACE` or `extra` variables for xml in xmlelts_: - if xml.attrib['name'] == 'creole': + if xml.attrib['name'] == VARIABLE_NAMESPACE: xmlelts.insert(0, xml) elif xml.attrib['name'] == 'actions': actions = xml diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py index 93f7c152..e93a58f2 100644 --- a/src/rougail/objspace.py +++ b/src/rougail/objspace.py @@ -4,11 +4,11 @@ as an input and outputs a human readable flatened XML Sample usage:: - >>> from creole.objspace import CreoleObjSpace - >>> eolobj = CreoleObjSpace('/usr/share/creole/creole.dtd') - >>> eolobj.create_or_populate_from_xml('creole', ['/usr/share/eole/creole/dicos']) + >>> from rougail.objspace import CreoleObjSpace + >>> eolobj = CreoleObjSpace('/usr/share/rougail/rougail.dtd') + >>> eolobj.create_or_populate_from_xml('rougail', ['/usr/share/eole/rougail/dicos']) >>> eolobj.space_visitor() - >>> eolobj.save('/tmp/creole_flatened_output.xml') + >>> eolobj.save('/tmp/rougail_flatened_output.xml') The CreoleObjSpace @@ -28,7 +28,7 @@ from lxml.etree import Element, SubElement # pylint: disable=E0611 from .i18n import _ from .xmlreflector import XMLReflector, HIGH_COMPATIBILITY -from .annotator import ERASED_ATTRIBUTES, ServiceAnnotator, SpaceAnnotator +from .annotator import ERASED_ATTRIBUTES, VARIABLE_NAMESPACE, ServiceAnnotator, SpaceAnnotator from .utils import normalize_family from .error import CreoleOperationError, SpaceObjShallNotBeUpdated, CreoleDictConsistencyError from .path import Path @@ -175,41 +175,41 @@ class CreoleObjSpace: if HIGH_COMPATIBILITY and child.tag == 'value' and child.text == None: # FIXME should not be here continue - # creole objects creation + # variable objects creation try: - creoleobj = self.generate_creoleobj(child, + variableobj = self.generate_variableobj(child, space, namespace, ) except SpaceObjShallNotBeUpdated: continue self.set_text_to_obj(child, - creoleobj, + variableobj, ) self.set_xml_attributes_to_obj(child, - creoleobj, + variableobj, ) - self.creoleobj_tree_visitor(child, - creoleobj, + self.variableobj_tree_visitor(child, + variableobj, namespace, ) - self.fill_creoleobj_path_attribute(space, + self.fill_variableobj_path_attribute(space, child, namespace, document, - creoleobj, + variableobj, ) - self.add_to_tree_structure(creoleobj, + self.add_to_tree_structure(variableobj, space, child, ) if list(child) != []: self.xml_parse_document(child, - creoleobj, + variableobj, namespace, ) - def generate_creoleobj(self, + def generate_variableobj(self, child, space, namespace, @@ -217,24 +217,24 @@ class CreoleObjSpace: """ instanciates or creates Creole Object Subspace objects """ - creoleobj = getattr(self, child.tag)() - if isinstance(creoleobj, self.Redefinable): - creoleobj = self.create_or_update_redefinable_object(child.attrib, + variableobj = getattr(self, child.tag)() + if isinstance(variableobj, self.Redefinable): + variableobj = self.create_or_update_redefinable_object(child.attrib, space, child, namespace, ) - elif isinstance(creoleobj, self.Atom) and child.tag in vars(space): + elif isinstance(variableobj, self.Atom) and child.tag in vars(space): # instanciates an object from the CreoleObjSpace's builtins types # example : child.tag = constraints -> a self.Constraints() object is created # this Atom instance has to be a singleton here # we do not re-create it, we reuse it - creoleobj = getattr(space, child.tag) + variableobj = getattr(space, child.tag) self.create_tree_structure(space, child, - creoleobj, + variableobj, ) - return creoleobj + return variableobj def create_or_update_redefinable_object(self, subspace, @@ -296,7 +296,7 @@ class CreoleObjSpace: def create_tree_structure(self, space, child, - creoleobj, + variableobj, ): # pylint: disable=R0201 """ Builds the tree structure of the object space here @@ -310,17 +310,17 @@ class CreoleObjSpace: space.value = list() """ if child.tag not in vars(space): - if isinstance(creoleobj, self.Redefinable): + if isinstance(variableobj, self.Redefinable): setattr(space, child.tag, OrderedDict()) - elif isinstance(creoleobj, self.UnRedefinable): + elif isinstance(variableobj, self.UnRedefinable): setattr(space, child.tag, []) - elif not isinstance(creoleobj, self.Atom): # pragma: no cover + elif not isinstance(variableobj, self.Atom): # pragma: no cover raise CreoleOperationError(_("Creole object {} " - "has a wrong type").format(type(creoleobj))) + "has a wrong type").format(type(variableobj))) def is_already_exists(self, name, space, child, namespace): if isinstance(space, self.family): # pylint: disable=E1101 - if namespace != 'creole': + if namespace != VARIABLE_NAMESPACE: name = space.path + '.' + name return self.paths.path_is_defined(name) if child.tag == 'family': @@ -353,14 +353,14 @@ class CreoleObjSpace: else: norm_name = name return getattr(family, variable.tag)[norm_name] - if namespace == 'creole': + if namespace == VARIABLE_NAMESPACE: path = name else: path = family.path + '.' + name old_family_name = self.paths.get_variable_family_name(path) if normalize_family(family.name) == old_family_name: return getattr(family, variable.tag)[name] - old_family = self.space.variables['creole'].family[old_family_name] # pylint: disable=E1101 + old_family = self.space.variables[VARIABLE_NAMESPACE].family[old_family_name] # pylint: disable=E1101 variable_obj = old_family.variable[name] del old_family.variable[name] if 'variable' not in vars(family): @@ -399,23 +399,23 @@ class CreoleObjSpace: del condition.target[idx] def add_to_tree_structure(self, - creoleobj, + variableobj, space, child, ): # pylint: disable=R0201 - if isinstance(creoleobj, self.Redefinable): - name = creoleobj.name + if isinstance(variableobj, self.Redefinable): + name = variableobj.name if child.tag == 'family': name = normalize_family(name) - getattr(space, child.tag)[name] = creoleobj - elif isinstance(creoleobj, self.UnRedefinable): - getattr(space, child.tag).append(creoleobj) + getattr(space, child.tag)[name] = variableobj + elif isinstance(variableobj, self.UnRedefinable): + getattr(space, child.tag).append(variableobj) else: - setattr(space, child.tag, creoleobj) + setattr(space, child.tag, variableobj) def set_text_to_obj(self, child, - creoleobj, + variableobj, ): if child.text is None: text = None @@ -423,20 +423,20 @@ class CreoleObjSpace: text = child.text.strip() if text: if child.tag in self.forced_text_elts_as_name: - creoleobj.name = text + variableobj.name = text else: - creoleobj.text = text + variableobj.text = text def set_xml_attributes_to_obj(self, child, - creoleobj, + variableobj, ): redefine = self.convert_boolean(child.attrib.get('redefine', False)) - has_value = hasattr(creoleobj, 'value') + has_value = hasattr(variableobj, 'value') if HIGH_COMPATIBILITY and has_value: has_value = len(child) != 1 or child[0].text != None if redefine is True and child.tag == 'variable' and has_value and len(child) != 0: - del creoleobj.value + del variableobj.value for attr, val in child.attrib.items(): if redefine and attr in UNREDEFINABLE: # UNREDEFINABLE concerns only 'variable' node so we can fix name @@ -445,9 +445,9 @@ class CreoleObjSpace: raise CreoleDictConsistencyError(_(f'cannot redefine attribute {attr} for variable {name}')) if attr in self.booleans_attributs: val = self.convert_boolean(val) - if not (attr == 'name' and getattr(creoleobj, 'name', None) != None): - setattr(creoleobj, attr, val) - keys = list(vars(creoleobj).keys()) + if not (attr == 'name' and getattr(variableobj, 'name', None) != None): + setattr(variableobj, attr, val) + keys = list(vars(variableobj).keys()) for incompatible in INCOMPATIBLE_ATTRIBUTES: found = False for inc in incompatible: @@ -456,33 +456,33 @@ class CreoleObjSpace: raise CreoleDictConsistencyError(_('those attributes are incompatible {}').format(incompatible)) found = True - def creoleobj_tree_visitor(self, + def variableobj_tree_visitor(self, child, - creoleobj, + variableobj, namespace, ): """Creole object tree manipulations """ if child.tag == 'variable': if child.attrib.get('remove_check', False): - self.remove_check(creoleobj.name) + self.remove_check(variableobj.name) if child.attrib.get('remove_condition', False): - self.remove_condition(creoleobj.name) + self.remove_condition(variableobj.name) if child.tag in ['fill', 'check']: # if variable is a redefine in current dictionary - # XXX not working with variable not in creole and in leader/followers - creoleobj.redefine = child.attrib['target'] in self.redefine_variables - if not hasattr(creoleobj, 'index'): - creoleobj.index = self.index + # XXX not working with variable not in variable and in leader/followers + variableobj.redefine = child.attrib['target'] in self.redefine_variables + if not hasattr(variableobj, 'index'): + variableobj.index = self.index if child.tag in ['fill', 'condition', 'check', 'action']: - creoleobj.namespace = namespace + variableobj.namespace = namespace - def fill_creoleobj_path_attribute(self, + def fill_variableobj_path_attribute(self, space, child, namespace, document, - creoleobj, + variableobj, ): # pylint: disable=R0913 """Fill self.paths attributes """ @@ -494,9 +494,9 @@ class CreoleObjSpace: child.attrib['name'], family_name, document.attrib.get('dynamic') != None, - creoleobj) + variableobj) if child.attrib.get('redefine', 'False') == 'True': - if namespace == 'creole': + if namespace == VARIABLE_NAMESPACE: self.redefine_variables.append(child.attrib['name']) else: self.redefine_variables.append(namespace + '.' + family_name + '.' + @@ -504,13 +504,13 @@ class CreoleObjSpace: elif child.tag == 'family': family_name = normalize_family(child.attrib['name']) - if namespace != 'creole': + if namespace != VARIABLE_NAMESPACE: family_name = namespace + '.' + family_name self.paths.add_family(namespace, family_name, - creoleobj, + variableobj, ) - creoleobj.path = self.paths.get_family_path(family_name, namespace) + variableobj.path = self.paths.get_family_path(family_name, namespace) def space_visitor(self, eosfunc_file): # pylint: disable=C0111 ServiceAnnotator(self) @@ -592,7 +592,11 @@ class CreoleObjSpace: if space is not None: node.attrib[name] = str(space) - def _xml_export(self, node, space, node_name='creole'): + def _xml_export(self, + node, + space, + node_name=VARIABLE_NAMESPACE, + ): for name in self.get_attributes(space): subspace = getattr(space, name) self._sub_xml_export(name, node, node_name, subspace, space) diff --git a/src/rougail/path.py b/src/rougail/path.py index 9d7995ee..88215e94 100644 --- a/src/rougail/path.py +++ b/src/rougail/path.py @@ -1,6 +1,7 @@ from .i18n import _ from .utils import normalize_family from .error import CreoleOperationError, CreoleDictConsistencyError +from .annotator import VARIABLE_NAMESPACE class Path: @@ -17,11 +18,11 @@ class Path: def add_family(self, namespace: str, name: str, - creoleobj: str, + variableobj: str, ) -> str: # pylint: disable=C0111 self.families[name] = dict(name=name, namespace=namespace, - creoleobj=creoleobj, + variableobj=variableobj, ) def get_family_path(self, @@ -34,7 +35,7 @@ class Path: check_name=False, allow_dot=True, )] - if dico['namespace'] != 'creole' and current_namespace != dico['namespace']: + if dico['namespace'] != VARIABLE_NAMESPACE and current_namespace != dico['namespace']: raise CreoleDictConsistencyError(_('A family located in the {} namespace ' 'shall not be used in the {} namespace').format( dico['namespace'], current_namespace)) @@ -49,7 +50,7 @@ class Path: if name not in self.families: raise CreoleDictConsistencyError(_('unknown family {}').format(name)) dico = self.families[name] - return dico['creoleobj'] + return dico['variableobj'] # Leadership def set_leader(self, @@ -58,7 +59,7 @@ class Path: name: str, leader_name: str, ) -> None: # pylint: disable=C0111 - if namespace != 'creole': + if namespace != VARIABLE_NAMESPACE: # need rebuild path and move object in new path old_path = namespace + '.' + leader_family_name + '.' + name dico = self._get_variable(old_path) @@ -68,7 +69,7 @@ class Path: new_path, dico['family'], False, - dico['creoleobj'], + dico['variableobj'], ) name = new_path dico = self._get_variable(name) @@ -86,9 +87,9 @@ class Path: name: str, family: str, is_dynamic: bool, - creoleobj, + variableobj, ) -> str: # pylint: disable=C0111 - if namespace == 'creole' or '.' in name: + if namespace == VARIABLE_NAMESPACE or '.' in name: varname = name else: varname = '.'.join([namespace, family, name]) @@ -97,7 +98,7 @@ class Path: namespace=namespace, leader=None, is_dynamic=is_dynamic, - creoleobj=creoleobj) + variableobj=variableobj) def get_variable_name(self, name, @@ -107,7 +108,7 @@ class Path: def get_variable_obj(self, name:str, ) -> 'Variable': # pylint: disable=C0111 - return self._get_variable(name)['creoleobj'] + return self._get_variable(name)['variableobj'] def get_variable_family_name(self, name: str, @@ -143,7 +144,7 @@ class Path: else: dico = self._get_variable(name) if not allow_source: - if dico['namespace'] not in ['creole', 'services'] and current_namespace != dico['namespace']: + if dico['namespace'] not in [VARIABLE_NAMESPACE, 'services'] and current_namespace != dico['namespace']: raise CreoleDictConsistencyError(_('A variable located in the {} namespace ' 'shall not be used in the {} namespace').format( dico['namespace'], current_namespace)) @@ -169,7 +170,7 @@ class Path: with_suffix: bool=False, ) -> str: if name not in self.variables: - if name.startswith('creole.'): + if name.startswith(f'{VARIABLE_NAMESPACE}.'): name = name.split('.')[-1] if name not in self.variables: for var_name, variable in self.variables.items(): diff --git a/src/rougail/template.py b/src/rougail/template.py index ce214061..25013de5 100644 --- a/src/rougail/template.py +++ b/src/rougail/template.py @@ -18,6 +18,8 @@ from tempfile import mktemp from Cheetah import Parser +from .annotator import VARIABLE_NAMESPACE + # l'encoding du template est déterminé par une regexp (encodingDirectiveRE dans Parser.py) # il cherche un ligne qui ressemble à '#encoding: utf-8 @@ -280,25 +282,25 @@ class CreoleTemplateEngine: if not func.startswith('_'): eos[func] = getattr(eosfunc, func) self.eosfunc = eos - self.creole_variables_dict = {} + self.rougail_variables_dict = {} - async def load_eole_variables_creole(self, - optiondescription): + async def load_eole_variables_rougail(self, + optiondescription): for option in await optiondescription.list('all'): if await option.option.isoptiondescription(): if await option.option.isleadership(): for idx, suboption in enumerate(await option.list('all')): if idx == 0: leader = CreoleLeader(await suboption.value.get()) - self.creole_variables_dict[await suboption.option.name()] = leader + self.rougail_variables_dict[await suboption.option.name()] = leader else: await leader.add_follower(self.config, await suboption.option.name(), await suboption.option.path()) else: - await self.load_eole_variables_creole(option) + await self.load_eole_variables_rougail(option) else: - self.creole_variables_dict[await option.option.name()] = await option.value.get() + self.rougail_variables_dict[await option.option.name()] = await option.value.get() async def load_eole_variables(self, namespace, @@ -320,7 +322,7 @@ class CreoleTemplateEngine: else: variables[await variable.option.name()] = await variable.value.get() families[await family.option.name()] = CreoleExtra(variables) - self.creole_variables_dict[namespace] = CreoleExtra(families) + self.rougail_variables_dict[namespace] = CreoleExtra(families) def patch_template(self, filename: str): @@ -359,10 +361,11 @@ class CreoleTemplateEngine: log.info(_(f"Cheetah processing: '{destfilename}'")) try: cheetah_template = CheetahTemplate(source, - self.creole_variables_dict, + self.rougail_variables_dict, self.eosfunc, destfilename, - variable) + variable, + ) data = str(cheetah_template) except CheetahNotFound as err: varname = err.args[0][13:-1] @@ -422,8 +425,8 @@ class CreoleTemplateEngine: namespace = await option.option.name() if namespace in ['services', 'actions']: continue - elif namespace == 'creole': - await self.load_eole_variables_creole(option) + elif namespace == VARIABLE_NAMESPACE: + await self.load_eole_variables_rougail(option) else: await self.load_eole_variables(namespace, option) diff --git a/tests/flattener_dicos/00load_autofreeze/makedict/base.json b/tests/flattener_dicos/00load_autofreeze/makedict/base.json index 4909ab10..6e7af070 100644 --- a/tests/flattener_dicos/00load_autofreeze/makedict/base.json +++ b/tests/flattener_dicos/00load_autofreeze/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.module_instancie": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.module_instancie": "non"} diff --git a/tests/flattener_dicos/00load_autofreeze/result/00-base.xml b/tests/flattener_dicos/00load_autofreeze/result/00-base.xml index 7cb08d61..81ab03d4 100644 --- a/tests/flattener_dicos/00load_autofreeze/result/00-base.xml +++ b/tests/flattener_dicos/00load_autofreeze/result/00-base.xml @@ -1,6 +1,6 @@ - + basic @@ -10,7 +10,7 @@ non mandatory basic - auto_frozen + auto_frozen non diff --git a/tests/flattener_dicos/00load_autofreezeexpert/makedict/base.json b/tests/flattener_dicos/00load_autofreezeexpert/makedict/base.json index 4909ab10..6e7af070 100644 --- a/tests/flattener_dicos/00load_autofreezeexpert/makedict/base.json +++ b/tests/flattener_dicos/00load_autofreezeexpert/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.module_instancie": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.module_instancie": "non"} diff --git a/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml b/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml index 0c50974c..f66da60c 100644 --- a/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml +++ b/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -10,7 +10,7 @@ non mandatory expert - auto_frozen + auto_frozen non diff --git a/tests/flattener_dicos/00load_autosave/makedict/base.json b/tests/flattener_dicos/00load_autosave/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/00load_autosave/makedict/base.json +++ b/tests/flattener_dicos/00load_autosave/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/00load_autosave/result/00-base.xml b/tests/flattener_dicos/00load_autosave/result/00-base.xml index e85260bf..3549c7a1 100644 --- a/tests/flattener_dicos/00load_autosave/result/00-base.xml +++ b/tests/flattener_dicos/00load_autosave/result/00-base.xml @@ -1,6 +1,6 @@ - + basic diff --git a/tests/flattener_dicos/00load_autosaveexpert/makedict/base.json b/tests/flattener_dicos/00load_autosaveexpert/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/00load_autosaveexpert/makedict/base.json +++ b/tests/flattener_dicos/00load_autosaveexpert/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml b/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml index 62b4e978..1397f9bd 100644 --- a/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml +++ b/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml @@ -1,6 +1,6 @@ - + expert diff --git a/tests/flattener_dicos/00load_comment/makedict/base.json b/tests/flattener_dicos/00load_comment/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/00load_comment/makedict/base.json +++ b/tests/flattener_dicos/00load_comment/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/00load_comment/result/00-base.xml b/tests/flattener_dicos/00load_comment/result/00-base.xml index 1a57bb8d..f6b2bc8d 100644 --- a/tests/flattener_dicos/00load_comment/result/00-base.xml +++ b/tests/flattener_dicos/00load_comment/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/00load_notype/makedict/base.json b/tests/flattener_dicos/00load_notype/makedict/base.json index b13db160..25dbe763 100644 --- a/tests/flattener_dicos/00load_notype/makedict/base.json +++ b/tests/flattener_dicos/00load_notype/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.without_type": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.without_type": "non"} diff --git a/tests/flattener_dicos/00load_notype/result/00-base.xml b/tests/flattener_dicos/00load_notype/result/00-base.xml index 54fe43d1..35d6e59f 100644 --- a/tests/flattener_dicos/00load_notype/result/00-base.xml +++ b/tests/flattener_dicos/00load_notype/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/00load_save/makedict/base.json b/tests/flattener_dicos/00load_save/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/00load_save/makedict/base.json +++ b/tests/flattener_dicos/00load_save/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/00load_save/result/00-base.xml b/tests/flattener_dicos/00load_save/result/00-base.xml index 1a57bb8d..f6b2bc8d 100644 --- a/tests/flattener_dicos/00load_save/result/00-base.xml +++ b/tests/flattener_dicos/00load_save/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/00load_subfolder/makedict/base.json b/tests/flattener_dicos/00load_subfolder/makedict/base.json index dcccb00c..b58d6e7c 100644 --- a/tests/flattener_dicos/00load_subfolder/makedict/base.json +++ b/tests/flattener_dicos/00load_subfolder/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/00load_subfolder/result/00-base.xml b/tests/flattener_dicos/00load_subfolder/result/00-base.xml index f7e00d90..684ba2ea 100644 --- a/tests/flattener_dicos/00load_subfolder/result/00-base.xml +++ b/tests/flattener_dicos/00load_subfolder/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/01auto_base/makedict/base.json b/tests/flattener_dicos/01auto_base/makedict/base.json index 530abf24..86ba9458 100644 --- a/tests/flattener_dicos/01auto_base/makedict/base.json +++ b/tests/flattener_dicos/01auto_base/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/01auto_base/result/00-base.xml b/tests/flattener_dicos/01auto_base/result/00-base.xml index 5ff153fb..0bb18d0b 100644 --- a/tests/flattener_dicos/01auto_base/result/00-base.xml +++ b/tests/flattener_dicos/01auto_base/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -12,7 +12,7 @@ mandatory normal - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 diff --git a/tests/flattener_dicos/01auto_withoutparam/makedict/base.json b/tests/flattener_dicos/01auto_withoutparam/makedict/base.json index 530abf24..86ba9458 100644 --- a/tests/flattener_dicos/01auto_withoutparam/makedict/base.json +++ b/tests/flattener_dicos/01auto_withoutparam/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml b/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml index 441dc24b..67e65176 100644 --- a/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml +++ b/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/01base_multi/makedict/base.json b/tests/flattener_dicos/01base_multi/makedict/base.json index f4597dea..b11e88ef 100644 --- a/tests/flattener_dicos/01base_multi/makedict/base.json +++ b/tests/flattener_dicos/01base_multi/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": ["non"]} +{"rougail.general.mode_conteneur_actif": ["non"]} diff --git a/tests/flattener_dicos/01base_multi/result/00-base.xml b/tests/flattener_dicos/01base_multi/result/00-base.xml index aa8240e0..4f0fe326 100644 --- a/tests/flattener_dicos/01base_multi/result/00-base.xml +++ b/tests/flattener_dicos/01base_multi/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/01base_submulti/makedict/base.json b/tests/flattener_dicos/01base_submulti/makedict/base.json index 179a0b61..62e28070 100644 --- a/tests/flattener_dicos/01base_submulti/makedict/base.json +++ b/tests/flattener_dicos/01base_submulti/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": [["non"]]} +{"rougail.general.mode_conteneur_actif": [["non"]]} diff --git a/tests/flattener_dicos/01base_submulti/result/00-base.xml b/tests/flattener_dicos/01base_submulti/result/00-base.xml index e0085fb3..6287f508 100644 --- a/tests/flattener_dicos/01base_submulti/result/00-base.xml +++ b/tests/flattener_dicos/01base_submulti/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/01fill_autofreeze/makedict/base.json b/tests/flattener_dicos/01fill_autofreeze/makedict/base.json index 58bc35f0..47b2052a 100644 --- a/tests/flattener_dicos/01fill_autofreeze/makedict/base.json +++ b/tests/flattener_dicos/01fill_autofreeze/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non", "creole.general.module_instancie": "non"} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non", "rougail.general.module_instancie": "non"} diff --git a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml index 7af4a94e..7c06b41c 100644 --- a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml +++ b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml @@ -1,6 +1,6 @@ - + basic @@ -10,9 +10,9 @@ non mandatory basic - auto_frozen + auto_frozen - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 diff --git a/tests/flattener_dicos/01fill_autosave/makedict/base.json b/tests/flattener_dicos/01fill_autosave/makedict/base.json index 530abf24..86ba9458 100644 --- a/tests/flattener_dicos/01fill_autosave/makedict/base.json +++ b/tests/flattener_dicos/01fill_autosave/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/01fill_autosave/result/00-base.xml b/tests/flattener_dicos/01fill_autosave/result/00-base.xml index 79cae590..ca2e6af4 100644 --- a/tests/flattener_dicos/01fill_autosave/result/00-base.xml +++ b/tests/flattener_dicos/01fill_autosave/result/00-base.xml @@ -1,6 +1,6 @@ - + basic @@ -10,7 +10,7 @@ mandatory basic - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 diff --git a/tests/flattener_dicos/01fill_base/makedict/base.json b/tests/flattener_dicos/01fill_base/makedict/base.json index 530abf24..86ba9458 100644 --- a/tests/flattener_dicos/01fill_base/makedict/base.json +++ b/tests/flattener_dicos/01fill_base/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/01fill_base/result/00-base.xml b/tests/flattener_dicos/01fill_base/result/00-base.xml index 5ff153fb..0bb18d0b 100644 --- a/tests/flattener_dicos/01fill_base/result/00-base.xml +++ b/tests/flattener_dicos/01fill_base/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -12,7 +12,7 @@ mandatory normal - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 diff --git a/tests/flattener_dicos/01fill_baseaccent/makedict/base.json b/tests/flattener_dicos/01fill_baseaccent/makedict/base.json index 530abf24..86ba9458 100644 --- a/tests/flattener_dicos/01fill_baseaccent/makedict/base.json +++ b/tests/flattener_dicos/01fill_baseaccent/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml index ef70b6a8..dffdeca9 100644 --- a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml +++ b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -12,7 +12,7 @@ mandatory normal - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 diff --git a/tests/flattener_dicos/01fill_mandatory/makedict/base.json b/tests/flattener_dicos/01fill_mandatory/makedict/base.json index 530abf24..86ba9458 100644 --- a/tests/flattener_dicos/01fill_mandatory/makedict/base.json +++ b/tests/flattener_dicos/01fill_mandatory/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml index 57be5d28..33ab0598 100644 --- a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml @@ -1,13 +1,13 @@ - + normal mandatory expert - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 diff --git a/tests/flattener_dicos/01fill_number/makedict/base.json b/tests/flattener_dicos/01fill_number/makedict/base.json index 530abf24..86ba9458 100644 --- a/tests/flattener_dicos/01fill_number/makedict/base.json +++ b/tests/flattener_dicos/01fill_number/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/01fill_number/result/00-base.xml b/tests/flattener_dicos/01fill_number/result/00-base.xml index 2a3c6c80..54dbe833 100644 --- a/tests/flattener_dicos/01fill_number/result/00-base.xml +++ b/tests/flattener_dicos/01fill_number/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/01fill_optional/makedict/base.json b/tests/flattener_dicos/01fill_optional/makedict/base.json index 530abf24..86ba9458 100644 --- a/tests/flattener_dicos/01fill_optional/makedict/base.json +++ b/tests/flattener_dicos/01fill_optional/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/01fill_optional/result/00-base.xml b/tests/flattener_dicos/01fill_optional/result/00-base.xml index 5ff153fb..0bb18d0b 100644 --- a/tests/flattener_dicos/01fill_optional/result/00-base.xml +++ b/tests/flattener_dicos/01fill_optional/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -12,7 +12,7 @@ mandatory normal - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 diff --git a/tests/flattener_dicos/01separator_base/makedict/base.json b/tests/flattener_dicos/01separator_base/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/01separator_base/makedict/base.json +++ b/tests/flattener_dicos/01separator_base/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/01separator_base/result/00-base.xml b/tests/flattener_dicos/01separator_base/result/00-base.xml index 026c68d4..01849b18 100644 --- a/tests/flattener_dicos/01separator_base/result/00-base.xml +++ b/tests/flattener_dicos/01separator_base/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -15,7 +15,7 @@ - Établissement + Établissement diff --git a/tests/flattener_dicos/01separator_neverhidden/makedict/base.json b/tests/flattener_dicos/01separator_neverhidden/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/01separator_neverhidden/makedict/base.json +++ b/tests/flattener_dicos/01separator_neverhidden/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml b/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml index 46dede28..385282dd 100644 --- a/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml +++ b/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -15,7 +15,7 @@ - Établissement + Établissement diff --git a/tests/flattener_dicos/10autosave_hidden/makedict/base.json b/tests/flattener_dicos/10autosave_hidden/makedict/base.json index 359ba452..6f9b1c86 100644 --- a/tests/flattener_dicos/10autosave_hidden/makedict/base.json +++ b/tests/flattener_dicos/10autosave_hidden/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.autosavevar": null} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": null} diff --git a/tests/flattener_dicos/10autosave_hidden/result/00-base.xml b/tests/flattener_dicos/10autosave_hidden/result/00-base.xml index 2a31fb2e..d7603fff 100644 --- a/tests/flattener_dicos/10autosave_hidden/result/00-base.xml +++ b/tests/flattener_dicos/10autosave_hidden/result/00-base.xml @@ -1,6 +1,6 @@ - + basic diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json b/tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json index 359ba452..6f9b1c86 100644 --- a/tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json +++ b/tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.autosavevar": null} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": null} diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml b/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml index e00e9035..35929cce 100644 --- a/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml +++ b/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml @@ -1,6 +1,6 @@ - + basic @@ -16,9 +16,9 @@ force_store_value basic - frozen - hidden - force_default_on_freeze + frozen + hidden + force_default_on_freeze oui diff --git a/tests/flattener_dicos/10check_base/makedict/base.json b/tests/flattener_dicos/10check_base/makedict/base.json index 43996096..0279c93a 100644 --- a/tests/flattener_dicos/10check_base/makedict/base.json +++ b/tests/flattener_dicos/10check_base/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "b", "creole.general.int": null} +{"rougail.general.mode_conteneur_actif": "b", "rougail.general.int": null} diff --git a/tests/flattener_dicos/10check_base/result/00-base.xml b/tests/flattener_dicos/10check_base/result/00-base.xml index 908f8585..05c8edac 100644 --- a/tests/flattener_dicos/10check_base/result/00-base.xml +++ b/tests/flattener_dicos/10check_base/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10check_option/makedict/base.json b/tests/flattener_dicos/10check_option/makedict/base.json index 518cf56b..fa46e9fc 100644 --- a/tests/flattener_dicos/10check_option/makedict/base.json +++ b/tests/flattener_dicos/10check_option/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "b", "creole.general.int2": 100, "creole.general.int": null} +{"rougail.general.mode_conteneur_actif": "b", "rougail.general.int2": 100, "rougail.general.int": null} diff --git a/tests/flattener_dicos/10check_option/result/00-base.xml b/tests/flattener_dicos/10check_option/result/00-base.xml index 967c5ecf..3fe50ff7 100644 --- a/tests/flattener_dicos/10check_option/result/00-base.xml +++ b/tests/flattener_dicos/10check_option/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -16,7 +16,7 @@ 0 - creole.general.int2 + rougail.general.int2 normal diff --git a/tests/flattener_dicos/10check_optional/makedict/base.json b/tests/flattener_dicos/10check_optional/makedict/base.json index cbc8625f..50c9a71e 100644 --- a/tests/flattener_dicos/10check_optional/makedict/base.json +++ b/tests/flattener_dicos/10check_optional/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "b", "creole.general.int": null, "creole.general.int2": null} +{"rougail.general.mode_conteneur_actif": "b", "rougail.general.int": null, "rougail.general.int2": null} diff --git a/tests/flattener_dicos/10check_optional/result/00-base.xml b/tests/flattener_dicos/10check_optional/result/00-base.xml index 9cc336e6..ddabcb9a 100644 --- a/tests/flattener_dicos/10check_optional/result/00-base.xml +++ b/tests/flattener_dicos/10check_optional/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -10,7 +10,7 @@ - creole.general.int2 + rougail.general.int2 normal diff --git a/tests/flattener_dicos/10check_valid_differ/makedict/base.json b/tests/flattener_dicos/10check_valid_differ/makedict/base.json index dc3eb091..bf7550e6 100644 --- a/tests/flattener_dicos/10check_valid_differ/makedict/base.json +++ b/tests/flattener_dicos/10check_valid_differ/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/10check_valid_differ/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ/result/00-base.xml index 9b36f786..3067b49e 100644 --- a/tests/flattener_dicos/10check_valid_differ/result/00-base.xml +++ b/tests/flattener_dicos/10check_valid_differ/result/00-base.xml @@ -1,11 +1,11 @@ - + normal - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 oui non diff --git a/tests/flattener_dicos/10check_valid_differ_add/makedict/base.json b/tests/flattener_dicos/10check_valid_differ_add/makedict/base.json index 6b217817..32db0bf5 100644 --- a/tests/flattener_dicos/10check_valid_differ_add/makedict/base.json +++ b/tests/flattener_dicos/10check_valid_differ_add/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general.mode_conteneur_actif3": "oui"} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non", "rougail.general.mode_conteneur_actif3": "oui"} diff --git a/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml index 49875577..9ae0cecd 100644 --- a/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml +++ b/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -26,16 +26,16 @@ - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 - creole.general.mode_conteneur_actif2 + rougail.general.mode_conteneur_actif2 - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 - creole.general.mode_conteneur_actif2 + rougail.general.mode_conteneur_actif2 mandatory normal diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/makedict/base.json b/tests/flattener_dicos/10check_valid_differ_removecheck/makedict/base.json index 6b217817..32db0bf5 100644 --- a/tests/flattener_dicos/10check_valid_differ_removecheck/makedict/base.json +++ b/tests/flattener_dicos/10check_valid_differ_removecheck/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general.mode_conteneur_actif3": "oui"} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non", "rougail.general.mode_conteneur_actif3": "oui"} diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml index a6cee741..3e442b48 100644 --- a/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml +++ b/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -26,10 +26,10 @@ - creole.general.mode_conteneur_actif1 + rougail.general.mode_conteneur_actif1 - creole.general.mode_conteneur_actif2 + rougail.general.mode_conteneur_actif2 mandatory normal diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/makedict/base.json b/tests/flattener_dicos/10check_valid_ipnetmask/makedict/base.json index 8e900373..7fe0b8af 100644 --- a/tests/flattener_dicos/10check_valid_ipnetmask/makedict/base.json +++ b/tests/flattener_dicos/10check_valid_ipnetmask/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.adresse_ip_eth0": null, "creole.general.adresse_netmask_eth0": null} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.adresse_ip_eth0": null, "rougail.general.adresse_netmask_eth0": null} diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml b/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml index 5bbc5953..ee6c8533 100644 --- a/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml +++ b/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml @@ -1,6 +1,6 @@ - + basic @@ -16,7 +16,7 @@ - creole.general.adresse_ip_eth0 + rougail.general.adresse_ip_eth0 mandatory basic diff --git a/tests/flattener_dicos/10leadership_append/makedict/base.json b/tests/flattener_dicos/10leadership_append/makedict/base.json index efadab16..346b748d 100644 --- a/tests/flattener_dicos/10leadership_append/makedict/base.json +++ b/tests/flattener_dicos/10leadership_append/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": [], "creole.general1.leader.follower3": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general1.leader.leader": [], "rougail.general1.leader.follower1": [], "rougail.general1.leader.follower2": [], "rougail.general1.leader.follower3": []} diff --git a/tests/flattener_dicos/10leadership_append/result/00-base.xml b/tests/flattener_dicos/10leadership_append/result/00-base.xml index b3d76d32..a760ca7d 100644 --- a/tests/flattener_dicos/10leadership_append/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_append/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -25,7 +25,7 @@ normal - creole.general1.leader.follower1 + rougail.general1.leader.follower1 diff --git a/tests/flattener_dicos/10leadership_auto/makedict/base.json b/tests/flattener_dicos/10leadership_auto/makedict/base.json index 1c87f8f8..330c847d 100644 --- a/tests/flattener_dicos/10leadership_auto/makedict/base.json +++ b/tests/flattener_dicos/10leadership_auto/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": [], "creole.general.leader.follower3": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": [], "rougail.general.leader.follower3": []} diff --git a/tests/flattener_dicos/10leadership_auto/result/00-base.xml b/tests/flattener_dicos/10leadership_auto/result/00-base.xml index fe58139d..d4ec7ef4 100644 --- a/tests/flattener_dicos/10leadership_auto/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_auto/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -28,7 +28,7 @@ hidden normal - creole.general.leader.follower1 + rougail.general.leader.follower1 @@ -37,7 +37,7 @@ hidden normal - creole.general.leader.leader + rougail.general.leader.leader diff --git a/tests/flattener_dicos/10leadership_autoleader/makedict/base.json b/tests/flattener_dicos/10leadership_autoleader/makedict/base.json index a5b9c7f6..3ff8a0ae 100644 --- a/tests/flattener_dicos/10leadership_autoleader/makedict/base.json +++ b/tests/flattener_dicos/10leadership_autoleader/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/10leadership_autoleader/result/00-base.xml b/tests/flattener_dicos/10leadership_autoleader/result/00-base.xml index 6fc71f0d..e752e967 100644 --- a/tests/flattener_dicos/10leadership_autoleader/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_autoleader/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -28,7 +28,7 @@ hidden normal - creole.general.leader.leader + rougail.general.leader.leader diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/makedict/base.json b/tests/flattener_dicos/10leadership_autoleader_expert/makedict/base.json index 631fdc62..903d2481 100644 --- a/tests/flattener_dicos/10leadership_autoleader_expert/makedict/base.json +++ b/tests/flattener_dicos/10leadership_autoleader_expert/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.leadermode.leader.leader": [], "creole.leadermode.leader.follower1": [], "creole.leadermode.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.leadermode.leader.leader": [], "rougail.leadermode.leader.follower1": [], "rougail.leadermode.leader.follower2": []} diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml b/tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml index 7c74227c..62ebc334 100644 --- a/tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml @@ -1,6 +1,6 @@ - + expert diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/makedict/base.json b/tests/flattener_dicos/10leadership_autosaveexpert/makedict/base.json index a5b9c7f6..3ff8a0ae 100644 --- a/tests/flattener_dicos/10leadership_autosaveexpert/makedict/base.json +++ b/tests/flattener_dicos/10leadership_autosaveexpert/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml b/tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml index 1a921c2a..25901650 100644 --- a/tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -22,7 +22,7 @@ expert - creole.general.leader.follower1 + rougail.general.leader.follower1 diff --git a/tests/flattener_dicos/10leadership_familyaccent/makedict/base.json b/tests/flattener_dicos/10leadership_familyaccent/makedict/base.json index a5b9c7f6..3ff8a0ae 100644 --- a/tests/flattener_dicos/10leadership_familyaccent/makedict/base.json +++ b/tests/flattener_dicos/10leadership_familyaccent/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml b/tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml index c1bf10b1..123f4b34 100644 --- a/tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -22,7 +22,7 @@ normal - creole.general.leader.follower1 + rougail.general.leader.follower1 diff --git a/tests/flattener_dicos/10leadership_leadermandatory/makedict/base.json b/tests/flattener_dicos/10leadership_leadermandatory/makedict/base.json index a5b9c7f6..3ff8a0ae 100644 --- a/tests/flattener_dicos/10leadership_leadermandatory/makedict/base.json +++ b/tests/flattener_dicos/10leadership_leadermandatory/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml b/tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml index 9c49bf25..111ee0dc 100644 --- a/tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml @@ -1,6 +1,6 @@ - + basic @@ -24,7 +24,7 @@ normal - creole.general.leader.follower1 + rougail.general.leader.follower1 diff --git a/tests/flattener_dicos/10leadership_mandatory/makedict/base.json b/tests/flattener_dicos/10leadership_mandatory/makedict/base.json index a5b9c7f6..3ff8a0ae 100644 --- a/tests/flattener_dicos/10leadership_mandatory/makedict/base.json +++ b/tests/flattener_dicos/10leadership_mandatory/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/10leadership_mandatory/result/00-base.xml b/tests/flattener_dicos/10leadership_mandatory/result/00-base.xml index 71215bec..657e8c46 100644 --- a/tests/flattener_dicos/10leadership_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_mandatory/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -23,7 +23,7 @@ normal - creole.general.leader.follower1 + rougail.general.leader.follower1 diff --git a/tests/flattener_dicos/10leadership_mandatoryfollower/makedict/base.json b/tests/flattener_dicos/10leadership_mandatoryfollower/makedict/base.json index 4ff9e4c6..c61597eb 100644 --- a/tests/flattener_dicos/10leadership_mandatoryfollower/makedict/base.json +++ b/tests/flattener_dicos/10leadership_mandatoryfollower/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.nut_monitor_netmask.nut_monitor_netmask": [], "creole.general.nut_monitor_netmask.nut_monitor_host": []} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.nut_monitor_netmask.nut_monitor_netmask": [], "rougail.general.nut_monitor_netmask.nut_monitor_host": []} diff --git a/tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml b/tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml index 871c120e..d04ebb09 100644 --- a/tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10leadership_multi/makedict/base.json b/tests/flattener_dicos/10leadership_multi/makedict/base.json index b51314de..3e5c28c6 100644 --- a/tests/flattener_dicos/10leadership_multi/makedict/base.json +++ b/tests/flattener_dicos/10leadership_multi/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": [], "creole.general1.leader1.leader1": [], "creole.general1.leader1.follower11": [], "creole.general1.leader1.follower21": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general1.leader.leader": [], "rougail.general1.leader.follower1": [], "rougail.general1.leader.follower2": [], "rougail.general1.leader1.leader1": [], "rougail.general1.leader1.follower11": [], "rougail.general1.leader1.follower21": []} diff --git a/tests/flattener_dicos/10leadership_multi/result/00-base.xml b/tests/flattener_dicos/10leadership_multi/result/00-base.xml index aaec8c90..c9cfb9c5 100644 --- a/tests/flattener_dicos/10leadership_multi/result/00-base.xml +++ b/tests/flattener_dicos/10leadership_multi/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -25,7 +25,7 @@ normal - creole.general1.leader.follower1 + rougail.general1.leader.follower1 diff --git a/tests/flattener_dicos/10load_disabled_if_in/makedict/base.json b/tests/flattener_dicos/10load_disabled_if_in/makedict/base.json index ee95cc57..25db64a2 100644 --- a/tests/flattener_dicos/10load_disabled_if_in/makedict/base.json +++ b/tests/flattener_dicos/10load_disabled_if_in/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml b/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml index 50c7e8e3..04e5f22e 100644 --- a/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -18,7 +18,7 @@ hidden mandatory normal - disabled + disabled non @@ -29,7 +29,7 @@ hidden mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/makedict/base.json b/tests/flattener_dicos/10load_disabled_if_in_none/makedict/base.json index ee95cc57..25db64a2 100644 --- a/tests/flattener_dicos/10load_disabled_if_in_none/makedict/base.json +++ b/tests/flattener_dicos/10load_disabled_if_in_none/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml b/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml index 8b34ce92..bfc5daef 100644 --- a/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -16,7 +16,7 @@ hidden mandatory normal - disabled + disabled non @@ -27,7 +27,7 @@ hidden mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent/makedict/base.json b/tests/flattener_dicos/10load_disabled_if_inaccent/makedict/base.json index 25520e4a..6d963f23 100644 --- a/tests/flattener_dicos/10load_disabled_if_inaccent/makedict/base.json +++ b/tests/flattener_dicos/10load_disabled_if_inaccent/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general2.mode_conteneur_actif3": "non"} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "rougail.general2.mode_conteneur_actif3": "non"} diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml b/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml index 72b61840..9c97fbff 100644 --- a/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -15,7 +15,7 @@ non mandatory normal - disabled + disabled non @@ -23,13 +23,13 @@ non mandatory normal - disabled + disabled non normal - disabled + disabled oui non diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/makedict/base.json b/tests/flattener_dicos/10load_disabledifin_fallback/makedict/base.json index cd6b4f1a..f91225f3 100644 --- a/tests/flattener_dicos/10load_disabledifin_fallback/makedict/base.json +++ b/tests/flattener_dicos/10load_disabledifin_fallback/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml b/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml index 2d7f6260..02c80297 100644 --- a/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -23,7 +23,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/makedict/base.json b/tests/flattener_dicos/10load_disabledifin_whithouttype/makedict/base.json index ee95cc57..25db64a2 100644 --- a/tests/flattener_dicos/10load_disabledifin_whithouttype/makedict/base.json +++ b/tests/flattener_dicos/10load_disabledifin_whithouttype/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml b/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml index a261f0c6..17bf29a3 100644 --- a/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml +++ b/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -15,7 +15,7 @@ non mandatory normal - disabled + disabled non @@ -23,7 +23,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/10load_emptyvalue/makedict/base.json b/tests/flattener_dicos/10load_emptyvalue/makedict/base.json index 50891dbd..e907fc60 100644 --- a/tests/flattener_dicos/10load_emptyvalue/makedict/base.json +++ b/tests/flattener_dicos/10load_emptyvalue/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif2": null} +{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif2": null} diff --git a/tests/flattener_dicos/10load_emptyvalue/result/00-base.xml b/tests/flattener_dicos/10load_emptyvalue/result/00-base.xml index 8ca6ec36..2c327b82 100644 --- a/tests/flattener_dicos/10load_emptyvalue/result/00-base.xml +++ b/tests/flattener_dicos/10load_emptyvalue/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10load_frozenifin/makedict/base.json b/tests/flattener_dicos/10load_frozenifin/makedict/base.json index ee95cc57..25db64a2 100644 --- a/tests/flattener_dicos/10load_frozenifin/makedict/base.json +++ b/tests/flattener_dicos/10load_frozenifin/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/10load_frozenifin/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin/result/00-base.xml index 946256b0..b4030dc1 100644 --- a/tests/flattener_dicos/10load_frozenifin/result/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -15,9 +15,9 @@ non mandatory normal - frozen - hidden - force_default_on_freeze + frozen + hidden + force_default_on_freeze non @@ -25,9 +25,9 @@ non mandatory normal - frozen - hidden - force_default_on_freeze + frozen + hidden + force_default_on_freeze non diff --git a/tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json b/tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json index 4922432e..67a2eb8a 100644 --- a/tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json +++ b/tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml index 17c29e84..d3b33c68 100644 --- a/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -15,9 +15,9 @@ non mandatory normal - frozen - hidden - force_default_on_freeze + frozen + hidden + force_default_on_freeze non @@ -27,9 +27,9 @@ non mandatory normal - frozen - hidden - force_default_on_freeze + frozen + hidden + force_default_on_freeze non diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/makedict/base.json b/tests/flattener_dicos/10load_frozenifin_multiparam/makedict/base.json index dd51702f..3e41cfc3 100644 --- a/tests/flattener_dicos/10load_frozenifin_multiparam/makedict/base.json +++ b/tests/flattener_dicos/10load_frozenifin_multiparam/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "tous", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.condition": "tous", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml index d39c2006..7d43ce14 100644 --- a/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -16,12 +16,12 @@ non mandatory normal - frozen - hidden - force_default_on_freeze - frozen - hidden - force_default_on_freeze + frozen + hidden + force_default_on_freeze + frozen + hidden + force_default_on_freeze non @@ -29,12 +29,12 @@ non mandatory normal - frozen - hidden - force_default_on_freeze - frozen - hidden - force_default_on_freeze + frozen + hidden + force_default_on_freeze + frozen + hidden + force_default_on_freeze non diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/makedict/base.json b/tests/flattener_dicos/10load_frozenifin_noexist/makedict/base.json index dd51702f..3e41cfc3 100644 --- a/tests/flattener_dicos/10load_frozenifin_noexist/makedict/base.json +++ b/tests/flattener_dicos/10load_frozenifin_noexist/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "tous", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.condition": "tous", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml index bfc72f99..8d1d185a 100644 --- a/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml +++ b/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10load_leadership/makedict/base.json b/tests/flattener_dicos/10load_leadership/makedict/base.json index 7637dca2..a84a00cf 100644 --- a/tests/flattener_dicos/10load_leadership/makedict/base.json +++ b/tests/flattener_dicos/10load_leadership/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general1.leader.leader": [], "rougail.general1.leader.follower1": [], "rougail.general1.leader.follower2": []} diff --git a/tests/flattener_dicos/10load_leadership/result/00-base.xml b/tests/flattener_dicos/10load_leadership/result/00-base.xml index 16e4373f..529f2263 100644 --- a/tests/flattener_dicos/10load_leadership/result/00-base.xml +++ b/tests/flattener_dicos/10load_leadership/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -25,7 +25,7 @@ normal - creole.general1.leader.follower1 + rougail.general1.leader.follower1 diff --git a/tests/flattener_dicos/10load_leadership_default_multi/makedict/base.json b/tests/flattener_dicos/10load_leadership_default_multi/makedict/base.json index ccd15703..bab2c504 100644 --- a/tests/flattener_dicos/10load_leadership_default_multi/makedict/base.json +++ b/tests/flattener_dicos/10load_leadership_default_multi/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": ["non"], "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": ["non"], "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/10load_leadership_default_multi/result/00-base.xml b/tests/flattener_dicos/10load_leadership_default_multi/result/00-base.xml index bc430fc1..b6f8d146 100644 --- a/tests/flattener_dicos/10load_leadership_default_multi/result/00-base.xml +++ b/tests/flattener_dicos/10load_leadership_default_multi/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10load_leadership_default_submulti/makedict/base.json b/tests/flattener_dicos/10load_leadership_default_submulti/makedict/base.json index 7c8f0444..63ea34ae 100644 --- a/tests/flattener_dicos/10load_leadership_default_submulti/makedict/base.json +++ b/tests/flattener_dicos/10load_leadership_default_submulti/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": ["non"], "creole.general.leader.leader": ["leader"], "creole.general.leader.follower1": [["value"]], "creole.general.leader.follower2": [["value1", "value2"]]} +{"rougail.general.mode_conteneur_actif": ["non"], "rougail.general.leader.leader": ["leader"], "rougail.general.leader.follower1": [["value"]], "rougail.general.leader.follower2": [["value1", "value2"]]} diff --git a/tests/flattener_dicos/10load_leadership_default_submulti/result/00-base.xml b/tests/flattener_dicos/10load_leadership_default_submulti/result/00-base.xml index ee40188a..4b6e403c 100644 --- a/tests/flattener_dicos/10load_leadership_default_submulti/result/00-base.xml +++ b/tests/flattener_dicos/10load_leadership_default_submulti/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/makedict/base.json b/tests/flattener_dicos/10load_leadership_defaultmulti_leader/makedict/base.json index 4efe2c93..ef51ba28 100644 --- a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/makedict/base.json +++ b/tests/flattener_dicos/10load_leadership_defaultmulti_leader/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": ["non"], "creole.general.leader.leader": ["value"], "creole.general.leader.follower1": [null], "creole.general.leader.follower2": [null]} +{"rougail.general.mode_conteneur_actif": ["non"], "rougail.general.leader.leader": ["value"], "rougail.general.leader.follower1": [null], "rougail.general.leader.follower2": [null]} diff --git a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/result/00-base.xml b/tests/flattener_dicos/10load_leadership_defaultmulti_leader/result/00-base.xml index cc779b5e..7d38f6ab 100644 --- a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/result/00-base.xml +++ b/tests/flattener_dicos/10load_leadership_defaultmulti_leader/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10load_leadership_description/makedict/base.json b/tests/flattener_dicos/10load_leadership_description/makedict/base.json index 7637dca2..a84a00cf 100644 --- a/tests/flattener_dicos/10load_leadership_description/makedict/base.json +++ b/tests/flattener_dicos/10load_leadership_description/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general1.leader.leader": [], "rougail.general1.leader.follower1": [], "rougail.general1.leader.follower2": []} diff --git a/tests/flattener_dicos/10load_leadership_description/result/00-base.xml b/tests/flattener_dicos/10load_leadership_description/result/00-base.xml index 543524c9..a9f4468d 100644 --- a/tests/flattener_dicos/10load_leadership_description/result/00-base.xml +++ b/tests/flattener_dicos/10load_leadership_description/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -25,7 +25,7 @@ normal - creole.general1.leader.follower1 + rougail.general1.leader.follower1 diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/makedict/base.json b/tests/flattener_dicos/10load_leadership_normalize_family/makedict/base.json index dd3f25df..c2596da8 100644 --- a/tests/flattener_dicos/10load_leadership_normalize_family/makedict/base.json +++ b/tests/flattener_dicos/10load_leadership_normalize_family/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general_1.leader.leader": [], "creole.general_1.leader.follower1": [], "creole.general_1.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general_1.leader.leader": [], "rougail.general_1.leader.follower1": [], "rougail.general_1.leader.follower2": []} diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/result/00-base.xml b/tests/flattener_dicos/10load_leadership_normalize_family/result/00-base.xml index 1b3280ed..4b218f72 100644 --- a/tests/flattener_dicos/10load_leadership_normalize_family/result/00-base.xml +++ b/tests/flattener_dicos/10load_leadership_normalize_family/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10load_leadership_submulti/makedict/base.json b/tests/flattener_dicos/10load_leadership_submulti/makedict/base.json index 7637dca2..a84a00cf 100644 --- a/tests/flattener_dicos/10load_leadership_submulti/makedict/base.json +++ b/tests/flattener_dicos/10load_leadership_submulti/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general1.leader.leader": [], "creole.general1.leader.follower1": [], "creole.general1.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general1.leader.leader": [], "rougail.general1.leader.follower1": [], "rougail.general1.leader.follower2": []} diff --git a/tests/flattener_dicos/10load_leadership_submulti/result/00-base.xml b/tests/flattener_dicos/10load_leadership_submulti/result/00-base.xml index 2a49f80e..db7f01ec 100644 --- a/tests/flattener_dicos/10load_leadership_submulti/result/00-base.xml +++ b/tests/flattener_dicos/10load_leadership_submulti/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -25,7 +25,7 @@ normal - creole.general1.leader.follower1 + rougail.general1.leader.follower1 diff --git a/tests/flattener_dicos/10load_mandatoryifin/makedict/base.json b/tests/flattener_dicos/10load_mandatoryifin/makedict/base.json index ee95cc57..25db64a2 100644 --- a/tests/flattener_dicos/10load_mandatoryifin/makedict/base.json +++ b/tests/flattener_dicos/10load_mandatoryifin/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml b/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml index f8e99f2d..1530f04f 100644 --- a/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml +++ b/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -15,7 +15,7 @@ non mandatory normal - mandatory + mandatory non @@ -23,7 +23,7 @@ non mandatory normal - mandatory + mandatory non diff --git a/tests/flattener_dicos/10load_multivalue/makedict/base.json b/tests/flattener_dicos/10load_multivalue/makedict/base.json index d737c9ad..d65d28b0 100644 --- a/tests/flattener_dicos/10load_multivalue/makedict/base.json +++ b/tests/flattener_dicos/10load_multivalue/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": ["non", "oui"]} +{"rougail.general.mode_conteneur_actif": ["non", "oui"]} diff --git a/tests/flattener_dicos/10load_multivalue/result/00-base.xml b/tests/flattener_dicos/10load_multivalue/result/00-base.xml index 4c2d13e7..5ffd0ba9 100644 --- a/tests/flattener_dicos/10load_multivalue/result/00-base.xml +++ b/tests/flattener_dicos/10load_multivalue/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10load_submulti_two_value/makedict/base.json b/tests/flattener_dicos/10load_submulti_two_value/makedict/base.json index a36d5a83..9ddb1476 100644 --- a/tests/flattener_dicos/10load_submulti_two_value/makedict/base.json +++ b/tests/flattener_dicos/10load_submulti_two_value/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": [["non"], ["oui"]]} +{"rougail.general.mode_conteneur_actif": [["non"], ["oui"]]} diff --git a/tests/flattener_dicos/10load_submulti_two_value/result/00-base.xml b/tests/flattener_dicos/10load_submulti_two_value/result/00-base.xml index 27596cb3..0fb67117 100644 --- a/tests/flattener_dicos/10load_submulti_two_value/result/00-base.xml +++ b/tests/flattener_dicos/10load_submulti_two_value/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10valid_enum_accent/makedict/base.json b/tests/flattener_dicos/10valid_enum_accent/makedict/base.json index 7d6534c6..51f95bc0 100644 --- a/tests/flattener_dicos/10valid_enum_accent/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_accent/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "c"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": "c"} diff --git a/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml b/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml index 61a7f517..84004a44 100644 --- a/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml @@ -1,6 +1,6 @@ - + expert diff --git a/tests/flattener_dicos/10valid_enum_base/makedict/base.json b/tests/flattener_dicos/10valid_enum_base/makedict/base.json index 7d6534c6..51f95bc0 100644 --- a/tests/flattener_dicos/10valid_enum_base/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_base/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "c"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": "c"} diff --git a/tests/flattener_dicos/10valid_enum_base/result/00-base.xml b/tests/flattener_dicos/10valid_enum_base/result/00-base.xml index ac7cc8cd..051f0a99 100644 --- a/tests/flattener_dicos/10valid_enum_base/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_base/result/00-base.xml @@ -1,6 +1,6 @@ - + expert diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/makedict/base.json b/tests/flattener_dicos/10valid_enum_base_redefine/makedict/base.json index f85221e5..ec589332 100644 --- a/tests/flattener_dicos/10valid_enum_base_redefine/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_base_redefine/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar2": "c", "creole.enumfam.enumvar": "c"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar2": "c", "rougail.enumfam.enumvar": "c"} diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml b/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml index 204ddc81..ac327a72 100644 --- a/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml @@ -1,6 +1,6 @@ - + expert diff --git a/tests/flattener_dicos/10valid_enum_checkval_true/makedict/base.json b/tests/flattener_dicos/10valid_enum_checkval_true/makedict/base.json index 721d9f37..ef30ef31 100644 --- a/tests/flattener_dicos/10valid_enum_checkval_true/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_checkval_true/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "a"} +{"rougail.general.mode_conteneur_actif": "a"} diff --git a/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml b/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml index 25cb89bf..b0b707f2 100644 --- a/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/makedict/base.json b/tests/flattener_dicos/10valid_enum_eosfunc/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/10valid_enum_eosfunc/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_eosfunc/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml b/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml index 9ad13af8..75f3caf6 100644 --- a/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10valid_enum_leader/makedict/base.json b/tests/flattener_dicos/10valid_enum_leader/makedict/base.json index a5b9c7f6..3ff8a0ae 100644 --- a/tests/flattener_dicos/10valid_enum_leader/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_leader/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/10valid_enum_leader/result/00-base.xml b/tests/flattener_dicos/10valid_enum_leader/result/00-base.xml index f55544ba..1e6774ae 100644 --- a/tests/flattener_dicos/10valid_enum_leader/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_leader/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10valid_enum_mandatory/makedict/base.json b/tests/flattener_dicos/10valid_enum_mandatory/makedict/base.json index e7dc0311..d875ba96 100644 --- a/tests/flattener_dicos/10valid_enum_mandatory/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_mandatory/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "a"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": "a"} diff --git a/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml b/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml index 2b327ddc..3a222912 100644 --- a/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml @@ -1,6 +1,6 @@ - + expert diff --git a/tests/flattener_dicos/10valid_enum_multi/makedict/base.json b/tests/flattener_dicos/10valid_enum_multi/makedict/base.json index a183eb62..e40e3d93 100644 --- a/tests/flattener_dicos/10valid_enum_multi/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_multi/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.multi": ["a"]} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.multi": ["a"]} diff --git a/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml b/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml index cfbb11eb..a62a4a74 100644 --- a/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/10valid_enum_number/makedict/base.json b/tests/flattener_dicos/10valid_enum_number/makedict/base.json index 0e08403f..b69cd0a7 100644 --- a/tests/flattener_dicos/10valid_enum_number/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_number/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": 1} +{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": 1} diff --git a/tests/flattener_dicos/10valid_enum_number/result/00-base.xml b/tests/flattener_dicos/10valid_enum_number/result/00-base.xml index 8d5aa2d2..951e5114 100644 --- a/tests/flattener_dicos/10valid_enum_number/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_number/result/00-base.xml @@ -1,6 +1,6 @@ - + expert diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/makedict/base.json b/tests/flattener_dicos/10valid_enum_numberdefault/makedict/base.json index cf21cd32..7047db72 100644 --- a/tests/flattener_dicos/10valid_enum_numberdefault/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_numberdefault/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": 3} +{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": 3} diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml b/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml index fdcd0f44..56aaf16e 100644 --- a/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml @@ -1,6 +1,6 @@ - + expert diff --git a/tests/flattener_dicos/10valid_enum_python/makedict/base.json b/tests/flattener_dicos/10valid_enum_python/makedict/base.json index 82b597c1..7fdca9ef 100644 --- a/tests/flattener_dicos/10valid_enum_python/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_python/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "test"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": "test"} diff --git a/tests/flattener_dicos/10valid_enum_python/result/00-base.xml b/tests/flattener_dicos/10valid_enum_python/result/00-base.xml index 361ae5eb..c3cd706d 100644 --- a/tests/flattener_dicos/10valid_enum_python/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_python/result/00-base.xml @@ -1,6 +1,6 @@ - + expert diff --git a/tests/flattener_dicos/10valid_enum_value/makedict/base.json b/tests/flattener_dicos/10valid_enum_value/makedict/base.json index 1708d5fc..bcf489f7 100644 --- a/tests/flattener_dicos/10valid_enum_value/makedict/base.json +++ b/tests/flattener_dicos/10valid_enum_value/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "b"} +{"rougail.general.mode_conteneur_actif": "b"} diff --git a/tests/flattener_dicos/10valid_enum_value/result/00-base.xml b/tests/flattener_dicos/10valid_enum_value/result/00-base.xml index 9a500d82..8fc279e5 100644 --- a/tests/flattener_dicos/10valid_enum_value/result/00-base.xml +++ b/tests/flattener_dicos/10valid_enum_value/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/makedict/base.json b/tests/flattener_dicos/11disabled_if_in_filelist/makedict/base.json index 9a626913..1c9825d8 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist/makedict/base.json +++ b/tests/flattener_dicos/11disabled_if_in_filelist/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true} diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml index 7c14cc08..589cd687 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml +++ b/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml @@ -30,14 +30,14 @@ hidden - disabled + disabled True - + normal @@ -52,7 +52,7 @@ non mandatory normal - disabled + disabled non @@ -60,7 +60,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/makedict/base.json b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/makedict/base.json index 9d5d5a44..7fe29543 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/makedict/base.json +++ b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "oui", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} +{"rougail.general.condition": "oui", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml index 1a084cfa..7030a714 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml +++ b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml @@ -30,14 +30,14 @@ hidden - disabled + disabled True - + normal @@ -52,7 +52,7 @@ non mandatory normal - disabled + disabled non @@ -60,7 +60,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/makedict/base.json b/tests/flattener_dicos/11disabled_if_in_filelist_multi/makedict/base.json index 85277c17..16f87b7b 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist_multi/makedict/base.json +++ b/tests/flattener_dicos/11disabled_if_in_filelist_multi/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file1", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file1", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true, "services.service0.files.file1.group": "root", "services.service0.files.file1.mode": "0644", "services.service0.files.file1.name": "/tmp/file2", "services.service0.files.file1.owner": "root", "services.service0.files.file1.source": "file2", "services.service0.files.file1.templating": true, "services.service0.files.file1.activate": true} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file1", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file1", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true, "services.service0.files.file1.group": "root", "services.service0.files.file1.mode": "0644", "services.service0.files.file1.name": "/tmp/file2", "services.service0.files.file1.owner": "root", "services.service0.files.file1.source": "file2", "services.service0.files.file1.templating": true, "services.service0.files.file1.activate": true} diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml index 26cf602a..26d42f55 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml +++ b/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml @@ -30,7 +30,7 @@ hidden - disabled + disabled True @@ -61,14 +61,14 @@ hidden - disabled + disabled True - + normal @@ -83,7 +83,7 @@ non mandatory normal - disabled + disabled non @@ -91,7 +91,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/makedict/base.json b/tests/flattener_dicos/11disabledifin_filelist_notexist/makedict/base.json index afb4a22d..9dbc54a6 100644 --- a/tests/flattener_dicos/11disabledifin_filelist_notexist/makedict/base.json +++ b/tests/flattener_dicos/11disabledifin_filelist_notexist/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml b/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml index 07e5fd6b..6054991a 100644 --- a/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml +++ b/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml @@ -37,7 +37,7 @@ - + normal diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/makedict/base.json b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/makedict/base.json index afb4a22d..9dbc54a6 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/makedict/base.json +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml index 07e5fd6b..6054991a 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml @@ -37,7 +37,7 @@ - + normal diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/makedict/base.json b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/makedict/base.json index afb4a22d..9dbc54a6 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/makedict/base.json +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml index 07e5fd6b..6054991a 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml @@ -37,7 +37,7 @@ - + normal diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/makedict/base.json b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/makedict/base.json index afb4a22d..9dbc54a6 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/makedict/base.json +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/makedict/base.json @@ -1 +1 @@ -{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} +{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": true} diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml index 9cc7f0d3..7be5d23c 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml @@ -30,14 +30,14 @@ hidden - disabled + disabled True - + normal diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/makedict/base.json b/tests/flattener_dicos/11multi_disabled_if_in_filelist/makedict/base.json index dde869d7..c23b6367 100644 --- a/tests/flattener_dicos/11multi_disabled_if_in_filelist/makedict/base.json +++ b/tests/flattener_dicos/11multi_disabled_if_in_filelist/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file1", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file1", "services.service0.files.file0.templating": true} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/tmp/file1", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file1", "services.service0.files.file0.templating": true} diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml b/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml index 1e085c7e..3722c41f 100644 --- a/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml +++ b/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml @@ -37,7 +37,7 @@ - + normal diff --git a/tests/flattener_dicos/20family_append/makedict/base.json b/tests/flattener_dicos/20family_append/makedict/base.json index dcccb00c..b58d6e7c 100644 --- a/tests/flattener_dicos/20family_append/makedict/base.json +++ b/tests/flattener_dicos/20family_append/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/20family_append/result/00-base.xml b/tests/flattener_dicos/20family_append/result/00-base.xml index 239debcd..993f6dd5 100644 --- a/tests/flattener_dicos/20family_append/result/00-base.xml +++ b/tests/flattener_dicos/20family_append/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/20family_appendaccent/makedict/base.json b/tests/flattener_dicos/20family_appendaccent/makedict/base.json index 328663ea..abc90084 100644 --- a/tests/flattener_dicos/20family_appendaccent/makedict/base.json +++ b/tests/flattener_dicos/20family_appendaccent/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non", "creole.other.mode_conteneur_actif3": "non"} +{"rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non", "rougail.other.mode_conteneur_actif3": "non"} diff --git a/tests/flattener_dicos/20family_appendaccent/result/00-base.xml b/tests/flattener_dicos/20family_appendaccent/result/00-base.xml index 4fc4b83f..d5c52bf2 100644 --- a/tests/flattener_dicos/20family_appendaccent/result/00-base.xml +++ b/tests/flattener_dicos/20family_appendaccent/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -8,7 +8,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/20family_dynamic/makedict/base.json b/tests/flattener_dicos/20family_dynamic/makedict/base.json index dfca80d3..64024485 100644 --- a/tests/flattener_dicos/20family_dynamic/makedict/base.json +++ b/tests/flattener_dicos/20family_dynamic/makedict/base.json @@ -1 +1 @@ -{"creole.general.varname": ["val1", "val2"], "creole.dynval1.vardynval1": null, "creole.dynval2.vardynval2": null} +{"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": null, "rougail.dynval2.vardynval2": null} diff --git a/tests/flattener_dicos/20family_dynamic/result/00-base.xml b/tests/flattener_dicos/20family_dynamic/result/00-base.xml index 9764f274..6a8e3964 100644 --- a/tests/flattener_dicos/20family_dynamic/result/00-base.xml +++ b/tests/flattener_dicos/20family_dynamic/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -10,7 +10,7 @@ val2 - + normal normal diff --git a/tests/flattener_dicos/20family_dynamic_calc/makedict/base.json b/tests/flattener_dicos/20family_dynamic_calc/makedict/base.json index 0f79db59..82b6fff8 100644 --- a/tests/flattener_dicos/20family_dynamic_calc/makedict/base.json +++ b/tests/flattener_dicos/20family_dynamic_calc/makedict/base.json @@ -1 +1 @@ -{"creole.general.varname": ["val1", "val2"], "creole.dynval1.vardynval1": "val", "creole.dynval2.vardynval2": "val", "creole.new.newvar": null} +{"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": "val", "rougail.dynval2.vardynval2": "val", "rougail.new.newvar": null} diff --git a/tests/flattener_dicos/20family_dynamic_calc/result/00-base.xml b/tests/flattener_dicos/20family_dynamic_calc/result/00-base.xml index 149907e5..fe07045c 100644 --- a/tests/flattener_dicos/20family_dynamic_calc/result/00-base.xml +++ b/tests/flattener_dicos/20family_dynamic_calc/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -10,7 +10,7 @@ val2 - + normal mandatory @@ -23,7 +23,7 @@ normal - creole.dyn.vardyn + rougail.dyn.vardyn diff --git a/tests/flattener_dicos/20family_empty/makedict/base.json b/tests/flattener_dicos/20family_empty/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/20family_empty/makedict/base.json +++ b/tests/flattener_dicos/20family_empty/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/20family_empty/result/00-base.xml b/tests/flattener_dicos/20family_empty/result/00-base.xml index e4a6576f..b55c68a9 100644 --- a/tests/flattener_dicos/20family_empty/result/00-base.xml +++ b/tests/flattener_dicos/20family_empty/result/00-base.xml @@ -1,6 +1,6 @@ - + basic diff --git a/tests/flattener_dicos/20family_hidden/makedict/base.json b/tests/flattener_dicos/20family_hidden/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/20family_hidden/makedict/base.json +++ b/tests/flattener_dicos/20family_hidden/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/20family_hidden/result/00-base.xml b/tests/flattener_dicos/20family_hidden/result/00-base.xml index 67cc40f1..3d690098 100644 --- a/tests/flattener_dicos/20family_hidden/result/00-base.xml +++ b/tests/flattener_dicos/20family_hidden/result/00-base.xml @@ -1,6 +1,6 @@ - + hidden normal diff --git a/tests/flattener_dicos/20family_mode/makedict/base.json b/tests/flattener_dicos/20family_mode/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/20family_mode/makedict/base.json +++ b/tests/flattener_dicos/20family_mode/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/20family_mode/result/00-base.xml b/tests/flattener_dicos/20family_mode/result/00-base.xml index e4a6576f..b55c68a9 100644 --- a/tests/flattener_dicos/20family_mode/result/00-base.xml +++ b/tests/flattener_dicos/20family_mode/result/00-base.xml @@ -1,6 +1,6 @@ - + basic diff --git a/tests/flattener_dicos/20family_modeleadership/makedict/base.json b/tests/flattener_dicos/20family_modeleadership/makedict/base.json index a5b9c7f6..3ff8a0ae 100644 --- a/tests/flattener_dicos/20family_modeleadership/makedict/base.json +++ b/tests/flattener_dicos/20family_modeleadership/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.leader.leader": [], "creole.general.leader.follower1": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.leader.leader": [], "rougail.general.leader.follower1": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/20family_modeleadership/result/00-base.xml b/tests/flattener_dicos/20family_modeleadership/result/00-base.xml index db9923da..c1ad3a3a 100644 --- a/tests/flattener_dicos/20family_modeleadership/result/00-base.xml +++ b/tests/flattener_dicos/20family_modeleadership/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/20notemplating/makedict/base.json b/tests/flattener_dicos/20notemplating/makedict/base.json index 03c52d96..7360c985 100644 --- a/tests/flattener_dicos/20notemplating/makedict/base.json +++ b/tests/flattener_dicos/20notemplating/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": false, "services.service0.files.file0.activate": true} +{"rougail.general.mode_conteneur_actif": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/file", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "file", "services.service0.files.file0.templating": false, "services.service0.files.file0.activate": true} diff --git a/tests/flattener_dicos/20notemplating/result/00-base.xml b/tests/flattener_dicos/20notemplating/result/00-base.xml index 30c32c42..37386279 100644 --- a/tests/flattener_dicos/20notemplating/result/00-base.xml +++ b/tests/flattener_dicos/20notemplating/result/00-base.xml @@ -36,7 +36,7 @@ - + normal diff --git a/tests/flattener_dicos/20override/makedict/base.json b/tests/flattener_dicos/20override/makedict/base.json index 84573e71..ea514d21 100644 --- a/tests/flattener_dicos/20override/makedict/base.json +++ b/tests/flattener_dicos/20override/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "services.service0.overrides.override0.name": "test.service", "services.service0.overrides.override0.source": "test.service", "services.service0.overrides.override0.templating": true, "services.service0.overrides.override0.activate": true} +{"rougail.general.mode_conteneur_actif": "non", "services.service0.overrides.override0.name": "test.service", "services.service0.overrides.override0.source": "test.service", "services.service0.overrides.override0.templating": true, "services.service0.overrides.override0.activate": true} diff --git a/tests/flattener_dicos/20override/result/00-base.xml b/tests/flattener_dicos/20override/result/00-base.xml index e2cadba4..dfe53bca 100644 --- a/tests/flattener_dicos/20override/result/00-base.xml +++ b/tests/flattener_dicos/20override/result/00-base.xml @@ -24,7 +24,7 @@ - + normal diff --git a/tests/flattener_dicos/21family_change/makedict/base.json b/tests/flattener_dicos/21family_change/makedict/base.json index 7caf63cd..40871a66 100644 --- a/tests/flattener_dicos/21family_change/makedict/base.json +++ b/tests/flattener_dicos/21family_change/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.other.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.other.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/21family_change/result/00-base.xml b/tests/flattener_dicos/21family_change/result/00-base.xml index 1ad3bf2a..d5e21846 100644 --- a/tests/flattener_dicos/21family_change/result/00-base.xml +++ b/tests/flattener_dicos/21family_change/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/21family_changeaccent/makedict/base.json b/tests/flattener_dicos/21family_changeaccent/makedict/base.json index 1a807bd7..ef4e8007 100644 --- a/tests/flattener_dicos/21family_changeaccent/makedict/base.json +++ b/tests/flattener_dicos/21family_changeaccent/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.otherwithe.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.otherwithe.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/21family_changeaccent/result/00-base.xml b/tests/flattener_dicos/21family_changeaccent/result/00-base.xml index 8a3ee696..09c36ad1 100644 --- a/tests/flattener_dicos/21family_changeaccent/result/00-base.xml +++ b/tests/flattener_dicos/21family_changeaccent/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/21family_empty/makedict/base.json b/tests/flattener_dicos/21family_empty/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/21family_empty/makedict/base.json +++ b/tests/flattener_dicos/21family_empty/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/21family_empty/result/00-base.xml b/tests/flattener_dicos/21family_empty/result/00-base.xml index 9ad13af8..75f3caf6 100644 --- a/tests/flattener_dicos/21family_empty/result/00-base.xml +++ b/tests/flattener_dicos/21family_empty/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/30mandatory_withoutvalue/makedict/base.json b/tests/flattener_dicos/30mandatory_withoutvalue/makedict/base.json index aa1bbf84..dc0cf526 100644 --- a/tests/flattener_dicos/30mandatory_withoutvalue/makedict/base.json +++ b/tests/flattener_dicos/30mandatory_withoutvalue/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null} +{"rougail.general.mode_conteneur_actif": null} diff --git a/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml b/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml index e045b049..e60dc60a 100644 --- a/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml +++ b/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml @@ -1,6 +1,6 @@ - + basic diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/makedict/base.json b/tests/flattener_dicos/30mandatory_withoutvaluecalc/makedict/base.json index aa1bbf84..dc0cf526 100644 --- a/tests/flattener_dicos/30mandatory_withoutvaluecalc/makedict/base.json +++ b/tests/flattener_dicos/30mandatory_withoutvaluecalc/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null} +{"rougail.general.mode_conteneur_actif": null} diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml b/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml index f10a2f63..b9fb0424 100644 --- a/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml +++ b/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/30mandatory_withvalue/makedict/base.json b/tests/flattener_dicos/30mandatory_withvalue/makedict/base.json index 799c0957..5f62f349 100644 --- a/tests/flattener_dicos/30mandatory_withvalue/makedict/base.json +++ b/tests/flattener_dicos/30mandatory_withvalue/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "value"} +{"rougail.general.mode_conteneur_actif": "value"} diff --git a/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml b/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml index 28060d78..4f6f38cd 100644 --- a/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml +++ b/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/makedict/base.json b/tests/flattener_dicos/30mandatory_withvaluecalc/makedict/base.json index aa1bbf84..dc0cf526 100644 --- a/tests/flattener_dicos/30mandatory_withvaluecalc/makedict/base.json +++ b/tests/flattener_dicos/30mandatory_withvaluecalc/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null} +{"rougail.general.mode_conteneur_actif": null} diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml b/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml index 460a3dda..140532b8 100644 --- a/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml +++ b/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/40condition_base/makedict/base.json b/tests/flattener_dicos/40condition_base/makedict/base.json index 22e8af3e..ee42ef2d 100644 --- a/tests/flattener_dicos/40condition_base/makedict/base.json +++ b/tests/flattener_dicos/40condition_base/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "non", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/40condition_base/result/00-base.xml b/tests/flattener_dicos/40condition_base/result/00-base.xml index e6709a3f..8402aa9c 100644 --- a/tests/flattener_dicos/40condition_base/result/00-base.xml +++ b/tests/flattener_dicos/40condition_base/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -22,7 +22,7 @@ non mandatory normal - disabled + disabled non @@ -30,7 +30,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/40condition_fallback/makedict/base.json b/tests/flattener_dicos/40condition_fallback/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/40condition_fallback/makedict/base.json +++ b/tests/flattener_dicos/40condition_fallback/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/40condition_fallback/result/00-base.xml b/tests/flattener_dicos/40condition_fallback/result/00-base.xml index ae511a31..7c579d34 100644 --- a/tests/flattener_dicos/40condition_fallback/result/00-base.xml +++ b/tests/flattener_dicos/40condition_fallback/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/40condition_optional/makedict/base.json b/tests/flattener_dicos/40condition_optional/makedict/base.json index 87b4fa48..6008a9ce 100644 --- a/tests/flattener_dicos/40condition_optional/makedict/base.json +++ b/tests/flattener_dicos/40condition_optional/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "non", "creole.general.mode_conteneur_actif1": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif1": "non"} diff --git a/tests/flattener_dicos/40condition_optional/result/00-base.xml b/tests/flattener_dicos/40condition_optional/result/00-base.xml index 5184b67d..6e33787b 100644 --- a/tests/flattener_dicos/40condition_optional/result/00-base.xml +++ b/tests/flattener_dicos/40condition_optional/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -22,7 +22,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/40ifin_leadership/makedict/base.json b/tests/flattener_dicos/40ifin_leadership/makedict/base.json index 4d5d7674..ef2026a8 100644 --- a/tests/flattener_dicos/40ifin_leadership/makedict/base.json +++ b/tests/flattener_dicos/40ifin_leadership/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.leader.leader": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "oui", "rougail.general.leader.leader": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/40ifin_leadership/result/00-base.xml b/tests/flattener_dicos/40ifin_leadership/result/00-base.xml index 2ae4017a..44634256 100644 --- a/tests/flattener_dicos/40ifin_leadership/result/00-base.xml +++ b/tests/flattener_dicos/40ifin_leadership/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -22,7 +22,7 @@ normal - disabled + disabled normal diff --git a/tests/flattener_dicos/40ifin_leadershipauto/makedict/base.json b/tests/flattener_dicos/40ifin_leadershipauto/makedict/base.json index 4d5d7674..ef2026a8 100644 --- a/tests/flattener_dicos/40ifin_leadershipauto/makedict/base.json +++ b/tests/flattener_dicos/40ifin_leadershipauto/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "oui", "creole.general.leader.leader": [], "creole.general.leader.follower2": []} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "oui", "rougail.general.leader.leader": [], "rougail.general.leader.follower2": []} diff --git a/tests/flattener_dicos/40ifin_leadershipauto/result/00-base.xml b/tests/flattener_dicos/40ifin_leadershipauto/result/00-base.xml index 54a3246b..aa18f6cb 100644 --- a/tests/flattener_dicos/40ifin_leadershipauto/result/00-base.xml +++ b/tests/flattener_dicos/40ifin_leadershipauto/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -25,7 +25,7 @@ frozen hidden normal - disabled + disabled valfill diff --git a/tests/flattener_dicos/40ifin_multi/makedict/base.json b/tests/flattener_dicos/40ifin_multi/makedict/base.json index 6d33608d..4c3844b8 100644 --- a/tests/flattener_dicos/40ifin_multi/makedict/base.json +++ b/tests/flattener_dicos/40ifin_multi/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general2.mode_conteneur_actif2": "non", "creole.general2.mode_conteneur_actif3": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general2.mode_conteneur_actif2": "non", "rougail.general2.mode_conteneur_actif3": "non"} diff --git a/tests/flattener_dicos/40ifin_multi/result/00-base.xml b/tests/flattener_dicos/40ifin_multi/result/00-base.xml index 846ef89b..d6c1240c 100644 --- a/tests/flattener_dicos/40ifin_multi/result/00-base.xml +++ b/tests/flattener_dicos/40ifin_multi/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -32,8 +32,8 @@ non mandatory normal - disabled - disabled + disabled + disabled non diff --git a/tests/flattener_dicos/40ifin_validenum/makedict/base.json b/tests/flattener_dicos/40ifin_validenum/makedict/base.json index 806f2ee3..6b1c9cf7 100644 --- a/tests/flattener_dicos/40ifin_validenum/makedict/base.json +++ b/tests/flattener_dicos/40ifin_validenum/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general2.mode_conteneur_actif3": "a"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general2.mode_conteneur_actif3": "a"} diff --git a/tests/flattener_dicos/40ifin_validenum/result/00-base.xml b/tests/flattener_dicos/40ifin_validenum/result/00-base.xml index 007ec37c..88d0c39f 100644 --- a/tests/flattener_dicos/40ifin_validenum/result/00-base.xml +++ b/tests/flattener_dicos/40ifin_validenum/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/50exists_exists/makedict/base.json b/tests/flattener_dicos/50exists_exists/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/50exists_exists/makedict/base.json +++ b/tests/flattener_dicos/50exists_exists/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/50exists_exists/result/00-base.xml b/tests/flattener_dicos/50exists_exists/result/00-base.xml index 54265b55..be2f0049 100644 --- a/tests/flattener_dicos/50exists_exists/result/00-base.xml +++ b/tests/flattener_dicos/50exists_exists/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/50redefine_description/makedict/base.json b/tests/flattener_dicos/50redefine_description/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/50redefine_description/makedict/base.json +++ b/tests/flattener_dicos/50redefine_description/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/50redefine_description/result/00-base.xml b/tests/flattener_dicos/50redefine_description/result/00-base.xml index 5ed379c1..779b90eb 100644 --- a/tests/flattener_dicos/50redefine_description/result/00-base.xml +++ b/tests/flattener_dicos/50redefine_description/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51exists_nonexists/makedict/base.json b/tests/flattener_dicos/51exists_nonexists/makedict/base.json index 0117ed2d..701610f6 100644 --- a/tests/flattener_dicos/51exists_nonexists/makedict/base.json +++ b/tests/flattener_dicos/51exists_nonexists/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "oui"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "oui"} diff --git a/tests/flattener_dicos/51exists_nonexists/result/00-base.xml b/tests/flattener_dicos/51exists_nonexists/result/00-base.xml index f3ba01b3..96f88099 100644 --- a/tests/flattener_dicos/51exists_nonexists/result/00-base.xml +++ b/tests/flattener_dicos/51exists_nonexists/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_auto/makedict/base.json b/tests/flattener_dicos/51redefine_auto/makedict/base.json index aa1bbf84..dc0cf526 100644 --- a/tests/flattener_dicos/51redefine_auto/makedict/base.json +++ b/tests/flattener_dicos/51redefine_auto/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null} +{"rougail.general.mode_conteneur_actif": null} diff --git a/tests/flattener_dicos/51redefine_auto/result/00-base.xml b/tests/flattener_dicos/51redefine_auto/result/00-base.xml index b6995fbb..87b387d1 100644 --- a/tests/flattener_dicos/51redefine_auto/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_auto/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_autofill/makedict/base.json b/tests/flattener_dicos/51redefine_autofill/makedict/base.json index aa1bbf84..dc0cf526 100644 --- a/tests/flattener_dicos/51redefine_autofill/makedict/base.json +++ b/tests/flattener_dicos/51redefine_autofill/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null} +{"rougail.general.mode_conteneur_actif": null} diff --git a/tests/flattener_dicos/51redefine_autofill/result/00-base.xml b/tests/flattener_dicos/51redefine_autofill/result/00-base.xml index c62293fb..d8c6ca35 100644 --- a/tests/flattener_dicos/51redefine_autofill/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_autofill/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_family/makedict/base.json b/tests/flattener_dicos/51redefine_family/makedict/base.json index 9c2c5bbe..54b3faed 100644 --- a/tests/flattener_dicos/51redefine_family/makedict/base.json +++ b/tests/flattener_dicos/51redefine_family/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general2.mode_conteneur_actif2": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general2.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/51redefine_family/result/00-base.xml b/tests/flattener_dicos/51redefine_family/result/00-base.xml index 095584e8..297ea814 100644 --- a/tests/flattener_dicos/51redefine_family/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_family/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -17,7 +17,7 @@ hidden normal - disabled + disabled oui non diff --git a/tests/flattener_dicos/51redefine_fill/makedict/base.json b/tests/flattener_dicos/51redefine_fill/makedict/base.json index aa1bbf84..dc0cf526 100644 --- a/tests/flattener_dicos/51redefine_fill/makedict/base.json +++ b/tests/flattener_dicos/51redefine_fill/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null} +{"rougail.general.mode_conteneur_actif": null} diff --git a/tests/flattener_dicos/51redefine_fill/result/00-base.xml b/tests/flattener_dicos/51redefine_fill/result/00-base.xml index b6995fbb..87b387d1 100644 --- a/tests/flattener_dicos/51redefine_fill/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_fill/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_fillauto/makedict/base.json b/tests/flattener_dicos/51redefine_fillauto/makedict/base.json index aa1bbf84..dc0cf526 100644 --- a/tests/flattener_dicos/51redefine_fillauto/makedict/base.json +++ b/tests/flattener_dicos/51redefine_fillauto/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": null} +{"rougail.general.mode_conteneur_actif": null} diff --git a/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml b/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml index b6995fbb..87b387d1 100644 --- a/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_help/makedict/base.json b/tests/flattener_dicos/51redefine_help/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/51redefine_help/makedict/base.json +++ b/tests/flattener_dicos/51redefine_help/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/51redefine_help/result/00-base.xml b/tests/flattener_dicos/51redefine_help/result/00-base.xml index b10a96d9..a9037163 100644 --- a/tests/flattener_dicos/51redefine_help/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_help/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_hidden/makedict/base.json b/tests/flattener_dicos/51redefine_hidden/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/51redefine_hidden/makedict/base.json +++ b/tests/flattener_dicos/51redefine_hidden/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/51redefine_hidden/result/00-base.xml b/tests/flattener_dicos/51redefine_hidden/result/00-base.xml index f1d910bb..240d21c5 100644 --- a/tests/flattener_dicos/51redefine_hidden/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_hidden/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_remove_check/makedict/base.json b/tests/flattener_dicos/51redefine_remove_check/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/51redefine_remove_check/makedict/base.json +++ b/tests/flattener_dicos/51redefine_remove_check/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml b/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml index 960df686..e90c0ef6 100644 --- a/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_remove_condition/makedict/base.json b/tests/flattener_dicos/51redefine_remove_condition/makedict/base.json index 22e8af3e..ee42ef2d 100644 --- a/tests/flattener_dicos/51redefine_remove_condition/makedict/base.json +++ b/tests/flattener_dicos/51redefine_remove_condition/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "non", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml b/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml index 4206d282..880e6532 100644 --- a/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -32,7 +32,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/makedict/base.json b/tests/flattener_dicos/51redefine_removecondition_alltarget/makedict/base.json index 22e8af3e..ee42ef2d 100644 --- a/tests/flattener_dicos/51redefine_removecondition_alltarget/makedict/base.json +++ b/tests/flattener_dicos/51redefine_removecondition_alltarget/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "non", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml b/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml index 32c67144..7ebafa8a 100644 --- a/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/makedict/base.json b/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/makedict/base.json index c0e25119..a5d0b07e 100644 --- a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/makedict/base.json +++ b/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.condition": "non", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general.module_instancie": "non"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.condition": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.mode_conteneur_actif2": "non", "rougail.general.module_instancie": "non"} diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml b/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml index 4f9458a8..61233b9c 100644 --- a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml @@ -1,6 +1,6 @@ - + basic @@ -10,7 +10,7 @@ non mandatory basic - auto_frozen + auto_frozen non @@ -35,7 +35,7 @@ non mandatory normal - disabled + disabled non diff --git a/tests/flattener_dicos/51redefine_validenum/makedict/base.json b/tests/flattener_dicos/51redefine_validenum/makedict/base.json index 721d9f37..ef30ef31 100644 --- a/tests/flattener_dicos/51redefine_validenum/makedict/base.json +++ b/tests/flattener_dicos/51redefine_validenum/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "a"} +{"rougail.general.mode_conteneur_actif": "a"} diff --git a/tests/flattener_dicos/51redefine_validenum/result/00-base.xml b/tests/flattener_dicos/51redefine_validenum/result/00-base.xml index 98e34759..43d963d3 100644 --- a/tests/flattener_dicos/51redefine_validenum/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_validenum/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/51redefine_value/makedict/base.json b/tests/flattener_dicos/51redefine_value/makedict/base.json index 5c36ec6c..76f57513 100644 --- a/tests/flattener_dicos/51redefine_value/makedict/base.json +++ b/tests/flattener_dicos/51redefine_value/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif1": "oui"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "oui"} diff --git a/tests/flattener_dicos/51redefine_value/result/00-base.xml b/tests/flattener_dicos/51redefine_value/result/00-base.xml index f1c6c3e1..adbe7194 100644 --- a/tests/flattener_dicos/51redefine_value/result/00-base.xml +++ b/tests/flattener_dicos/51redefine_value/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/52exists_redefine/makedict/base.json b/tests/flattener_dicos/52exists_redefine/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/52exists_redefine/makedict/base.json +++ b/tests/flattener_dicos/52exists_redefine/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/52exists_redefine/result/00-base.xml b/tests/flattener_dicos/52exists_redefine/result/00-base.xml index c60a3acf..9545f529 100644 --- a/tests/flattener_dicos/52exists_redefine/result/00-base.xml +++ b/tests/flattener_dicos/52exists_redefine/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/60action_external/makedict/base.json b/tests/flattener_dicos/60action_external/makedict/base.json index 4287bf82..c2f531b4 100644 --- a/tests/flattener_dicos/60action_external/makedict/base.json +++ b/tests/flattener_dicos/60action_external/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "extra.test.delay": 0, "extra.test.calc_url": null} +{"rougail.general.mode_conteneur_actif": "non", "extra.test.delay": 0, "extra.test.calc_url": null} diff --git a/tests/flattener_dicos/60action_external/result/00-base.xml b/tests/flattener_dicos/60action_external/result/00-base.xml index 8004c221..7d87498d 100644 --- a/tests/flattener_dicos/60action_external/result/00-base.xml +++ b/tests/flattener_dicos/60action_external/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/60extra_externalspacecondition/makedict/base.json b/tests/flattener_dicos/60extra_externalspacecondition/makedict/base.json index 27229bc9..e44851be 100644 --- a/tests/flattener_dicos/60extra_externalspacecondition/makedict/base.json +++ b/tests/flattener_dicos/60extra_externalspacecondition/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.activer_ejabberd": "non", "creole.general.module_instancie": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": "none", "extra.ejabberd.mode": "pre", "extra1.external.description": "test"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "rougail.general.module_instancie": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": "none", "extra.ejabberd.mode": "pre", "extra1.external.description": "test"} diff --git a/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml b/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml index 6d791a29..4b60af60 100644 --- a/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml +++ b/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml @@ -1,6 +1,6 @@ - + basic @@ -10,7 +10,7 @@ non mandatory basic - auto_frozen + auto_frozen non diff --git a/tests/flattener_dicos/60extra_group/makedict/base.json b/tests/flattener_dicos/60extra_group/makedict/base.json index 6b03c9d2..768d3e44 100644 --- a/tests/flattener_dicos/60extra_group/makedict/base.json +++ b/tests/flattener_dicos/60extra_group/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.activer_ejabberd": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true, "extra.ejabberd.description.description": ["test"], "extra.ejabberd.description.mode": ["pre"]} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true, "extra.ejabberd.description.description": ["test"], "extra.ejabberd.description.mode": ["pre"]} diff --git a/tests/flattener_dicos/60extra_group/result/00-base.xml b/tests/flattener_dicos/60extra_group/result/00-base.xml index 106bd7ca..2830ffad 100644 --- a/tests/flattener_dicos/60extra_group/result/00-base.xml +++ b/tests/flattener_dicos/60extra_group/result/00-base.xml @@ -36,7 +36,7 @@ - + normal diff --git a/tests/flattener_dicos/60extra_help/makedict/base.json b/tests/flattener_dicos/60extra_help/makedict/base.json index 473f2c42..12bcdae4 100644 --- a/tests/flattener_dicos/60extra_help/makedict/base.json +++ b/tests/flattener_dicos/60extra_help/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.activer_ejabberd": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true, "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true, "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre"} diff --git a/tests/flattener_dicos/60extra_help/result/00-base.xml b/tests/flattener_dicos/60extra_help/result/00-base.xml index 408827f7..6802bccb 100644 --- a/tests/flattener_dicos/60extra_help/result/00-base.xml +++ b/tests/flattener_dicos/60extra_help/result/00-base.xml @@ -36,7 +36,7 @@ - + normal @@ -79,7 +79,7 @@ normal non - creole.general.activer_ejabberd + rougail.general.activer_ejabberd none daily diff --git a/tests/flattener_dicos/60extra_load/makedict/base.json b/tests/flattener_dicos/60extra_load/makedict/base.json index c78b57f5..816c41bd 100644 --- a/tests/flattener_dicos/60extra_load/makedict/base.json +++ b/tests/flattener_dicos/60extra_load/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre"} diff --git a/tests/flattener_dicos/60extra_load/result/00-base.xml b/tests/flattener_dicos/60extra_load/result/00-base.xml index 64083dd1..a7c272c4 100644 --- a/tests/flattener_dicos/60extra_load/result/00-base.xml +++ b/tests/flattener_dicos/60extra_load/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -43,7 +43,7 @@ normal non - creole.general.activer_ejabberd + rougail.general.activer_ejabberd none daily diff --git a/tests/flattener_dicos/60extra_mandatory/makedict/base.json b/tests/flattener_dicos/60extra_mandatory/makedict/base.json index 8dc2370d..3d194686 100644 --- a/tests/flattener_dicos/60extra_mandatory/makedict/base.json +++ b/tests/flattener_dicos/60extra_mandatory/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre", "extra.ejabberd.var1": null} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre", "extra.ejabberd.var1": null} diff --git a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml index 6731e9fa..96181e6e 100644 --- a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -43,7 +43,7 @@ normal non - creole.general.activer_ejabberd + rougail.general.activer_ejabberd none daily diff --git a/tests/flattener_dicos/60extra_redefine/makedict/base.json b/tests/flattener_dicos/60extra_redefine/makedict/base.json index c78b57f5..816c41bd 100644 --- a/tests/flattener_dicos/60extra_redefine/makedict/base.json +++ b/tests/flattener_dicos/60extra_redefine/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre"} +{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre"} diff --git a/tests/flattener_dicos/60extra_redefine/result/00-base.xml b/tests/flattener_dicos/60extra_redefine/result/00-base.xml index 20795ce7..78a736de 100644 --- a/tests/flattener_dicos/60extra_redefine/result/00-base.xml +++ b/tests/flattener_dicos/60extra_redefine/result/00-base.xml @@ -1,6 +1,6 @@ - + normal @@ -46,7 +46,7 @@ normal non - creole.general.activer_ejabberd + rougail.general.activer_ejabberd none daily diff --git a/tests/flattener_dicos/60familyaction/makedict/base.json b/tests/flattener_dicos/60familyaction/makedict/base.json index 098ceb82..efe896ec 100644 --- a/tests/flattener_dicos/60familyaction/makedict/base.json +++ b/tests/flattener_dicos/60familyaction/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "extra.test.delay": 0} +{"rougail.general.mode_conteneur_actif": "non", "extra.test.delay": 0} diff --git a/tests/flattener_dicos/60familyaction/result/00-base.xml b/tests/flattener_dicos/60familyaction/result/00-base.xml index 142afc83..6e2d3bbe 100644 --- a/tests/flattener_dicos/60familyaction/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/60familyaction_accent/makedict/base.json b/tests/flattener_dicos/60familyaction_accent/makedict/base.json index 098ceb82..efe896ec 100644 --- a/tests/flattener_dicos/60familyaction_accent/makedict/base.json +++ b/tests/flattener_dicos/60familyaction_accent/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "extra.test.delay": 0} +{"rougail.general.mode_conteneur_actif": "non", "extra.test.delay": 0} diff --git a/tests/flattener_dicos/60familyaction_accent/result/00-base.xml b/tests/flattener_dicos/60familyaction_accent/result/00-base.xml index 142afc83..6e2d3bbe 100644 --- a/tests/flattener_dicos/60familyaction_accent/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction_accent/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/60familyaction_mandatory/makedict/base.json b/tests/flattener_dicos/60familyaction_mandatory/makedict/base.json index 122f9dfc..c5da58ed 100644 --- a/tests/flattener_dicos/60familyaction_mandatory/makedict/base.json +++ b/tests/flattener_dicos/60familyaction_mandatory/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non", "extra.test.delay": 0, "extra.test.day": null} +{"rougail.general.mode_conteneur_actif": "non", "extra.test.delay": 0, "extra.test.day": null} diff --git a/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml b/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml index 1a2e3bce..8ffcc198 100644 --- a/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml +++ b/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/70container_files/makedict/base.json b/tests/flattener_dicos/70container_files/makedict/base.json index 1f8971f5..a437e817 100644 --- a/tests/flattener_dicos/70container_files/makedict/base.json +++ b/tests/flattener_dicos/70container_files/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true} +{"rougail.general.mode_conteneur_actif": "oui", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true} diff --git a/tests/flattener_dicos/70container_files/result/00-base.xml b/tests/flattener_dicos/70container_files/result/00-base.xml index bbacedf5..9ce18c65 100644 --- a/tests/flattener_dicos/70container_files/result/00-base.xml +++ b/tests/flattener_dicos/70container_files/result/00-base.xml @@ -36,7 +36,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_files_symlink_multi/makedict/base.json b/tests/flattener_dicos/70container_files_symlink_multi/makedict/base.json index 2d002c52..b8ecb650 100644 --- a/tests/flattener_dicos/70container_files_symlink_multi/makedict/base.json +++ b/tests/flattener_dicos/70container_files_symlink_multi/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.file_name": ["/etc/mailname", "/etc/mailname2"], "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": ["/etc/mailname", "/etc/mailname2"], "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.file_name": ["/etc/mailname", "/etc/mailname2"], "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": ["/etc/mailname", "/etc/mailname2"], "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true} diff --git a/tests/flattener_dicos/70container_files_symlink_multi/result/00-base.xml b/tests/flattener_dicos/70container_files_symlink_multi/result/00-base.xml index 543e2c37..f20d0c05 100644 --- a/tests/flattener_dicos/70container_files_symlink_multi/result/00-base.xml +++ b/tests/flattener_dicos/70container_files_symlink_multi/result/00-base.xml @@ -12,7 +12,7 @@ hidden 0644 - + hidden @@ -35,7 +35,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/makedict/base.json b/tests/flattener_dicos/70container_files_symlink_multi_variable/makedict/base.json index 9ffa6386..0e0c4a23 100644 --- a/tests/flattener_dicos/70container_files_symlink_multi_variable/makedict/base.json +++ b/tests/flattener_dicos/70container_files_symlink_multi_variable/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.file_name": ["/etc/mailname", "/etc/mailname2"], "creole.general.var": ["mailname", "mailname2"], "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": ["/etc/mailname", "/etc/mailname2"], "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.variable": ["mailname", "mailname2"], "services.service0.files.file0.activate": true} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.file_name": ["/etc/mailname", "/etc/mailname2"], "rougail.general.var": ["mailname", "mailname2"], "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": ["/etc/mailname", "/etc/mailname2"], "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.variable": ["mailname", "mailname2"], "services.service0.files.file0.activate": true} diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/result/00-base.xml b/tests/flattener_dicos/70container_files_symlink_multi_variable/result/00-base.xml index 9ae644ef..fa429958 100644 --- a/tests/flattener_dicos/70container_files_symlink_multi_variable/result/00-base.xml +++ b/tests/flattener_dicos/70container_files_symlink_multi_variable/result/00-base.xml @@ -12,7 +12,7 @@ hidden 0644 - + hidden @@ -27,7 +27,7 @@ hidden True - + hidden @@ -38,7 +38,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_filesmulti/makedict/base.json b/tests/flattener_dicos/70container_filesmulti/makedict/base.json index ed13f2be..8d474b7f 100644 --- a/tests/flattener_dicos/70container_filesmulti/makedict/base.json +++ b/tests/flattener_dicos/70container_filesmulti/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true, "services.service0.files.file1.group": "root", "services.service0.files.file1.mode": "0644", "services.service0.files.file1.name": "/etc/mailname2", "services.service0.files.file1.owner": "root", "services.service0.files.file1.source": "mailname2", "services.service0.files.file1.templating": true, "services.service0.files.file1.activate": true} +{"rougail.general.mode_conteneur_actif": "oui", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true, "services.service0.files.file1.group": "root", "services.service0.files.file1.mode": "0644", "services.service0.files.file1.name": "/etc/mailname2", "services.service0.files.file1.owner": "root", "services.service0.files.file1.source": "mailname2", "services.service0.files.file1.templating": true, "services.service0.files.file1.activate": true} diff --git a/tests/flattener_dicos/70container_filesmulti/result/00-base.xml b/tests/flattener_dicos/70container_filesmulti/result/00-base.xml index 891be5fa..1706a5b9 100644 --- a/tests/flattener_dicos/70container_filesmulti/result/00-base.xml +++ b/tests/flattener_dicos/70container_filesmulti/result/00-base.xml @@ -66,7 +66,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_filesredefine/makedict/base.json b/tests/flattener_dicos/70container_filesredefine/makedict/base.json index d365566f..5d463377 100644 --- a/tests/flattener_dicos/70container_filesredefine/makedict/base.json +++ b/tests/flattener_dicos/70container_filesredefine/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname.new", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true} +{"rougail.general.mode_conteneur_actif": "oui", "services.service0.files.file0.group": "root", "services.service0.files.file0.mode": "0644", "services.service0.files.file0.name": "/etc/mailname", "services.service0.files.file0.owner": "root", "services.service0.files.file0.source": "mailname.new", "services.service0.files.file0.templating": true, "services.service0.files.file0.activate": true} diff --git a/tests/flattener_dicos/70container_filesredefine/result/00-base.xml b/tests/flattener_dicos/70container_filesredefine/result/00-base.xml index 6259e5de..2f31ea2c 100644 --- a/tests/flattener_dicos/70container_filesredefine/result/00-base.xml +++ b/tests/flattener_dicos/70container_filesredefine/result/00-base.xml @@ -36,7 +36,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_new/makedict/base.json b/tests/flattener_dicos/70container_new/makedict/base.json index 00630d60..eb10bec4 100644 --- a/tests/flattener_dicos/70container_new/makedict/base.json +++ b/tests/flattener_dicos/70container_new/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui"} +{"rougail.general.mode_conteneur_actif": "oui"} diff --git a/tests/flattener_dicos/70container_new/result/00-base.xml b/tests/flattener_dicos/70container_new/result/00-base.xml index a561fd0e..4a48f742 100644 --- a/tests/flattener_dicos/70container_new/result/00-base.xml +++ b/tests/flattener_dicos/70container_new/result/00-base.xml @@ -3,7 +3,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_newnocont/makedict/base.json b/tests/flattener_dicos/70container_newnocont/makedict/base.json index f06f2ed8..797595b0 100644 --- a/tests/flattener_dicos/70container_newnocont/makedict/base.json +++ b/tests/flattener_dicos/70container_newnocont/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "non"} +{"rougail.general.mode_conteneur_actif": "non"} diff --git a/tests/flattener_dicos/70container_newnocont/result/00-base.xml b/tests/flattener_dicos/70container_newnocont/result/00-base.xml index b65fca49..d124fe9f 100644 --- a/tests/flattener_dicos/70container_newnocont/result/00-base.xml +++ b/tests/flattener_dicos/70container_newnocont/result/00-base.xml @@ -3,7 +3,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_newwithip/makedict/base.json b/tests/flattener_dicos/70container_newwithip/makedict/base.json index 297a147b..7d28fa93 100644 --- a/tests/flattener_dicos/70container_newwithip/makedict/base.json +++ b/tests/flattener_dicos/70container_newwithip/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.adresse_ip_test": null} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.adresse_ip_test": null} diff --git a/tests/flattener_dicos/70container_newwithip/result/00-base.xml b/tests/flattener_dicos/70container_newwithip/result/00-base.xml index d69c9d8e..42dfe285 100644 --- a/tests/flattener_dicos/70container_newwithip/result/00-base.xml +++ b/tests/flattener_dicos/70container_newwithip/result/00-base.xml @@ -3,7 +3,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_pathaccess/makedict/base.json b/tests/flattener_dicos/70container_pathaccess/makedict/base.json index cfa82cd6..1e1fe4d8 100644 --- a/tests/flattener_dicos/70container_pathaccess/makedict/base.json +++ b/tests/flattener_dicos/70container_pathaccess/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.nut_monitor_netmask": null, "creole.general.nut_monitor_host": null, "services.service0.ips.ip0.interface": "auto", "services.service0.ips.ip0.name": null, "services.service0.ips.ip0.netmask": null, "services.service0.ips.ip0.activate": true} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.nut_monitor_netmask": null, "rougail.general.nut_monitor_host": null, "services.service0.ips.ip0.interface": "auto", "services.service0.ips.ip0.name": null, "services.service0.ips.ip0.netmask": null, "services.service0.ips.ip0.activate": true} diff --git a/tests/flattener_dicos/70container_pathaccess/result/00-base.xml b/tests/flattener_dicos/70container_pathaccess/result/00-base.xml index d71b70d0..0ec2a347 100644 --- a/tests/flattener_dicos/70container_pathaccess/result/00-base.xml +++ b/tests/flattener_dicos/70container_pathaccess/result/00-base.xml @@ -8,10 +8,10 @@ hidden auto - + hidden - + hidden @@ -22,7 +22,7 @@ - + basic diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/makedict/base.json b/tests/flattener_dicos/70container_pathaccess_leadership/makedict/base.json index 6298c5e7..797ae5e5 100644 --- a/tests/flattener_dicos/70container_pathaccess_leadership/makedict/base.json +++ b/tests/flattener_dicos/70container_pathaccess_leadership/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "creole.general.nut_monitor_netmask.nut_monitor_netmask": [], "creole.general.nut_monitor_netmask.nut_monitor_host": [], "services.service0.ips.ip0.interface": "auto", "services.service0.ips.ip0.name": [], "services.service0.ips.ip0.netmask": [], "services.service0.ips.ip0.activate": true} +{"rougail.general.mode_conteneur_actif": "oui", "rougail.general.nut_monitor_netmask.nut_monitor_netmask": [], "rougail.general.nut_monitor_netmask.nut_monitor_host": [], "services.service0.ips.ip0.interface": "auto", "services.service0.ips.ip0.name": [], "services.service0.ips.ip0.netmask": [], "services.service0.ips.ip0.activate": true} diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/result/00-base.xml b/tests/flattener_dicos/70container_pathaccess_leadership/result/00-base.xml index 509e61a0..678dc875 100644 --- a/tests/flattener_dicos/70container_pathaccess_leadership/result/00-base.xml +++ b/tests/flattener_dicos/70container_pathaccess_leadership/result/00-base.xml @@ -8,10 +8,10 @@ hidden auto - + hidden - + hidden @@ -22,7 +22,7 @@ - + basic diff --git a/tests/flattener_dicos/70container_save/makedict/base.json b/tests/flattener_dicos/70container_save/makedict/base.json index 00630d60..eb10bec4 100644 --- a/tests/flattener_dicos/70container_save/makedict/base.json +++ b/tests/flattener_dicos/70container_save/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui"} +{"rougail.general.mode_conteneur_actif": "oui"} diff --git a/tests/flattener_dicos/70container_save/result/00-base.xml b/tests/flattener_dicos/70container_save/result/00-base.xml index 077a24b7..e025065a 100644 --- a/tests/flattener_dicos/70container_save/result/00-base.xml +++ b/tests/flattener_dicos/70container_save/result/00-base.xml @@ -1,6 +1,6 @@ - + normal diff --git a/tests/flattener_dicos/70container_serviceaccess/makedict/base.json b/tests/flattener_dicos/70container_serviceaccess/makedict/base.json index 68cfd9eb..edc0279c 100644 --- a/tests/flattener_dicos/70container_serviceaccess/makedict/base.json +++ b/tests/flattener_dicos/70container_serviceaccess/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "services.service0.ports.port0.name": "123", "services.service0.ports.port0.protocol": "udp", "services.service0.ports.port0.activate": true} +{"rougail.general.mode_conteneur_actif": "oui", "services.service0.ports.port0.name": "123", "services.service0.ports.port0.protocol": "udp", "services.service0.ports.port0.activate": true} diff --git a/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml b/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml index 049c8d18..3f4e2687 100644 --- a/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml +++ b/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml @@ -20,7 +20,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_servicerestriction/makedict/base.json b/tests/flattener_dicos/70container_servicerestriction/makedict/base.json index 74c151e7..b161f3f8 100644 --- a/tests/flattener_dicos/70container_servicerestriction/makedict/base.json +++ b/tests/flattener_dicos/70container_servicerestriction/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui", "services.service0.ips.ip0.interface": "eth0", "services.service0.ips.ip0.name": "192.168.1.1", "services.service0.ips.ip0.netmask": "255.255.255.255", "services.service0.ips.ip0.activate": true} +{"rougail.general.mode_conteneur_actif": "oui", "services.service0.ips.ip0.interface": "eth0", "services.service0.ips.ip0.name": "192.168.1.1", "services.service0.ips.ip0.netmask": "255.255.255.255", "services.service0.ips.ip0.activate": true} diff --git a/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml b/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml index 0c444fcc..37be6aa4 100644 --- a/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml +++ b/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml @@ -24,7 +24,7 @@ - + normal diff --git a/tests/flattener_dicos/70container_services/makedict/base.json b/tests/flattener_dicos/70container_services/makedict/base.json index 00630d60..eb10bec4 100644 --- a/tests/flattener_dicos/70container_services/makedict/base.json +++ b/tests/flattener_dicos/70container_services/makedict/base.json @@ -1 +1 @@ -{"creole.general.mode_conteneur_actif": "oui"} +{"rougail.general.mode_conteneur_actif": "oui"} diff --git a/tests/flattener_dicos/70container_services/result/00-base.xml b/tests/flattener_dicos/70container_services/result/00-base.xml index b8db9f4e..3c3dda54 100644 --- a/tests/flattener_dicos/70container_services/result/00-base.xml +++ b/tests/flattener_dicos/70container_services/result/00-base.xml @@ -3,7 +3,7 @@ - + normal diff --git a/tests/flattener_dicos_hum/01fill_context/00-base.xml b/tests/flattener_dicos_hum/01fill_context/00-base.xml deleted file mode 100644 index cd22faaf..00000000 --- a/tests/flattener_dicos_hum/01fill_context/00-base.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - non - - - - - - - - mode_conteneur_actif - - - - - - - - diff --git a/tests/flattener_dicos_hum/01fill_context/makedict/base.json b/tests/flattener_dicos_hum/01fill_context/makedict/base.json deleted file mode 100644 index 7cd045d6..00000000 --- a/tests/flattener_dicos_hum/01fill_context/makedict/base.json +++ /dev/null @@ -1 +0,0 @@ -{"creole.general.mode_conteneur_actif1": null} \ No newline at end of file diff --git a/tests/flattener_dicos_hum/01fill_context/result/00-base.xml b/tests/flattener_dicos_hum/01fill_context/result/00-base.xml deleted file mode 100644 index 7df9992c..00000000 --- a/tests/flattener_dicos_hum/01fill_context/result/00-base.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - normal - - oui - non - force_default_on_freeze - frozen - hidden - mandatory - normal - non - - - oui - non - mandatory - normal - - creole.general.mode_conteneur_actif - - - - - - - diff --git a/tests/flattener_dicos_hum/10load_hidden_if_in/00-base.xml b/tests/flattener_dicos_hum/10load_hidden_if_in/00-base.xml deleted file mode 100644 index 793bf56e..00000000 --- a/tests/flattener_dicos_hum/10load_hidden_if_in/00-base.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - non - - - - - - - - - - oui - mode_conteneur_actif - mode_conteneur_actif2 - - - - - - - diff --git a/tests/flattener_dicos_hum/10load_hidden_if_in/result/00-base.xml b/tests/flattener_dicos_hum/10load_hidden_if_in/result/00-base.xml deleted file mode 100644 index 4233eede..00000000 --- a/tests/flattener_dicos_hum/10load_hidden_if_in/result/00-base.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - oui - creole.general.mode_conteneur_actif - creole.general.mode_conteneur_actif2 - - - - - - - diff --git a/tests/flattener_dicos_hum/10load_hidden_if_not_in/00-base.xml b/tests/flattener_dicos_hum/10load_hidden_if_not_in/00-base.xml deleted file mode 100644 index 18e81e51..00000000 --- a/tests/flattener_dicos_hum/10load_hidden_if_not_in/00-base.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - non - - - - - - - - - - oui - mode_conteneur_actif - mode_conteneur_actif2 - - - - - - - diff --git a/tests/flattener_dicos_hum/10load_hidden_if_not_in/result/00-base.xml b/tests/flattener_dicos_hum/10load_hidden_if_not_in/result/00-base.xml deleted file mode 100644 index 24e0f011..00000000 --- a/tests/flattener_dicos_hum/10load_hidden_if_not_in/result/00-base.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - oui - creole.general.mode_conteneur_actif - creole.general.mode_conteneur_actif2 - - - - - - - diff --git a/tests/flattener_dicos_hum/10valid_enum_accent_checkval/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_accent_checkval/00-base.xml deleted file mode 100644 index e4842300..00000000 --- a/tests/flattener_dicos_hum/10valid_enum_accent_checkval/00-base.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - non - - - - - c - - - - - - - - ['a', 'b', 'c', 'é'] - False - - - - - bla bla bla - - - - diff --git a/tests/flattener_dicos_hum/10valid_enum_accent_checkval/makedict/base.json b/tests/flattener_dicos_hum/10valid_enum_accent_checkval/makedict/base.json deleted file mode 100644 index 132193cd..00000000 --- a/tests/flattener_dicos_hum/10valid_enum_accent_checkval/makedict/base.json +++ /dev/null @@ -1 +0,0 @@ -{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "a"} \ No newline at end of file diff --git a/tests/flattener_dicos_hum/10valid_enum_accent_checkval/result/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_accent_checkval/result/00-base.xml deleted file mode 100644 index 122b6597..00000000 --- a/tests/flattener_dicos_hum/10valid_enum_accent_checkval/result/00-base.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - ['a', 'b', 'c', 'é'] - - - - - expert - - oui - non - mandatory - expert - non - - - - expert - - mandatory - expert - a - - - - - diff --git a/tests/flattener_dicos_hum/10valid_enum_checkval/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_checkval/00-base.xml deleted file mode 100644 index 657bad6d..00000000 --- a/tests/flattener_dicos_hum/10valid_enum_checkval/00-base.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - ['a','b','c'] - False - - - - - - - diff --git a/tests/flattener_dicos_hum/10valid_enum_checkval/makedict/base.json b/tests/flattener_dicos_hum/10valid_enum_checkval/makedict/base.json deleted file mode 100644 index ff9061a9..00000000 --- a/tests/flattener_dicos_hum/10valid_enum_checkval/makedict/base.json +++ /dev/null @@ -1 +0,0 @@ -{"creole.general.mode_conteneur_actif": "a"} \ No newline at end of file diff --git a/tests/flattener_dicos_hum/10valid_enum_checkval/result/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_checkval/result/00-base.xml deleted file mode 100644 index 27478a0c..00000000 --- a/tests/flattener_dicos_hum/10valid_enum_checkval/result/00-base.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - ['a','b','c'] - - - - - normal - - mandatory - normal - a - - - - - diff --git a/tests/flattener_dicos_hum/10valid_enum_value_checkval/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_value_checkval/00-base.xml deleted file mode 100644 index 62a372ae..00000000 --- a/tests/flattener_dicos_hum/10valid_enum_value_checkval/00-base.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - b - - - - - - - - ['a','b','c'] - False - - - - - - - diff --git a/tests/flattener_dicos_hum/10valid_enum_value_checkval/makedict/base.json b/tests/flattener_dicos_hum/10valid_enum_value_checkval/makedict/base.json deleted file mode 100644 index ff9061a9..00000000 --- a/tests/flattener_dicos_hum/10valid_enum_value_checkval/makedict/base.json +++ /dev/null @@ -1 +0,0 @@ -{"creole.general.mode_conteneur_actif": "a"} \ No newline at end of file diff --git a/tests/flattener_dicos_hum/10valid_enum_value_checkval/result/00-base.xml b/tests/flattener_dicos_hum/10valid_enum_value_checkval/result/00-base.xml deleted file mode 100644 index 27478a0c..00000000 --- a/tests/flattener_dicos_hum/10valid_enum_value_checkval/result/00-base.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - ['a','b','c'] - - - - - normal - - mandatory - normal - a - - - - - diff --git a/tests/flattener_dicos_hum/51redefine_remove_condition_no_target/00-base.xml b/tests/flattener_dicos_hum/51redefine_remove_condition_no_target/00-base.xml deleted file mode 100644 index 1d18748e..00000000 --- a/tests/flattener_dicos_hum/51redefine_remove_condition_no_target/00-base.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - non - - - non - - - - - - - - - - oui - mode_conteneur_actif1 - mode_conteneur_actif2 - - - oui - - - - - - - diff --git a/tests/flattener_dicos_hum/51redefine_remove_condition_no_target/01-base.xml b/tests/flattener_dicos_hum/51redefine_remove_condition_no_target/01-base.xml deleted file mode 100644 index 128f6153..00000000 --- a/tests/flattener_dicos_hum/51redefine_remove_condition_no_target/01-base.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tests/flattener_dicos_hum/51redefine_remove_condition_no_target/result/00-base.xml b/tests/flattener_dicos_hum/51redefine_remove_condition_no_target/result/00-base.xml deleted file mode 100644 index cec28e6b..00000000 --- a/tests/flattener_dicos_hum/51redefine_remove_condition_no_target/result/00-base.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - oui - creole.general.mode_conteneur_actif2 - - - - - - - diff --git a/tests/test_flattener.py b/tests/test_flattener.py index 50c14fd9..8b1e8da3 100644 --- a/tests/test_flattener.py +++ b/tests/test_flattener.py @@ -8,6 +8,7 @@ from rougail import objspace, annotator from rougail.xml_compare import xml_compare from rougail.error import CreoleDictConsistencyError from rougail.config import dtdfilename +from rougail.annotator import VARIABLE_NAMESPACE @@ -71,7 +72,7 @@ def launch_flattener(test_dir, test_ok=False): subfolder = join(test_dir, 'subfolder') if isdir(subfolder): dirs.append(subfolder) - eolobj.create_or_populate_from_xml('creole', dirs) + eolobj.create_or_populate_from_xml(VARIABLE_NAMESPACE, dirs) subfolder = join(test_dir, 'extra_dirs', 'extra') if isdir(subfolder): eolobj.create_or_populate_from_xml('extra', [subfolder])