From 5f2d1b3eb75c00cc44f0b2a7679e8351af6f58a3 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Thu, 30 Jul 2020 09:37:19 +0200 Subject: [PATCH] add 'manage' attribut to service, unmanage services is, for example a fake service --- src/rougail/annotator.py | 5 ++-- src/rougail/data/rougail.dtd | 1 + src/rougail/objspace.py | 19 +++++++------ src/rougail/tiramisureflector.py | 9 ++++--- .../flattener_dicos/00empty/tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../20notemplating/tiramisu/base.py | 1 + .../20override/tiramisu/base.py | 1 + .../60extra_group/tiramisu/base.py | 1 + .../60extra_help/tiramisu/base.py | 1 + .../70container_files/tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../70container_filesmulti/tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../70container_new/tiramisu/base.py | 1 + .../70container_newnocont/tiramisu/base.py | 1 + .../70container_newwithip/tiramisu/base.py | 1 + .../70container_pathaccess/tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../tiramisu/base.py | 1 + .../70container_services/tiramisu/base.py | 1 + .../70services_unmanage/00-base.xml | 27 +++++++++++++++++++ .../70services_unmanage/__init__.py | 0 .../70services_unmanage/makedict/base.json | 1 + .../70services_unmanage/tiramisu/__init__.py | 0 .../70services_unmanage/tiramisu/base.py | 11 ++++++++ 35 files changed, 83 insertions(+), 16 deletions(-) create mode 100644 tests/flattener_dicos/70services_unmanage/00-base.xml create mode 100644 tests/flattener_dicos/70services_unmanage/__init__.py create mode 100644 tests/flattener_dicos/70services_unmanage/makedict/base.json create mode 100644 tests/flattener_dicos/70services_unmanage/tiramisu/__init__.py create mode 100644 tests/flattener_dicos/70services_unmanage/tiramisu/base.py diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py index 340d448f..36ff1c84 100644 --- a/src/rougail/annotator.py +++ b/src/rougail/annotator.py @@ -241,7 +241,7 @@ class ServiceAnnotator: service = self.objectspace.space.services.service[service_name] new_service = self.objectspace.service() for elttype, values in vars(service).items(): - if elttype == 'name' or elttype in ERASED_ATTRIBUTES: + if not isinstance(values, (dict, list)) or elttype in ERASED_ATTRIBUTES: setattr(new_service, elttype, values) continue eltname = elttype + 's' @@ -1065,7 +1065,8 @@ class FamilyAnnotator: for family_name, family in space.items(): if not hasattr(family, 'variable') or len(family.variable) == 0: removed_families.append(family_name) - del space[family_name] + for family_name in removed_families: + del space[family_name] def change_family_mode(self): # pylint: disable=C0111 if not hasattr(self.objectspace.space, 'variables'): diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd index 51eb9a47..1b819ca1 100644 --- a/src/rougail/data/rougail.dtd +++ b/src/rougail/data/rougail.dtd @@ -47,6 +47,7 @@ + diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py index 34223754..6bacb604 100644 --- a/src/rougail/objspace.py +++ b/src/rougail/objspace.py @@ -23,7 +23,6 @@ For example: a variable is redefined and shall be moved to another family means that a variable1 = Variable() object in the object space who lives in the family1 parent has to be moved in family2. The visit procedure changes the varable1's object space's parent. """ -from collections import OrderedDict from lxml.etree import Element, SubElement # pylint: disable=E0611 from .i18n import _ @@ -66,20 +65,20 @@ class RootCreoleObject: class CreoleObjSpace: """DOM XML reflexion free internal representation of a Creole Dictionary """ - choice = type('Choice', (RootCreoleObject,), OrderedDict()) - property_ = type('Property', (RootCreoleObject,), OrderedDict()) + choice = type('Choice', (RootCreoleObject,), dict()) + property_ = type('Property', (RootCreoleObject,), dict()) # Creole ObjectSpace's Leadership variable class type - Leadership = type('Leadership', (RootCreoleObject,), OrderedDict()) + Leadership = type('Leadership', (RootCreoleObject,), dict()) """ This Atom type stands for singleton, that is an Object Space's atom object is present only once in the object space's tree """ - Atom = type('Atom', (RootCreoleObject,), OrderedDict()) + Atom = type('Atom', (RootCreoleObject,), dict()) "A variable that can't be redefined" - Redefinable = type('Redefinable', (RootCreoleObject,), OrderedDict()) + Redefinable = type('Redefinable', (RootCreoleObject,), dict()) "A variable can be redefined" - UnRedefinable = type('UnRedefinable', (RootCreoleObject,), OrderedDict()) + UnRedefinable = type('UnRedefinable', (RootCreoleObject,), dict()) def __init__(self, dtdfilename): # pylint: disable=R0912 @@ -314,14 +313,14 @@ class CreoleObjSpace: for example:: space = Family() - space.variable = OrderedDict() + space.variable = dict() another example: space = Variable() space.value = list() """ if child.tag not in vars(space): if isinstance(variableobj, self.Redefinable): - setattr(space, child.tag, OrderedDict()) + setattr(space, child.tag, dict()) elif isinstance(variableobj, self.UnRedefinable): setattr(space, child.tag, []) elif not isinstance(variableobj, self.Atom): # pragma: no cover @@ -374,7 +373,7 @@ class CreoleObjSpace: variable_obj = old_family.variable[name] del old_family.variable[name] if 'variable' not in vars(family): - family.variable = OrderedDict() + family.variable = dict() family.variable[name] = variable_obj self.paths.add_variable(namespace, name, diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index d3fcc954..a7c4a8c9 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -11,7 +11,7 @@ from .annotator import ERASED_ATTRIBUTES FUNC_TO_DICT = ['valid_not_equal'] -FORCE_INFORMATIONS = ['help', 'test', 'separator'] +FORCE_INFORMATIONS = ['help', 'test', 'separator', 'manage'] ATTRIBUTES_ORDER = ('name', 'doc', 'default', 'multi') @@ -261,8 +261,9 @@ class Common: def populate_informations(self): for key, value in self.informations.items(): - value = value.replace('"', '\"') - self.storage.text.append(f'{self.option_name}.impl_set_information("{key}", "{value}")') + if isinstance(value, str): + value = '"' + value.replace('"', '\"') + '"' + self.storage.text.append(f'{self.option_name}.impl_set_information("{key}", {value})') def get_text(self, ): @@ -472,7 +473,7 @@ class Family(Common): def populate_attrib(self): for key in self.get_attributes(self.elt): value = getattr(self.elt, key) - if key == 'help': + if key in FORCE_INFORMATIONS: self.informations[key] = value elif key == 'dynamic': dynamic = self.storage.get(value).get() diff --git a/tests/flattener_dicos/00empty/tiramisu/base.py b/tests/flattener_dicos/00empty/tiramisu/base.py index ad3c8412..833ce194 100644 --- a/tests/flattener_dicos/00empty/tiramisu/base.py +++ b/tests/flattener_dicos/00empty/tiramisu/base.py @@ -3,5 +3,6 @@ from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') option_2 = OptionDescription(name='tata', doc='tata', children=[]) +option_2.impl_set_information("manage", True) option_1 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/base.py b/tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/base.py index 059fb4e9..89a5eb47 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/base.py @@ -17,5 +17,6 @@ option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(Para option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) +option_7.impl_set_information("manage", True) option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/base.py index bf0989c4..9711a198 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -17,5 +17,6 @@ option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(Para option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) +option_7.impl_set_information("manage", True) option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/base.py index 1e400ba6..484b7e57 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -25,5 +25,6 @@ option_24 = BoolOption(properties=frozenset({Calculation(calc_value, Params(Para option_17 = OptionDescription(name='file2', doc='file2', children=[option_18, option_19, option_20, option_21, option_22, option_23, option_24]) option_8 = OptionDescription(name='files', doc='files', children=[option_9, option_17]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) +option_7.impl_set_information("manage", True) option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py index ad3e2d15..25546cb5 100644 --- a/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py @@ -17,5 +17,6 @@ option_16 = BoolOption(properties=frozenset({'disabled'}), name='activate', doc= option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) +option_7.impl_set_information("manage", True) option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py index ad3e2d15..25546cb5 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -17,5 +17,6 @@ option_16 = BoolOption(properties=frozenset({'disabled'}), name='activate', doc= option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) +option_7.impl_set_information("manage", True) option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index ad3e2d15..25546cb5 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -17,5 +17,6 @@ option_16 = BoolOption(properties=frozenset({'disabled'}), name='activate', doc= option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) +option_7.impl_set_information("manage", True) option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index 9c30b1a1..53cd3efc 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -17,5 +17,6 @@ option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(Para option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) +option_7.impl_set_information("manage", True) option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/base.py index 7b1d4162..10a32087 100644 --- a/tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/base.py +++ b/tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/base.py @@ -16,5 +16,6 @@ option_15 = BoolOption(properties=frozenset({'disabled'}), name='activate', doc= option_8 = OptionDescription(name='file1', doc='file1', children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15]) option_7 = OptionDescription(name='files', doc='files', children=[option_8]) option_6 = OptionDescription(name='test', doc='test', children=[option_7]) +option_6.impl_set_information("manage", True) option_5 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/flattener_dicos/20notemplating/tiramisu/base.py b/tests/flattener_dicos/20notemplating/tiramisu/base.py index 63a51db6..13f053b2 100644 --- a/tests/flattener_dicos/20notemplating/tiramisu/base.py +++ b/tests/flattener_dicos/20notemplating/tiramisu/base.py @@ -15,5 +15,6 @@ option_14 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/20override/tiramisu/base.py b/tests/flattener_dicos/20override/tiramisu/base.py index c9a6b6ac..1f93931f 100644 --- a/tests/flattener_dicos/20override/tiramisu/base.py +++ b/tests/flattener_dicos/20override/tiramisu/base.py @@ -15,5 +15,6 @@ option_14 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_7 = OptionDescription(name='test_service', doc='test.service', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='overrides', doc='overrides', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/60extra_group/tiramisu/base.py b/tests/flattener_dicos/60extra_group/tiramisu/base.py index 2bd22e01..d25b3e62 100644 --- a/tests/flattener_dicos/60extra_group/tiramisu/base.py +++ b/tests/flattener_dicos/60extra_group/tiramisu/base.py @@ -21,5 +21,6 @@ option_20 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_13 = OptionDescription(name='mailname', doc='mailname', children=[option_14, option_15, option_16, option_17, option_18, option_19, option_20]) option_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) +option_11.impl_set_information("manage", True) option_10 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_11]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5, option_10]) diff --git a/tests/flattener_dicos/60extra_help/tiramisu/base.py b/tests/flattener_dicos/60extra_help/tiramisu/base.py index 214596af..0e0d6bcb 100644 --- a/tests/flattener_dicos/60extra_help/tiramisu/base.py +++ b/tests/flattener_dicos/60extra_help/tiramisu/base.py @@ -22,5 +22,6 @@ option_20 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_13 = OptionDescription(name='mailname', doc='mailname', children=[option_14, option_15, option_16, option_17, option_18, option_19, option_20]) option_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) +option_11.impl_set_information("manage", True) option_10 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_11]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5, option_10]) diff --git a/tests/flattener_dicos/70container_files/tiramisu/base.py b/tests/flattener_dicos/70container_files/tiramisu/base.py index 7677fadc..fd979f08 100644 --- a/tests/flattener_dicos/70container_files/tiramisu/base.py +++ b/tests/flattener_dicos/70container_files/tiramisu/base.py @@ -23,5 +23,6 @@ option_22 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_15 = OptionDescription(name='rougail_conf', doc='rougail.conf', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py b/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py index b5ae0afd..a691664d 100644 --- a/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py +++ b/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py @@ -16,5 +16,6 @@ option_15 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_8 = OptionDescription(name='mailname', doc='mailname', children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15]) option_7 = OptionDescription(name='files', doc='files', children=[option_8]) option_6 = OptionDescription(name='test', doc='test', children=[option_7]) +option_6.impl_set_information("manage", True) option_5 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/base.py index 3ebd5e98..5e76710f 100644 --- a/tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/base.py +++ b/tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/base.py @@ -18,5 +18,6 @@ option_17 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_9 = OptionDescription(name='mailname', doc='mailname', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) +option_7.impl_set_information("manage", True) option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py b/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py index 5de7a2cf..20734465 100644 --- a/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py +++ b/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py @@ -23,5 +23,6 @@ option_22 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_15 = OptionDescription(name='mailname2', doc='mailname2', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py b/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py index 3945a088..535ab37f 100644 --- a/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py +++ b/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py @@ -15,5 +15,6 @@ option_14 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_7 = OptionDescription(name='mailname_new', doc='mailname.new', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/70container_new/tiramisu/base.py b/tests/flattener_dicos/70container_new/tiramisu/base.py index 6847a727..32d64fd3 100644 --- a/tests/flattener_dicos/70container_new/tiramisu/base.py +++ b/tests/flattener_dicos/70container_new/tiramisu/base.py @@ -6,5 +6,6 @@ option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='test', doc='test', children=[]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/70container_newnocont/tiramisu/base.py b/tests/flattener_dicos/70container_newnocont/tiramisu/base.py index 4cd10158..fed3f064 100644 --- a/tests/flattener_dicos/70container_newnocont/tiramisu/base.py +++ b/tests/flattener_dicos/70container_newnocont/tiramisu/base.py @@ -6,5 +6,6 @@ option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='test', doc='test', children=[]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/70container_newwithip/tiramisu/base.py b/tests/flattener_dicos/70container_newwithip/tiramisu/base.py index 2ff70949..8fc41114 100644 --- a/tests/flattener_dicos/70container_newwithip/tiramisu/base.py +++ b/tests/flattener_dicos/70container_newwithip/tiramisu/base.py @@ -7,5 +7,6 @@ option_4 = IPOption(allow_reserved=True, properties=frozenset({'normal'}), name= option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = OptionDescription(name='test', doc='test', children=[]) +option_6.impl_set_information("manage", True) option_5 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py b/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py index ec33ed77..7e0d5c67 100644 --- a/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py +++ b/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py @@ -14,5 +14,6 @@ option_13 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_9 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', children=[option_10, option_11, option_12, option_13]) option_8 = OptionDescription(name='ips', doc='ips', children=[option_9]) option_7 = OptionDescription(name='nut', doc='nut', children=[option_8]) +option_7.impl_set_information("manage", True) option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py b/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py index 80bf806e..e6b3e795 100644 --- a/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py +++ b/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py @@ -15,5 +15,6 @@ option_14 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_10 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', children=[option_11, option_12, option_13, option_14]) option_9 = OptionDescription(name='ips', doc='ips', children=[option_10]) option_8 = OptionDescription(name='ntp', doc='ntp', children=[option_9]) +option_8.impl_set_information("manage", True) option_7 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_8]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_7]) diff --git a/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py b/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py index 6716ad5a..5482792a 100644 --- a/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py +++ b/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py @@ -11,5 +11,6 @@ option_10 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_7 = OptionDescription(name='123', doc='123', children=[option_8, option_9, option_10]) option_6 = OptionDescription(name='ports', doc='ports', children=[option_7]) option_5 = OptionDescription(name='ntp', doc='ntp', children=[option_6]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py b/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py index 80775344..954c5aac 100644 --- a/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py +++ b/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py @@ -12,5 +12,6 @@ option_11 = BoolOption(name='activate', doc='activate', multi=False, default=Tru option_7 = OptionDescription(name='192_168_1_1', doc='192.168.1.1', children=[option_8, option_9, option_10, option_11]) option_6 = OptionDescription(name='ips', doc='ips', children=[option_7]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[option_6]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/70container_services/tiramisu/base.py b/tests/flattener_dicos/70container_services/tiramisu/base.py index 7fd56f37..b43dfac4 100644 --- a/tests/flattener_dicos/70container_services/tiramisu/base.py +++ b/tests/flattener_dicos/70container_services/tiramisu/base.py @@ -6,5 +6,6 @@ option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[]) +option_5.impl_set_information("manage", True) option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/flattener_dicos/70services_unmanage/00-base.xml b/tests/flattener_dicos/70services_unmanage/00-base.xml new file mode 100644 index 00000000..06d0a07e --- /dev/null +++ b/tests/flattener_dicos/70services_unmanage/00-base.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/flattener_dicos/70services_unmanage/__init__.py b/tests/flattener_dicos/70services_unmanage/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/flattener_dicos/70services_unmanage/makedict/base.json b/tests/flattener_dicos/70services_unmanage/makedict/base.json new file mode 100644 index 00000000..eb10bec4 --- /dev/null +++ b/tests/flattener_dicos/70services_unmanage/makedict/base.json @@ -0,0 +1 @@ +{"rougail.general.mode_conteneur_actif": "oui"} diff --git a/tests/flattener_dicos/70services_unmanage/tiramisu/__init__.py b/tests/flattener_dicos/70services_unmanage/tiramisu/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/flattener_dicos/70services_unmanage/tiramisu/base.py b/tests/flattener_dicos/70services_unmanage/tiramisu/base.py new file mode 100644 index 00000000..dbb49546 --- /dev/null +++ b/tests/flattener_dicos/70services_unmanage/tiramisu/base.py @@ -0,0 +1,11 @@ +from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') +option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='oui', values=('oui', 'non')) +option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) +option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[]) +option_5.impl_set_information("manage", False) +option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])