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

add systemd timer + a service and a timer can have same name

This commit is contained in:
Emmanuel Garette 2022-03-05 10:57:55 +01:00
parent fbc5f9374e
commit d1d6a80fe7
331 changed files with 1201 additions and 1132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/service/README.md
View File

@ -24,6 +24,7 @@ Les services peuvent être de plusieurs type :
- service (valeur par défaut) : cela signifie que c'est un service systemd qui est activer au démarrage de la machine - service (valeur par défaut) : cela signifie que c'est un service systemd qui est activer au démarrage de la machine
- mount : fichier utilisé par systemd-mount - mount : fichier utilisé par systemd-mount
- swap : fichier utilisé par systemd-swap - swap : fichier utilisé par systemd-swap
- timer : tâche planifié pour systemd
``` ```
<service name="dev-disk-by\x2dpartlabel-swap" type="swap"/> <service name="dev-disk-by\x2dpartlabel-swap" type="swap"/>

2
doc/service/file.md
View File

@ -2,7 +2,7 @@
## La balise file ## La balise file
La gestion des fichiers se fait dans un conteneur de [service](service.md). La gestion des fichiers se fait dans un conteneur de [service](README.md).
La déclaration du fichier permet de générer un fichier à partir d'un template pour le déposer à l'endroit prévu dans la déclaration de cette élément. La déclaration du fichier permet de générer un fichier à partir d'un template pour le déposer à l'endroit prévu dans la déclaration de cette élément.

2
doc/service/ip.md
View File

@ -2,7 +2,7 @@
## La balise IP ## La balise IP
La gestion des IP se fait dans un conteneur de [service](service.md). La gestion des IP se fait dans un conteneur de [service](README.md).
La déclaration de l'attribut permet d'associer une IP autorisé à accéder au service. La déclaration de l'attribut permet d'associer une IP autorisé à accéder au service.

2
doc/service/override.md
View File

@ -2,7 +2,7 @@
## La balise override ## La balise override
La gestion des overrides se fait dans un conteneur de [service](service.md). La gestion des overrides se fait dans un conteneur de [service](README.md).
La balise override permet de redéfinir facilement un service systemd. La balise override permet de redéfinir facilement un service systemd.

4
src/rougail/annotator/service.py
View File

@ -253,7 +253,7 @@ class Annotator:
variable.mode = None variable.mode = None
variable.type = type_ variable.type = type_
if type_ == 'symlink': if type_ == 'symlink':
variable.opt = self.objectspace.paths.get_variable(value) variable.opt = self.objectspace.paths.get_variable(value, xmlfiles=elt.xmlfiles)
variable.multi = None variable.multi = None
needed_type = self.objectspace.types[dtd_key_type] needed_type = self.objectspace.types[dtd_key_type]
if needed_type not in ('variable', variable.opt.type): if needed_type not in ('variable', variable.opt.type):
@ -285,7 +285,7 @@ class Annotator:
self.uniq_overrides.append(service_name) self.uniq_overrides.append(service_name)
override.name = service_name override.name = service_name
if not hasattr(override, 'source'): if not hasattr(override, 'source'):
override.source = f'{service_name}.service' override.source = service_name
@staticmethod @staticmethod
def _update_file(file_, def _update_file(file_,

2
src/rougail/data/rougail.dtd
View File

@ -53,7 +53,7 @@
<!ATTLIST service disabled (True|False) "False"> <!ATTLIST service disabled (True|False) "False">
<!ATTLIST service engine (none|creole|jinja2) #IMPLIED> <!ATTLIST service engine (none|creole|jinja2) #IMPLIED>
<!ATTLIST service target CDATA #IMPLIED> <!ATTLIST service target CDATA #IMPLIED>
<!ATTLIST service type (service|mount|swap) "service"> <!ATTLIST service type (service|mount|swap|timer) "service">
<!ATTLIST service undisable (True|False) "False"> <!ATTLIST service undisable (True|False) "False">
<!ELEMENT ip (#PCDATA)> <!ELEMENT ip (#PCDATA)>

2
src/rougail/objspace.py
View File

@ -286,6 +286,8 @@ class RougailObjSpace:
) -> Optional[str]: ) -> Optional[str]:
if child.tag == 'variables': if child.tag == 'variables':
return namespace return namespace
if child.tag == 'service':
return child.attrib['name'] + '.' + child.attrib.get('type', 'service')
if 'name' in child.attrib: if 'name' in child.attrib:
return child.attrib['name'] return child.attrib['name']
if child.text and child.tag in self.forced_text_elts_as_name: if child.text and child.tag in self.forced_text_elts_as_name:

10
src/rougail/template/base.py
View File

@ -276,7 +276,6 @@ class RougailBaseTemplate:
filevar: Dict, filevar: Dict,
type_: str, type_: str,
service_name: str, service_name: str,
service_type: str,
) -> str: ) -> str:
"""Run templatisation on one file """Run templatisation on one file
""" """
@ -302,7 +301,6 @@ class RougailBaseTemplate:
data = getattr(self, func)(filevar, data = getattr(self, func)(filevar,
filename, filename,
service_name, service_name,
service_type,
variable, variable,
idx, idx,
) )
@ -359,10 +357,9 @@ class RougailBaseTemplate:
for included in (True, False): for included in (True, False):
for service_obj in await self.config.option('services').list('all'): for service_obj in await self.config.option('services').list('all'):
service_name = await service_obj.option.description() service_name = await service_obj.option.description()
service_type = await service_obj.information.get('type', 'service')
if await service_obj.option('activate').value.get() is False: if await service_obj.option('activate').value.get() is False:
if included is False and not await service_obj.information.get('undisable', False): if included is False and not await service_obj.information.get('undisable', False):
self.desactive_service(service_name, service_type) self.desactive_service(service_name)
continue continue
if not included: if not included:
engine = await service_obj.information.get('engine', None) engine = await service_obj.information.get('engine', None)
@ -370,13 +367,11 @@ class RougailBaseTemplate:
self.instance_file({'engine': engine}, self.instance_file({'engine': engine},
'service', 'service',
service_name, service_name,
service_type,
) )
target_name = await service_obj.information.get('target', None) target_name = await service_obj.information.get('target', None)
if target_name: if target_name:
self.target_service(service_name, self.target_service(service_name,
target_name, target_name,
service_type,
engine is None, engine is None,
) )
for fills in await service_obj.list('optiondescription'): for fills in await service_obj.list('optiondescription'):
@ -395,13 +390,12 @@ class RougailBaseTemplate:
destfilenames = self.instance_file(fill, destfilenames = self.instance_file(fill,
type_, type_,
service_name, service_name,
service_type,
) )
if included and fill.get('included', 'no') == 'content': if included and fill.get('included', 'no') == 'content':
files_to_delete.extend(destfilenames) files_to_delete.extend(destfilenames)
else: else:
self.log.debug(_(f"Instantiation of file '{fill['name']}' disabled")) self.log.debug(_(f"Instantiation of file '{fill['name']}' disabled"))
self.post_instance_service(service_name, service_type) self.post_instance_service(service_name)
for filename in files_to_delete: for filename in files_to_delete:
unlink(filename) unlink(filename)
parent = filename parent = filename

24
src/rougail/template/systemd.py
View File

@ -82,7 +82,6 @@ class RougailSystemdTemplate(RougailBaseTemplate):
filevar: Dict, filevar: Dict,
destfile: str, destfile: str,
service_name: str, service_name: str,
service_type: str,
variable, variable,
idx: int, idx: int,
) -> tuple: ) -> tuple:
@ -101,7 +100,6 @@ class RougailSystemdTemplate(RougailBaseTemplate):
filevar: Dict, filevar: Dict,
destfile, destfile,
service_name: str, service_name: str,
service_type: str,
*args, *args,
) -> tuple: ) -> tuple:
source = filevar['source'] source = filevar['source']
@ -109,14 +107,13 @@ class RougailSystemdTemplate(RougailBaseTemplate):
raise FileNotFound(_(f'Override source file "{source}" does not exist in {", ".join(self.templates_dir)}')) raise FileNotFound(_(f'Override source file "{source}" does not exist in {", ".join(self.templates_dir)}'))
tmp_file = join(self.tmp_dir, source) tmp_file = join(self.tmp_dir, source)
service_name = filevar['name'] service_name = filevar['name']
destfile = f'/systemd/system/{service_name}.{service_type}.d/rougail.conf' destfile = f'/systemd/system/{service_name}.d/rougail.conf'
return tmp_file, None, destfile, None return tmp_file, None, destfile, None
def get_data_ip(self, def get_data_ip(self,
filevar: Dict, filevar: Dict,
ip, ip,
service_name: str, service_name: str,
service_type: str,
var: Any, var: Any,
idx: int, idx: int,
*args, *args,
@ -136,45 +133,40 @@ class RougailSystemdTemplate(RougailBaseTemplate):
servicevar: Dict, servicevar: Dict,
info, info,
service_name: str, service_name: str,
service_type: str,
*args, *args,
): ):
filename = f'{service_name}.{service_type}' tmp_file = join(self.tmp_dir, service_name)
tmp_file = join(self.tmp_dir, filename)
var = None var = None
destfile = f'/systemd/system/{filename}' destfile = f'/systemd/system/{service_name}'
return tmp_file, None, destfile, var return tmp_file, None, destfile, var
def desactive_service(self, def desactive_service(self,
service_name: str, service_name: str,
service_type: str,
): ):
filename = f'{self.destinations_dir}/systemd/system/{service_name}.{service_type}' filename = f'{self.destinations_dir}/systemd/system/{service_name}'
makedirs(dirname(filename), exist_ok=True) makedirs(dirname(filename), exist_ok=True)
symlink('/dev/null', filename) symlink('/dev/null', filename)
def target_service(self, def target_service(self,
service_name: str, service_name: str,
target_name: str, target_name: str,
service_type: str,
global_service: str, global_service: str,
): ):
filename = f'{self.destinations_dir}/systemd/system/{target_name}.target.wants/{service_name}.{service_type}' filename = f'{self.destinations_dir}/systemd/system/{target_name}.target.wants/{service_name}'
makedirs(dirname(filename), exist_ok=True) makedirs(dirname(filename), exist_ok=True)
if global_service: if global_service:
source_filename = f'{ROUGAIL_GLOBAL_SYSTEMD_FILE}/{service_name}.{service_type}' source_filename = f'{ROUGAIL_GLOBAL_SYSTEMD_FILE}/{service_name}'
else: else:
source_filename = f'{ROUGAIL_DEST}/systemd/system/{service_name}.{service_type}' source_filename = f'{ROUGAIL_DEST}/systemd/system/{service_name}'
symlink(source_filename, filename) symlink(source_filename, filename)
def post_instance_service(self, def post_instance_service(self,
service_name: str, service_name: str,
service_type: str,
) -> None: # pragma: no cover ) -> None: # pragma: no cover
if self.ip_per_service is None: if self.ip_per_service is None:
return return
destfile = f'/systemd/system/{service_name}.{service_type}.d/rougail_ip.conf' destfile = f'/systemd/system/{service_name}.d/rougail_ip.conf'
destfilename = join(self.destinations_dir, destfile[1:]) destfilename = join(self.destinations_dir, destfile[1:])
makedirs(dirname(destfilename), exist_ok=True) makedirs(dirname(destfilename), exist_ok=True)
self.log.info(_(f"creole processing: '{destfilename}'")) self.log.info(_(f"creole processing: '{destfilename}'"))

4
tests/dictionaries/00empty/makedict/after.json
View File

@ -1,9 +1,9 @@
{ {
"services.tata.activate": { "services.tata_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.tata.manage": { "services.tata_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

4
tests/dictionaries/00empty/makedict/base.json
View File

@ -1,4 +1,4 @@
{ {
"services.tata.activate": true, "services.tata_service.activate": true,
"services.tata.manage": true "services.tata_service.manage": true
} }

4
tests/dictionaries/00empty/makedict/before.json
View File

@ -1,9 +1,9 @@
{ {
"services.tata.activate": { "services.tata_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.tata.manage": { "services.tata_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/00empty/tiramisu/base.py
View File

@ -16,6 +16,6 @@ except:
from tiramisu import * from tiramisu import *
option_3 = BoolOption(name="activate", doc="activate", default=True) option_3 = BoolOption(name="activate", doc="activate", default=True)
option_4 = BoolOption(name="manage", doc="manage", default=True) option_4 = BoolOption(name="manage", doc="manage", default=True)
option_2 = OptionDescription(name="tata", doc="tata", children=[option_3, option_4]) option_2 = OptionDescription(name="tata_service", doc="tata.service", children=[option_3, option_4])
option_1 = OptionDescription(name="services", doc="services", children=[option_2], properties=frozenset({"hidden"})) option_1 = OptionDescription(name="services", doc="services", children=[option_2], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

8
tests/dictionaries/00load_subfolder/makedict/after.json
View File

@ -1,10 +1,10 @@
{ {
"rougail.general.mode_conteneur_actif": {
"owner": "default",
"value": "non"
},
"rougail.general.mode_conteneur_actif1": { "rougail.general.mode_conteneur_actif1": {
"owner": "default", "owner": "default",
"value": "non" "value": "non"
},
"rougail.general.mode_conteneur_actif": {
"owner": "default",
"value": "non"
} }
} }

4
tests/dictionaries/00load_subfolder/makedict/base.json
View File

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

8
tests/dictionaries/00load_subfolder/makedict/before.json
View File

@ -1,10 +1,10 @@
{ {
"rougail.general.mode_conteneur_actif": {
"owner": "default",
"value": "non"
},
"rougail.general.mode_conteneur_actif1": { "rougail.general.mode_conteneur_actif1": {
"owner": "default", "owner": "default",
"value": "non" "value": "non"
},
"rougail.general.mode_conteneur_actif": {
"owner": "default",
"value": "non"
} }
} }

12
tests/dictionaries/01base_file/makedict/after.json
View File

@ -3,27 +3,27 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

12
tests/dictionaries/01base_file/makedict/base.json
View File

@ -1,9 +1,9 @@
{ {
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.activate": true, "services.test_service.files.file.activate": true,
"services.test.files.file2.name": "/etc/file2", "services.test_service.files.file2.name": "/etc/file2",
"services.test.files.file2.activate": true, "services.test_service.files.file2.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

12
tests/dictionaries/01base_file/makedict/before.json
View File

@ -3,27 +3,27 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/01base_file/tiramisu/base.py
View File

@ -29,6 +29,6 @@ option_10.impl_set_information('source', "file2")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
option_13 = BoolOption(name="activate", doc="activate", default=True) option_13 = BoolOption(name="activate", doc="activate", default=True)
option_14 = BoolOption(name="manage", doc="manage", default=True) option_14 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_13, option_14])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

16
tests/dictionaries/01base_file_disabled/makedict/after.json
View File

@ -3,35 +3,35 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file3.name": { "services.test_service.files.file3.name": {
"owner": "default", "owner": "default",
"value": "/etc/file3" "value": "/etc/file3"
}, },
"services.test.files.file3.activate": { "services.test_service.files.file3.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

16
tests/dictionaries/01base_file_disabled/makedict/base.json
View File

@ -1,11 +1,11 @@
{ {
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.activate": true, "services.test_service.files.file.activate": true,
"services.test.files.file2.name": "/etc/file2", "services.test_service.files.file2.name": "/etc/file2",
"services.test.files.file2.activate": true, "services.test_service.files.file2.activate": true,
"services.test.files.file3.name": "/etc/file3", "services.test_service.files.file3.name": "/etc/file3",
"services.test.files.file3.activate": false, "services.test_service.files.file3.activate": false,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

16
tests/dictionaries/01base_file_disabled/makedict/before.json
View File

@ -3,35 +3,35 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file3.name": { "services.test_service.files.file3.name": {
"owner": "default", "owner": "default",
"value": "/etc/file3" "value": "/etc/file3"
}, },
"services.test.files.file3.activate": { "services.test_service.files.file3.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/01base_file_disabled/tiramisu/base.py
View File

@ -33,6 +33,6 @@ option_13.impl_set_information('source', "file3")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13]) option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
option_16 = BoolOption(name="activate", doc="activate", default=True) option_16 = BoolOption(name="activate", doc="activate", default=True)
option_17 = BoolOption(name="manage", doc="manage", default=True) option_17 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_16, option_17])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

12
tests/dictionaries/01base_file_include/makedict/after.json
View File

@ -3,27 +3,27 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

12
tests/dictionaries/01base_file_include/makedict/base.json
View File

@ -1,9 +1,9 @@
{ {
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.activate": true, "services.test_service.files.file.activate": true,
"services.test.files.file2.name": "/etc/file2", "services.test_service.files.file2.name": "/etc/file2",
"services.test.files.file2.activate": true, "services.test_service.files.file2.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

12
tests/dictionaries/01base_file_include/makedict/before.json
View File

@ -3,27 +3,27 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/01base_file_include/tiramisu/base.py
View File

@ -29,6 +29,6 @@ option_10.impl_set_information('source', "file2")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
option_13 = BoolOption(name="activate", doc="activate", default=True) option_13 = BoolOption(name="activate", doc="activate", default=True)
option_14 = BoolOption(name="manage", doc="manage", default=True) option_14 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_13, option_14])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

16
tests/dictionaries/01base_file_include_content/makedict/after.json
View File

@ -3,35 +3,35 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.incfile.name": { "services.test_service.files.incfile.name": {
"owner": "default", "owner": "default",
"value": "/etc/dir/incfile" "value": "/etc/dir/incfile"
}, },
"services.test.files.incfile.activate": { "services.test_service.files.incfile.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

16
tests/dictionaries/01base_file_include_content/makedict/base.json
View File

@ -1,11 +1,11 @@
{ {
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.activate": true, "services.test_service.files.file.activate": true,
"services.test.files.file2.name": "/etc/file2", "services.test_service.files.file2.name": "/etc/file2",
"services.test.files.file2.activate": true, "services.test_service.files.file2.activate": true,
"services.test.files.incfile.name": "/etc/dir/incfile", "services.test_service.files.incfile.name": "/etc/dir/incfile",
"services.test.files.incfile.activate": true, "services.test_service.files.incfile.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

16
tests/dictionaries/01base_file_include_content/makedict/before.json
View File

@ -3,35 +3,35 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.incfile.name": { "services.test_service.files.incfile.name": {
"owner": "default", "owner": "default",
"value": "/etc/dir/incfile" "value": "/etc/dir/incfile"
}, },
"services.test.files.incfile.activate": { "services.test_service.files.incfile.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/01base_file_include_content/tiramisu/base.py
View File

@ -34,6 +34,6 @@ option_13.impl_set_information('source', "incfile")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13]) option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
option_16 = BoolOption(name="activate", doc="activate", default=True) option_16 = BoolOption(name="activate", doc="activate", default=True)
option_17 = BoolOption(name="manage", doc="manage", default=True) option_17 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_16, option_17])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

16
tests/dictionaries/01base_file_include_name/makedict/after.json
View File

@ -3,35 +3,35 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.incfile.name": { "services.test_service.files.incfile.name": {
"owner": "default", "owner": "default",
"value": "/etc/dir/incfile" "value": "/etc/dir/incfile"
}, },
"services.test.files.incfile.activate": { "services.test_service.files.incfile.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

16
tests/dictionaries/01base_file_include_name/makedict/base.json
View File

@ -1,11 +1,11 @@
{ {
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.activate": true, "services.test_service.files.file.activate": true,
"services.test.files.file2.name": "/etc/file2", "services.test_service.files.file2.name": "/etc/file2",
"services.test.files.file2.activate": true, "services.test_service.files.file2.activate": true,
"services.test.files.incfile.name": "/etc/dir/incfile", "services.test_service.files.incfile.name": "/etc/dir/incfile",
"services.test.files.incfile.activate": true, "services.test_service.files.incfile.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

16
tests/dictionaries/01base_file_include_name/makedict/before.json
View File

@ -3,35 +3,35 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.incfile.name": { "services.test_service.files.incfile.name": {
"owner": "default", "owner": "default",
"value": "/etc/dir/incfile" "value": "/etc/dir/incfile"
}, },
"services.test.files.incfile.activate": { "services.test_service.files.incfile.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/01base_file_include_name/tiramisu/base.py
View File

@ -34,6 +34,6 @@ option_13.impl_set_information('source', "incfile")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13]) option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10, option_13])
option_16 = BoolOption(name="activate", doc="activate", default=True) option_16 = BoolOption(name="activate", doc="activate", default=True)
option_17 = BoolOption(name="manage", doc="manage", default=True) option_17 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_16, option_17]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_16, option_17])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

20
tests/dictionaries/01base_file_owner/makedict/after.json
View File

@ -3,43 +3,43 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.group": { "services.test_service.files.file.group": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.owner": { "services.test_service.files.file.owner": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.group": { "services.test_service.files.file2.group": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.owner": { "services.test_service.files.file2.owner": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

20
tests/dictionaries/01base_file_owner/makedict/base.json
View File

@ -1,13 +1,13 @@
{ {
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"services.test.files.file.group": "nobody", "services.test_service.files.file.group": "nobody",
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.owner": "nobody", "services.test_service.files.file.owner": "nobody",
"services.test.files.file.activate": true, "services.test_service.files.file.activate": true,
"services.test.files.file2.group": "nobody", "services.test_service.files.file2.group": "nobody",
"services.test.files.file2.name": "/etc/file2", "services.test_service.files.file2.name": "/etc/file2",
"services.test.files.file2.owner": "nobody", "services.test_service.files.file2.owner": "nobody",
"services.test.files.file2.activate": true, "services.test_service.files.file2.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

20
tests/dictionaries/01base_file_owner/makedict/before.json
View File

@ -3,43 +3,43 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.group": { "services.test_service.files.file.group": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.owner": { "services.test_service.files.file.owner": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.group": { "services.test_service.files.file2.group": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.owner": { "services.test_service.files.file2.owner": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/01base_file_owner/tiramisu/base.py
View File

@ -33,6 +33,6 @@ option_12.impl_set_information('source', "file2")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_12]) option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_12])
option_17 = BoolOption(name="activate", doc="activate", default=True) option_17 = BoolOption(name="activate", doc="activate", default=True)
option_18 = BoolOption(name="manage", doc="manage", default=True) option_18 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_17, option_18]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_17, option_18])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

20
tests/dictionaries/01base_file_owner_variable/makedict/after.json
View File

@ -11,43 +11,43 @@
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.group": { "services.test_service.files.file.group": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.owner": { "services.test_service.files.file.owner": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.group": { "services.test_service.files.file2.group": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.owner": { "services.test_service.files.file2.owner": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

20
tests/dictionaries/01base_file_owner_variable/makedict/base.json
View File

@ -2,14 +2,14 @@
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"rougail.general.owner": "nobody", "rougail.general.owner": "nobody",
"rougail.general.group": "nobody", "rougail.general.group": "nobody",
"services.test.files.file.group": "nobody", "services.test_service.files.file.group": "nobody",
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.owner": "nobody", "services.test_service.files.file.owner": "nobody",
"services.test.files.file.activate": true, "services.test_service.files.file.activate": true,
"services.test.files.file2.group": "nobody", "services.test_service.files.file2.group": "nobody",
"services.test.files.file2.name": "/etc/file2", "services.test_service.files.file2.name": "/etc/file2",
"services.test.files.file2.owner": "nobody", "services.test_service.files.file2.owner": "nobody",
"services.test.files.file2.activate": true, "services.test_service.files.file2.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

20
tests/dictionaries/01base_file_owner_variable/makedict/before.json
View File

@ -11,43 +11,43 @@
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.group": { "services.test_service.files.file.group": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.owner": { "services.test_service.files.file.owner": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.group": { "services.test_service.files.file2.group": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.owner": { "services.test_service.files.file2.owner": {
"owner": "default", "owner": "default",
"value": "nobody" "value": "nobody"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/01base_file_owner_variable/tiramisu/base.py
View File

@ -35,6 +35,6 @@ option_14.impl_set_information('source', "file2")
option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_14]) option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_14])
option_19 = BoolOption(name="activate", doc="activate", default=True) option_19 = BoolOption(name="activate", doc="activate", default=True)
option_20 = BoolOption(name="manage", doc="manage", default=True) option_20 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_19, option_20]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_19, option_20])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

12
tests/dictionaries/01base_file_patch/makedict/after.json
View File

@ -3,27 +3,27 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

12
tests/dictionaries/01base_file_patch/makedict/base.json
View File

@ -1,9 +1,9 @@
{ {
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.activate": true, "services.test_service.files.file.activate": true,
"services.test.files.file2.name": "/etc/file2", "services.test_service.files.file2.name": "/etc/file2",
"services.test.files.file2.activate": true, "services.test_service.files.file2.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

12
tests/dictionaries/01base_file_patch/makedict/before.json
View File

@ -3,27 +3,27 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file2.name": { "services.test_service.files.file2.name": {
"owner": "default", "owner": "default",
"value": "/etc/file2" "value": "/etc/file2"
}, },
"services.test.files.file2.activate": { "services.test_service.files.file2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/01base_file_patch/tiramisu/base.py
View File

@ -29,6 +29,6 @@ option_10.impl_set_information('source', "file2")
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
option_13 = BoolOption(name="activate", doc="activate", default=True) option_13 = BoolOption(name="activate", doc="activate", default=True)
option_14 = BoolOption(name="manage", doc="manage", default=True) option_14 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_13, option_14])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

12
tests/dictionaries/01base_file_utfchar/makedict/after.json
View File

@ -3,27 +3,27 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": { "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": {
"owner": "default", "owner": "default",
"value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel" "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel"
}, },
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": { "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": { "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": {
"owner": "default", "owner": "default",
"value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2" "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2"
}, },
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": { "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

12
tests/dictionaries/01base_file_utfchar/makedict/base.json
View File

@ -1,9 +1,9 @@
{ {
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel", "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel",
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": true, "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": true,
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2", "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2",
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": true, "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

12
tests/dictionaries/01base_file_utfchar/makedict/before.json
View File

@ -3,27 +3,27 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": { "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": {
"owner": "default", "owner": "default",
"value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel" "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel"
}, },
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": { "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": { "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.name": {
"owner": "default", "owner": "default",
"value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2" "value": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel2"
}, },
"services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": { "services.test_service.files.systemd_makefs@dev_disk_by\\x2dpartlabel2.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/01base_file_utfchar/tiramisu/base.py
View File

@ -29,6 +29,6 @@ option_10.impl_set_information('source', "systemd-makefs@dev-disk-by\\x2dpartlab
option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10]) option_6 = OptionDescription(name="files", doc="files", children=[option_7, option_10])
option_13 = BoolOption(name="activate", doc="activate", default=True) option_13 = BoolOption(name="activate", doc="activate", default=True)
option_14 = BoolOption(name="manage", doc="manage", default=True) option_14 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_13, option_14]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_13, option_14])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

8
tests/dictionaries/10load_disabled_if_in_multi_param/makedict/after.json
View File

@ -11,19 +11,19 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param/makedict/base.json
View File

@ -2,8 +2,8 @@
"rougail.general.condition": "non", "rougail.general.condition": "non",
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"rougail.general.mode_conteneur_actif2": "non", "rougail.general.mode_conteneur_actif2": "non",
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": true, "services.test_service.files.file1.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param/makedict/before.json
View File

@ -11,19 +11,19 @@
"owner": "default", "owner": "default",
"value": "non" "value": "non"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py
View File

@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_8 = OptionDescription(name="files", doc="files", children=[option_9])
option_12 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="activate", doc="activate", default=True)
option_13 = BoolOption(name="manage", doc="manage", default=True) option_13 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

8
tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/after.json
View File

@ -11,19 +11,19 @@
"owner": "default", "owner": "default",
"value": "no" "value": "no"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/base.json
View File

@ -2,8 +2,8 @@
"rougail.general.condition": "no", "rougail.general.condition": "no",
"rougail.general.condition2": "no", "rougail.general.condition2": "no",
"rougail.general.test_variable": "no", "rougail.general.test_variable": "no",
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": true, "services.test_service.files.file1.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/before.json
View File

@ -11,19 +11,19 @@
"owner": "default", "owner": "default",
"value": "no" "value": "no"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py
View File

@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_8 = OptionDescription(name="files", doc="files", children=[option_9])
option_12 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="activate", doc="activate", default=True)
option_13 = BoolOption(name="manage", doc="manage", default=True) option_13 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

8
tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/after.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "no" "value": "no"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/base.json
View File

@ -1,8 +1,8 @@
{ {
"rougail.general.condition": "no", "rougail.general.condition": "no",
"rougail.general.condition2": "no", "rougail.general.condition2": "no",
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": false, "services.test_service.files.file1.activate": false,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/before.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "no" "value": "no"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py
View File

@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_8 = OptionDescription(name="files", doc="files", children=[option_9])
option_12 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="activate", doc="activate", default=True)
option_13 = BoolOption(name="manage", doc="manage", default=True) option_13 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

8
tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/after.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "no" "value": "no"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/base.json
View File

@ -1,8 +1,8 @@
{ {
"rougail.general.condition": "yes", "rougail.general.condition": "yes",
"rougail.general.condition2": "no", "rougail.general.condition2": "no",
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": true, "services.test_service.files.file1.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/before.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "no" "value": "no"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py
View File

@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_8 = OptionDescription(name="files", doc="files", children=[option_9])
option_12 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="activate", doc="activate", default=True)
option_13 = BoolOption(name="manage", doc="manage", default=True) option_13 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

8
tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/after.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "yes" "value": "yes"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/base.json
View File

@ -1,8 +1,8 @@
{ {
"rougail.general.condition": "yes", "rougail.general.condition": "yes",
"rougail.general.condition2": "yes", "rougail.general.condition2": "yes",
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": false, "services.test_service.files.file1.activate": false,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/before.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "yes" "value": "yes"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py
View File

@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_8 = OptionDescription(name="files", doc="files", children=[option_9])
option_12 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="activate", doc="activate", default=True)
option_13 = BoolOption(name="manage", doc="manage", default=True) option_13 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

8
tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/after.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "yes" "value": "yes"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/base.json
View File

@ -1,8 +1,8 @@
{ {
"rougail.general.condition": "no", "rougail.general.condition": "no",
"rougail.general.condition2": "yes", "rougail.general.condition2": "yes",
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": false, "services.test_service.files.file1.activate": false,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/before.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "yes" "value": "yes"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py
View File

@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_8 = OptionDescription(name="files", doc="files", children=[option_9])
option_12 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="activate", doc="activate", default=True)
option_13 = BoolOption(name="manage", doc="manage", default=True) option_13 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

8
tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/after.json
View File

@ -3,19 +3,19 @@
"owner": "default", "owner": "default",
"value": "oui" "value": "oui"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/base.json
View File

@ -1,7 +1,7 @@
{ {
"rougail.general.condition": "oui", "rougail.general.condition": "oui",
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": false, "services.test_service.files.file1.activate": false,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/before.json
View File

@ -3,19 +3,19 @@
"owner": "default", "owner": "default",
"value": "oui" "value": "oui"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py
View File

@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file1")
option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_8 = OptionDescription(name="files", doc="files", children=[option_9])
option_12 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="activate", doc="activate", default=True)
option_13 = BoolOption(name="manage", doc="manage", default=True) option_13 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

8
tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/after.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "no" "value": "no"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/base.json
View File

@ -1,8 +1,8 @@
{ {
"rougail.general.condition": "no", "rougail.general.condition": "no",
"rougail.general.disable_variable": "no", "rougail.general.disable_variable": "no",
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": true, "services.test_service.files.file1.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/before.json
View File

@ -7,19 +7,19 @@
"owner": "default", "owner": "default",
"value": "no" "value": "no"
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py
View File

@ -25,6 +25,6 @@ option_8.impl_set_information('source', "file1")
option_7 = OptionDescription(name="files", doc="files", children=[option_8]) option_7 = OptionDescription(name="files", doc="files", children=[option_8])
option_11 = BoolOption(name="activate", doc="activate", default=True) option_11 = BoolOption(name="activate", doc="activate", default=True)
option_12 = BoolOption(name="manage", doc="manage", default=True) option_12 = BoolOption(name="manage", doc="manage", default=True)
option_6 = OptionDescription(name="test", doc="test", children=[option_7, option_11, option_12]) option_6 = OptionDescription(name="test_service", doc="test.service", children=[option_7, option_11, option_12])
option_5 = OptionDescription(name="services", doc="services", children=[option_6], properties=frozenset({"hidden"})) option_5 = OptionDescription(name="services", doc="services", children=[option_6], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5])

8
tests/dictionaries/11disabled_if_in_filelist/makedict/after.json
View File

@ -11,19 +11,19 @@
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/11disabled_if_in_filelist/makedict/base.json
View File

@ -2,8 +2,8 @@
"rougail.general.condition": "non", "rougail.general.condition": "non",
"rougail.general.mode_conteneur_actif": "non", "rougail.general.mode_conteneur_actif": "non",
"rougail.general.mode_conteneur_actif2": true, "rougail.general.mode_conteneur_actif2": true,
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.activate": true, "services.test_service.files.file.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/11disabled_if_in_filelist/makedict/before.json
View File

@ -11,19 +11,19 @@
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py
View File

@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file")
option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_8 = OptionDescription(name="files", doc="files", children=[option_9])
option_12 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="activate", doc="activate", default=True)
option_13 = BoolOption(name="manage", doc="manage", default=True) option_13 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

8
tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/after.json
View File

@ -3,19 +3,19 @@
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/base.json
View File

@ -1,7 +1,7 @@
{ {
"rougail.general.condition": true, "rougail.general.condition": true,
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": false, "services.test_service.files.file1.activate": false,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/11disabled_if_in_filelist_boolean/makedict/before.json
View File

@ -3,19 +3,19 @@
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/11disabled_if_in_filelist_boolean/tiramisu/base.py
View File

@ -24,6 +24,6 @@ option_7.impl_set_information('source', "file1")
option_6 = OptionDescription(name="files", doc="files", children=[option_7]) option_6 = OptionDescription(name="files", doc="files", children=[option_7])
option_10 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="activate", doc="activate", default=True)
option_11 = BoolOption(name="manage", doc="manage", default=True) option_11 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_10, option_11])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

8
tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/after.json
View File

@ -3,19 +3,19 @@
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/base.json
View File

@ -1,7 +1,7 @@
{ {
"rougail.general.condition": false, "rougail.general.condition": false,
"services.test.files.file1.name": "/tmp/file1", "services.test_service.files.file1.name": "/tmp/file1",
"services.test.files.file1.activate": true, "services.test_service.files.file1.activate": true,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/11disabled_if_in_filelist_boolean2/makedict/before.json
View File

@ -3,19 +3,19 @@
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.files.file1.name": { "services.test_service.files.file1.name": {
"owner": "default", "owner": "default",
"value": "/tmp/file1" "value": "/tmp/file1"
}, },
"services.test.files.file1.activate": { "services.test_service.files.file1.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/11disabled_if_in_filelist_boolean2/tiramisu/base.py
View File

@ -24,6 +24,6 @@ option_7.impl_set_information('source', "file1")
option_6 = OptionDescription(name="files", doc="files", children=[option_7]) option_6 = OptionDescription(name="files", doc="files", children=[option_7])
option_10 = BoolOption(name="activate", doc="activate", default=True) option_10 = BoolOption(name="activate", doc="activate", default=True)
option_11 = BoolOption(name="manage", doc="manage", default=True) option_11 = BoolOption(name="manage", doc="manage", default=True)
option_5 = OptionDescription(name="test", doc="test", children=[option_6, option_10, option_11]) option_5 = OptionDescription(name="test_service", doc="test.service", children=[option_6, option_10, option_11])
option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"})) option_4 = OptionDescription(name="services", doc="services", children=[option_5], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_4])

8
tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/after.json
View File

@ -3,19 +3,19 @@
"owner": "default", "owner": "default",
"value": "oui" "value": "oui"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

8
tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/base.json
View File

@ -1,7 +1,7 @@
{ {
"rougail.general.condition": "oui", "rougail.general.condition": "oui",
"services.test.files.file.name": "/etc/file", "services.test_service.files.file.name": "/etc/file",
"services.test.files.file.activate": false, "services.test_service.files.file.activate": false,
"services.test.activate": true, "services.test_service.activate": true,
"services.test.manage": true "services.test_service.manage": true
} }

8
tests/dictionaries/11disabled_if_in_filelist_disabled/makedict/before.json
View File

@ -3,19 +3,19 @@
"owner": "default", "owner": "default",
"value": "oui" "value": "oui"
}, },
"services.test.files.file.name": { "services.test_service.files.file.name": {
"owner": "default", "owner": "default",
"value": "/etc/file" "value": "/etc/file"
}, },
"services.test.files.file.activate": { "services.test_service.files.file.activate": {
"owner": "default", "owner": "default",
"value": false "value": false
}, },
"services.test.activate": { "services.test_service.activate": {
"owner": "default", "owner": "default",
"value": true "value": true
}, },
"services.test.manage": { "services.test_service.manage": {
"owner": "default", "owner": "default",
"value": true "value": true
} }

2
tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py
View File

@ -26,6 +26,6 @@ option_9.impl_set_information('source', "file")
option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_8 = OptionDescription(name="files", doc="files", children=[option_9])
option_12 = BoolOption(name="activate", doc="activate", default=True) option_12 = BoolOption(name="activate", doc="activate", default=True)
option_13 = BoolOption(name="manage", doc="manage", default=True) option_13 = BoolOption(name="manage", doc="manage", default=True)
option_7 = OptionDescription(name="test", doc="test", children=[option_8, option_12, option_13]) option_7 = OptionDescription(name="test_service", doc="test.service", children=[option_8, option_12, option_13])
option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"})) option_6 = OptionDescription(name="services", doc="services", children=[option_7], properties=frozenset({"hidden"}))
option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6])

Some files were not shown because too many files have changed in this diff Show More