diff --git a/data/creole.dtd b/data/creole.dtd
index 82bbfdb3..658e1094 100644
--- a/data/creole.dtd
+++ b/data/creole.dtd
@@ -37,7 +37,7 @@
-
+
@@ -64,19 +64,11 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
@@ -84,9 +76,6 @@
-
-
-
@@ -96,9 +85,6 @@
-
-
-
@@ -121,34 +107,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -219,7 +183,7 @@
-
+
diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py
index 8b6fb2af..c938a2af 100644
--- a/src/rougail/annotator.py
+++ b/src/rougail/annotator.py
@@ -56,8 +56,6 @@ ERASED_ATTRIBUTES = ('redefine', 'exists', 'fallback', 'optional', 'remove_check
'level', 'submulti') # , '_real_container')
ERASED_CONTAINER_ATTRIBUTES = ('id', 'container', 'group_id', 'group', 'container_group')
-NOT_NEED_ACTIVATE = ('disknod',)
-
FORCE_CHOICE = {'oui/non': ['oui', 'non'],
'on/off': ['on', 'off'],
'yes/no': ['yes', 'no'],
@@ -77,16 +75,13 @@ TYPE_PARAM_CHECK = ('string', 'python', 'eole', 'variable')
TYPE_PARAM_CONDITION = ('string', 'python', 'number', 'eole', 'variable')
TYPE_PARAM_FILL = ('string', 'eole', 'number', 'context', 'variable')
-DISKNOD_KEY_TYPE = {'major': 'number',
- 'minor': 'number'}
-
ERASED_FAMILY_ACTION_ATTRIBUTES = ('index', 'action')
FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie'
-class ContainerAnnotator:
- """Manage container's object
+class ServiceAnnotator:
+ """Manage service's object
"""
def __init__(self, objectspace):
self.space = objectspace.space
@@ -99,79 +94,104 @@ class ContainerAnnotator:
"""
self.grouplist_conditions = {}
- self.convert_containers()
+ self.convert_services()
- def convert_containers(self):
- if hasattr(self.space, 'containers'):
- if hasattr(self.space.containers, 'container'):
- self.convert_all()
+ def convert_services(self):
+ if hasattr(self.space, 'services'):
+ if hasattr(self.space.services, 'service'):
subelts = dict()
- # self.space.containers.containers = self.objectspace.containers()
- for idx, container in enumerate(self.space.containers.container.values()):
+ for idx, service in enumerate(self.space.services.service.values()):
family = self.objectspace.family()
- family.name = 'container{}'.format(idx)
- family.doc = container.name
+ family.name = 'service{}'.format(idx)
+ family.doc = service.name
family.family = OrderedDict()
- self.convert_container_to_family(family.name, family.family, container)
- setattr(self.space.containers, family.name, family)
- del self.space.containers.container
+ self.convert_service_to_family(family.name, family.family, service)
+ setattr(self.space.services, family.name, family)
+ del self.space.services.service
else:
- del self.space.containers
+ del self.space.services
- def convert_all(self):
- if hasattr(self.space.containers, 'all'):
- # Remove "all" and dispatch informations in all containers
- for type_, containers in vars(self.space.containers.all).items():
- if type_ == 'index':
- continue
- if isinstance(containers, list):
- for elt in containers:
- for container in self.space.containers.container.values():
- if container.name != 'all':
- if not hasattr(container, type_):
- setattr(container, type_, [])
- new_elt = copy(elt)
- new_elt.container = container
- getattr(container, type_).append(new_elt)
- else:
- for name, elt in containers.items():
- for container in self.space.containers.container.values():
- if container.name != 'all':
- if not hasattr(container, type_):
- setattr(container, type_, OrderedDict())
- old_container = getattr(container, type_)
- if name in old_container:
- raise CreoleDictConsistencyError('{}'.format(name))
- new_elt = copy(elt)
- new_elt.container = container
- old_container[name] = new_elt
- del self.space.containers.all
-
- def convert_container_to_family(self, container_name, container_family, container):
- # tranform container object to family object
+ def convert_service_to_family(self, service_name, service_family, service):
+ # tranform service object to family object
# add services, service_accesses, ...
- for elttype in self.objectspace.container_elt_attr_list:
- if hasattr(container, elttype):
+ for elttype in self.objectspace.service_elt_attr_list:
+ if hasattr(service, elttype):
family = self.objectspace.family()
- key_type_name = elttype.upper() + '_KEY_TYPE'
- if key_type_name in globals():
- key_type = globals()[key_type_name]
- else:
- key_type = {}
if elttype.endswith('s'):
family.name = elttype + 'es'
else:
family.name = elttype + 's'
- values = getattr(container, elttype)
+ values = getattr(service, elttype)
if isinstance(values, dict):
values = list(values.values())
- family.family = self.make_group_from_elts(elttype,
- values,
- key_type,
- 'containers.{}.{}'.format(container_name, family.name),
- True)
+ family.family = self.convert_subelement_service(elttype,
+ values,
+ 'services.{}.{}'.format(service_name, family.name))
family.mode = None
- container_family[family.name] = family
+ service_family[family.name] = family
+
+ def convert_subelement_service(self, name, elts, path):
+ families = []
+ new_elts = self._reorder_elts(name, elts, True)
+ for index, elt_info in enumerate(new_elts):
+ elt = elt_info['elt']
+ elt_name = elt_info['elt_name']
+
+ # try to launch _update_xxxx() function
+ update_elt = '_update_' + elt_name
+ if hasattr(self, update_elt):
+ getattr(self, update_elt)(elt, index, path)
+ variables = []
+ subpath = '{}.{}{}'.format(path, name, index)
+ listname = '{}list'.format(name)
+ activate_path = '.'.join([subpath, 'activate'])
+ if elt in self.grouplist_conditions:
+ # FIXME transformer le activate qui disparait en boolean
+ self.objectspace.list_conditions.setdefault(listname,
+ {}).setdefault(self.grouplist_conditions[elt],
+ []).append(activate_path)
+ for key in dir(elt):
+ if key.startswith('_') or key.endswith('_type') or key in ERASED_ATTRIBUTES:
+ continue
+ value = getattr(elt, key)
+ if isinstance(value, list):
+ continue
+ if key == 'service':
+ value = value.name
+ if key == listname:
+ self.objectspace.list_conditions.setdefault(listname,
+ {}).setdefault(
+ value,
+ []).append(activate_path)
+ continue
+ if key == 'name':
+ true_key = elt_name
+ else:
+ true_key = key
+ if true_key in self.objectspace.booleans_attributs:
+ type_ = 'boolean'
+ else:
+ type_ = 'string'
+ dtd_key_type = true_key + '_type'
+
+ if hasattr(elt, dtd_key_type):
+ type_ = KEY_TYPE[getattr(elt, dtd_key_type)]
+ multi = isinstance(value, list)
+ variables.append(self._generate_element(elt_name,
+ key,
+ value,
+ type_,
+ subpath,
+ multi))
+ # FIXME ne devrait pas etre True par défaut
+ variables.append(self._generate_element(name, 'activate', True, 'boolean', subpath))
+ family = self.objectspace.family()
+ family.name = '{}{}'.format(name, index)
+ family.variable = variables
+ family.mode = None
+ self.paths.append('family', subpath, 'services', creoleobj=family)
+ families.append(family)
+ return families
def _generate_element(self, eltname, name, value, type_, subpath, multi=False):
var_data = {'name': name, 'doc': '', 'value': value,
@@ -216,103 +236,17 @@ class ContainerAnnotator:
choices.append(choice)
variable.choice = choices
path = '{}.{}'.format(subpath, name)
- self.paths.append('variable', path, 'containers', 'containers', variable)
+ self.paths.append('variable', path, 'services', 'service', variable)
return variable
- def _make_disknod_auto(self, type_, index, variable, container_path):
- if not hasattr(self.space.constraints, 'auto'):
- self.space.constraints.auto = []
- auto = self.objectspace.auto()
- self.objectspace.index += 1
- auto.index = self.objectspace.index
- auto.namespace = 'containers'
- param1 = self.objectspace.param()
- param1.text = type_
- param2 = self.objectspace.param()
- param2.text = variable.name
- auto.param = [param1, param2]
- auto.name = 'cdrom_minormajor'
- family = 'disknod{}'.format(index)
- auto.target = '{}.{}.{}'.format(container_path, family, type_)
- if not hasattr(self.space, 'constraints'):
- self.space.constraints = self.objectspace.constraints()
- self.space.constraints.auto.append(auto)
-
- def _make_disknod_type(self, index, variable, container_path):
- auto = self.objectspace.auto()
- self.objectspace.index += 1
- auto.index = self.objectspace.index
- auto.namespace = 'containers'
- param = self.objectspace.param()
- param.text = variable.name
- auto.param = [param]
- auto.name = 'device_type'
- family = 'disknod{}'.format(index)
- auto.target = '{}.{}.type'.format(container_path, family)
- if not hasattr(self.space, 'constraints'):
- self.space.constraints = self.objectspace.constraints()
- if not hasattr(self.space.constraints, 'auto'):
- self.space.constraints.auto = []
- self.space.constraints.auto.append(auto)
-
-
- def _update_disknod(self, disknod, index, container_path):
- disknod.major = None
- disknod.minor = None
- disknod.type = None
- self._make_disknod_auto('minor', index, disknod, container_path)
- self._make_disknod_auto('major', index, disknod, container_path)
- self._make_disknod_type(index, disknod, container_path)
- disknod.mode = u'rwm'
- disknod.permission = 'allow'
-
- def _update_file(self, file_, index, container_path):
- if file_.name_type == "UnicodeOption":
+ def _update_file(self, file_, index, service_path):
+ if file_.file_type == "UnicodeOption":
if not hasattr(file_, 'source'):
file_.source = basename(file_.name)
elif not hasattr(file_, 'source'):
- raise CreoleDictConsistencyError(_('attribute source mandatory for file with SymLinkOption name '
+ raise CreoleDictConsistencyError(_('attribute source mandatory for file with variable name '
'for {}').format(file_.name))
- def _split_elts(self, name, key, value, elt):
- """for example::
-
-
- 123
- ntpd
-
-
- builds a `service_access` object, but we need **two** objects `service_access`,
- for example one for the port and one for the tcpwrapper
- """
- for subelt in value:
- new_elt = copy(elt)
- for subsubelt in dir(subelt):
- if subsubelt.startswith('_') or subsubelt == 'index':
- continue
- if hasattr(new_elt, subsubelt):
- if hasattr(elt, 'name'):
- name_ = elt.name
- else:
- name_ = elt.service
- raise CreoleDictConsistencyError(_('attribute {} already exists '
- 'for {}').format(subsubelt,
- name_))
- setattr(new_elt, subsubelt, getattr(subelt, subsubelt))
- if hasattr(new_elt, 'node_name') or hasattr(new_elt, 'name_type'):
- raise CreoleDictConsistencyError(_('attribute node_name or name_type '
- 'already exists for {}'
- '').format(name))
- if hasattr(subelt, key + '_type'):
- type_ = getattr(subelt, key + '_type')
- setattr(new_elt, 'name_type', type_)
- setattr(new_elt, 'node_name', key)
- if not hasattr(new_elt, name + 'list'):
- setattr(new_elt, name + 'list', '___auto_{}'.format(elt.service))
- else:
- self.grouplist_conditions[new_elt] = '___auto_{}'.format(elt.service)
- yield new_elt
-
def _reorder_elts(self, name, elts, duplicate_list):
"""Reorders by index the elts (the interface,
the hosts, actions...)
@@ -338,11 +272,6 @@ class ContainerAnnotator:
if key.startswith('_') or key.endswith('_type') or key in ERASED_ATTRIBUTES:
continue
value = getattr(elt, key)
- if isinstance(value, list) and duplicate_list:
- for new_elt in self._split_elts(name, key, value, elt):
- dict_elts.setdefault(new_elt.name, []).append({'elt_name': key,
- 'elt': new_elt})
- elt_added = True
if not elt_added:
if hasattr(elt, 'name'):
eltname = elt.name
@@ -355,7 +284,7 @@ class ContainerAnnotator:
result_elts.extend(elt)
return result_elts
- def make_group_from_elts(self, name, elts, key_type, path, duplicate_list):
+ def make_group_from_elts(self, name, elts, path, duplicate_list):
"""Splits each objects into a group (and `OptionDescription`, in tiramisu terms)
and build elements and its attributes (the `Options` in tiramisu terms)
"""
@@ -373,7 +302,7 @@ class ContainerAnnotator:
subpath = '{}.{}{}'.format(path, name, index)
listname = '{}list'.format(name)
activate_path = '.'.join([subpath, 'activate'])
- if name not in NOT_NEED_ACTIVATE and elt in self.grouplist_conditions:
+ if elt in self.grouplist_conditions:
# FIXME transformer le activate qui disparait en boolean
self.objectspace.list_conditions.setdefault(listname,
{}).setdefault(self.grouplist_conditions[elt],
@@ -383,19 +312,18 @@ class ContainerAnnotator:
continue
value = getattr(elt, key)
if isinstance(value, list) and duplicate_list:
+ # FIXME plusieurs fichier si calculé !
continue
- if key == 'container':
- value = value.name
- if name not in NOT_NEED_ACTIVATE and key == listname:
+ if key == listname:
self.objectspace.list_conditions.setdefault(listname,
{}).setdefault(
value,
[]).append(activate_path)
continue
- default_type = 'string'
if key in self.objectspace.booleans_attributs:
- default_type = 'boolean'
- type_ = key_type.get(key, default_type)
+ type_ = 'boolean'
+ else:
+ type_ = 'string'
dtd_key_type = key + '_type'
if hasattr(elt, dtd_key_type):
type_ = KEY_TYPE[getattr(elt, dtd_key_type)]
@@ -406,19 +334,18 @@ class ContainerAnnotator:
type_,
subpath,
multi))
- if name not in NOT_NEED_ACTIVATE:
- # FIXME ne devrait pas etre True par défaut
- variables.append(self._generate_element(name, 'activate', True, 'boolean', subpath))
+ # FIXME ne devrait pas etre True par défaut
+ variables.append(self._generate_element(name, 'activate', True, 'boolean', subpath))
family = self.objectspace.family()
family.name = '{}{}'.format(name, index)
family.variable = variables
family.mode = None
- self.paths.append('family', subpath, 'containers', creoleobj=family)
+ self.paths.append('family', subpath, 'services', creoleobj=family)
families.append(family)
return families
-class ActionAnnotator(ContainerAnnotator):
+class ActionAnnotator(ServiceAnnotator):
def __init__(self, objectspace):
self.space = objectspace.space
self.paths = objectspace.paths
@@ -443,7 +370,7 @@ class ActionAnnotator(ContainerAnnotator):
'').format(namespace))
namespaces.append(namespace)
action.name = action.namespace
- new_actions = self.make_group_from_elts('action', actions.action, {}, subpath, False)
+ new_actions = self.make_group_from_elts('action', actions.action, subpath, False)
family = self.objectspace.family()
family.name = actions.name
family.family = new_actions
@@ -491,7 +418,7 @@ class SpaceAnnotator(object):
self.change_family_mode()
self.dynamic_families()
self.filter_separators()
- self.absolute_path_for_symlink_in_containers()
+ self.absolute_path_for_symlink_in_services()
self.convert_helps()
if hasattr(self.space, 'constraints'):
del self.space.constraints.index
@@ -499,10 +426,10 @@ class SpaceAnnotator(object):
raise Exception('constraints again?')
del self.space.constraints
- def absolute_path_for_symlink_in_containers(self):
- if not hasattr(self.space, 'containers'):
+ def absolute_path_for_symlink_in_services(self):
+ if not hasattr(self.space, 'services'):
return
- families = vars(self.space.containers).values()
+ families = vars(self.space.services).values()
for family in families:
if hasattr(family, 'family'):
for fam in family.family.values():
@@ -645,7 +572,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.containers.') \
+ if not HIGH_COMPATIBILITY or (not path.startswith('creole.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:
@@ -965,9 +892,9 @@ class SpaceAnnotator(object):
if param.type == 'eole':
param.type = 'variable'
if param.type == 'variable':
- if HIGH_COMPATIBILITY and param.text.startswith('container_ip'):
- if param.optional is True:
- param_option_indexes.append(idx)
+ # if HIGH_COMPATIBILITY and param.text.startswith('container_ip'):
+ # if param.optional is True:
+ # param_option_indexes.append(idx)
try:
param.text = self.paths.get_variable_path(param.text, namespace)
except CreoleDictConsistencyError as err:
@@ -1167,9 +1094,9 @@ class SpaceAnnotator(object):
# 'so cannot depends to an '
# 'other variable'
# ).format(fill.name, fill.target))
- if HIGH_COMPATIBILITY and param.text.startswith('container_ip'):
- if param.optional is True:
- param_option_indexes.append(fill_idx)
+ # if HIGH_COMPATIBILITY and param.text.startswith('container_ip'):
+ # if param.optional is True:
+ # param_option_indexes.append(fill_idx)
try:
param.text = self.paths.get_variable_path(param.text, namespace)
except CreoleDictConsistencyError as err:
diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py
index 49f2a424..5c6047e4 100644
--- a/src/rougail/objspace.py
+++ b/src/rougail/objspace.py
@@ -30,12 +30,12 @@ from json import dump
from .i18n import _
from .xmlreflector import XMLReflector, HIGH_COMPATIBILITY
-from .annotator import ERASED_ATTRIBUTES, ActionAnnotator, ContainerAnnotator, SpaceAnnotator
+from .annotator import ERASED_ATTRIBUTES, ActionAnnotator, ServiceAnnotator, SpaceAnnotator
from .utils import normalize_family
from .error import CreoleOperationError, SpaceObjShallNotBeUpdated, CreoleDictConsistencyError
# CreoleObjSpace's elements like 'family' or 'slave', that shall be forced to the Redefinable type
-FORCE_REDEFINABLES = ('family', 'slave', 'container', 'disknod', 'variables', 'family_action')
+FORCE_REDEFINABLES = ('family', 'slave', 'service', 'disknod', 'variables', 'family_action')
# CreoleObjSpace's elements that shall be forced to the UnRedefinable type
FORCE_UNREDEFINABLES = ('value', 'input', 'profile', 'ewtapp', 'tag', 'saltaction')
# CreoleObjSpace's elements that shall be set to the UnRedefinable type
@@ -86,8 +86,8 @@ class CreoleObjSpace(object):
self.redefine_variables = None
self.probe_variables = []
- # elt container's attrs list
- self.container_elt_attr_list = [] #
+ # elt service's attrs list
+ self.service_elt_attr_list = [] #
# ['variable', 'separator', 'family']
self.forced_text_elts = set()
# ['disknod', 'follower', 'target', 'service', 'package', 'ip', 'value', 'tcpwrapper',
@@ -106,8 +106,8 @@ class CreoleObjSpace(object):
forced_text_elt = False
if elt.type == 'mixed':
forced_text_elt = True
- if elt.name == 'container':
- self.container_elt_attr_list = [elt.content.left.name]
+ if elt.name == 'service':
+ self.service_elt_attr_list = [elt.content.left.name]
self.parse_dtd_right_left_elt(elt.content)
for attr in elt.iterattributes():
atomic = False
@@ -152,10 +152,10 @@ class CreoleObjSpace(object):
def parse_dtd_right_left_elt(self, elt):
if elt.right.type == 'or':
- self.container_elt_attr_list.append(elt.right.left.name)
+ self.service_elt_attr_list.append(elt.right.left.name)
self.parse_dtd_right_left_elt(elt.right)
else:
- self.container_elt_attr_list.append(elt.right.name)
+ self.service_elt_attr_list.append(elt.right.name)
def _convert_boolean(self, value): # pylint: disable=R0201
"""Boolean coercion. The Creole XML may contain srings like `True` or `False`
@@ -297,7 +297,7 @@ class CreoleObjSpace(object):
def create_tree_structure(self, space, child, creoleobj): # pylint: disable=R0201
"""
Builds the tree structure of the object space here
- we set containers attributes in order to be populated later on
+ we set services attributes in order to be populated later on
for example::
space = Family()
@@ -458,7 +458,7 @@ class CreoleObjSpace(object):
def space_visitor(self, eosfunc_file): # pylint: disable=C0111
ActionAnnotator(self)
- ContainerAnnotator(self)
+ ServiceAnnotator(self)
SpaceAnnotator(self, eosfunc_file)
def save(self, filename, force_no_save=False):
@@ -515,7 +515,7 @@ class CreoleObjSpace(object):
_name = 'leader'
else:
_name = name
- if name in ['containers', 'variables', 'actions']:
+ if name in ['services', 'variables', 'actions']:
_name = 'family'
if HIGH_COMPATIBILITY and not hasattr(subspace, 'doc'):
subspace.doc = ''
@@ -524,7 +524,7 @@ class CreoleObjSpace(object):
child_node = SubElement(node, _name)
self._xml_export(child_node, subspace, _name)
elif isinstance(space, self.Atom):
- if name == 'containers':
+ if name == 'services':
child_node = SubElement(node, 'family')
child_node.attrib['name'] = name
else:
@@ -652,7 +652,7 @@ class Path(object):
raise CreoleOperationError('current_namespace must not be None')
dico = self._get_variable(name)
if not allow_source:
- if dico['namespace'] != 'creole' and current_namespace != dico['namespace']:
+ if dico['namespace'] not in ['creole', '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))
diff --git a/src/rougail/template.py b/src/rougail/template.py
index ae0f6c0a..d3ca1352 100644
--- a/src/rougail/template.py
+++ b/src/rougail/template.py
@@ -465,7 +465,7 @@ class CreoleTemplateEngine:
"""
for option in await self.config.option.list(type='all'):
namespace = await option.option.name()
- if namespace in ['containers', 'actions']:
+ if namespace in ['services', 'actions']:
continue
elif namespace == 'creole':
await self.load_eole_variables_creole(self.config,
@@ -476,11 +476,11 @@ class CreoleTemplateEngine:
option)
for template in listdir(self.distrib_dir):
self.prepare_template(join(self.distrib_dir, template))
- for container_obj in await self.config.option('containers').list('all'):
- current_container = await container_obj.option.doc()
+ for service_obj in await self.config.option('services').list('all'):
+ current_container = await service_obj.option.doc()
if container is not None and container != current_container:
continue
- for fills in await container_obj.list('all'):
+ for fills in await service_obj.list('all'):
if await fills.option.name() == 'files':
for fill_obj in await fills.list('all'):
fill = await fill_obj.value.dict()
diff --git a/tests/flattener_dicos/00empty/00_base.xml b/tests/flattener_dicos/00empty/00_base.xml
index 7ba94a44..545bd9c3 100644
--- a/tests/flattener_dicos/00empty/00_base.xml
+++ b/tests/flattener_dicos/00empty/00_base.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
diff --git a/tests/flattener_dicos/00empty/result/00-base.xml b/tests/flattener_dicos/00empty/result/00-base.xml
index e0ce864d..320698ef 100644
--- a/tests/flattener_dicos/00empty/result/00-base.xml
+++ b/tests/flattener_dicos/00empty/result/00-base.xml
@@ -1,7 +1,7 @@
-
-
+
+
basic
diff --git a/tests/flattener_dicos/00load_autofreeze/00-base.xml b/tests/flattener_dicos/00load_autofreeze/00-base.xml
index 56f9b3a2..07d258b2 100644
--- a/tests/flattener_dicos/00load_autofreeze/00-base.xml
+++ b/tests/flattener_dicos/00load_autofreeze/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/00load_autofreeze/makedict/base.json b/tests/flattener_dicos/00load_autofreeze/makedict/base.json
index f884e87d..4909ab10 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.module_instancie": "non"}
diff --git a/tests/flattener_dicos/00load_autofreezeexpert/00-base.xml b/tests/flattener_dicos/00load_autofreezeexpert/00-base.xml
index 8c5f9457..a835d437 100644
--- a/tests/flattener_dicos/00load_autofreezeexpert/00-base.xml
+++ b/tests/flattener_dicos/00load_autofreezeexpert/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/00load_autofreezeexpert/makedict/base.json b/tests/flattener_dicos/00load_autofreezeexpert/makedict/base.json
index f884e87d..4909ab10 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.module_instancie": "non"}
diff --git a/tests/flattener_dicos/00load_autosave/00-base.xml b/tests/flattener_dicos/00load_autosave/00-base.xml
index cf82ff0d..612011e9 100644
--- a/tests/flattener_dicos/00load_autosave/00-base.xml
+++ b/tests/flattener_dicos/00load_autosave/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/00load_autosave/makedict/base.json b/tests/flattener_dicos/00load_autosave/makedict/base.json
index bf6b67e6..f06f2ed8 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non"}
diff --git a/tests/flattener_dicos/00load_autosaveexpert/00-base.xml b/tests/flattener_dicos/00load_autosaveexpert/00-base.xml
index 16dd8dda..8f986047 100644
--- a/tests/flattener_dicos/00load_autosaveexpert/00-base.xml
+++ b/tests/flattener_dicos/00load_autosaveexpert/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/00load_autosaveexpert/makedict/base.json b/tests/flattener_dicos/00load_autosaveexpert/makedict/base.json
index bf6b67e6..f06f2ed8 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non"}
diff --git a/tests/flattener_dicos/00load_comment/00-base.xml b/tests/flattener_dicos/00load_comment/00-base.xml
index e98f036e..dab2353b 100644
--- a/tests/flattener_dicos/00load_comment/00-base.xml
+++ b/tests/flattener_dicos/00load_comment/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/00load_notype/00-base.xml b/tests/flattener_dicos/00load_notype/00-base.xml
index b090917a..eecc5177 100644
--- a/tests/flattener_dicos/00load_notype/00-base.xml
+++ b/tests/flattener_dicos/00load_notype/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/00load_notype/makedict/base.json b/tests/flattener_dicos/00load_notype/makedict/base.json
index 7b3cfe8d..87b2ec3b 100644
--- a/tests/flattener_dicos/00load_notype/makedict/base.json
+++ b/tests/flattener_dicos/00load_notype/makedict/base.json
@@ -1 +1 @@
-{"creole.general.without_type": "non"}
\ No newline at end of file
+{"creole.general.without_type": "non"}
diff --git a/tests/flattener_dicos/00load_save/00-base.xml b/tests/flattener_dicos/00load_save/00-base.xml
index af3c8bfa..7710e3c2 100644
--- a/tests/flattener_dicos/00load_save/00-base.xml
+++ b/tests/flattener_dicos/00load_save/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/00load_subfolder/99-base.xml b/tests/flattener_dicos/00load_subfolder/99-base.xml
index af3c8bfa..7710e3c2 100644
--- a/tests/flattener_dicos/00load_subfolder/99-base.xml
+++ b/tests/flattener_dicos/00load_subfolder/99-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/00load_subfolder/subfolder/00-base.xml b/tests/flattener_dicos/00load_subfolder/subfolder/00-base.xml
index 3500c820..be7e84a7 100644
--- a/tests/flattener_dicos/00load_subfolder/subfolder/00-base.xml
+++ b/tests/flattener_dicos/00load_subfolder/subfolder/00-base.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/tests/flattener_dicos/01auto_base/00-base.xml b/tests/flattener_dicos/01auto_base/00-base.xml
index 5b921352..cb085bd4 100644
--- a/tests/flattener_dicos/01auto_base/00-base.xml
+++ b/tests/flattener_dicos/01auto_base/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01auto_base/makedict/base.json b/tests/flattener_dicos/01auto_base/makedict/base.json
index bda74bb7..8f8f47c6 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_actif1": "non"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/01auto_withoutparam/00-base.xml b/tests/flattener_dicos/01auto_withoutparam/00-base.xml
index 5e19ee08..67253f35 100644
--- a/tests/flattener_dicos/01auto_withoutparam/00-base.xml
+++ b/tests/flattener_dicos/01auto_withoutparam/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01auto_withoutparam/makedict/base.json b/tests/flattener_dicos/01auto_withoutparam/makedict/base.json
index bda74bb7..8f8f47c6 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_actif1": "non"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/01fill_autofreeze/00-base.xml b/tests/flattener_dicos/01fill_autofreeze/00-base.xml
index 24aeb442..30a3ae01 100644
--- a/tests/flattener_dicos/01fill_autofreeze/00-base.xml
+++ b/tests/flattener_dicos/01fill_autofreeze/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01fill_autofreeze/makedict/base.json b/tests/flattener_dicos/01fill_autofreeze/makedict/base.json
index 2b7f732b..58bc35f0 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non", "creole.general.module_instancie": "non"}
diff --git a/tests/flattener_dicos/01fill_autosave/00-base.xml b/tests/flattener_dicos/01fill_autosave/00-base.xml
index 18da20d3..4a9b79cb 100644
--- a/tests/flattener_dicos/01fill_autosave/00-base.xml
+++ b/tests/flattener_dicos/01fill_autosave/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01fill_autosave/makedict/base.json b/tests/flattener_dicos/01fill_autosave/makedict/base.json
index fd2b82c1..530abf24 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/01fill_base/00-base.xml b/tests/flattener_dicos/01fill_base/00-base.xml
index 0bf4a908..474bd94d 100644
--- a/tests/flattener_dicos/01fill_base/00-base.xml
+++ b/tests/flattener_dicos/01fill_base/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01fill_base/makedict/base.json b/tests/flattener_dicos/01fill_base/makedict/base.json
index bda74bb7..8f8f47c6 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_actif1": "non"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/01fill_baseaccent/00-base.xml b/tests/flattener_dicos/01fill_baseaccent/00-base.xml
index 2d582e01..571c1616 100644
--- a/tests/flattener_dicos/01fill_baseaccent/00-base.xml
+++ b/tests/flattener_dicos/01fill_baseaccent/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01fill_baseaccent/makedict/base.json b/tests/flattener_dicos/01fill_baseaccent/makedict/base.json
index bda74bb7..8f8f47c6 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_actif1": "non"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/01fill_mandatory/00-base.xml b/tests/flattener_dicos/01fill_mandatory/00-base.xml
index 7479379e..47c378af 100644
--- a/tests/flattener_dicos/01fill_mandatory/00-base.xml
+++ b/tests/flattener_dicos/01fill_mandatory/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01fill_mandatory/makedict/base.json b/tests/flattener_dicos/01fill_mandatory/makedict/base.json
index fd2b82c1..530abf24 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/01fill_number/00-base.xml b/tests/flattener_dicos/01fill_number/00-base.xml
index 31c97dfa..05bb874e 100644
--- a/tests/flattener_dicos/01fill_number/00-base.xml
+++ b/tests/flattener_dicos/01fill_number/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01fill_number/makedict/base.json b/tests/flattener_dicos/01fill_number/makedict/base.json
index bda74bb7..8f8f47c6 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_actif1": "non"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/01fill_optional/00-base.xml b/tests/flattener_dicos/01fill_optional/00-base.xml
index f923aa41..1e1429c8 100644
--- a/tests/flattener_dicos/01fill_optional/00-base.xml
+++ b/tests/flattener_dicos/01fill_optional/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01fill_optional/makedict/base.json b/tests/flattener_dicos/01fill_optional/makedict/base.json
index bda74bb7..8f8f47c6 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_actif1": "non"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/01separator_base/00-base.xml b/tests/flattener_dicos/01separator_base/00-base.xml
index 54cb0657..90428098 100644
--- a/tests/flattener_dicos/01separator_base/00-base.xml
+++ b/tests/flattener_dicos/01separator_base/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/01separator_neverhidden/00-base.xml b/tests/flattener_dicos/01separator_neverhidden/00-base.xml
index ddb1f943..9cdb6fe2 100644
--- a/tests/flattener_dicos/01separator_neverhidden/00-base.xml
+++ b/tests/flattener_dicos/01separator_neverhidden/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10autosave_hidden/00-base.xml b/tests/flattener_dicos/10autosave_hidden/00-base.xml
index b367c530..eb616911 100644
--- a/tests/flattener_dicos/10autosave_hidden/00-base.xml
+++ b/tests/flattener_dicos/10autosave_hidden/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml b/tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml
index 8b7c66af..b79ee4d1 100644
--- a/tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml
+++ b/tests/flattener_dicos/10autosave_hidden_frozenifin/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json b/tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json
index 160a4f84..fb8fd49f 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.autosavevar": null}
\ No newline at end of file
+{"creole.general.autosavevar": null}
diff --git a/tests/flattener_dicos/10check_base/00-base.xml b/tests/flattener_dicos/10check_base/00-base.xml
index 86f85657..00cf2e12 100644
--- a/tests/flattener_dicos/10check_base/00-base.xml
+++ b/tests/flattener_dicos/10check_base/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10check_base/makedict/base.json b/tests/flattener_dicos/10check_base/makedict/base.json
index c77b6a90..43996096 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}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "b", "creole.general.int": null}
diff --git a/tests/flattener_dicos/10check_option/00-base.xml b/tests/flattener_dicos/10check_option/00-base.xml
index 6dfe146f..1a47991a 100644
--- a/tests/flattener_dicos/10check_option/00-base.xml
+++ b/tests/flattener_dicos/10check_option/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10check_option/makedict/base.json b/tests/flattener_dicos/10check_option/makedict/base.json
index 0411902b..518cf56b 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}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "b", "creole.general.int2": 100, "creole.general.int": null}
diff --git a/tests/flattener_dicos/10check_optional/00-base.xml b/tests/flattener_dicos/10check_optional/00-base.xml
index df6ef40c..b45b6ec4 100644
--- a/tests/flattener_dicos/10check_optional/00-base.xml
+++ b/tests/flattener_dicos/10check_optional/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10check_optional/makedict/base.json b/tests/flattener_dicos/10check_optional/makedict/base.json
index 22f5d8ca..cbc8625f 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}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "b", "creole.general.int": null, "creole.general.int2": null}
diff --git a/tests/flattener_dicos/10check_valid_differ/00-base.xml b/tests/flattener_dicos/10check_valid_differ/00-base.xml
index 5d4dca8f..4c4a2eed 100644
--- a/tests/flattener_dicos/10check_valid_differ/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10check_valid_differ/makedict/base.json b/tests/flattener_dicos/10check_valid_differ/makedict/base.json
index e9dc509c..dc3eb091 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "oui", "creole.general.mode_conteneur_actif1": "non"}
diff --git a/tests/flattener_dicos/10check_valid_differ_add/00-base.xml b/tests/flattener_dicos/10check_valid_differ_add/00-base.xml
index 00860c07..150649d0 100644
--- a/tests/flattener_dicos/10check_valid_differ_add/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ_add/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10check_valid_differ_add/01-base.xml b/tests/flattener_dicos/10check_valid_differ_add/01-base.xml
index 5f81c3ef..c85eab75 100644
--- a/tests/flattener_dicos/10check_valid_differ_add/01-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ_add/01-base.xml
@@ -1,7 +1,7 @@
-
+
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 5b00949f..6b217817 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "oui", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general.mode_conteneur_actif3": "oui"}
diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/00-base.xml b/tests/flattener_dicos/10check_valid_differ_removecheck/00-base.xml
index 00860c07..150649d0 100644
--- a/tests/flattener_dicos/10check_valid_differ_removecheck/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ_removecheck/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/01-base.xml b/tests/flattener_dicos/10check_valid_differ_removecheck/01-base.xml
index 458c54d4..2a1c1d1d 100644
--- a/tests/flattener_dicos/10check_valid_differ_removecheck/01-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ_removecheck/01-base.xml
@@ -1,7 +1,7 @@
-
+
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 5b00949f..6b217817 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "oui", "creole.general.mode_conteneur_actif1": "non", "creole.general.mode_conteneur_actif2": "non", "creole.general.mode_conteneur_actif3": "oui"}
diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/00-base.xml b/tests/flattener_dicos/10check_valid_ipnetmask/00-base.xml
index 1b671813..52041239 100644
--- a/tests/flattener_dicos/10check_valid_ipnetmask/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_ipnetmask/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/makedict/base.json b/tests/flattener_dicos/10check_valid_ipnetmask/makedict/base.json
index ec6fe9bf..8e900373 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}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "oui", "creole.general.adresse_ip_eth0": null, "creole.general.adresse_netmask_eth0": null}
diff --git a/tests/flattener_dicos/10load_disabled_if_in/00-base.xml b/tests/flattener_dicos/10load_disabled_if_in/00-base.xml
index 3a95a384..5d0964eb 100644
--- a/tests/flattener_dicos/10load_disabled_if_in/00-base.xml
+++ b/tests/flattener_dicos/10load_disabled_if_in/00-base.xml
@@ -1,7 +1,7 @@
-
+
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 0725cb1d..ee95cc57 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"}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"}
diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/00-base.xml b/tests/flattener_dicos/10load_disabled_if_in_none/00-base.xml
index 8469ff0a..45148b9a 100644
--- a/tests/flattener_dicos/10load_disabled_if_in_none/00-base.xml
+++ b/tests/flattener_dicos/10load_disabled_if_in_none/00-base.xml
@@ -1,7 +1,7 @@
-
+
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 0725cb1d..ee95cc57 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"}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"}
diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent/00-base.xml b/tests/flattener_dicos/10load_disabled_if_inaccent/00-base.xml
index bd041572..e160bac0 100644
--- a/tests/flattener_dicos/10load_disabled_if_inaccent/00-base.xml
+++ b/tests/flattener_dicos/10load_disabled_if_inaccent/00-base.xml
@@ -1,7 +1,7 @@
-
+
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 0725cb1d..ee95cc57 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"}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"}
diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/00-base.xml b/tests/flattener_dicos/10load_disabledifin_fallback/00-base.xml
index 6b108863..08657595 100644
--- a/tests/flattener_dicos/10load_disabledifin_fallback/00-base.xml
+++ b/tests/flattener_dicos/10load_disabledifin_fallback/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/makedict/base.json b/tests/flattener_dicos/10load_disabledifin_fallback/makedict/base.json
index fec7de58..cd6b4f1a 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"}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif2": "non"}
diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/00-base.xml b/tests/flattener_dicos/10load_disabledifin_whithouttype/00-base.xml
index 81c9e811..535674e8 100644
--- a/tests/flattener_dicos/10load_disabledifin_whithouttype/00-base.xml
+++ b/tests/flattener_dicos/10load_disabledifin_whithouttype/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/makedict/base.json b/tests/flattener_dicos/10load_disabledifin_whithouttype/makedict/base.json
index 0725cb1d..ee95cc57 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"}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"}
diff --git a/tests/flattener_dicos/10load_frozenifin/00-base.xml b/tests/flattener_dicos/10load_frozenifin/00-base.xml
index 4a1980d7..7d775a4c 100644
--- a/tests/flattener_dicos/10load_frozenifin/00-base.xml
+++ b/tests/flattener_dicos/10load_frozenifin/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_frozenifin/makedict/base.json b/tests/flattener_dicos/10load_frozenifin/makedict/base.json
index 0725cb1d..ee95cc57 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"}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"}
diff --git a/tests/flattener_dicos/10load_frozenifin_auto/00-base.xml b/tests/flattener_dicos/10load_frozenifin_auto/00-base.xml
index 7d72d11b..e3eb4eb6 100644
--- a/tests/flattener_dicos/10load_frozenifin_auto/00-base.xml
+++ b/tests/flattener_dicos/10load_frozenifin_auto/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json b/tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json
index bf87a60c..4922432e 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"}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": null, "creole.general.mode_conteneur_actif2": "non"}
diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml b/tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml
index 9717d680..7fc020d1 100644
--- a/tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml
+++ b/tests/flattener_dicos/10load_frozenifin_multiparam/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/makedict/base.json b/tests/flattener_dicos/10load_frozenifin_multiparam/makedict/base.json
index f72aae68..e47ed39c 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"}
\ No newline at end of file
+{"creole.general.condition": "tous"}
diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/makedict/base.json b/tests/flattener_dicos/10load_frozenifin_noexist/makedict/base.json
index f72aae68..e47ed39c 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"}
\ No newline at end of file
+{"creole.general.condition": "tous"}
diff --git a/tests/flattener_dicos/10load_mandatoryifin/00-base.xml b/tests/flattener_dicos/10load_mandatoryifin/00-base.xml
index 61adb76b..eea1a985 100644
--- a/tests/flattener_dicos/10load_mandatoryifin/00-base.xml
+++ b/tests/flattener_dicos/10load_mandatoryifin/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_mandatoryifin/makedict/base.json b/tests/flattener_dicos/10load_mandatoryifin/makedict/base.json
index 0725cb1d..ee95cc57 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"}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non"}
diff --git a/tests/flattener_dicos/10load_masterslaves/00-base.xml b/tests/flattener_dicos/10load_masterslaves/00-base.xml
index 99b0f2a5..f1d5d0a5 100644
--- a/tests/flattener_dicos/10load_masterslaves/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_masterslaves/makedict/base.json b/tests/flattener_dicos/10load_masterslaves/makedict/base.json
index 7c3624f5..d80c04f0 100644
--- a/tests/flattener_dicos/10load_masterslaves/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []}
diff --git a/tests/flattener_dicos/10load_masterslaves_default_multi/00-base.xml b/tests/flattener_dicos/10load_masterslaves_default_multi/00-base.xml
index e8c87581..9b505a26 100644
--- a/tests/flattener_dicos/10load_masterslaves_default_multi/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_default_multi/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_masterslaves_default_multi/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_default_multi/makedict/base.json
index 598dfc8c..d3f6f01a 100644
--- a/tests/flattener_dicos/10load_masterslaves_default_multi/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves_default_multi/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": ["non"], "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": ["non"], "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
diff --git a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/00-base.xml b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/00-base.xml
index f89e96b6..85902cc7 100644
--- a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/makedict/base.json
index ee2a7cb6..044ad1ee 100644
--- a/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves_defaultmulti_master/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": ["non"], "creole.general.master.master": ["value"], "creole.general.master.slave1": [null], "creole.general.master.slave2": [null]}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": ["non"], "creole.general.master.master": ["value"], "creole.general.master.slave1": [null], "creole.general.master.slave2": [null]}
diff --git a/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
index 7c3624f5..d80c04f0 100644
--- a/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []}
diff --git a/tests/flattener_dicos/10load_masterslaves_normalize_family/00-base.xml b/tests/flattener_dicos/10load_masterslaves_normalize_family/00-base.xml
index 0d918810..23d1b3ef 100644
--- a/tests/flattener_dicos/10load_masterslaves_normalize_family/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_normalize_family/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_masterslaves_normalize_family/01-base.xml b/tests/flattener_dicos/10load_masterslaves_normalize_family/01-base.xml
index 8a315396..968590e3 100644
--- a/tests/flattener_dicos/10load_masterslaves_normalize_family/01-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves_normalize_family/01-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10load_masterslaves_normalize_family/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_normalize_family/makedict/base.json
index 9482056d..a82c00c4 100644
--- a/tests/flattener_dicos/10load_masterslaves_normalize_family/makedict/base.json
+++ b/tests/flattener_dicos/10load_masterslaves_normalize_family/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general_1.master.master": [], "creole.general_1.master.slave1": [], "creole.general_1.master.slave2": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general_1.master.master": [], "creole.general_1.master.slave1": [], "creole.general_1.master.slave2": []}
diff --git a/tests/flattener_dicos/10load_multivalue/00-base.xml b/tests/flattener_dicos/10load_multivalue/00-base.xml
index 087cfd43..0b04f09d 100644
--- a/tests/flattener_dicos/10load_multivalue/00-base.xml
+++ b/tests/flattener_dicos/10load_multivalue/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslave_autosaveexpert/00-base.xml b/tests/flattener_dicos/10masterslave_autosaveexpert/00-base.xml
index 3771b737..0f936928 100644
--- a/tests/flattener_dicos/10masterslave_autosaveexpert/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_autosaveexpert/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslave_autosaveexpert/makedict/base.json b/tests/flattener_dicos/10masterslave_autosaveexpert/makedict/base.json
index 819d27ee..61f7517c 100644
--- a/tests/flattener_dicos/10masterslave_autosaveexpert/makedict/base.json
+++ b/tests/flattener_dicos/10masterslave_autosaveexpert/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
diff --git a/tests/flattener_dicos/10masterslave_mandatory/00-base.xml b/tests/flattener_dicos/10masterslave_mandatory/00-base.xml
index 87730b9a..34a87299 100644
--- a/tests/flattener_dicos/10masterslave_mandatory/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mandatory/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslave_mandatory/makedict/base.json b/tests/flattener_dicos/10masterslave_mandatory/makedict/base.json
index 819d27ee..61f7517c 100644
--- a/tests/flattener_dicos/10masterslave_mandatory/makedict/base.json
+++ b/tests/flattener_dicos/10masterslave_mandatory/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
diff --git a/tests/flattener_dicos/10masterslave_mandatoryslave/makedict/base.json b/tests/flattener_dicos/10masterslave_mandatoryslave/makedict/base.json
index ef67b29e..81e39999 100644
--- a/tests/flattener_dicos/10masterslave_mandatoryslave/makedict/base.json
+++ b/tests/flattener_dicos/10masterslave_mandatoryslave/makedict/base.json
@@ -1 +1 @@
-{"creole.general.nut_monitor_netmask.nut_monitor_netmask": [], "creole.general.nut_monitor_netmask.nut_monitor_host": []}
\ No newline at end of file
+{"creole.general.nut_monitor_netmask.nut_monitor_netmask": [], "creole.general.nut_monitor_netmask.nut_monitor_host": []}
diff --git a/tests/flattener_dicos/10masterslave_mastermandatory/00-base.xml b/tests/flattener_dicos/10masterslave_mastermandatory/00-base.xml
index dd639e09..606e37cc 100644
--- a/tests/flattener_dicos/10masterslave_mastermandatory/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mastermandatory/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslave_mastermandatory/makedict/base.json b/tests/flattener_dicos/10masterslave_mastermandatory/makedict/base.json
index 819d27ee..61f7517c 100644
--- a/tests/flattener_dicos/10masterslave_mastermandatory/makedict/base.json
+++ b/tests/flattener_dicos/10masterslave_mastermandatory/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
diff --git a/tests/flattener_dicos/10masterslave_multi/00-base.xml b/tests/flattener_dicos/10masterslave_multi/00-base.xml
index 2a38b81f..178f83f9 100644
--- a/tests/flattener_dicos/10masterslave_multi/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_multi/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslave_multi/makedict/base.json b/tests/flattener_dicos/10masterslave_multi/makedict/base.json
index 2203789b..1651d055 100644
--- a/tests/flattener_dicos/10masterslave_multi/makedict/base.json
+++ b/tests/flattener_dicos/10masterslave_multi/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": [], "creole.general1.master1.master1": [], "creole.general1.master1.slave11": [], "creole.general1.master1.slave21": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": [], "creole.general1.master1.master1": [], "creole.general1.master1.slave11": [], "creole.general1.master1.slave21": []}
diff --git a/tests/flattener_dicos/10masterslaves_append/00-base.xml b/tests/flattener_dicos/10masterslaves_append/00-base.xml
index 99b0f2a5..f1d5d0a5 100644
--- a/tests/flattener_dicos/10masterslaves_append/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_append/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslaves_append/01-base.xml b/tests/flattener_dicos/10masterslaves_append/01-base.xml
index 55b5063a..6891304f 100644
--- a/tests/flattener_dicos/10masterslaves_append/01-base.xml
+++ b/tests/flattener_dicos/10masterslaves_append/01-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslaves_append/makedict/base.json b/tests/flattener_dicos/10masterslaves_append/makedict/base.json
index 982684c8..459e3dfc 100644
--- a/tests/flattener_dicos/10masterslaves_append/makedict/base.json
+++ b/tests/flattener_dicos/10masterslaves_append/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": [], "creole.general1.master.slave3": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": [], "creole.general1.master.slave3": []}
diff --git a/tests/flattener_dicos/10masterslaves_auto/00-base.xml b/tests/flattener_dicos/10masterslaves_auto/00-base.xml
index ec4f8ebc..fa416338 100644
--- a/tests/flattener_dicos/10masterslaves_auto/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_auto/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslaves_auto/makedict/base.json b/tests/flattener_dicos/10masterslaves_auto/makedict/base.json
index 7d61f3b7..9202d7fe 100644
--- a/tests/flattener_dicos/10masterslaves_auto/makedict/base.json
+++ b/tests/flattener_dicos/10masterslaves_auto/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": []}
diff --git a/tests/flattener_dicos/10masterslaves_automaster/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster/00-base.xml
index befe2491..cb84ddbf 100644
--- a/tests/flattener_dicos/10masterslaves_automaster/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_automaster/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslaves_automaster/makedict/base.json b/tests/flattener_dicos/10masterslaves_automaster/makedict/base.json
index 7d61f3b7..9202d7fe 100644
--- a/tests/flattener_dicos/10masterslaves_automaster/makedict/base.json
+++ b/tests/flattener_dicos/10masterslaves_automaster/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": []}
diff --git a/tests/flattener_dicos/10masterslaves_automaster_expert/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster_expert/00-base.xml
index 347ddcc3..8597ad09 100644
--- a/tests/flattener_dicos/10masterslaves_automaster_expert/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_automaster_expert/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslaves_automaster_expert/makedict/base.json b/tests/flattener_dicos/10masterslaves_automaster_expert/makedict/base.json
index bf6b67e6..f06f2ed8 100644
--- a/tests/flattener_dicos/10masterslaves_automaster_expert/makedict/base.json
+++ b/tests/flattener_dicos/10masterslaves_automaster_expert/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non"}
diff --git a/tests/flattener_dicos/10masterslaves_familyaccent/00-base.xml b/tests/flattener_dicos/10masterslaves_familyaccent/00-base.xml
index fdd34f47..55c84388 100644
--- a/tests/flattener_dicos/10masterslaves_familyaccent/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_familyaccent/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10masterslaves_familyaccent/makedict/base.json b/tests/flattener_dicos/10masterslaves_familyaccent/makedict/base.json
index 819d27ee..61f7517c 100644
--- a/tests/flattener_dicos/10masterslaves_familyaccent/makedict/base.json
+++ b/tests/flattener_dicos/10masterslaves_familyaccent/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
diff --git a/tests/flattener_dicos/10valid_enum_accent/00-base.xml b/tests/flattener_dicos/10valid_enum_accent/00-base.xml
index 561d778d..6c9bed6e 100644
--- a/tests/flattener_dicos/10valid_enum_accent/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_accent/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_base/00-base.xml b/tests/flattener_dicos/10valid_enum_base/00-base.xml
index bcb9f3a4..d1363f30 100644
--- a/tests/flattener_dicos/10valid_enum_base/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_base/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_base/makedict/base.json b/tests/flattener_dicos/10valid_enum_base/makedict/base.json
index 22244884..7d6534c6 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "c"}
diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/00-base.xml b/tests/flattener_dicos/10valid_enum_base_redefine/00-base.xml
index 3fa29cae..120c1e1d 100644
--- a/tests/flattener_dicos/10valid_enum_base_redefine/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_base_redefine/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/01-base.xml b/tests/flattener_dicos/10valid_enum_base_redefine/01-base.xml
index 015eac28..2f40de5f 100644
--- a/tests/flattener_dicos/10valid_enum_base_redefine/01-base.xml
+++ b/tests/flattener_dicos/10valid_enum_base_redefine/01-base.xml
@@ -1,7 +1,7 @@
-
+
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 f3d8ffdc..f85221e5 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar2": "c", "creole.enumfam.enumvar": "c"}
diff --git a/tests/flattener_dicos/10valid_enum_checkval_true/00-base.xml b/tests/flattener_dicos/10valid_enum_checkval_true/00-base.xml
index e538b7f9..d686e512 100644
--- a/tests/flattener_dicos/10valid_enum_checkval_true/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_checkval_true/00-base.xml
@@ -1,7 +1,7 @@
-
+
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 ff9061a9..721d9f37 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "a"}
diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/00-base.xml b/tests/flattener_dicos/10valid_enum_eosfunc/00-base.xml
index 2018d9d3..3650b363 100644
--- a/tests/flattener_dicos/10valid_enum_eosfunc/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_eosfunc/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/makedict/base.json b/tests/flattener_dicos/10valid_enum_eosfunc/makedict/base.json
index bf6b67e6..f06f2ed8 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non"}
diff --git a/tests/flattener_dicos/10valid_enum_mandatory/00-base.xml b/tests/flattener_dicos/10valid_enum_mandatory/00-base.xml
index 637f5863..afce08bd 100644
--- a/tests/flattener_dicos/10valid_enum_mandatory/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_mandatory/00-base.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_mandatory/makedict/base.json b/tests/flattener_dicos/10valid_enum_mandatory/makedict/base.json
index 132193cd..e7dc0311 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "a"}
diff --git a/tests/flattener_dicos/10valid_enum_master/00-base.xml b/tests/flattener_dicos/10valid_enum_master/00-base.xml
index 3280ea36..af93e099 100644
--- a/tests/flattener_dicos/10valid_enum_master/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_master/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_master/makedict/base.json b/tests/flattener_dicos/10valid_enum_master/makedict/base.json
index 819d27ee..61f7517c 100644
--- a/tests/flattener_dicos/10valid_enum_master/makedict/base.json
+++ b/tests/flattener_dicos/10valid_enum_master/makedict/base.json
@@ -1 +1 @@
-{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.master.master": [], "creole.general.master.slave1": [], "creole.general.master.slave2": []}
diff --git a/tests/flattener_dicos/10valid_enum_multi/00-base.xml b/tests/flattener_dicos/10valid_enum_multi/00-base.xml
index 481f22ee..ea769bee 100644
--- a/tests/flattener_dicos/10valid_enum_multi/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_multi/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_multi/makedict/base.json b/tests/flattener_dicos/10valid_enum_multi/makedict/base.json
index f83a3a36..a183eb62 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"]}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.general.multi": ["a"]}
diff --git a/tests/flattener_dicos/10valid_enum_number/00-base.xml b/tests/flattener_dicos/10valid_enum_number/00-base.xml
index 9ea87c76..b59bd73a 100644
--- a/tests/flattener_dicos/10valid_enum_number/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_number/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_number/makedict/base.json b/tests/flattener_dicos/10valid_enum_number/makedict/base.json
index 17ad9443..0e08403f 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}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": 1}
diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/00-base.xml b/tests/flattener_dicos/10valid_enum_numberdefault/00-base.xml
index 359cd162..1e759eec 100644
--- a/tests/flattener_dicos/10valid_enum_numberdefault/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_numberdefault/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/makedict/base.json b/tests/flattener_dicos/10valid_enum_numberdefault/makedict/base.json
index 90f40df3..cf21cd32 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}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": 3}
diff --git a/tests/flattener_dicos/10valid_enum_python/00-base.xml b/tests/flattener_dicos/10valid_enum_python/00-base.xml
index a8b4cc63..fe335b5a 100644
--- a/tests/flattener_dicos/10valid_enum_python/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_python/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/10valid_enum_python/makedict/base.json b/tests/flattener_dicos/10valid_enum_python/makedict/base.json
index b33f50b6..82b597c1 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"}
\ No newline at end of file
+{"creole.general.mode_conteneur_actif": "non", "creole.enumfam.enumvar": "test"}
diff --git a/tests/flattener_dicos/10valid_enum_value/00-base.xml b/tests/flattener_dicos/10valid_enum_value/00-base.xml
index f3b0940f..9241ba30 100644
--- a/tests/flattener_dicos/10valid_enum_value/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_value/00-base.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist/00-base.xml
index 638f69a7..ae0e0028 100644
--- a/tests/flattener_dicos/11disabled_if_in_filelist/00-base.xml
+++ b/tests/flattener_dicos/11disabled_if_in_filelist/00-base.xml
@@ -1,11 +1,11 @@
-
-
+
+
-
-
+
+
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 5981c078..f5c34b5b 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", "containers.container0.files.file0.mkdir": false, "containers.container0.files.file0.name": "/tmp/file", "containers.container0.files.file0.rm": false, "containers.container0.files.file0.source": "file", "containers.container0.files.file0.activate": true}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "services.service0.files.file0.mkdir": false, "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.rm": false, "services.service0.files.file0.source": "file", "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 131a2077..3d957e96 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
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/00-base.xml
new file mode 100644
index 00000000..0c3cf779
--- /dev/null
+++ b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/00-base.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ oui
+
+
+ non
+
+
+ non
+
+
+
+
+
+
+
+ oui
+ mode_conteneur_actif
+ mode_conteneur_actif2
+ afilllist
+
+
+
+
+
+
+
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
new file mode 100644
index 00000000..bd7e1cbc
--- /dev/null
+++ b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/makedict/base.json
@@ -0,0 +1 @@
+{"creole.general.condition": "oui", "services.service0.files.file0.mkdir": false, "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.rm": false, "services.service0.files.file0.source": "file"}
diff --git a/tests/flattener_dicos/70container_subgroup/result/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml
similarity index 51%
rename from tests/flattener_dicos/70container_subgroup/result/00-base.xml
rename to tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml
index aaf870be..794728f1 100644
--- a/tests/flattener_dicos/70container_subgroup/result/00-base.xml
+++ b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml
@@ -1,48 +1,56 @@
-
-
- basic
-
-
+
+
False
- /etc/mailname
+ /tmp/file
False
- mailname
+ file
+ disabled
True
basic
-
- basic
-
-
+
normal
-
+
oui
non
- force_default_on_freeze
- frozen
- hidden
mandatory
normal
oui
+
+ oui
+ non
+ mandatory
+ normal
+ disabled
+ non
+
+
+ oui
+ non
+ mandatory
+ normal
+ disabled
+ non
+
diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist_multi/00-base.xml
index ee3a2b8c..46e29c33 100644
--- a/tests/flattener_dicos/11disabled_if_in_filelist_multi/00-base.xml
+++ b/tests/flattener_dicos/11disabled_if_in_filelist_multi/00-base.xml
@@ -1,12 +1,12 @@
-
-
+
+
-
-
+
+
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 ee3c179b..ef734d97 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", "containers.container0.files.file0.mkdir": false, "containers.container0.files.file0.name": "/tmp/file1", "containers.container0.files.file0.rm": false, "containers.container0.files.file0.source": "file1", "containers.container0.files.file0.activate": true, "containers.container0.files.file1.mkdir": false, "containers.container0.files.file1.name": "/tmp/file2", "containers.container0.files.file1.rm": false, "containers.container0.files.file1.source": "file2", "containers.container0.files.file1.activate": true}
\ No newline at end of file
+{"creole.general.condition": "non", "creole.general.mode_conteneur_actif": "non", "creole.general.mode_conteneur_actif2": "non", "services.service0.files.file0.mkdir": false, "services.service0.files.file0.name": "/tmp/file1", "services.service0.files.file0.rm": false, "services.service0.files.file0.source": "file1", "services.service0.files.file0.activate": true, "services.service0.files.file1.mkdir": false, "services.service0.files.file1.name": "/tmp/file2", "services.service0.files.file1.rm": false, "services.service0.files.file1.source": "file2", "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 99472430..690a483b 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
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/00-base.xml b/tests/flattener_dicos/11disabledifin_filelist_notexist/00-base.xml
index a9669d01..774c605a 100644
--- a/tests/flattener_dicos/11disabledifin_filelist_notexist/00-base.xml
+++ b/tests/flattener_dicos/11disabledifin_filelist_notexist/00-base.xml
@@ -1,11 +1,11 @@
-
-
+
+
-
-
+
+
diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/makedict/base.json b/tests/flattener_dicos/11disabledifin_filelist_notexist/makedict/base.json
index e3d0a054..4369661d 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", "containers.container0.files.file0.mkdir": false, "containers.container0.files.file0.name": "/tmp/file", "containers.container0.files.file0.rm": false, "containers.container0.files.file0.source": "file"}
\ No newline at end of file
+{"creole.general.condition": "non", "services.service0.files.file0.mkdir": false, "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.rm": false, "services.service0.files.file0.source": "file"}
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 fd84f7bc..7aad6959 100644
--- a/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml
+++ b/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/00-base.xml
index dc26bed7..5f005ca1 100644
--- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/00-base.xml
+++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/00-base.xml
@@ -1,12 +1,12 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/makedict/base.json b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/makedict/base.json
index e3d0a054..4369661d 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", "containers.container0.files.file0.mkdir": false, "containers.container0.files.file0.name": "/tmp/file", "containers.container0.files.file0.rm": false, "containers.container0.files.file0.source": "file"}
\ No newline at end of file
+{"creole.general.condition": "non", "services.service0.files.file0.mkdir": false, "services.service0.files.file0.name": "/tmp/file", "services.service0.files.file0.rm": false, "services.service0.files.file0.source": "file"}
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 fd84f7bc..7aad6959 100644
--- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml
+++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml
@@ -1,7 +1,7 @@
-
-
+