Infra
/
rougail
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add OptionInformation support

This commit is contained in:
Emmanuel Garette 2020-10-03 22:10:32 +02:00
parent b55b8f4d9d
commit 5b3d57812e
27 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rougail/tiramisureflector.py
View File

@ -422,6 +422,8 @@ class Variable(Common):
if hasattr(param, 'suffix'): if hasattr(param, 'suffix'):
value['suffix'] = param.suffix value['suffix'] = param.suffix
return self.build_param(value) return self.build_param(value)
elif param.type == 'information':
return f'ParamInformation("{param.text}")'
raise LoaderError(_('unknown param type {}').format(param.type)) raise LoaderError(_('unknown param type {}').format(param.type))
def populate_value(self, def populate_value(self,

3
tests/eosfunc/test.py
View File

@ -1,7 +1,8 @@
from tiramisu import valid_not_equal, valid_ip_netmask, calc_value from tiramisu import valid_not_equal, valid_ip_netmask, calc_value
def calc_val(*args, **kwargs): def calc_val(*args, **kwargs):
pass if len(args) > 0:
return args[0]
def concat(*args, **kwargs): def concat(*args, **kwargs):

2
tests/flattener_dicos/01auto_base/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}

2
tests/flattener_dicos/01fill_autofreeze/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non", "rougail.general.module_instancie": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non", "rougail.general.module_instancie": "non"}

2
tests/flattener_dicos/01fill_autosave/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}

2
tests/flattener_dicos/01fill_base/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}

2
tests/flattener_dicos/01fill_baseaccent/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}

23
tests/flattener_dicos/01fill_information/00-base.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version='1.0' encoding='UTF-8'?>
<rougail>
<services/>
<variables>
<family name="general">
<variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
</family>
<separators/>
</variables>
<constraints>
<fill name="calc_val" target="mode_conteneur_actif">
<param type="information">info</param>
</fill>
</constraints>
<help/>
</rougail>
<!-- vim: ts=4 sw=4 expandtab
-->

0
tests/flattener_dicos/01fill_information/__init__.py Normal file
View File

1
tests/flattener_dicos/01fill_information/makedict/base.json Normal file
View File

@ -0,0 +1 @@
{"rougail.general.mode_conteneur_actif": "value"}

0
tests/flattener_dicos/01fill_information/tiramisu/__init__.py Normal file
View File

8
tests/flattener_dicos/01fill_information/tiramisu/base.py Normal file
View File

@ -0,0 +1,8 @@
from tiramisu import *
from rougail.tiramisu import ConvertDynOptionDescription
import imp
func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
option_3 = StrOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamInformation("info")), kwargs={})))
option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

2
tests/flattener_dicos/01fill_mandatory/00-base.xml
View File

@ -5,7 +5,7 @@
<variables> <variables>
<family name="general" mode="basic"> <family name="general" mode="basic">
<variable name="mode_conteneur_actif" type="domain" description="No change" mandatory="True" mode="expert"/> <variable name="mode_conteneur_actif" type="oui/non" description="No change" mandatory="True" mode="expert"/>
<variable name="mode_conteneur_actif1" type="oui/non" description="No change"> <variable name="mode_conteneur_actif1" type="oui/non" description="No change">
<value>non</value> <value>non</value>
</variable> </variable>

2
tests/flattener_dicos/01fill_mandatory/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}

2
tests/flattener_dicos/01fill_mandatory/tiramisu/base.py
View File

@ -3,7 +3,7 @@ from rougail.tiramisu import ConvertDynOptionDescription
import imp import imp
func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py') func = imp.load_source('func', 'tests/flattener_dicos/../eosfunc/test.py')
option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
option_3 = DomainnameOption(type='domainname', allow_ip=False, properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}))) option_3 = ChoiceOption(properties=frozenset({'expert', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

2
tests/flattener_dicos/01fill_number/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": 3, "rougail.general.mode_conteneur_actif1": "non"}

2
tests/flattener_dicos/01fill_optional/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif1": "non"} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif1": "non"}

2
tests/flattener_dicos/10autosave_hidden/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": null} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": "oui"}

2
tests/flattener_dicos/10autosave_hidden_frozenifin/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": null} {"rougail.general.mode_conteneur_actif": "non", "rougail.general.autosavevar": "oui"}

2
tests/flattener_dicos/10load_frozenifin_auto/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": null, "rougail.general.mode_conteneur_actif2": "non"} {"rougail.general.condition": "non", "rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif2": "non"}

2
tests/flattener_dicos/10valid_enum_variable/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": "test", "rougail.enumfam.varmulti": ["test"]} {"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.varmulti": ["test"], "rougail.enumfam.enumvar": "test"}

2
tests/flattener_dicos/20family_dynamic_calc/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": "val", "rougail.dynval2.vardynval2": "val", "rougail.new.newvar": null} {"rougail.general.varname": ["val1", "val2"], "rougail.dynval1.vardynval1": "val", "rougail.dynval2.vardynval2": "val", "rougail.new.newvar": "val"}

2
tests/flattener_dicos/20family_dynamic_number/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.varname": [1, 2], "rougail.dyn1.vardyn1": "val", "rougail.dyn2.vardyn2": "val", "rougail.new.newvar": null} {"rougail.general.varname": [1, 2], "rougail.dyn1.vardyn1": "val", "rougail.dyn2.vardyn2": "val", "rougail.new.newvar": "val"}

2
tests/flattener_dicos/30mandatory_withoutvaluecalc/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null} {"rougail.general.mode_conteneur_actif": "value"}

2
tests/flattener_dicos/30mandatory_withvaluecalc/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": null} {"rougail.general.mode_conteneur_actif": "value"}

2
tests/flattener_dicos/60action_external/makedict/base.json
View File

@ -1 +1 @@
{"rougail.general.mode_conteneur_actif": "non", "extra.test.delay": 0, "extra.test.calc_url": null} {"rougail.general.mode_conteneur_actif": "non", "extra.test.delay": 0, "extra.test.calc_url": "http://localhost/"}

1
tests/test_2_makedict.py
View File

@ -48,6 +48,7 @@ async def launch_flattener(test_dir):
config = await Config(mod.option_0) config = await Config(mod.option_0)
await config.property.read_only() await config.property.read_only()
await config.property.pop('mandatory') await config.property.pop('mandatory')
await config.information.set('info', 'value')
config_dict = await config.value.dict() config_dict = await config.value.dict()
if config_dict: if config_dict:
if not isdir(makedict_dir): if not isdir(makedict_dir):