add 'manage' attribut to service, unmanage services is, for example a fake service

2020-07-30 09:37:19 +02:00
parent 08f4362816
commit 5f2d1b3eb7
35 changed files with 83 additions and 16 deletions
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- 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])
--- a/tests/flattener_dicos/70services_unmanage/00-base.xml
+++ b/tests/flattener_dicos/70services_unmanage/00-base.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rougail>
+
+    <services>
+        <service name='testsrv' manage='False'>
+        </service>
+    </services>
+
+
+    <variables>
+        <family name='général'>
+            <variable name='mode_conteneur_actif' type='oui/non' description="No change" hidden="True">
+                <value>oui</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+
+    <constraints>
+    </constraints>
+
+    <help/>
+
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->
--- a/tests/flattener_dicos/70services_unmanage/init.py
+++ b/tests/flattener_dicos/70services_unmanage/init.py
--- a/tests/flattener_dicos/70services_unmanage/makedict/base.json
+++ b/tests/flattener_dicos/70services_unmanage/makedict/base.json
@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "oui"}
--- a/tests/flattener_dicos/70services_unmanage/tiramisu/init.py
+++ b/tests/flattener_dicos/70services_unmanage/tiramisu/init.py
--- a/tests/flattener_dicos/70services_unmanage/tiramisu/base.py
+++ 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])
				`@ -0,0 +1 @@`
				`{"rougail.general.mode_conteneur_actif": "oui"}`