From cc2f7b64b19bdf65525ccc2d918270bd66d93629 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 29 Jul 2020 16:07:18 +0200 Subject: [PATCH] better default value for boolean values --- src/rougail/annotator.py | 6 ++++++ src/rougail/loader.py | 2 +- .../11disabled_if_in_filelist/tiramisu/base.py | 6 +++--- .../11disabled_if_in_filelist_disabled/tiramisu/base.py | 4 ++-- .../11disabled_if_in_filelist_multi/tiramisu/base.py | 8 ++++---- .../11disabledifin_filelist_notexist/tiramisu/base.py | 4 ++-- .../11disabledifnotin_filelist_notexist/tiramisu/base.py | 4 ++-- .../tiramisu/base.py | 4 ++-- .../tiramisu/base.py | 4 ++-- .../11multi_disabled_if_in_filelist/tiramisu/base.py | 4 ++-- tests/flattener_dicos/20notemplating/tiramisu/base.py | 4 ++-- tests/flattener_dicos/20override/tiramisu/base.py | 4 ++-- tests/flattener_dicos/60extra_group/tiramisu/base.py | 4 ++-- tests/flattener_dicos/60extra_help/tiramisu/base.py | 4 ++-- tests/flattener_dicos/70container_files/tiramisu/base.py | 8 ++++---- .../70container_files_symlink_multi/tiramisu/base.py | 4 ++-- .../tiramisu/base.py | 4 ++-- .../70container_filesmulti/tiramisu/base.py | 8 ++++---- .../70container_filesredefine/tiramisu/base.py | 4 ++-- .../70container_pathaccess/tiramisu/base.py | 2 +- .../70container_pathaccess_leadership/tiramisu/base.py | 2 +- .../70container_serviceaccess/tiramisu/base.py | 2 +- .../70container_servicerestriction/tiramisu/base.py | 2 +- 23 files changed, 52 insertions(+), 46 deletions(-) diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py index c1dced68..340d448f 100644 --- a/src/rougail/annotator.py +++ b/src/rougail/annotator.py @@ -1110,6 +1110,12 @@ class FamilyAnnotator: variable.frozen = True if not variable.auto_save is True and 'force_default_on_freeze' not in vars(variable): variable.force_default_on_freeze = True + if not has_value and variable.type == 'boolean': + new_value = self.objectspace.value() + new_value.name = True + new_value.type = 'boolean' + variable.value = [new_value] + variable.mandatory = True def change_variable_mode(self): # pylint: disable=C0111 if not hasattr(self.objectspace.space, 'variables'): diff --git a/src/rougail/loader.py b/src/rougail/loader.py index b3eccb71..2b61bde9 100644 --- a/src/rougail/loader.py +++ b/src/rougail/loader.py @@ -20,7 +20,7 @@ CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int), 'string': dict(opttype="StrOption"), 'password': dict(opttype="PasswordOption"), 'mail': dict(opttype="EmailOption"), - 'boolean': dict(opttype="BoolOption", initkwargs={'default': [True]}), + 'boolean': dict(opttype="BoolOption"), 'symlink': dict(opttype="SymLinkOption"), 'filename': dict(opttype="FilenameOption"), 'date': dict(opttype="DateOption"), 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 37fb14df..059fb4e9 100644 --- a/tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/flattener_dicos/11disabled_if_in_filelist/tiramisu/base.py @@ -4,7 +4,7 @@ import imp func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='condition', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_5 = BoolOption(default=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False) +option_5 = BoolOption(properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='mode_conteneur_actif2', doc='No change', multi=False, default=True) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', multi=False, default='root') @@ -12,8 +12,8 @@ option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_12 = StrOption(name='name', doc='name', multi=False, default='/etc/file') option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = BoolOption(default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False) +option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False, default=True) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/tiramisu/base.py index a1d97a8a..bf0989c4 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 @@ -12,8 +12,8 @@ option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_12 = StrOption(name='name', doc='name', multi=False, default='/etc/file') option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = BoolOption(default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False) +option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False, default=True) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/flattener_dicos/11disabled_if_in_filelist_multi/tiramisu/base.py index cb37d2b9..1e400ba6 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 @@ -12,16 +12,16 @@ option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file1') option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') option_14 = StrOption(name='source', doc='source', multi=False, default='file1') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = BoolOption(default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False) +option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False, default=True) option_9 = OptionDescription(name='file1', doc='file1', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_18 = StrOption(name='group', doc='group', multi=False, default='root') option_19 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_20 = StrOption(name='name', doc='name', multi=False, default='/tmp/file2') option_21 = StrOption(name='owner', doc='owner', multi=False, default='root') option_22 = StrOption(name='source', doc='source', multi=False, default='file2') -option_23 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_24 = BoolOption(default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False) +option_23 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_24 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), name='activate', doc='activate', multi=False, default=True) option_17 = OptionDescription(name='file2', doc='file2', children=[option_18, option_19, option_20, option_21, option_22, option_23, option_24]) option_8 = OptionDescription(name='files', doc='files', children=[option_9, option_17]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py index f98d5918..ad3e2d15 100644 --- a/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/flattener_dicos/11disabledifin_filelist_notexist/tiramisu/base.py @@ -12,8 +12,8 @@ option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file') option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = BoolOption(default=True, properties=frozenset({'disabled'}), name='activate', doc='activate', multi=False) +option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_16 = BoolOption(properties=frozenset({'disabled'}), name='activate', doc='activate', multi=False, default=True) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py index f98d5918..ad3e2d15 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -12,8 +12,8 @@ option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file') option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = BoolOption(default=True, properties=frozenset({'disabled'}), name='activate', doc='activate', multi=False) +option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_16 = BoolOption(properties=frozenset({'disabled'}), name='activate', doc='activate', multi=False, default=True) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index f98d5918..ad3e2d15 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -12,8 +12,8 @@ option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file') option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = BoolOption(default=True, properties=frozenset({'disabled'}), name='activate', doc='activate', multi=False) +option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_16 = BoolOption(properties=frozenset({'disabled'}), name='activate', doc='activate', multi=False, default=True) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index e8d76b4b..9c30b1a1 100644 --- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -12,8 +12,8 @@ option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_12 = StrOption(name='name', doc='name', multi=False, default='/tmp/file') option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') option_14 = StrOption(name='source', doc='source', multi=False, default='file') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_16 = BoolOption(default=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('statique'), 'reverse_condition': ParamValue(True)}))}), name='activate', doc='activate', multi=False) +option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_16 = BoolOption(properties=frozenset({Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('statique'), 'reverse_condition': ParamValue(True)}))}), name='activate', doc='activate', multi=False, default=True) option_9 = OptionDescription(name='file', doc='file', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/flattener_dicos/11multi_disabled_if_in_filelist/tiramisu/base.py index c047e581..7b1d4162 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 @@ -11,8 +11,8 @@ option_10 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_11 = StrOption(name='name', doc='name', multi=False, default='/tmp/file1') option_12 = StrOption(name='owner', doc='owner', multi=False, default='root') option_13 = StrOption(name='source', doc='source', multi=False, default='file1') -option_14 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_15 = BoolOption(default=True, properties=frozenset({'disabled'}), name='activate', doc='activate', multi=False) +option_14 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_15 = BoolOption(properties=frozenset({'disabled'}), name='activate', doc='activate', multi=False, default=True) option_8 = OptionDescription(name='file1', doc='file1', children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15]) option_7 = OptionDescription(name='files', doc='files', children=[option_8]) option_6 = OptionDescription(name='test', doc='test', children=[option_7]) diff --git a/tests/flattener_dicos/20notemplating/tiramisu/base.py b/tests/flattener_dicos/20notemplating/tiramisu/base.py index b37ec7dd..63a51db6 100644 --- a/tests/flattener_dicos/20notemplating/tiramisu/base.py +++ b/tests/flattener_dicos/20notemplating/tiramisu/base.py @@ -10,8 +10,8 @@ option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/file') option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') option_12 = StrOption(name='source', doc='source', multi=False, default='file') -option_13 = BoolOption(default=False, name='templating', doc='templating', multi=False) -option_14 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_13 = BoolOption(name='templating', doc='templating', multi=False, default=False) +option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/flattener_dicos/20override/tiramisu/base.py b/tests/flattener_dicos/20override/tiramisu/base.py index c420cb30..c9a6b6ac 100644 --- a/tests/flattener_dicos/20override/tiramisu/base.py +++ b/tests/flattener_dicos/20override/tiramisu/base.py @@ -10,8 +10,8 @@ option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_10 = StrOption(name='name', doc='name', multi=False, default='/systemd/system/test.service.d/rougail.conf') option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') option_12 = StrOption(name='source', doc='source', multi=False, default='test.service') -option_13 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_14 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_7 = OptionDescription(name='test_service', doc='test.service', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='overrides', doc='overrides', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/flattener_dicos/60extra_group/tiramisu/base.py b/tests/flattener_dicos/60extra_group/tiramisu/base.py index d409ba80..2bd22e01 100644 --- a/tests/flattener_dicos/60extra_group/tiramisu/base.py +++ b/tests/flattener_dicos/60extra_group/tiramisu/base.py @@ -16,8 +16,8 @@ option_15 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_16 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') option_17 = StrOption(name='owner', doc='owner', multi=False, default='root') option_18 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_19 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_20 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_19 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_20 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_13 = OptionDescription(name='mailname', doc='mailname', children=[option_14, option_15, option_16, option_17, option_18, option_19, option_20]) option_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) diff --git a/tests/flattener_dicos/60extra_help/tiramisu/base.py b/tests/flattener_dicos/60extra_help/tiramisu/base.py index 11da5207..214596af 100644 --- a/tests/flattener_dicos/60extra_help/tiramisu/base.py +++ b/tests/flattener_dicos/60extra_help/tiramisu/base.py @@ -17,8 +17,8 @@ option_15 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_16 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') option_17 = StrOption(name='owner', doc='owner', multi=False, default='root') option_18 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_19 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_20 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_19 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_20 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_13 = OptionDescription(name='mailname', doc='mailname', children=[option_14, option_15, option_16, option_17, option_18, option_19, option_20]) option_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) diff --git a/tests/flattener_dicos/70container_files/tiramisu/base.py b/tests/flattener_dicos/70container_files/tiramisu/base.py index a012e8eb..7677fadc 100644 --- a/tests/flattener_dicos/70container_files/tiramisu/base.py +++ b/tests/flattener_dicos/70container_files/tiramisu/base.py @@ -10,16 +10,16 @@ option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') option_12 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_13 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_14 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_7 = OptionDescription(name='mailname', doc='mailname', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_16 = StrOption(name='group', doc='group', multi=False, default='root') option_17 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_18 = StrOption(name='name', doc='name', multi=False, default='/rougail.conf') option_19 = StrOption(name='owner', doc='owner', multi=False, default='root') option_20 = StrOption(name='source', doc='source', multi=False, default='rougail.conf') -option_21 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_22 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_21 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_22 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_15 = OptionDescription(name='rougail_conf', doc='rougail.conf', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py b/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py index 8d3caddc..b5ae0afd 100644 --- a/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py +++ b/tests/flattener_dicos/70container_files_symlink_multi/tiramisu/base.py @@ -11,8 +11,8 @@ option_10 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_11 = SymLinkOption(name='name', opt=option_4) option_12 = StrOption(name='owner', doc='owner', multi=False, default='root') option_13 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_14 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_15 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_14 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_15 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_8 = OptionDescription(name='mailname', doc='mailname', children=[option_9, option_10, option_11, option_12, option_13, option_14, option_15]) option_7 = OptionDescription(name='files', doc='files', children=[option_8]) option_6 = OptionDescription(name='test', doc='test', children=[option_7]) diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/flattener_dicos/70container_files_symlink_multi_variable/tiramisu/base.py index 3fdeb247..3ebd5e98 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 @@ -12,9 +12,9 @@ option_11 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_12 = SymLinkOption(name='name', opt=option_4) option_13 = StrOption(name='owner', doc='owner', multi=False, default='root') option_14 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_15 = BoolOption(default=True, name='templating', doc='templating', multi=False) +option_15 = BoolOption(name='templating', doc='templating', multi=False, default=True) option_16 = SymLinkOption(name='variable', opt=option_5) -option_17 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_17 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_9 = OptionDescription(name='mailname', doc='mailname', children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16, option_17]) option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) diff --git a/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py b/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py index d89d8a98..5de7a2cf 100644 --- a/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py +++ b/tests/flattener_dicos/70container_filesmulti/tiramisu/base.py @@ -10,16 +10,16 @@ option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') option_12 = StrOption(name='source', doc='source', multi=False, default='mailname') -option_13 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_14 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_7 = OptionDescription(name='mailname', doc='mailname', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_16 = StrOption(name='group', doc='group', multi=False, default='root') option_17 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_18 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname2') option_19 = StrOption(name='owner', doc='owner', multi=False, default='root') option_20 = StrOption(name='source', doc='source', multi=False, default='mailname2') -option_21 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_22 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_21 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_22 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_15 = OptionDescription(name='mailname2', doc='mailname2', children=[option_16, option_17, option_18, option_19, option_20, option_21, option_22]) option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py b/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py index 7e4b48dd..3945a088 100644 --- a/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py +++ b/tests/flattener_dicos/70container_filesredefine/tiramisu/base.py @@ -10,8 +10,8 @@ option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644') option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/mailname') option_11 = StrOption(name='owner', doc='owner', multi=False, default='root') option_12 = StrOption(name='source', doc='source', multi=False, default='mailname.new') -option_13 = BoolOption(default=True, name='templating', doc='templating', multi=False) -option_14 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True) +option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_7 = OptionDescription(name='mailname_new', doc='mailname.new', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14]) option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) diff --git a/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py b/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py index a40376fc..ec33ed77 100644 --- a/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py +++ b/tests/flattener_dicos/70container_pathaccess/tiramisu/base.py @@ -10,7 +10,7 @@ option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='interface', doc='interface', multi=False, default='auto') option_11 = SymLinkOption(name='name', opt=option_5) option_12 = SymLinkOption(name='netmask', opt=option_4) -option_13 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_13 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_9 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', children=[option_10, option_11, option_12, option_13]) option_8 = OptionDescription(name='ips', doc='ips', children=[option_9]) option_7 = OptionDescription(name='nut', doc='nut', children=[option_8]) diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py b/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py index d8f2be59..80bf806e 100644 --- a/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py +++ b/tests/flattener_dicos/70container_pathaccess_leadership/tiramisu/base.py @@ -11,7 +11,7 @@ option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_11 = StrOption(name='interface', doc='interface', multi=False, default='auto') option_12 = SymLinkOption(name='name', opt=option_6) option_13 = SymLinkOption(name='netmask', opt=option_5) -option_14 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_10 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', children=[option_11, option_12, option_13, option_14]) option_9 = OptionDescription(name='ips', doc='ips', children=[option_10]) option_8 = OptionDescription(name='ntp', doc='ntp', children=[option_9]) diff --git a/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py b/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py index 44dbc798..6716ad5a 100644 --- a/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py +++ b/tests/flattener_dicos/70container_serviceaccess/tiramisu/base.py @@ -7,7 +7,7 @@ option_2 = OptionDescription(name='general', doc='général', properties=frozens option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = PortOption(allow_private=True, name='name', doc='name', multi=False, default='123') option_9 = StrOption(name='protocol', doc='protocol', multi=False, default='udp') -option_10 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_10 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_7 = OptionDescription(name='123', doc='123', children=[option_8, option_9, option_10]) option_6 = OptionDescription(name='ports', doc='ports', children=[option_7]) option_5 = OptionDescription(name='ntp', doc='ntp', children=[option_6]) diff --git a/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py b/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py index 8a3c7c57..80775344 100644 --- a/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py +++ b/tests/flattener_dicos/70container_servicerestriction/tiramisu/base.py @@ -8,7 +8,7 @@ option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='interface', doc='interface', multi=False, default='eth0') option_9 = NetworkOption(name='name', doc='name', multi=False, default='192.168.1.1') option_10 = NetmaskOption(name='netmask', doc='netmask', multi=False, default='255.255.255.255') -option_11 = BoolOption(default=True, name='activate', doc='activate', multi=False) +option_11 = BoolOption(name='activate', doc='activate', multi=False, default=True) option_7 = OptionDescription(name='192_168_1_1', doc='192.168.1.1', children=[option_8, option_9, option_10, option_11]) option_6 = OptionDescription(name='ips', doc='ips', children=[option_7]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[option_6])